This is related to QPID-2242

I modified the code to keep a map consisting of exchange_type and exchange_name, so it can be properly used when needed.


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

1 files changed, 97 insertions, 47 deletions

diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractAMQMessageDelegate.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractAMQMessageDelegate.java
index 534fb19b76..6b90bd3ad2 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractAMQMessageDelegate.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractAMQMessageDelegate.java
@@ -20,16 +20,16 @@
  */
 package org.apache.qpid.client.message;
 
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.qpid.client.AMQAnyDestination;
 import org.apache.qpid.client.AMQDestination;
 import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQTopic;
-import org.apache.qpid.client.AMQUndefinedDestination;
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.framing.AMQShortString;
 
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
 /**
  * This abstract class provides exchange lookup functionality that is shared
  * between all MessageDelegates. Update facilities are provided so that the 0-10
@@ -43,28 +43,42 @@ import java.util.concurrent.ConcurrentHashMap;
 public abstract class AbstractAMQMessageDelegate implements AMQMessageDelegate
 {
 
-    private static Map<AMQShortString, Integer> _exchangeTypeMap = new ConcurrentHashMap<AMQShortString, Integer>();
-    private static Map<String, Integer> _exchangeTypeStringMap = new ConcurrentHashMap<String, Integer>();
-    private static Map<String, Integer> _exchangeTypeToDestinationType = new ConcurrentHashMap<String, Integer>();
+    private static Map<String, Integer> _exchangeTypeToDestinationType = new ConcurrentHashMap<String, Integer>();    
+    private static Map<String,ExchangeInfo> _exchangeMap = new  ConcurrentHashMap<String, ExchangeInfo>();
 
     /**
      * Add default Mappings for the Direct, Default, Topic and Fanout exchanges.
      */
     static
     {
-        _exchangeTypeMap.put(ExchangeDefaults.DIRECT_EXCHANGE_NAME, AMQDestination.QUEUE_TYPE);
-        _exchangeTypeMap.put(AMQShortString.EMPTY_STRING, AMQDestination.QUEUE_TYPE);
-        _exchangeTypeMap.put(ExchangeDefaults.TOPIC_EXCHANGE_NAME, AMQDestination.TOPIC_TYPE);
-        _exchangeTypeMap.put(ExchangeDefaults.FANOUT_EXCHANGE_NAME, AMQDestination.TOPIC_TYPE);
-
-        _exchangeTypeStringMap.put(ExchangeDefaults.DIRECT_EXCHANGE_NAME.toString(), AMQDestination.QUEUE_TYPE);
-        _exchangeTypeStringMap.put("", AMQDestination.QUEUE_TYPE);
-        _exchangeTypeStringMap.put(ExchangeDefaults.TOPIC_EXCHANGE_NAME.toString(), AMQDestination.TOPIC_TYPE);
-        _exchangeTypeStringMap.put(ExchangeDefaults.FANOUT_EXCHANGE_NAME.toString(), AMQDestination.TOPIC_TYPE);
-
-        _exchangeTypeToDestinationType.put(ExchangeDefaults.DIRECT_EXCHANGE_NAME.toString(), AMQDestination.QUEUE_TYPE);
-        _exchangeTypeToDestinationType.put(ExchangeDefaults.TOPIC_EXCHANGE_NAME.toString(), AMQDestination.TOPIC_TYPE);
-        _exchangeTypeToDestinationType.put(ExchangeDefaults.FANOUT_EXCHANGE_NAME.toString(), AMQDestination.TOPIC_TYPE);
+        _exchangeTypeToDestinationType.put("", AMQDestination.QUEUE_TYPE);
+        _exchangeTypeToDestinationType.put(ExchangeDefaults.DIRECT_EXCHANGE_CLASS.toString(), AMQDestination.QUEUE_TYPE);
+        _exchangeTypeToDestinationType.put(ExchangeDefaults.TOPIC_EXCHANGE_CLASS.toString(), AMQDestination.TOPIC_TYPE);
+        _exchangeTypeToDestinationType.put(ExchangeDefaults.FANOUT_EXCHANGE_CLASS.toString(), AMQDestination.TOPIC_TYPE);
+        _exchangeTypeToDestinationType.put(ExchangeDefaults.HEADERS_EXCHANGE_CLASS.toString(), AMQDestination.QUEUE_TYPE);
+        
+        _exchangeMap.put("", new ExchangeInfo("","",AMQDestination.QUEUE_TYPE));
+        
+        _exchangeMap.put(ExchangeDefaults.DIRECT_EXCHANGE_NAME.toString(),
+                         new ExchangeInfo(ExchangeDefaults.DIRECT_EXCHANGE_NAME.toString(),
+                                          ExchangeDefaults.DIRECT_EXCHANGE_CLASS.toString(),
+                                          AMQDestination.QUEUE_TYPE));
+        
+        _exchangeMap.put(ExchangeDefaults.TOPIC_EXCHANGE_NAME.toString(),
+                         new ExchangeInfo(ExchangeDefaults.TOPIC_EXCHANGE_NAME.toString(),
+                                          ExchangeDefaults.TOPIC_EXCHANGE_CLASS.toString(),
+                                          AMQDestination.TOPIC_TYPE));
+        
+        _exchangeMap.put(ExchangeDefaults.FANOUT_EXCHANGE_NAME.toString(),
+                         new ExchangeInfo(ExchangeDefaults.FANOUT_EXCHANGE_NAME.toString(),
+                                          ExchangeDefaults.FANOUT_EXCHANGE_CLASS.toString(),
+                                          AMQDestination.TOPIC_TYPE));
+        
+        _exchangeMap.put(ExchangeDefaults.HEADERS_EXCHANGE_NAME.toString(),
+                         new ExchangeInfo(ExchangeDefaults.HEADERS_EXCHANGE_NAME.toString(),
+                                          ExchangeDefaults.HEADERS_EXCHANGE_CLASS.toString(),
+                                          AMQDestination.QUEUE_TYPE));        
+        
     }
 
     /**
@@ -79,16 +93,26 @@ public abstract class AbstractAMQMessageDelegate implements AMQMessageDelegate
     protected AMQDestination generateDestination(AMQShortString exchange, AMQShortString routingKey)
     {
         AMQDestination dest;
-        switch (getExchangeType(exchange))
+        ExchangeInfo exchangeInfo = _exchangeMap.get(exchange.asString());
+        
+        if ("topic".equals(exchangeInfo.exchangeType))
+        {
+            dest = new AMQTopic(exchange, routingKey, null);
+        }
+        else if ("direct".equals(exchangeInfo.exchangeType))
         {
-            case AMQDestination.QUEUE_TYPE:
-                dest = new AMQQueue(exchange, routingKey, routingKey);
-                break;
-            case AMQDestination.TOPIC_TYPE:
-                dest = new AMQTopic(exchange, routingKey, null);
-                break;
-            default:
-                dest = new AMQUndefinedDestination(exchange, routingKey, null);
+            dest = new AMQQueue(exchange, routingKey, routingKey); 
+        }
+        else
+        {
+            dest = new AMQAnyDestination(exchange,
+                                         new AMQShortString(exchangeInfo.exchangeType),
+                                         routingKey,
+                                         false,
+                                         false,
+                                         routingKey,
+                                         false,
+                                         new AMQShortString[] {routingKey});
         }
 
         return dest;
@@ -102,7 +126,7 @@ public abstract class AbstractAMQMessageDelegate implements AMQMessageDelegate
      * create a suitable AMQDestination representation
      *
      * @param exchange the name of the exchange
-     * @param newtype the AMQP exchange class name i.e. amq.direct
+     * @param newtype the AMQP exchange class name i.e. direct
      */
     protected static void updateExchangeType(String exchange, String newtype)
     {
@@ -111,8 +135,8 @@ public abstract class AbstractAMQMessageDelegate implements AMQMessageDelegate
         {
             type = AMQDestination.UNKNOWN_TYPE;
         }
-        _exchangeTypeStringMap.put(exchange, type);
-        _exchangeTypeMap.put(new AMQShortString(exchange), type);
+        
+        _exchangeMap.put(exchange, new ExchangeInfo(exchange,newtype,type));
     }
 
     /**
@@ -126,26 +150,52 @@ public abstract class AbstractAMQMessageDelegate implements AMQMessageDelegate
      */
     protected static boolean exchangeMapContains(String exchange)
     {
-        return _exchangeTypeStringMap.containsKey(exchange);
+        return _exchangeMap.containsKey(exchange);
     }
+}
 
-    /**
-     * Returns an int representing the exchange type. This is used in the
-     * createDestination method to ensure the correct AMQDestiation is created. 
-     *
-     * @param exchange the exchange name to lookup
-     * @return int representing the Exchange type
-     */
-    private int getExchangeType(AMQShortString exchange)
+class ExchangeInfo
+{
+    String exchangeName;
+    String exchangeType;
+    int destType = AMQDestination.QUEUE_TYPE;
+    
+    public ExchangeInfo(String exchangeName, String exchangeType,
+                        int destType)
     {
-        Integer type = _exchangeTypeMap.get(exchange == null ? AMQShortString.EMPTY_STRING : exchange);
+        super();
+        this.exchangeName = exchangeName;
+        this.exchangeType = exchangeType;
+        this.destType = destType;
+    }
 
-        if (type == null)
-        {
-            return AMQDestination.UNKNOWN_TYPE;
-        }
+    public String getExchangeName()
+    {
+        return exchangeName;
+    }
+
+    public void setExchangeName(String exchangeName)
+    {
+        this.exchangeName = exchangeName;
+    }
 
-        return type;
+    public String getExchangeType()
+    {
+        return exchangeType;
+    }
+
+    public void setExchangeType(String exchangeType)
+    {
+        this.exchangeType = exchangeType;
     }
 
+    public int getDestType()
+    {
+        return destType;
+    }
+
+    public void setDestType(int destType)
+    {
+        this.destType = destType;
+    }        
 }