Improve web socket implementation and move shaded libraries to another package

Author: stirante

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.stirante</groupId>
     <artifactId>lol-client-java-api</artifactId>
-    <version>1.1.7</version>
+    <version>1.1.8</version>
 
     <properties>
         <java.version>1.8</java.version>
@@ -96,6 +96,22 @@
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <relocations>
+                        <relocation>
+                            <pattern>org.apache</pattern>
+                            <shadedPattern>com.stirante.lolclient.libs.org.apache</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>com.google</pattern>
+                            <shadedPattern>com.stirante.lolclient.libs.com.google</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>org.java_websocket</pattern>
+                            <shadedPattern>com.stirante.lolclient.libs.org.java_websocket</shadedPattern>
+                        </relocation>
+                    </relocations>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

src/main/java/com/stirante/lolclient/ClientWebSocket.java

@@ -59,7 +59,9 @@ public void checkServerTrusted(X509Certificate[] certs, String authType) {
     }
 
     private static Map<String, String> createHeaders(String... headers) {
-        if (headers.length % 2 != 0) throw new IllegalArgumentException("Invalid amount of parameters!");
+        if (headers.length % 2 != 0) {
+            throw new IllegalArgumentException("Invalid amount of parameters!");
+        }
         HashMap<String, String> map = new HashMap<>();
         for (int i = 0; i < headers.length; i += 2) {
             String key = headers[i];
@@ -70,14 +72,13 @@ private static Map<String, String> createHeaders(String... headers) {
     }
 
     public void subscribe(String event) {
-        sendMessage(MessageType.SUBSCRIBE, event);
+        sendMessage(new Message(MessageType.SUBSCRIBE, event, null));
     }
 
     public void unsubscribe(String event) {
-        sendMessage(MessageType.UNSUBSCRIBE, event);
+        sendMessage(new Message(MessageType.UNSUBSCRIBE, event, null));
     }
 
-
     public void onOpen(ServerHandshake handshakedata) {
     }
 
@@ -88,8 +89,13 @@ public void onClose(int code, String reason, boolean remote) {
     }
 
     public void onMessage(String message) {
-        if (message.isEmpty()) return;
+        if (message.isEmpty()) {
+            return;
+        }
         Message mess = GSON.fromJson(message, Message.class);
+        if (mess == null) {
+            return;
+        }
         if (mess.type == MessageType.EVENT && socketListener != null) {
             socketListener.onEvent(mess.event);
         }
@@ -99,8 +105,9 @@ public void setSocketListener(SocketListener socketListener) {
         this.socketListener = socketListener;
     }
 
-    public void sendMessage(MessageType type, String message) {
-        send(GSON.toJson(new Object[]{type.getId(), message}));
+    public void sendMessage(Message message) {
+        String text = GSON.toJson(message);
+        send(text);
     }
 
     @Override
@@ -155,7 +162,7 @@ public static class Message {
         private final String source;
         private final Event event;
 
-        private Message(MessageType type, String source, Event event) {
+        public Message(MessageType type, String source, Event event) {
             this.type = type;
             this.source = source;
             this.event = event;
@@ -232,7 +239,9 @@ public Event deserialize(JsonElement json, Type typeOfT, JsonDeserializationCont
                     }
                 }
             }
-            if (c == null) data = context.deserialize((JsonElement) data, Object.class);
+            if (c == null) {
+                data = context.deserialize((JsonElement) data, Object.class);
+            }
             else {
                 try {
                     data = context.deserialize((JsonElement) data, c);
@@ -246,10 +255,13 @@ public Event deserialize(JsonElement json, Type typeOfT, JsonDeserializationCont
         }
     }
 
-    public static class MessageDeserializer implements JsonDeserializer<Message> {
+    public static class MessageDeserializer implements JsonDeserializer<Message>, JsonSerializer<Message> {
 
         @Override
         public Message deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+            if (!(json instanceof JsonArray)) {
+                return null;
+            }
             JsonArray jArr = (JsonArray) json;
             MessageType type = MessageType.getById(jArr.get(0).getAsInt());
             String source = jArr.get(1).getAsString();
@@ -259,6 +271,17 @@ public Message deserialize(JsonElement json, Type typeOfT, JsonDeserializationCo
             }
             return new Message(type, source, event);
         }
+
+        @Override
+        public JsonElement serialize(Message message, Type type, JsonSerializationContext context) {
+            JsonArray result = new JsonArray();
+            result.add(message.type.id);
+            result.add(message.source);
+            if (message.event != null) {
+                result.add(context.serialize(message.event));
+            }
+            return result;
+        }
     }
 
 }