Improve MessageFilter logging and refactor search element styles

Refactors the ToStringStyle implementations for MessageFilter and related
search elements to significantly improve debuggability and log readability.

Key Changes:
- Refactored MetaDataSearchElementToStringStyle into a generic
  SearchElementToStringStyle to eliminate code duplication.
- Added ContentSearchElementToStringStyle:
  - Converts raw content codes into human-readable ContentType names
    (e.g., "1(Raw)") instead of opaque integers.
- Updated MessageFilterToStringStyle:
  - Replaced legacy Calendar formatting with java.time (ZonedDateTime)
    and included time and timezone id.
  - Added recursive indentation logic to render nested collections
    in a hierarchical format.
- Applied new styles to ContentSearchElement and MetaDataSearchElement
  toString() methods.
- Previously ContentSearchElement was inheriting the Object.toString
  method.

This change primarily adds detail for ContentSearchElements when viewing
the MessageFilter in the server event log. The addition of the time and
timezone id fill in some missing details for the start and end times.
The additonal reformats improve readability.

Signed-off-by: Tony Germano <tony@germano.name>

Author: tonygermano

server/src/com/mirth/connect/model/ContentSearchElementToStringStyle.java

@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: MPL-2.0
+// SPDX-FileCopyrightText: 2026 Tony Germano <tony@germano.name>
+
+package com.mirth.connect.model;
+
+import java.util.Collection;
+
+import com.mirth.connect.donkey.model.message.ContentType;
+
+public class ContentSearchElementToStringStyle extends SearchElementToStringStyle {
+    public ContentSearchElementToStringStyle() {
+        super();
+        setFieldSeparator(", ");
+        setArraySeparator(", ");
+        setArrayStart("[");
+        setArrayEnd("]");
+    }
+
+    @Override
+    protected void appendDetail(StringBuffer buffer, String fieldName, Collection<?> coll) {
+        appendDetail(buffer, fieldName, (Object[]) coll.toArray());
+    }
+
+    @Override
+    protected void appendDetail(StringBuffer buffer, String fieldname, Object value) {
+        if (fieldname.equals("contentCode") && value instanceof Integer code) {
+            ContentType type = ContentType.fromCode(code);
+            String typeName = (type != null) ? type.toString() : "UNKNOWN";
+            String formatted = String.format("%d(%s)", code, typeName);
+            buffer.append(formatted);
+        } else {
+            super.appendDetail(buffer, fieldname, value);
+        }
+    }
+
+    public static ContentSearchElementToStringStyle instance() {
+        return new ContentSearchElementToStringStyle();
+    }
+}

server/src/com/mirth/connect/model/MessageFilterToStringStyle.java

@@ -1,48 +1,68 @@
+// SPDX-License-Identifier: MPL-2.0
+// SPDX-FileCopyrightText: 2005-2024 NextGen Healthcare
+// SPDX-FileCopyrightText: 2026 Tony Germano <tony@germano.name>
+
 package com.mirth.connect.model;
 
-import java.util.Calendar;
+import java.time.format.DateTimeFormatter;
+import java.util.GregorianCalendar;
 import java.util.Collection;
-import java.util.Iterator;
+import java.util.Set;
 
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 public class MessageFilterToStringStyle extends ToStringStyle {
+    private static final int INDENT = 2;
+    private static final Set<String> flatten = Set.of("excludedMetaDataIds", "includedMetaDataIds", "statuses",
+            "textSearchMetaDataColumns");
+    private static final DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mmXXX'['VV']'");
+
+    private int level = 1;
+
     public MessageFilterToStringStyle() {
         super();
-        this.setUseShortClassName(true);
-        this.setUseIdentityHashCode(false);
-        this.setContentStart("[\n");
-        this.setFieldSeparator(",\n");
-        this.setContentEnd("\n]");
+        setUseShortClassName(true);
+        setUseIdentityHashCode(false);
+        resetIndent();
     }
-    
+
     public static MessageFilterToStringStyle instance() {
         return new MessageFilterToStringStyle();
     }
-    
+
+    @Override
     protected void appendDetail(StringBuffer buffer, String fieldName, Object value) {
-        if (value instanceof Calendar) {
-            value = String.format("%1$tY-%1$tm-%1$td", value);
+        if (value instanceof GregorianCalendar cal) {
+            value = cal.toZonedDateTime().format(dateFormat);
         }
 
         buffer.append(value);
     }
 
+    @Override
     protected void appendDetail(StringBuffer buffer, String fieldName, Collection<?> coll) {
-        if (fieldName.equals("metaDataSearch")) {
-            buffer.append("[\n");
-            Iterator<?> iterator = coll.iterator();
-            while (iterator.hasNext()) {
-                Object element = iterator.next();
-                if (!iterator.hasNext()) {
-                    buffer.append(element.toString() + "\n");
-                } else {
-                    buffer.append(element.toString() + ",\n");
-                }
-            }
-            buffer.append("]");
+        if (flatten.contains(fieldName)) {
+            appendDetail(buffer, fieldName, coll.toString());
         } else {
-            super.appendDetail(buffer, fieldName, coll);
+            appendDetail(buffer, fieldName, (Object[]) coll.toArray());
         }
     }
+
+    @Override
+    protected void appendDetail(StringBuffer buffer, String fieldName, Object[] array) {
+        level += 1;
+        resetIndent();
+        super.appendDetail(buffer, fieldName, array);
+        level -= 1;
+        resetIndent();
+    }
+
+    private void resetIndent() {
+        setArrayStart("[" + System.lineSeparator() + " ".repeat(INDENT * level));
+        setArraySeparator("," + System.lineSeparator() + " ".repeat(INDENT * level));
+        setArrayEnd(System.lineSeparator() + " ".repeat(INDENT * (level - 1)) + "]");
+        setContentStart("[" + System.lineSeparator() + " ".repeat(INDENT * level));
+        setFieldSeparator("," + System.lineSeparator() + " ".repeat(INDENT * level));
+        setContentEnd(System.lineSeparator() + " ".repeat(INDENT * (level - 1)) + "]");
+    }
 }

server/src/com/mirth/connect/model/MetaDataSearchElementToStringStyle.java

@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: MPL-2.0
+// SPDX-FileCopyrightText: 2005-2024 NextGen Healthcare
+// SPDX-FileCopyrightText: 2026 Tony Germano <tony@germano.name>
+
+package com.mirth.connect.model;
+
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+public class SearchElementToStringStyle extends ToStringStyle {
+    public SearchElementToStringStyle() {
+        super();
+        this.setUseShortClassName(true);
+        this.setUseIdentityHashCode(false);
+    }
+
+    @Override
+    protected void appendDetail(StringBuffer buffer, String fieldname, Object value) {
+        if (value instanceof String) {
+            buffer.append("\"" + value + "\"");
+        } else {
+            super.appendDetail(buffer, fieldname, value);
+        }
+    }
+
+    public static SearchElementToStringStyle instance() {
+        return new SearchElementToStringStyle();
+    }
+}

server/src/com/mirth/connect/model/SearchElementToStringStyle.java

@@ -1,17 +1,16 @@
-/*
- * Copyright (c) Mirth Corporation. All rights reserved.
- * 
- * http://www.mirthcorp.com
- * 
- * The software in this package is published under the terms of the MPL license a copy of which has
- * been included with this distribution in the LICENSE.txt file.
- */
+// SPDX-License-Identifier: MPL-2.0
+// SPDX-FileCopyrightText: Mirth Corporation
+// SPDX-FileCopyrightText: 2026 Tony Germano <tony@germano.name>
 
 package com.mirth.connect.model.filters.elements;
 
 import java.io.Serializable;
 import java.util.List;
 
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import com.mirth.connect.model.ContentSearchElementToStringStyle;
+
 public class ContentSearchElement implements Serializable {
 
     private int contentCode;
@@ -37,4 +36,9 @@ public List<String> getSearches() {
     public void setSearches(List<String> searches) {
         this.searches = searches;
     }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ContentSearchElementToStringStyle.instance());
+    }
 }

server/src/com/mirth/connect/model/filters/elements/ContentSearchElement.java

@@ -1,19 +1,13 @@
-/*
- * Copyright (c) Mirth Corporation. All rights reserved.
- * 
- * http://www.mirthcorp.com
- * 
- * The software in this package is published under the terms of the MPL license a copy of which has
- * been included with this distribution in the LICENSE.txt file.
- */
+// SPDX-License-Identifier: MPL-2.0
+// SPDX-FileCopyrightText: Mirth Corporation
 
 package com.mirth.connect.model.filters.elements;
 
 import java.io.Serializable;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
-import com.mirth.connect.model.MetaDataSearchElementToStringStyle;
+import com.mirth.connect.model.SearchElementToStringStyle;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 
 @XStreamAlias("metaDataSearchCriteria")
@@ -65,6 +59,6 @@ public void setIgnoreCase(Boolean ignoreCase) {
 
     @Override
     public String toString() {
-        return ToStringBuilder.reflectionToString(this, MetaDataSearchElementToStringStyle.instance());
+        return ToStringBuilder.reflectionToString(this, SearchElementToStringStyle.instance());
     }
 }