Implemented old ServerLogItem + an attributes map

Signed-off-by: Nico Piel <nico.piel@hotmail.de>

Author: NicoPiel

client/src/com/mirth/connect/plugins/serverlog/ServerLogClient.java

@@ -24,9 +24,7 @@
 public class ServerLogClient extends DashboardTabPlugin {
     private ServerLogPanel serverLogPanel;
     private LinkedList<ServerLogItem> serverLogs;
-    private static final ServerLogItem unauthorizedLog = new ServerLogItem(new HashMap<String, Object>(){{
-            put("message", "You are not authorized to view the server log.");
-    }});
+    private static final ServerLogItem unauthorizedLog = new ServerLogItem("You are not authorized to view the server log.");
     private int currentServerLogSize;
     private boolean receivedNewLogs;
     private Long lastLogId;

server/src/com/mirth/connect/plugins/serverlog/ArrayAppender.java

@@ -38,14 +38,6 @@ public void append(LogEvent logEvent) {
             return;
         }
 
-        String channelId = null;
-        String channelName = null;
-
-        if (logEvent.getContextData() != null) {
-            channelId = logEvent.getContextData().getValue("channelId");
-            channelName = logEvent.getContextData().getValue("channelName");
-        }
-
         String level = String.valueOf(logEvent.getLevel());
         Date date = new Date(logEvent.getTimeMillis());
         String threadName = logEvent.getThreadName();
@@ -71,17 +63,6 @@ public void append(LogEvent logEvent) {
             throwableInformation = logText.toString();
         }
 
-        Map<String, Object> properties = new HashMap<>();
-        properties.put("channelId", channelId);
-        properties.put("channelName", channelName);
-        properties.put("level", level);
-        properties.put("date", date);
-        properties.put("threadName", threadName);
-        properties.put("category", category);
-        properties.put("lineNumber", lineNumber);
-        properties.put("message", message);
-        properties.put("throwableInformation", throwableInformation);
-
-        serverLogProvider.newServerLogReceived(new ServerLogItem(properties));
+        serverLogProvider.newServerLogReceived(level, date, threadName, category, lineNumber, message, throwableInformation, logEvent.getContextData().toMap());
     }
 }

server/src/com/mirth/connect/plugins/serverlog/ServerLogItem.java

@@ -24,37 +24,38 @@ public class ServerLogItem implements Serializable {
 
     private String serverId;
     private Long id;
-    private String channelId;
     private String level;
     private Date date;
     private String threadName;
     private String category;
     private String lineNumber;
     private String message;
     private String throwableInformation;
-    private String channelName;
-    private HashMap<String, Object> context;
+    private Map<String, String> attributes;
 
-    public ServerLogItem() {}
+    public ServerLogItem() {
+        this(null, null, null, null, null, null, null, null, null, new HashMap<>());
+    }
 
-    public ServerLogItem(Map<String, Object> properties) {
-        if (properties != null) {
-            this.context = new HashMap<>(properties);
-        } else {
-            this.context = new HashMap<>();
-        }
+    public ServerLogItem(String message) {
+        this(null, null, null, null, null, null, null, message, null, new HashMap<>());
+    }
 
-        this.serverId = (String) context.getOrDefault("serverId", "");
-        this.id = (Long) context.getOrDefault("id", 0L);
-        this.channelId = (String) context.getOrDefault("channelId", "");
-        this.channelName = (String) context.getOrDefault("channelName", "");
-        this.level = (String) context.getOrDefault("level", "");
-        this.date = (Date) context.getOrDefault("date", Date.from(Instant.now()));
-        this.threadName = (String) context.getOrDefault("threadName", "");
-        this.category = (String) context.getOrDefault("category", "");
-        this.lineNumber = (String) context.getOrDefault("lineNumber", "");
-        this.message = (String) context.getOrDefault("message", "");
-        this.throwableInformation = (String) context.getOrDefault("throwableInformation", "");
+    public ServerLogItem(String serverId, Long id, String level, Date date, String threadName, String category, String lineNumber, String message, String throwableInformation) {
+        this(serverId, id, level, date, threadName, category, lineNumber, message, throwableInformation, new HashMap<>());
+    }
+
+    public ServerLogItem(String serverId, Long id, String level, Date date, String threadName, String category, String lineNumber, String message, String throwableInformation, Map<String, String> attributes) {
+        this.serverId = serverId;
+        this.id = id;
+        this.level = level;
+        this.date = date;
+        this.threadName = threadName;
+        this.category = category;
+        this.lineNumber = lineNumber;
+        this.message = message;
+        this.throwableInformation = throwableInformation;
+        this.attributes = attributes;
     }
 
     public String getServerId() {
@@ -72,14 +73,6 @@ public Long getId() {
     public void setId(Long id) {
         this.id = id;
     }
-    
-    public String getChannelId() {
-        return channelId;
-    }
-    
-    public void setChannelId(String channelId) {
-        this.channelId = channelId;
-    }
 
     public String getLevel() {
         return level;
@@ -136,21 +129,33 @@ public String getThrowableInformation() {
     public void setThrowableInformation(String throwableInformation) {
         this.throwableInformation = throwableInformation;
     }
-    
-    public String getChannelName() {
-        return channelName;
+
+    public Map<String, String> getAttributes() {
+        return attributes;
     }
-    
-    public void setChannelName(String channelName) {
-        this.channelName = channelName;
+
+    public void setAttributes(Map<String, String> attributes) {
+        if (attributes == null) {
+            this.attributes = new HashMap<String, String>();
+        } else {
+            this.attributes = attributes;
+        }
     }
-    
-    public Map<String, Object> getContext() {
-        return context;
+
+    public String getChannelId() {
+        return this.attributes.get("channelId");
+    }
+
+    public void setChannelId(String channelId) {
+        this.attributes.put("channelId", channelId);
     }
 
-    public void setContext(Map<String, Object> context) {
-        this.context = new HashMap<>(context);
+    public String getChannelName() {
+        return this.attributes.get("channelName");
+    }
+
+    public void setChannelName(String channelName) {
+        this.attributes.put("channelName", channelName);
     }
 
     @Override

server/src/com/mirth/connect/plugins/serverlog/ServerLogProvider.java

@@ -57,12 +57,9 @@ public void init(Properties properties) {
         initialize();
     }
 
-    public synchronized void newServerLogReceived(ServerLogItem svi) {
+    public synchronized void newServerLogReceived(String level, Date date, String threadName, String category, String lineNumber, String message, String throwableInformation, Map<String, String> attributes) {
         if (logController != null) {
-            svi.getContext().put("serverId", serverId);
-            svi.getContext().put("id", logId);
-
-            logController.addLogItem(svi);
+            logController.addLogItem(new ServerLogItem(serverId, logId, level, date, threadName, category, lineNumber, message, throwableInformation, attributes));
             logId++;
         }
     }

server/src/com/mirth/connect/server/servlets/SwaggerExamplesServlet.java

@@ -1286,19 +1286,7 @@ private List<ServerEvent> getServerEventListExample() {
 	}
 
 	private ServerLogItem getServerLogItemExample() {
-	    // return new ServerLogItem(UUID.randomUUID().toString(), 1L, "INFO", dateNow.getTime(), "Main Server Thread", "com.mirth.connect.server.Mirth", "1", "Example message", "Example throwable information");
-        Map<String, Object> properties = new HashMap<>();
-        properties.put("serverId", UUID.randomUUID().toString());
-        properties.put("id", 1L);
-        properties.put("channelId", "INFO");
-        properties.put("date", dateNow.getTime());
-        properties.put("threadName", "Main Server Thread");
-        properties.put("category", "com.mirth.connect.server.Mirth");
-        properties.put("lineNumber", "1");
-        properties.put("message", "Example Message");
-        properties.put("throwableInformation", "Example throwable Information");
-
-	    return new ServerLogItem(properties);
+	    return new ServerLogItem(UUID.randomUUID().toString(), 1L, "INFO", dateNow.getTime(), "Main Server Thread", "com.mirth.connect.server.Mirth", "1", "Example message", "Example throwable information");
     }
 
 	private List<ServerLogItem> getServerLogItemListExample() {