replace gson with jackson #85

isuru89 · Mar 19, 2021 · 1337049 · 1337049
1 parent f9158c1
commit 1337049
Show file tree

Hide file tree

Showing 37 changed files with 335 additions and 269 deletions.
diff --git a/core/src/main/java/io/github/oasis/core/ID.java b/core/src/main/java/io/github/oasis/core/ID.java
@@ -25,6 +25,7 @@
 public final class ID {
 
     public static final String ENGINE_STATUS_CHANNEL = "game.status.channel";
+    public static final String GAME_ENGINES = "oasis.engines.games";
 
     public static final String ALL_GAMES = "oasis:games";
     public static final String ALL_USERS = "oasis:users";

diff --git a/core/src/main/java/io/github/oasis/core/TeamMetadata.java b/core/src/main/java/io/github/oasis/core/TeamMetadata.java
@@ -21,19 +21,17 @@
 
 import io.github.oasis.core.model.TeamObject;
 import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
 /**
  * @author Isuru Weerarathna
  */
-@Getter
-@Setter
-@ToString
+@Data
 @AllArgsConstructor
+@NoArgsConstructor
 public class TeamMetadata implements Serializable {
 
     private int teamId;

diff --git a/core/src/main/java/io/github/oasis/core/UserMetadata.java b/core/src/main/java/io/github/oasis/core/UserMetadata.java
@@ -21,6 +21,7 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import java.io.Serializable;
@@ -31,6 +32,7 @@
 @Getter
 @Setter
 @AllArgsConstructor
+@NoArgsConstructor
 public class UserMetadata implements Serializable {
 
     private long userId;

diff --git a/core/src/main/java/io/github/oasis/core/context/RuntimeContextSupport.java b/core/src/main/java/io/github/oasis/core/context/RuntimeContextSupport.java
@@ -28,6 +28,8 @@
  */
 public interface RuntimeContextSupport {
 
+    String id();
+
     OasisConfigs getConfigs();
 
     Db getDb();

diff --git a/core/src/main/java/io/github/oasis/core/elements/AbstractElementParser.java b/core/src/main/java/io/github/oasis/core/elements/AbstractElementParser.java
@@ -19,6 +19,7 @@
 
 package io.github.oasis.core.elements;
 
+import io.github.oasis.core.elements.spec.BaseSpecification;
 import io.github.oasis.core.external.messages.EngineMessage;
 import org.yaml.snakeyaml.Yaml;
 
@@ -29,7 +30,8 @@ public abstract class AbstractElementParser implements ElementParser {
 
     private final Yaml yaml = new Yaml();
 
-    protected <T extends AbstractDef> T loadFrom(EngineMessage def, Class<T> clz) {
+    protected <T extends AbstractDef<? extends BaseSpecification>> T loadFrom(EngineMessage def, Class<T> clz) {
+        System.out.println(def.getData());
         return yaml.loadAs(yaml.dump(def.getData()), clz);
     }
 

diff --git a/core/src/main/java/io/github/oasis/core/external/messages/EngineStatusChangedMessage.java b/core/src/main/java/io/github/oasis/core/external/messages/EngineStatusChangedMessage.java
@@ -35,5 +35,6 @@ public class EngineStatusChangedMessage implements Serializable {
 
     private int gameId;
     private GameState state;
+    private String engineId;
 
 }
diff --git a/...s/badges/src/main/java/io/github/oasis/elements/badges/stats/to/GameRuleWiseBadgeLog.java b/...s/badges/src/main/java/io/github/oasis/elements/badges/stats/to/GameRuleWiseBadgeLog.java
@@ -23,25 +23,26 @@
 import io.github.oasis.core.elements.AttributeInfo;
 import io.github.oasis.core.elements.SimpleElementDefinition;
 import io.github.oasis.core.services.AbstractAdminApiResponse;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 
 import java.util.List;
 
 /**
  * @author Isuru Weerarathna
  */
-@Getter
-@Setter
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class GameRuleWiseBadgeLog extends AbstractAdminApiResponse {
 
     private String badgeId;
     private SimpleElementDefinition badgeMetadata;
 
     private List<RuleBadgeLogRecord> log;
 
-    @Getter
-    @Setter
+    @Data
+    @NoArgsConstructor
     public static class RuleBadgeLogRecord {
         private long userId;
         private UserMetadata userMetadata;

diff --git a/elements/badges/src/main/java/io/github/oasis/elements/badges/stats/to/UserBadgeLog.java b/elements/badges/src/main/java/io/github/oasis/elements/badges/stats/to/UserBadgeLog.java
@@ -22,24 +22,25 @@
 import io.github.oasis.core.elements.AttributeInfo;
 import io.github.oasis.core.elements.SimpleElementDefinition;
 import io.github.oasis.core.services.AbstractAdminApiResponse;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 
 import java.util.List;
 
 /**
  * @author Isuru Weerarathna
  */
-@Getter
-@Setter
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class UserBadgeLog extends AbstractAdminApiResponse {
 
     private Long userId;
 
     private List<BadgeLogRecord> log;
 
-    @Getter
-    @Setter
+    @Data
+    @NoArgsConstructor
     public static class BadgeLogRecord {
         private String badgeId;
         private SimpleElementDefinition badgeMetadata;

diff --git a/elements/badges/src/main/java/io/github/oasis/elements/badges/stats/to/UserBadgeSummary.java b/elements/badges/src/main/java/io/github/oasis/elements/badges/stats/to/UserBadgeSummary.java
@@ -22,17 +22,18 @@
 import io.github.oasis.core.elements.AttributeInfo;
 import io.github.oasis.core.elements.SimpleElementDefinition;
 import io.github.oasis.core.services.AbstractStatsApiResponse;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 
 import java.util.HashMap;
 import java.util.Map;
 
 /**
  * @author Isuru Weerarathna
  */
-@Getter
-@Setter
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class UserBadgeSummary extends AbstractStatsApiResponse {
 
     private Long userId;
@@ -85,30 +86,25 @@ public RuleSummaryStat addRuleStat(String ruleId, int attribute, AttributeSummar
         }
     }
 
-    @Getter
-    @Setter
+    @Data
+    @NoArgsConstructor
     public static class BaseSummaryStat {
         private int count;
         private Long lastWonAt;
 
-        public BaseSummaryStat() {
-        }
-
         public BaseSummaryStat(int count, Long lastWonAt) {
             this.count = count;
             this.lastWonAt = lastWonAt;
         }
     }
 
-    @Getter
-    @Setter
+    @EqualsAndHashCode(callSuper = true)
+    @Data
+    @NoArgsConstructor
     public static class RuleSummaryStat extends BaseSummaryStat {
         private SimpleElementDefinition badgeMetadata;
         private Map<String, AttributeSummaryStat> attributes;
 
-        public RuleSummaryStat() {
-        }
-
         public void addAttributeStat(String attrKey, AttributeSummaryStat stat) {
             if (attributes == null) {
                 attributes = new HashMap<>();
@@ -117,10 +113,12 @@ public void addAttributeStat(String attrKey, AttributeSummaryStat stat) {
         }
     }
 
-    @Getter
+    @EqualsAndHashCode(callSuper = true)
+    @Data
+    @NoArgsConstructor
     public static class AttributeSummaryStat extends BaseSummaryStat {
-        private final int attribute;
-        private final AttributeInfo attributeMetadata;
+        private int attribute;
+        private AttributeInfo attributeMetadata;
 
         public AttributeSummaryStat(int attribute, AttributeInfo attributeInfo, int count, Long lastWonAt) {
             super(count, lastWonAt);

diff --git a/...ges/src/main/java/io/github/oasis/elements/challenges/stats/to/GameChallengesSummary.java b/...ges/src/main/java/io/github/oasis/elements/challenges/stats/to/GameChallengesSummary.java
@@ -22,23 +22,22 @@
 import io.github.oasis.core.UserMetadata;
 import io.github.oasis.core.elements.SimpleElementDefinition;
 import io.github.oasis.core.services.AbstractStatsApiResponse;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.List;
 import java.util.Map;
 
 /**
  * @author Isuru Weerarathna
  */
-@Getter
-@Setter
+@Data
 public class GameChallengesSummary extends AbstractStatsApiResponse {
 
     private Map<String, ChallengeSummary> challenges;
 
-    @Getter
-    @Setter
+    @Data
+    @NoArgsConstructor
     public static class ChallengeWinner {
         private Long userId;
         private UserMetadata userMetadata;
@@ -50,8 +49,8 @@ public ChallengeWinner(Long userId, long wonAt) {
         }
     }
 
-    @Getter
-    @Setter
+    @Data
+    @NoArgsConstructor
     public static class ChallengeSummary {
         private String challengeId;
         private SimpleElementDefinition challengeMetadata;

diff --git a/...llenges/src/main/java/io/github/oasis/elements/challenges/stats/to/UserChallengesLog.java b/...llenges/src/main/java/io/github/oasis/elements/challenges/stats/to/UserChallengesLog.java
@@ -21,24 +21,25 @@
 
 import io.github.oasis.core.elements.SimpleElementDefinition;
 import io.github.oasis.core.services.AbstractStatsApiResponse;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 
 import java.util.List;
 
 /**
  * @author Isuru Weerarathna
  */
-@Getter
-@Setter
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class UserChallengesLog extends AbstractStatsApiResponse {
 
     private Long userId;
 
     private List<ChallengeRecord> winnings;
 
-    @Getter
-    @Setter
+    @Data
+    @NoArgsConstructor
     public static class ChallengeRecord {
         private String challengeId;
         private SimpleElementDefinition challengeMetadata;

diff --git a/...nes/src/main/java/io/github/oasis/elements/milestones/stats/to/GameMilestoneResponse.java b/...nes/src/main/java/io/github/oasis/elements/milestones/stats/to/GameMilestoneResponse.java
@@ -24,6 +24,7 @@
 import io.github.oasis.core.elements.SimpleElementDefinition;
 import io.github.oasis.core.services.AbstractStatsApiResponse;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import java.math.BigDecimal;
@@ -43,6 +44,7 @@ public class GameMilestoneResponse extends AbstractStatsApiResponse {
 
     @Getter
     @Setter
+    @NoArgsConstructor
     public static class UserMilestoneRecord {
         private long userId;
         private UserMetadata userMetadata;
@@ -69,8 +71,9 @@ public static class MilestoneSummary {
 
     @Getter
     @Setter
+    @NoArgsConstructor
     public static class MilestoneTeamSummary {
-        private final Integer teamId;
+        private Integer teamId;
         private TeamMetadata teamMetadata;
 
         private Map<String, Long> levels;

diff --git a/...ints/src/main/java/io/github/oasis/engine/element/points/stats/to/LeaderboardSummary.java b/...ints/src/main/java/io/github/oasis/engine/element/points/stats/to/LeaderboardSummary.java
@@ -21,8 +21,9 @@
 
 import io.github.oasis.core.UserMetadata;
 import io.github.oasis.core.services.AbstractStatsApiResponse;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -31,8 +32,8 @@
 /**
  * @author Isuru Weerarathna
  */
-@Getter
-@Setter
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class LeaderboardSummary extends AbstractStatsApiResponse {
 
     private Integer teamId;
@@ -43,8 +44,8 @@ public void addRecord(LeaderboardRecord record) {
         records.add(record);
     }
 
-    @Getter
-    @Setter
+    @Data
+    @NoArgsConstructor
     public static class LeaderboardRecord {
 
         private int rank;

diff --git a/...points/src/main/java/io/github/oasis/engine/element/points/stats/to/UserPointSummary.java b/...points/src/main/java/io/github/oasis/engine/element/points/stats/to/UserPointSummary.java
@@ -21,8 +21,10 @@
 
 import io.github.oasis.core.services.AbstractStatsApiResponse;
 import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import lombok.Setter;
+import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -33,8 +35,8 @@
 /**
  * @author Isuru Weerarathna
  */
-@Getter
-@Setter
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class UserPointSummary extends AbstractStatsApiResponse {
 
     private Long userId;
@@ -62,8 +64,9 @@ public void addPointRecord(String key, BigDecimal value) {
 
     @Getter
     @AllArgsConstructor
+    @NoArgsConstructor
     public static class PointRecord {
-        private final String key;
-        private final BigDecimal value;
+        private String key;
+        private BigDecimal value;
     }
 }