svn commit: r746250 - in /servicemix/smx4/nmr/trunk/jbi/runtime/src: main/java/org/apache/servicemix/jbi/runtime/impl/MessageExchangeImpl.java test/java/org/apache/servicemix/jbi/runtime/MessageExchangeImplTest.java

[gn...@apache.org]

Author: gnodet
Date: Fri Feb 20 14:21:29 2009
New Revision: 746250

URL: http://svn.apache.org/viewvc?rev=746250&view=rev
Log:
SMX4NMR-101: The message exchange pattern's URI does not comply with the spec

Added:
    servicemix/smx4/nmr/trunk/jbi/runtime/src/test/java/org/apache/servicemix/jbi/runtime/MessageExchangeImplTest.java
Modified:
    servicemix/smx4/nmr/trunk/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/MessageExchangeImpl.java

Modified: servicemix/smx4/nmr/trunk/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/MessageExchangeImpl.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/MessageExchangeImpl.java?rev=746250&r1=746249&r2=746250&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/MessageExchangeImpl.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/MessageExchangeImpl.java Fri Feb 20 14:21:29 2009
@@ -18,6 +18,8 @@
 
 import java.net.URI;
 import java.util.Set;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.jbi.messaging.ExchangeStatus;
 import javax.jbi.messaging.Fault;
@@ -30,6 +32,7 @@
 import org.apache.servicemix.nmr.api.Exchange;
 import org.apache.servicemix.nmr.api.Message;
 import org.apache.servicemix.nmr.api.Status;
+import org.apache.servicemix.nmr.api.Pattern;
 import org.apache.servicemix.nmr.core.MessageImpl;
 
 /**
@@ -47,6 +50,17 @@
     public static final String OUT = "out";
     public static final String FAULT = "fault";
 
+    private static final Map<Pattern, URI> MEP_URIS;
+
+    static {
+        MEP_URIS = new HashMap<Pattern, URI>();
+        for (Pattern mep : Pattern.values()) {
+            String uri = mep.getWsdlUri();
+            String name = uri.substring(uri.lastIndexOf('/') + 1);
+            MEP_URIS.put(mep, URI.create("http://www.w3.org/2004/08/wsdl/" + name));
+        }
+    }
+
     private final Exchange exchange;
     private ExchangeStatus previousStatus;
 
@@ -63,7 +77,7 @@
     }
 
     public URI getPattern() {
-        return URI.create(exchange.getPattern().getWsdlUri());
+        return MEP_URIS.get(exchange.getPattern());
     }
 
     public MessageExchange.Role getRole() {

Added: servicemix/smx4/nmr/trunk/jbi/runtime/src/test/java/org/apache/servicemix/jbi/runtime/MessageExchangeImplTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/runtime/src/test/java/org/apache/servicemix/jbi/runtime/MessageExchangeImplTest.java?rev=746250&view=auto
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/runtime/src/test/java/org/apache/servicemix/jbi/runtime/MessageExchangeImplTest.java (added)
+++ servicemix/smx4/nmr/trunk/jbi/runtime/src/test/java/org/apache/servicemix/jbi/runtime/MessageExchangeImplTest.java Fri Feb 20 14:21:29 2009
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.servicemix.jbi.runtime;
+
+import javax.jbi.messaging.MessageExchange;
+
+import junit.framework.TestCase;
+import org.apache.servicemix.jbi.runtime.impl.MessageExchangeImpl;
+import org.apache.servicemix.nmr.core.ExchangeImpl;
+import org.apache.servicemix.nmr.api.Pattern;
+
+public class MessageExchangeImplTest extends TestCase {
+
+    public void testMep() {
+        MessageExchange me;
+
+        me = new MessageExchangeImpl(new ExchangeImpl(Pattern.InOnly));
+        assertEquals("http://www.w3.org/2004/08/wsdl/in-only", me.getPattern().toString());
+
+        me = new MessageExchangeImpl(new ExchangeImpl(Pattern.InOut));
+        assertEquals("http://www.w3.org/2004/08/wsdl/in-out", me.getPattern().toString());
+
+        me = new MessageExchangeImpl(new ExchangeImpl(Pattern.InOptionalOut));
+        assertEquals("http://www.w3.org/2004/08/wsdl/in-opt-out", me.getPattern().toString());
+
+        me = new MessageExchangeImpl(new ExchangeImpl(Pattern.RobustInOnly));
+        assertEquals("http://www.w3.org/2004/08/wsdl/robust-in-only", me.getPattern().toString());
+    }
+}