Fix json format to fit previous contract

Author: bcivel

source/src/main/java/org/cerberus/core/crud/entity/AppService.java

@@ -19,6 +19,9 @@
  */
 package org.cerberus.core.crud.entity;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.logging.log4j.LogManager;
@@ -56,6 +59,7 @@ public class AppService {
     private String type; // either SOAP/REST/KAFKA/FTP
     private String method; // Method used : POST/GET
     private String servicePath; // Path to access the service
+    @JsonProperty("isFollowRedir")
     private boolean isFollowRedir; // Path to access the service
     private String fileName;
     private String operation; // Operation used for SOAP Requests
@@ -69,10 +73,13 @@ public class AppService {
     private String kafkaFilterValue;
     private String kafkaFilterHeaderPath;
     private String kafkaFilterHeaderValue;
+    @JsonProperty("isAvroEnable")
     private boolean isAvroEnable;
     private String schemaRegistryURL;
+    @JsonProperty("isAvroEnableKey")
     private boolean isAvroEnableKey;
     private String avroSchemaKey;
+    @JsonProperty("isAvroEnableValue")
     private boolean isAvroEnableValue;
     private String avroSchemaValue;
     private String parentContentService;
@@ -84,8 +91,10 @@ public class AppService {
     private JSONObject simulationParameters;
     private String description;
     private String usrCreated;
+    @JsonSerialize(using = ToStringSerializer.class)
     private Timestamp dateCreated;
     private String usrModif;
+    @JsonSerialize(using = ToStringSerializer.class)
     private Timestamp dateModif;
 
     /**

source/src/main/java/org/cerberus/core/crud/entity/ApplicationObject.java

@@ -19,6 +19,7 @@
  */
 package org.cerberus.core.crud.entity;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 /**
@@ -27,12 +28,15 @@
 @Data
 public class ApplicationObject {
 
+    @JsonProperty("ID")
     private int ID;
     private String application;
     private String object;
     private String value;
     private String screenshotFilename;
+    @JsonProperty("xOffset")
     private String xOffset;
+    @JsonProperty("yOffset")
     private String yOffset;
     private String usrCreated;
     private String dateCreated;

source/src/main/java/org/cerberus/core/crud/entity/CountryEnvironmentParameters.java

@@ -20,6 +20,10 @@
 package org.cerberus.core.crud.entity;
 
 import java.sql.Timestamp;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import jakarta.persistence.Id;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -47,7 +51,7 @@ public class CountryEnvironmentParameters {
     private String environment;
     @Id
     private String application;
-    
+    @JsonProperty("isActive")
     private boolean isActive;
     private String ip;
     private String domain;
@@ -63,8 +67,10 @@ public class CountryEnvironmentParameters {
     private String mobilePackage;
     private int poolSize;
     private String usrCreated;
+    @JsonSerialize(using = ToStringSerializer.class)
     private Timestamp dateCreated;
     private String usrModif;
+    @JsonSerialize(using = ToStringSerializer.class)
     private Timestamp dateModif;
 
     public CountryEnvironmentParameters(String system, String country, String environment, String application) {

source/src/main/java/org/cerberus/core/util/json/JsonUtil.java

@@ -19,13 +19,20 @@
  */
 package org.cerberus.core.util.json;
 
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 
 public final class JsonUtil {
 
-    private static final ObjectMapper MAPPER = new ObjectMapper();
+    private static final ObjectMapper MAPPER = new ObjectMapper()
+            .setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY)
+            .setVisibility(PropertyAccessor.GETTER, JsonAutoDetect.Visibility.NONE)
+            .setVisibility(PropertyAccessor.IS_GETTER, JsonAutoDetect.Visibility.NONE)
+            .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
 
     private JsonUtil() {
     }