1 files changed, 89 insertions, 8 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/model/Protocol.java b/java/broker/src/main/java/org/apache/qpid/server/model/Protocol.java
index 5d9de69f9a..6cd5eb23a4 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/model/Protocol.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/model/Protocol.java
@@ -20,14 +20,95 @@
  */
 package org.apache.qpid.server.model;
 
+import java.util.Collection;
+import java.util.EnumSet;
+
+import org.apache.qpid.server.protocol.AmqpProtocolVersion;
+
 public enum Protocol
 {
-    AMQP_0_8,
-    AMQP_0_9,
-    AMQP_0_9_1,
-    AMQP_0_10,
-    AMQP_1_0,
-    JMX,
-    HTTP,
-    HTTPS
+    AMQP_0_8(ProtocolType.AMQP),
+    AMQP_0_9(ProtocolType.AMQP),
+    AMQP_0_9_1(ProtocolType.AMQP),
+    AMQP_0_10(ProtocolType.AMQP),
+    AMQP_1_0(ProtocolType.AMQP),
+    JMX_RMI(ProtocolType.JMX),
+    HTTP(ProtocolType.HTTP),
+    HTTPS(ProtocolType.HTTP),
+    RMI(ProtocolType.RMI);
+
+    private final ProtocolType _protocolType;
+
+    private Protocol(ProtocolType type)
+    {
+        _protocolType =  type;
+    }
+
+    public ProtocolType getProtocolType()
+    {
+        return _protocolType;
+    }
+
+    public boolean isAMQP()
+    {
+        return _protocolType == ProtocolType.AMQP;
+    }
+
+    public AmqpProtocolVersion toAmqpProtocolVersion()
+    {
+        switch(this)
+        {
+            case AMQP_0_8:
+                return AmqpProtocolVersion.v0_8;
+            case AMQP_0_9:
+                return AmqpProtocolVersion.v0_9;
+            case AMQP_0_9_1:
+                return AmqpProtocolVersion.v0_9_1;
+            case AMQP_0_10:
+                return AmqpProtocolVersion.v0_10;
+            case AMQP_1_0:
+                return AmqpProtocolVersion.v1_0_0;
+            default:
+                throw new IllegalArgumentException(this + " is not an known AMQP protocol");
+        }
+    }
+
+    public static Protocol valueOfObject(Object protocolObject)
+    {
+        Protocol protocol;
+        if (protocolObject instanceof Protocol)
+        {
+            protocol = (Protocol) protocolObject;
+        }
+        else
+        {
+            try
+            {
+                protocol = Protocol.valueOf(String.valueOf(protocolObject));
+            }
+            catch (Exception e)
+            {
+                throw new IllegalArgumentException("Can't convert '" + protocolObject
+                        + "' to one of the supported protocols: " + EnumSet.allOf(Protocol.class), e);
+            }
+        }
+        return protocol;
+    }
+
+    public static boolean hasAmqpProtocol(Collection<Protocol> protocols)
+    {
+        for (Protocol protocol : protocols)
+        {
+            if (protocol.isAMQP())
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static enum ProtocolType
+    {
+        AMQP, HTTP, JMX, RMI;
+    }
 }