Extract logic of converting object into JSON in util class

romanpbm · romanpbm · commit ae36bd71dfbc · 2024-02-22T13:50:10.000+02:00
diff --git a/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/addon/listeners/broadcasting/EventListener.java b/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/addon/listeners/broadcasting/EventListener.java
@@ -3,11 +3,7 @@
 import com.bookmap.addons.broadcasting.api.view.listeners.LiveEventListener;
 import com.bookmap.api.rpc.server.EventLoop;
 import com.bookmap.api.rpc.server.data.outcome.BroadcastingEvent;
-import com.google.gson.JsonObject;
-
-import java.lang.reflect.Field;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
+import com.bookmap.api.rpc.server.utils.JsonUtil;
 
 /**
  * The listener that is passed to BrAPI.
@@ -17,7 +13,6 @@ public class EventListener implements LiveEventListener {
 
     private final EventLoop eventLoop;
     private final String generatorName;
-    private final Map<Class<?>, Field[]> classToFields = new ConcurrentHashMap<>();
     private final FilterListener filterListener;
 
     public EventListener(EventLoop eventLoop, String generatorName, FilterListener filterListener) {
@@ -34,43 +29,12 @@ public void giveEvent(Object o) {
             }
             String event;
             try {
-                event = convertEventToJSON(o);
+                event = JsonUtil.convertObjectToJsonString(o);
             }
             catch (IllegalAccessException e) {
                 throw new RuntimeException("Error during parsing event object", e);
             }
             eventLoop.pushEvent(new BroadcastingEvent(generatorName, event));
         }
     }
-
-    private String convertEventToJSON(Object o) throws IllegalAccessException {
-        JsonObject jsonObject = new JsonObject();
-        Class<?> clazz = o.getClass();
-        if (classToFields.containsKey(clazz)) {
-            Field[] fields = classToFields.get(clazz);
-            for (Field field : fields) {
-                field.setAccessible(true);
-                String fieldName = field.getName();
-                Object fieldValue = field.get(o);
-                jsonObject.addProperty(fieldName, fieldValue.toString());
-            }
-        } else {
-            Field[] fields = clazz.getDeclaredFields();
-            List<Field> fieldNames = new ArrayList<>();
-            for (Field field : fields) {
-                field.setAccessible(true);
-
-                String fieldName = field.getName();
-                if (fieldName.equals("serialVersionUID")) {
-                    continue;
-                }
-                fieldNames.add(field);
-                Object fieldValue = field.get(o);
-                jsonObject.addProperty(fieldName, fieldValue.toString());
-            }
-            classToFields.put(clazz, fieldNames.toArray(new Field[0]));
-        }
-
-        return jsonObject.toString();
-    }
 }
diff --git a/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/utils/JsonUtil.java b/serverside-rpc/src/main/java/com/bookmap/api/rpc/server/utils/JsonUtil.java
@@ -0,0 +1,44 @@
+package com.bookmap.api.rpc.server.utils;
+
+import com.google.gson.JsonObject;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class JsonUtil {
+    private static final Map<Class<?>, Field[]> classToFields = new ConcurrentHashMap<>();
+
+    public static String convertObjectToJsonString(Object o) throws IllegalAccessException {
+        JsonObject jsonObject = new JsonObject();
+        Class<?> clazz = o.getClass();
+        if (classToFields.containsKey(clazz)) {
+            Field[] fields = classToFields.get(clazz);
+            for (Field field : fields) {
+                field.setAccessible(true);
+                String fieldName = field.getName();
+                Object fieldValue = field.get(o);
+                jsonObject.addProperty(fieldName, fieldValue.toString());
+            }
+        } else {
+            Field[] fields = clazz.getDeclaredFields();
+            List<Field> fieldNames = new ArrayList<>();
+            for (Field field : fields) {
+                field.setAccessible(true);
+
+                String fieldName = field.getName();
+                if (fieldName.equals("serialVersionUID")) {
+                    continue;
+                }
+                fieldNames.add(field);
+                Object fieldValue = field.get(o);
+                jsonObject.addProperty(fieldName, fieldValue.toString());
+            }
+            classToFields.put(clazz, fieldNames.toArray(new Field[0]));
+        }
+
+        return jsonObject.toString();
+    }
+}
