recovered back to old codec system GsonCodec.java -> MessagePackCodec.java

Author: fajzu1

bridge/src/main/java/net/lightcode/bridge/listener/PlayerServerConnectListener.java

@@ -18,8 +18,7 @@ public PlayerServerConnectListener(BridgePlugin plugin) {
 
     @Subscribe
     public void onServerPreConnect(ServerPreConnectEvent event) {
-        Player player = event.getPlayer();
-        ;
+        final Player player = event.getPlayer();
 
         Sector sector = this.plugin.sectorService().find(
                 this.plugin.networkService().databaseConnection().sync().get(player.getUsername())

common/pom.xml

@@ -67,6 +67,25 @@
             <artifactId>guava</artifactId>
             <version>33.5.0-jre</version>
         </dependency>
+        <dependency>
+            <groupId>org.msgpack</groupId>
+            <artifactId>jackson-dataformat-msgpack</artifactId>
+            <version>0.9.10</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.20.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.20.0</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>io.lettuce</groupId>
             <artifactId>lettuce-core</artifactId>

common/src/main/java/net/lightcode/NetworkService.java

@@ -6,7 +6,7 @@
 import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
 import net.lightcode.packet.Packet;
 import net.lightcode.redis.PacketListener;
-import net.lightcode.redis.codec.GsonCodec;
+import net.lightcode.redis.codec.MessagePackCodec;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,10 +32,10 @@ public NetworkService(String address,
                 .withPassword(password)
                 .build());
 
-        GsonCodec gsonCodec = new GsonCodec();
+        MessagePackCodec messagePackCodec = new MessagePackCodec();
 
-        this.pubSubConnection = redisClient.connectPubSub(gsonCodec);
-        this.connection = redisClient.connect(gsonCodec);
+        this.pubSubConnection = redisClient.connectPubSub(messagePackCodec);
+        this.connection = redisClient.connect(messagePackCodec);
         this.databaseConnection = redisClient.connect();
     }
 

common/src/main/java/net/lightcode/redis/codec/GsonCodec.java

@@ -0,0 +1,77 @@
+package net.lightcode.redis.codec;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.MapperFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import io.lettuce.core.codec.RedisCodec;
+import net.lightcode.packet.Packet;
+import org.msgpack.jackson.dataformat.MessagePackFactory;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+
+public class MessagePackCodec implements RedisCodec<String, Packet> {
+
+    private final Charset charset = StandardCharsets.UTF_8;
+
+    private final ObjectMapper objectMapper;
+
+    public MessagePackCodec() {
+        this.objectMapper = new ObjectMapper(new MessagePackFactory());
+
+        this.objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+        this.objectMapper.setVisibility(
+                this.objectMapper
+                        .getSerializationConfig()
+                        .getDefaultVisibilityChecker()
+                        .withFieldVisibility(JsonAutoDetect.Visibility.ANY)
+                        .withGetterVisibility(JsonAutoDetect.Visibility.NONE)
+                        .withSetterVisibility(JsonAutoDetect.Visibility.NONE)
+                        .withCreatorVisibility(JsonAutoDetect.Visibility.NONE));
+        this.objectMapper
+                .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+                .enable(JsonGenerator.Feature.WRITE_BIGDECIMAL_AS_PLAIN)
+                .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS)
+                .enable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY);
+
+        this.objectMapper.registerSubtypes(Packet.class);
+    }
+
+    @Override
+    public String decodeKey(ByteBuffer bytes) {
+        return charset.decode(bytes).toString();
+    }
+
+    @Override
+    public Packet decodeValue(ByteBuffer bytes) {
+        byte[] buffer = new byte[bytes.remaining()];
+        bytes.get(buffer);
+
+        try {
+            return this.objectMapper.readValue(buffer, Packet.class);
+        } catch (IOException exception) {
+            throw new RuntimeException(exception);
+        }
+    }
+
+    @Override
+    public ByteBuffer encodeKey(String key) {
+        return charset.encode(key);
+    }
+
+    @Override
+    public ByteBuffer encodeValue(Packet value) {
+        try {
+            return ByteBuffer.wrap(this.objectMapper.writeValueAsBytes(value));
+        } catch (JsonProcessingException exception) {
+            throw new RuntimeException(exception);
+        }
+    }
+}