Merge pull request #1 from openmessaging/master

merge

Author: llIlll

openmessaging-api/src/main/java/io/openmessaging/Future.java

@@ -32,6 +32,29 @@
  * @since OMS 1.0.0
  */
 public interface Future<V> {
+    /**
+     * Attempts to cancel execution of this task.  This attempt will
+     * fail if the task has already completed, has already been cancelled,
+     * or could not be cancelled for some other reason. If successful,
+     * and this task has not started when {@code cancel} is called,
+     * this task should never run.  If the task has already started,
+     * then the {@code mayInterruptIfRunning} parameter determines
+     * whether the thread executing this task should be interrupted in
+     * an attempt to stop the task.
+     *
+     * <p>After this method returns, subsequent calls to {@link #isDone} will
+     * always return {@code true}.  Subsequent calls to {@link #isCancelled}
+     * will always return {@code true} if this method returned {@code true}.
+     *
+     * @param mayInterruptIfRunning {@code true} if the thread executing this
+     * task should be interrupted; otherwise, in-progress tasks are allowed
+     * to complete
+     * @return {@code false} if the task could not be cancelled,
+     * typically because it has already completed normally;
+     * {@code true} otherwise
+     */
+    boolean cancel(boolean mayInterruptIfRunning);
+
     /**
      * Returns {@code true} if this task was cancelled before it completed normally.
      *

openmessaging-api/src/main/java/io/openmessaging/KeyValue.java

@@ -83,7 +83,7 @@ public interface KeyValue {
      * @return the value in this {@code KeyValue} object with the specified key value
      * @see #put(String, short)
      */
-    int getShort(String key);
+    short getShort(String key);
 
     /**
      * Searches for the {@code short} property with the specified key in this {@code KeyValue} object. If the key is not
@@ -94,7 +94,7 @@ public interface KeyValue {
      * @return the value in this {@code KeyValue} object with the specified key value
      * @see #put(String, short)
      */
-    int getShort(String key, short defaultValue);
+    short getShort(String key, short defaultValue);
 
     /**
      * Searches for the {@code int} property with the specified key in this {@code KeyValue} object. If the key is not

openmessaging-api/src/main/java/io/openmessaging/OMSBuiltinKeys.java

@@ -41,6 +41,11 @@ public interface OMSBuiltinKeys {
      */
     String ACCOUNT_ID = "ACCOUNT_ID";
 
+    /**
+     * The {@code ACCOUNT_KEY} key shows the specified account key in OMS attribute.
+     */
+    String ACCOUNT_KEY = "ACCOUNT_KEY";
+
     /**
      * The {@code REGION} key shows the specified region in OMS driver schema.
      */

openmessaging-api/src/main/java/io/openmessaging/internal/DefaultKeyValue.java

@@ -32,13 +32,16 @@ public class DefaultKeyValue implements KeyValue {
     private Map<String, String> properties;
 
     @Override
-    public int getShort(String key) {
-        return 0;
+    public short getShort(String key) {
+        if (!properties.containsKey(key)) {
+            return 0;
+        }
+        return Short.valueOf(properties.get(key));
     }
 
     @Override
-    public int getShort(String key, short defaultValue) {
-        return 0;
+    public short getShort(String key, short defaultValue) {
+        return properties.containsKey(key) ? getShort(key) : defaultValue;
     }
 
     @Override