Support customize subscribe.options && compatible with null value for type int (#514)

* support customize subscribe.options

* enable empty SubscribeOptions

* compatible with null value for type int

Co-authored-by: Lin Wei <linwei@ifanr.com>

Author: cyrushine

autobahn/src/main/java/io/crossbar/autobahn/wamp/messages/Subscribe.java

@@ -30,8 +30,7 @@ public class Subscribe implements IMessage {
 
     private final long request;
     private final String topic;
-    private final String match;
-    private final boolean getRetained;
+    private final SubscribeOptions options;
 
     private static final String MATCH_EXACT = "exact";
     private static final String MATCH_PREFIX = "prefix";
@@ -41,54 +40,48 @@ public Subscribe(long request, SubscribeOptions options, String topic) {
         this.request = request;
         this.topic = topic;
         if (options != null) {
-            if (options.match != null) {
-                if (!options.match.equals(MATCH_EXACT) && !options.match.equals(MATCH_PREFIX) &&
-                        !options.match.equals(MATCH_WILDCARD)) {
+            String match = options.getMatch();
+            if (match != null) {
+                if (!match.equals(MATCH_EXACT) && !match.equals(MATCH_PREFIX) &&
+                        !match.equals(MATCH_WILDCARD)) {
                     throw new IllegalArgumentException("match must be one of exact, prefix or wildcard.");
                 }
             }
-            this.match = options.match;
-            this.getRetained = options.getRetained;
+            this.options = options;
         } else {
-            this.match = MATCH_EXACT;
-            this.getRetained = false;
+            this.options = new SubscribeOptions(MATCH_EXACT, false);
         }
     }
 
     public static Subscribe parse(List<Object> wmsg) {
         MessageUtil.validateMessage(wmsg, MESSAGE_TYPE, "SUBSCRIBE", 4);
 
         long request = MessageUtil.parseLong(wmsg.get(1));
-        Map<String, Object> options = (Map<String, Object>) wmsg.get(2);
+        SubscribeOptions options = new SubscribeOptions((Map<String, Object>) wmsg.get(2));
 
-        String match = null;
-        if (options.containsKey("match")) {
-            match = (String) options.get("match");
-            if (!match.equals(MATCH_EXACT) && !match.equals(MATCH_PREFIX) &&
-                    !match.equals(MATCH_WILDCARD)) {
-                throw new ProtocolError("match must be one of exact, prefix or wildcard.");
-            }
+        String match = options.getMatch();
+        if (match != null && !match.equals(MATCH_EXACT) && !match.equals(MATCH_PREFIX) &&
+                !match.equals(MATCH_WILDCARD)) {
+            throw new ProtocolError("match must be one of exact, prefix or wildcard.");
         }
-        boolean getRetained = getOrDefault(options, "get_retained", false);
 
         String topic = (String) wmsg.get(3);
-        SubscribeOptions opt = new SubscribeOptions(match, true, getRetained);
-        return new Subscribe(request, opt, topic);
+        return new Subscribe(request, options, topic);
     }
 
     @Override
     public List<Object> marshal() {
         List<Object> marshaled = new ArrayList<>();
         marshaled.add(MESSAGE_TYPE);
         marshaled.add(request);
-        Map<String, Object> extra = new HashMap<>();
-        if (match != null && !match.equals(MATCH_EXACT)) {
-        	 extra.put("match", match);
-        }
-        if (getRetained) {
-        	extra.put("get_retained", getRetained);
+
+        SubscribeOptions options = new SubscribeOptions(this.options);
+        String match = options.getMatch();
+        if (match != null && match.equals(MATCH_EXACT)) {
+        	 options.removeMatch();
         }
-        marshaled.add(extra);
+
+        marshaled.add(options);
         marshaled.add(topic);
         return marshaled;
     }

autobahn/src/main/java/io/crossbar/autobahn/wamp/types/SubscribeOptions.java

@@ -11,14 +11,51 @@
 
 package io.crossbar.autobahn.wamp.types;
 
-public class SubscribeOptions {
-    public String match;
-    public boolean details;
-    public boolean getRetained;
+import java.util.HashMap;
+import java.util.Map;
 
-    public SubscribeOptions(String match, boolean details, boolean getRetained) {
-        this.match = match;
-        this.details = details;
-        this.getRetained = getRetained;
+public class SubscribeOptions extends HashMap<String, Object> {
+
+    public static final String KEY_MATCH = "match";
+    public static final String KEY_GET_RETAINED = "get_retained";
+
+    public SubscribeOptions(String match, boolean getRetained) {
+        putMatch(match);
+        putGetRetained(getRetained);
+    }
+
+    public SubscribeOptions(Map<String, Object> origin) {
+        super(origin);
+    }
+
+    public SubscribeOptions() {
+        super();
+    }
+
+    public void putMatch(String match) {
+        put(KEY_MATCH, match);
+    }
+
+    public void putGetRetained(boolean getRetained) {
+        put(KEY_GET_RETAINED, getRetained);
     }
+
+    public String getMatch() {
+        Object value = get(KEY_MATCH);
+        return value instanceof String ? (String) value : null;
+    }
+
+    public Boolean getRetained() {
+        Object value = get(KEY_GET_RETAINED);
+        return value instanceof Boolean ? (Boolean) value : null;
+    }
+
+    public void removeMatch() {
+        remove(KEY_MATCH);
+    }
+
+    public void removeGetRetained() {
+        remove(KEY_GET_RETAINED);
+    }
+
 }

autobahn/src/main/java/io/crossbar/autobahn/wamp/utils/MessageUtil.java

@@ -67,6 +67,9 @@ public static long parseLong(Object object) {
 		if (object instanceof Integer) {
 			return (int) object;
 		}
-		return (long) object;
+		if (object instanceof Long) {
+		    return (Long) object;
+        }
+		return 0;
     }
 }