QPID-5578 : Remove unusued contants and tidy up other code

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

2 files changed, 1 insertions, 23 deletions

diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java
index 68e1f9d7f2..20020ea2a5 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java
@@ -108,7 +108,7 @@ public abstract class AbstractPluginAdapter<X extends Plugin<X>> extends Abstrac
         }
     }
 
-    protected Broker getBroker()
+    protected Broker<?> getBroker()
     {
         return _broker;
     }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
index 436122d2e1..0363fb6cdd 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
@@ -21,12 +21,10 @@
 
 package org.apache.qpid.server.model.port;
 
-import java.lang.reflect.Type;
 import java.security.AccessControlException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -50,29 +48,9 @@ import org.apache.qpid.server.model.VirtualHostAlias;
 import org.apache.qpid.server.model.VirtualHostNode;
 import org.apache.qpid.server.security.access.Operation;
 import org.apache.qpid.server.util.MapValueConverter;
-import org.apache.qpid.server.util.ParameterizedTypeImpl;
 
 abstract public class AbstractPort<X extends AbstractPort<X>> extends AbstractConfiguredObject<X> implements Port<X>
 {
-    @SuppressWarnings("serial")
-    public static final Map<String, Type> ATTRIBUTE_TYPES = Collections.unmodifiableMap(new HashMap<String, Type>(){{
-        put(NAME, String.class);
-        put(PROTOCOLS, new ParameterizedTypeImpl(Set.class, Protocol.class));
-        put(TRANSPORTS, new ParameterizedTypeImpl(Set.class, Transport.class));
-        put(TRUST_STORES, new ParameterizedTypeImpl(Set.class, String.class));
-        put(KEY_STORE, String.class);
-        put(PORT, Integer.class);
-        put(TCP_NO_DELAY, Boolean.class);
-        put(RECEIVE_BUFFER_SIZE, Integer.class);
-        put(SEND_BUFFER_SIZE, Integer.class);
-        put(NEED_CLIENT_AUTH, Boolean.class);
-        put(WANT_CLIENT_AUTH, Boolean.class);
-        put(BINDING_ADDRESS, String.class);
-        put(STATE, State.class);
-        put(AUTHENTICATION_PROVIDER, String.class);
-    }});
-
-    public static final Transport DEFAULT_TRANSPORT = Transport.TCP;
 
     private final Broker<?> _broker;
     private AtomicReference<State> _state;