QPID-5665 : Address review comments from Alex Rudyy

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1590593 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 4 insertions, 134 deletions

diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
index 018b72c805..95bd2f582d 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
@@ -1687,7 +1687,7 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im
         }
     }
 
-    protected final static class DuplicateIdException extends RuntimeException
+    protected final static class DuplicateIdException extends IllegalArgumentException
     {
         public DuplicateIdException(final ConfiguredObject<?> child)
         {
@@ -1695,7 +1695,7 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im
         }
     }
 
-    protected final static class DuplicateNameException extends RuntimeException
+    protected final static class DuplicateNameException extends IllegalArgumentException
     {
         private final String _name;
         public DuplicateNameException(final ConfiguredObject<?> child)
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
index 2936bc62d0..0da3ceea87 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
@@ -137,8 +137,7 @@ public interface VirtualHost<X extends VirtualHost<X, Q, E>, Q extends Queue<?>,
     Collection<Q> getQueues();
     Collection<E> getExchanges();
 
-    E createExchange(String name, State initialState, boolean durable,
-                            LifetimePolicy lifetime, String type, Map<String, Object> attributes)
+    E createExchange(Map<String, Object> attributes)
             throws AccessControlException, IllegalArgumentException;
 
     Q createQueue(Map<String, Object> attributes)
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
index d9104bfbe0..dd97b0cba9 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
@@ -98,8 +98,6 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
 
     private static final int HOUSEKEEPING_SHUTDOWN_TIMEOUT = 5;
 
-    private final long _createTime = System.currentTimeMillis();
-
     private ScheduledThreadPoolExecutor _houseKeepingTasks;
 
     private final Broker<?> _broker;
@@ -391,14 +389,6 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
         }
     }
 
-    public String setType(final String currentType, final String desiredType)
-            throws IllegalStateException, AccessControlException
-    {
-        throw new IllegalStateException();
-    }
-
-
-
     @Override
     public State getState()
     {
@@ -566,11 +556,6 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
         return _houseKeepingTasks.getActiveCount();
     }
 
-    public long getCreateTime()
-    {
-        return _createTime;
-    }
-
     @Override
     public AMQQueue<?> getQueue(String name)
     {
@@ -682,98 +667,6 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
         return children;
     }
 
-    public ExchangeImpl<?> createExchange(final String name,
-                                   final State initialState,
-                                   final boolean durable,
-                                   final LifetimePolicy lifetime,
-                                   final String type,
-                                   final Map<String, Object> attributes)
-            throws AccessControlException, IllegalArgumentException
-    {
-        checkVHostStateIsActive();
-
-        try
-        {
-            String alternateExchange = null;
-            if(attributes.containsKey(Exchange.ALTERNATE_EXCHANGE))
-            {
-                Object altExchangeObject = attributes.get(Exchange.ALTERNATE_EXCHANGE);
-                if(altExchangeObject instanceof Exchange)
-                {
-                    alternateExchange = ((Exchange) altExchangeObject).getName();
-                }
-                else if(altExchangeObject instanceof UUID)
-                {
-                    for(Exchange ex : getExchanges())
-                    {
-                        if(altExchangeObject.equals(ex.getId()))
-                        {
-                            alternateExchange = ex.getName();
-                            break;
-                        }
-                    }
-                }
-                else if(altExchangeObject instanceof String)
-                {
-
-                    for(Exchange ex : getExchanges())
-                    {
-                        if(altExchangeObject.equals(ex.getName()))
-                        {
-                            alternateExchange = ex.getName();
-                            break;
-                        }
-                    }
-                    if(alternateExchange == null)
-                    {
-                        try
-                        {
-                            UUID id = UUID.fromString(altExchangeObject.toString());
-                            for(Exchange ex : getExchanges())
-                            {
-                                if(id.equals(ex.getId()))
-                                {
-                                    alternateExchange = ex.getName();
-                                    break;
-                                }
-                            }
-                        }
-                        catch(IllegalArgumentException e)
-                        {
-                            // ignore
-                        }
-
-                    }
-                }
-            }
-            Map<String,Object> attributes1 = new HashMap<String, Object>();
-
-            attributes1.put(ID, null);
-            attributes1.put(NAME, name);
-            attributes1.put(Exchange.TYPE, type);
-            attributes1.put(Exchange.DURABLE, durable);
-            attributes1.put(Exchange.LIFETIME_POLICY,
-                            lifetime != null && lifetime != LifetimePolicy.PERMANENT
-                                    ? LifetimePolicy.DELETE_ON_NO_LINKS : LifetimePolicy.PERMANENT);
-            attributes1.put(Exchange.ALTERNATE_EXCHANGE, alternateExchange);
-            ExchangeImpl exchange = createExchange(attributes1);
-            return exchange;
-
-        }
-        catch(ExchangeExistsException e)
-        {
-            throw new IllegalArgumentException("Exchange with name '" + name + "' already exists");
-        }
-        catch(ReservedExchangeNameException e)
-        {
-            throw new UnsupportedOperationException("'" + name + "' is a reserved exchange name");
-        }
-        catch(AMQUnknownExchangeType e)
-        {
-            throw new IllegalArgumentException(e);
-        }
-    }
-
 
     @Override
     public ExchangeImpl createExchange(Map<String,Object> attributes)
@@ -1247,15 +1140,6 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
         {
             return getState();
         }
-        else if(SUPPORTED_EXCHANGE_TYPES.equals(name))
-        {
-            return getObjectFactory().getSupportedTypes(Exchange.class);
-        }
-        else if(SUPPORTED_QUEUE_TYPES.equals(name))
-        {
-            // TODO
-        }
-
         return super.getAttribute(name);
     }
 
@@ -1268,8 +1152,7 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
     @Override
     public Collection<String> getSupportedQueueTypes()
     {
-        // TODO
-        return null;
+        return getObjectFactory().getSupportedTypes(Queue.class);
     }
 
     @Override
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
index 33706d093c..f7bb58c736 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
@@ -404,18 +404,6 @@ public class MockVirtualHost implements VirtualHostImpl<MockVirtualHost, AMQQueu
         return null;
     }
 
-    @Override
-    public ExchangeImpl<?> createExchange(final String name,
-                                          final State initialState,
-                                          final boolean durable,
-                                          final LifetimePolicy lifetime,
-                                          final String type,
-                                          final Map<String, Object> attributes)
-            throws AccessControlException, IllegalArgumentException
-    {
-        return null;
-    }
-
     public SecurityManager getSecurityManager()
     {
         return null;