Replace rule with expression and polish the OMSBuiltinKeys

Author: zhouxinyu

assets/images/OpenMessaging-V0.3.0-alpha.png

@@ -48,7 +48,7 @@ public static void main(String[] args) throws OMSResourceNotExistException {
         KeyValue routingAttr = OMS.newKeyValue();
         routingAttr.put(OMSBuiltinKeys.ROUTING_SOURCE, sourceQueue)
             .put(OMSBuiltinKeys.ROUTING_DESTINATION, destinationQueue)
-            .put(OMSBuiltinKeys.ROUTING_RULE, "color = 'red'");
+            .put(OMSBuiltinKeys.ROUTING_EXPRESSION, "color = 'red'");
 
         resourceManager.createRouting("HELLO_ROUTING", routingAttr);
 

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

@@ -18,22 +18,72 @@
 package io.openmessaging;
 
 /**
- * This is the centralized source for keys that are used by {@link KeyValue}.
+ * This is the centralized source for keys that are used for OMS standard attributes.
  *
  * @version OMS 1.0.0
  * @since OMS 1.0.0
  */
 public interface OMSBuiltinKeys {
+    /**
+     * The {@code DRIVER_IMPL} key represents the vendor implementation
+     * entry of {@link MessagingAccessPoint}.
+     */
     String DRIVER_IMPL = "DRIVER_IMPL";
+
+    /**
+     * The {@code ACCESS_POINTS} key shows the specified access points in OMS driver schema.
+     * @see <a href="https://github.com/openmessaging/specification/blob/master/oms_access_point_schema.md">Access Point Schema</a>
+     */
     String ACCESS_POINTS = "ACCESS_POINTS";
+
+    /**
+     * The {@code NAMESPACE} key defines the isolated space of resources and related operations.
+     */
     String NAMESPACE = "NAMESPACE";
+
+    /**
+     * The {@code ACCOUNT_ID} key shows the specified account info in OMS driver schema.
+     */
     String ACCOUNT_ID = "ACCOUNT_ID";
+
+    /**
+     * The {@code REGION} key shows the specified region in OMS driver schema.
+     */
     String REGION = "REGION";
+
+    /**
+     * The {@code PRODUCER_ID} key represents the the unique producer id of a producer instance.
+     */
     String PRODUCER_ID = "PRODUCER_ID";
+
+    /**
+     * The {@code CONSUMER_ID} key represents the the unique consumer id of a consumer instance.
+     */
     String CONSUMER_ID = "CONSUMER_ID";
+
+    /**
+     * The {@code OPERATION_TIMEOUT} key defines the timeout of almost all the method calls in OMS.
+     */
     String OPERATION_TIMEOUT = "OPERATION_TIMEOUT";
 
+    /**
+     * The {@code ROUTING_SOURCE} key shows the source queue of a {@code Routing} instance.
+     * <p>
+     * The {@code Routing} consists of a triple, include source queue, destination queue and expression.
+     */
     String ROUTING_SOURCE = "ROUTING_SOURCE";
+
+    /**
+     * The {@code ROUTING_DESTINATION} key shows the destination queue of a {@code Routing} instance.
+     * <p>
+     * The {@code Routing} consists of a triple, include source queue, destination queue and expression.
+     */
     String ROUTING_DESTINATION = "ROUTING_DESTINATION";
-    String ROUTING_RULE = "ROUTING_RULE";
+
+    /**
+     * The {@code ROUTING_EXPRESSION} key shows the expression of a {@code Routing} instance.
+     * <p>
+     * The {@code Routing} consists of a triple, include source queue, destination queue and expression.
+     */
+    String ROUTING_EXPRESSION = "ROUTING_EXPRESSION";
 }