gson to jackson

itesla · Oct 3, 2017 · 3c4671b · 3c4671b
1 parent b3a0d78
commit 3c4671b
Show file tree

Hide file tree

Showing 31 changed files with 445 additions and 61 deletions.
diff --git a/online-server/pom.xml b/online-server/pom.xml
@@ -32,8 +32,8 @@
         </dependency-->
 
         <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
         </dependency>
         <dependency>
             <groupId>javax</groupId>

diff --git a/online-server/src/main/java/eu/itesla_project/online/server/message/ConnectionMessage.java b/online-server/src/main/java/eu/itesla_project/online/server/message/ConnectionMessage.java
@@ -8,7 +8,9 @@
 
 import javax.json.stream.JsonGenerator;
 
-import com.google.gson.Gson;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
  *
@@ -29,9 +31,13 @@ protected String getType() {
 
     @Override
     public String toJson() {
-        Gson gson = new Gson();
-        return gson.toJson(this);
-
+        ObjectMapper json = new ObjectMapper();
+        json.setVisibility(PropertyAccessor.FIELD, Visibility.ANY);
+        try {
+            return json.writeValueAsString(this);
+            } catch (Exception e) {
+            return "";
+         }
     }
 
     @Override

diff --git a/online-server/src/main/java/eu/itesla_project/online/server/message/RunningMessage.java b/online-server/src/main/java/eu/itesla_project/online/server/message/RunningMessage.java
@@ -8,7 +8,9 @@
 
 import javax.json.stream.JsonGenerator;
 
-import com.google.gson.Gson;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
  *
@@ -29,8 +31,13 @@ protected String getType() {
 
     @Override
     public String toJson() {
-        Gson gson = new Gson();
-        return gson.toJson(this);
+        ObjectMapper json = new ObjectMapper();
+        json.setVisibility(PropertyAccessor.FIELD, Visibility.ANY);
+        try {
+            return json.writeValueAsString(this);
+            } catch (Exception e) {
+            return "";
+         }
 
     }
 

diff --git a/...er/src/main/java/eu/itesla_project/online/server/message/SelectedWorkFlowInfoMessage.java b/...er/src/main/java/eu/itesla_project/online/server/message/SelectedWorkFlowInfoMessage.java
@@ -9,7 +9,9 @@
 
 import javax.json.stream.JsonGenerator;
 
-import com.google.gson.Gson;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import eu.itesla_project.online.server.OnlineWorkflowInfo;
 
@@ -33,8 +35,13 @@ protected String getType() {
 
     @Override
     public String toJson() {
-        Gson gson = new Gson();
-        return gson.toJson(this);
+        ObjectMapper json = new ObjectMapper();
+        json.setVisibility(PropertyAccessor.FIELD, Visibility.ANY);
+        try {
+            return json.writeValueAsString(this);
+            } catch (Exception e) {
+            return "";
+         }
     }
 
     @Override

diff --git a/...ver/src/main/java/eu/itesla_project/online/server/message/StableContingenciesMessage.java b/...ver/src/main/java/eu/itesla_project/online/server/message/StableContingenciesMessage.java
@@ -8,7 +8,9 @@
 
 import javax.json.stream.JsonGenerator;
 
-import com.google.gson.Gson;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import eu.itesla_project.online.StableContingenciesSynthesis;
 
@@ -33,9 +35,13 @@ protected String getType() {
 
     @Override
     public String toJson() {
-        Gson gson = new Gson();
-        return gson.toJson(this);
-
+        ObjectMapper json = new ObjectMapper();
+        json.setVisibility(PropertyAccessor.FIELD, Visibility.ANY);
+        try {
+            return json.writeValueAsString(this);
+            } catch (Exception e) {
+            return "";
+         }
     }
 
     @Override

diff --git a/.../main/java/eu/itesla_project/online/server/message/StatesWithActionsSynthesisMessage.java b/.../main/java/eu/itesla_project/online/server/message/StatesWithActionsSynthesisMessage.java
@@ -8,7 +8,9 @@
 
 import javax.json.stream.JsonGenerator;
 
-import com.google.gson.Gson;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import eu.itesla_project.online.ContingencyStatesActionsSynthesis;
 
@@ -31,10 +33,14 @@ protected String getType() {
 
     @Override
     public String toJson() {
-        Gson gson = new Gson();
-        return gson.toJson(this);
-
-    }
+        ObjectMapper json = new ObjectMapper();
+        json.setVisibility(PropertyAccessor.FIELD, Visibility.ANY);
+        try {
+            return json.writeValueAsString(this);
+            } catch (Exception e) {
+            return "";
+         }
+   }
 
     @Override
     public void toJson(JsonGenerator generator) {

diff --git a/.../main/java/eu/itesla_project/online/server/message/StatesWithIndexesSynthesisMessage.java b/.../main/java/eu/itesla_project/online/server/message/StatesWithIndexesSynthesisMessage.java
@@ -8,7 +8,9 @@
 
 import javax.json.stream.JsonGenerator;
 
-import com.google.gson.Gson;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import eu.itesla_project.online.ContingencyStatesIndexesSynthesis;
 
@@ -31,9 +33,13 @@ protected String getType() {
 
     @Override
     public String toJson() {
-        Gson gson = new Gson();
-        return gson.toJson(this);
-
+        ObjectMapper json = new ObjectMapper();
+        json.setVisibility(PropertyAccessor.FIELD, Visibility.ANY);
+        try {
+            return json.writeValueAsString(this);
+            } catch (Exception e) {
+            return "";
+         }
     }
 
     @Override

diff --git a/...u/itesla_project/online/server/message/StatesWithSecurityRulesResultSynthesisMessage.java b/...u/itesla_project/online/server/message/StatesWithSecurityRulesResultSynthesisMessage.java
@@ -8,7 +8,9 @@
 
 import javax.json.stream.JsonGenerator;
 
-import com.google.gson.Gson;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import eu.itesla_project.online.IndexSecurityRulesResultsSynthesis;
 
@@ -32,9 +34,13 @@ protected String getType() {
 
     @Override
     public String toJson() {
-        Gson gson = new Gson();
-        return gson.toJson(this);
-
+        ObjectMapper json = new ObjectMapper();
+        json.setVisibility(PropertyAccessor.FIELD, Visibility.ANY);
+        try {
+            return json.writeValueAsString(this);
+            } catch (Exception e) {
+            return "";
+         }
     }
 
     @Override

diff --git a/online-server/src/main/java/eu/itesla_project/online/server/message/StatusMessage.java b/online-server/src/main/java/eu/itesla_project/online/server/message/StatusMessage.java
@@ -8,7 +8,9 @@
 
 import javax.json.stream.JsonGenerator;
 
-import com.google.gson.Gson;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import eu.itesla_project.online.StatusSynthesis;
 
@@ -31,9 +33,13 @@ protected String getType() {
 
     @Override
     public String toJson() {
-        Gson gson = new Gson();
-        return gson.toJson(this);
-
+        ObjectMapper json = new ObjectMapper();
+        json.setVisibility(PropertyAccessor.FIELD, Visibility.ANY);
+        try {
+            return json.writeValueAsString(this);
+            } catch (Exception e) {
+            return "";
+         }
     }
 
     @Override

diff --git a/...r/src/main/java/eu/itesla_project/online/server/message/UnstableContingenciesMessage.java b/...r/src/main/java/eu/itesla_project/online/server/message/UnstableContingenciesMessage.java
@@ -8,7 +8,9 @@
 
 import javax.json.stream.JsonGenerator;
 
-import com.google.gson.Gson;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import eu.itesla_project.online.UnstableContingenciesSynthesis;
 
@@ -32,8 +34,13 @@ protected String getType() {
 
     @Override
     public String toJson() {
-        Gson gson = new Gson();
-        return gson.toJson(this);
+        ObjectMapper json = new ObjectMapper();
+        json.setVisibility(PropertyAccessor.FIELD, Visibility.ANY);
+        try {
+            return json.writeValueAsString(this);
+            } catch (Exception e) {
+            return "";
+         }
     }
 
     @Override

diff --git a/...server/src/main/java/eu/itesla_project/online/server/message/WcaContingenciesMessage.java b/...server/src/main/java/eu/itesla_project/online/server/message/WcaContingenciesMessage.java
@@ -8,7 +8,9 @@
 
 import javax.json.stream.JsonGenerator;
 
-import com.google.gson.Gson;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import eu.itesla_project.online.WcaContingenciesSynthesis;
 
@@ -32,8 +34,13 @@ protected String getType() {
 
     @Override
     public String toJson() {
-        Gson gson = new Gson();
-        return gson.toJson(this);
+        ObjectMapper json = new ObjectMapper();
+        json.setVisibility(PropertyAccessor.FIELD, Visibility.ANY);
+        try {
+            return json.writeValueAsString(this);
+            } catch (Exception e) {
+            return "";
+         }
     }
 
     @Override

diff --git a/online-server/src/main/java/eu/itesla_project/online/server/message/WcaRunningMessage.java b/online-server/src/main/java/eu/itesla_project/online/server/message/WcaRunningMessage.java
@@ -8,7 +8,9 @@
 
 import javax.json.stream.JsonGenerator;
 
-import com.google.gson.Gson;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import eu.itesla_project.online.RunningSynthesis;
 
@@ -31,9 +33,13 @@ protected String getType() {
 
     @Override
     public String toJson() {
-        Gson gson = new Gson();
-        return gson.toJson(this);
-
+        ObjectMapper json = new ObjectMapper();
+        json.setVisibility(PropertyAccessor.FIELD, Visibility.ANY);
+        try {
+            return json.writeValueAsString(this);
+            } catch (Exception e) {
+            return "";
+         }
     }
 
     @Override

diff --git a/online-server/src/main/java/eu/itesla_project/online/server/message/WorkFlowIdsMessage.java b/online-server/src/main/java/eu/itesla_project/online/server/message/WorkFlowIdsMessage.java
@@ -10,7 +10,10 @@
 
 import javax.json.stream.JsonGenerator;
 
-import com.google.gson.Gson;
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 
 /**
  *
@@ -32,8 +35,13 @@ protected String getType() {
 
     @Override
     public String toJson() {
-        Gson gson = new Gson();
-        return gson.toJson(this);
+        ObjectMapper json = new ObjectMapper();
+        json.setVisibility(PropertyAccessor.FIELD, Visibility.ANY);
+        try {
+            return json.writeValueAsString(this);
+            } catch (Exception e) {
+            return "";
+         }
     }
 
     @Override

diff --git a/online-server/src/main/java/eu/itesla_project/online/server/message/WorkStatusMessage.java b/online-server/src/main/java/eu/itesla_project/online/server/message/WorkStatusMessage.java
@@ -7,7 +7,11 @@
 package eu.itesla_project.online.server.message;
 
 import javax.json.stream.JsonGenerator;
-import com.google.gson.Gson;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import eu.itesla_project.online.WorkSynthesis;
 
 /**
@@ -29,10 +33,14 @@ protected String getType() {
 
     @Override
     public String toJson() {
-        Gson gson = new Gson();
-        return gson.toJson(this);
-
-    }
+        ObjectMapper json = new ObjectMapper();
+        json.setVisibility(PropertyAccessor.FIELD, Visibility.ANY);
+        try {
+            return json.writeValueAsString(this);
+            } catch (Exception e) {
+            return "";
+         }
+        }
 
     @Override
     protected void toJson(JsonGenerator generator) {