Refactor "map2json" (#1790)

* Refactor map2json method * Adapt callers
ArcadeData · Oct 28, 2024 · c63bb08 · c63bb08
1 parent a5b6d58
commit c63bb08
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/engine/src/main/java/com/arcadedb/database/BaseDocument.java b/engine/src/main/java/com/arcadedb/database/BaseDocument.java
@@ -173,6 +173,6 @@ public void readExternal(final ObjectInput in) throws IOException {
 
   @Override
   public JSONObject toJSON(final String... includeProperties) {
-    return new JSONSerializer(database).map2json(propertiesAsMap(), includeProperties);
+    return new JSONSerializer(database).map2json(propertiesAsMap(), null, includeProperties);
   }
 }
diff --git a/engine/src/main/java/com/arcadedb/database/JSONSerializer.java b/engine/src/main/java/com/arcadedb/database/JSONSerializer.java
@@ -39,15 +39,11 @@ public JSONSerializer(final Database database) {
     this.database = database;
   }
 
-  public JSONObject map2json(final Map<String, Object> map, final String... includeProperties) {
-    return map2json(map, null, includeProperties);
-  }
-
   public JSONObject map2json(final Map<String, Object> map, final DocumentType type, final String... includeProperties) {
     final JSONObject json = new JSONObject();
 
     final Set<String> includePropertiesSet;
-    if (includeProperties != null && includeProperties.length > 0) {
+    if (includeProperties.length > 0) {
       includePropertiesSet = new HashSet<>();
       for (String p : includeProperties)
         includePropertiesSet.add(p);
@@ -58,9 +54,11 @@ public JSONObject map2json(final Map<String, Object> map, final DocumentType typ
       if (includePropertiesSet != null && !includePropertiesSet.contains(entry.getKey()))
         continue;
 
-      Type propertyType = null;
+      final Type propertyType;
       if (type != null && type.existsProperty(entry.getKey()))
         propertyType = type.getProperty(entry.getKey()).getType();
+      else
+        propertyType = null;
 
       final Object value = convertToJSONType(entry.getValue(), propertyType);
 

diff --git a/engine/src/main/java/com/arcadedb/database/MutableDocument.java b/engine/src/main/java/com/arcadedb/database/MutableDocument.java
@@ -111,7 +111,7 @@ public MutableDocument fromJSON(final JSONObject json) {
   @Override
   public JSONObject toJSON(final boolean includeMetadata) {
     checkForLazyLoadingProperties();
-    final JSONObject result = new JSONSerializer(database).map2json(map, type, null);
+    final JSONObject result = new JSONSerializer(database).map2json(map, type);
     if (includeMetadata) {
       result.put("@cat", "d");
       result.put("@type", type.getName());