Polish routing parts

Author: vongosling

openmessaging-api-samples/src/main/java/io/openmessaging/samples/routing/RoutingApp.java

@@ -41,14 +41,15 @@ public static void main(String[] args)  {
         //Create the source queue.
         resourceManager.createQueue(sourceQueue);
 
-        resourceManager.deDuplicate(sourceQueue, destinationQueue);
+        resourceManager.routing(sourceQueue, destinationQueue);
+        resourceManager.filter(destinationQueue,"name = 'kaka'");
 
         //Send messages to the source queue ahead of the routing
         final Producer producer = messagingAccessPoint.createProducer();
         producer.startup();
 
         Message message = producer.createMessage(sourceQueue, "RED_COLOR".getBytes());
-        message.properties().put("color", "freen").put("shape", "round");
+        message.properties().put("color", "green").put("shape", "round");
 
         producer.send(message);
 

openmessaging-api/src/main/java/io/openmessaging/manager/ResourceManager.java

@@ -91,16 +91,6 @@ public interface ResourceManager {
      */
     ListQueueResult listQueues(String nsName);
 
-    /**
-     * Duplicate current queue to target queue, to After the current queue receives the message, it will be copied to
-     * the target queue.
-     *
-     * @param sourceQueueName original queue, user can send message to this queue.
-     * @param targetQueueName target queue, only receives message from original queue.
-     * @return
-     */
-    Result duplicate(String sourceQueueName, String targetQueueName);
-
     /**
      * In order to enable consumers to get the message in the specified mode, OpenMessaging recommend  use SQL
      * expression to filter out messages.
@@ -112,13 +102,12 @@ public interface ResourceManager {
     Result filter(String queueName, String filterString);
 
     /**
-     * Deduplicate current  queue from sourceQueue, after this operation, <code>targetQueue</code>  will no longer
-     * receive messages sent to the source queue.
+     * Routing from sourceQueue to targetQueue. Both queues are could be received messages after creating route action.
      *
      * @param sourceQueue source queue, process messages received from producer and duplicate those to target queue.
      * @param targetQueue receive messages from source queue.
      * @return
      */
-    Result deDuplicate(String sourceQueue, String targetQueue);
+    Result routing(String sourceQueue, String targetQueue);
 
 }

openmessaging-api/src/test/java/io/openmessaging/internal/AccessPointURITest.java

@@ -17,7 +17,6 @@
 
 package io.openmessaging.internal;
 
-import io.openmessaging.Message;
 import io.openmessaging.exception.OMSRuntimeException;
 import org.junit.Test;
 
@@ -28,11 +27,10 @@ public class AccessPointURITest {
     private String fullSchemaURI = "oms:rocketmq://alice@rocketmq.apache.org/us-east";
 
     @Test
-    public void testParse_DriverIsIllegal() throws Exception {
+    public void testParse_DriverIsIllegal() {
         String missDriverType = "oms://alice@rocketmq.apache.org/us-east";
-        AccessPointURI accessPointURI = null;
         try {
-            accessPointURI = new AccessPointURI(missDriverType);
+            new AccessPointURI(missDriverType);
             failBecauseExceptionWasNotThrown(OMSRuntimeException.class);
         } catch (Exception e) {
             assertThat(e).hasMessageContaining(String.format("The OMS driver URL [%s] is illegal.", missDriverType));
@@ -41,33 +39,33 @@ public void testParse_DriverIsIllegal() throws Exception {
 
         String missRegion = "oms:rocketmq://alice@rocketmq.apache.org/";
         try {
-            accessPointURI = new AccessPointURI(missRegion);
+            new AccessPointURI(missRegion);
             failBecauseExceptionWasNotThrown(OMSRuntimeException.class);
         } catch (Exception e) {
             assertThat(e).hasMessageContaining(String.format("The OMS driver URL [%s] is illegal.", missRegion));
         }
     }
 
     @Test
-    public void testGetAccessPointString() throws Exception {
+    public void testGetAccessPointString() {
         AccessPointURI accessPointURI = new AccessPointURI(fullSchemaURI);
         assertThat(accessPointURI.getAccessPointString()).isEqualTo(fullSchemaURI);
     }
 
     @Test
-    public void testGetDriverType() throws Exception {
+    public void testGetDriverType() {
         AccessPointURI accessPointURI = new AccessPointURI(fullSchemaURI);
         assertThat(accessPointURI.getDriverType()).isEqualTo("rocketmq");
     }
 
     @Test
-    public void testGetAccountId() throws Exception {
+    public void testGetAccountId() {
         AccessPointURI accessPointURI = new AccessPointURI(fullSchemaURI);
         assertThat(accessPointURI.getAccountId()).isEqualTo("alice");
     }
 
     @Test
-    public void testGetHosts() throws Exception {
+    public void testGetHosts() {
         AccessPointURI accessPointURI = new AccessPointURI(fullSchemaURI);
         assertThat(accessPointURI.getHosts()).isEqualTo("rocketmq.apache.org");
 
@@ -77,7 +75,7 @@ public void testGetHosts() throws Exception {
     }
 
     @Test
-    public void testGetRegion() throws Exception {
+    public void testGetRegion() {
         AccessPointURI accessPointURI = new AccessPointURI(fullSchemaURI);
 
         assertThat(accessPointURI.getRegion()).isEqualTo("us-east");