Merge pull request #2753 from SCADA-LTS/fix/#2752_Excluding_synchroni…

…zed_fields_in_the_toString_implementation #2752 Excluding synchronized fields in the toString implementation -
SCADA-LTS · Nov 2, 2023 · 76b3231 · 76b3231
2 parents 2773d0f + 5b5e0fb
commit 76b3231
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 15 deletions.
diff --git a/src/com/serotonin/mango/rt/dataSource/http/HttpImageDataSourceRT.java b/src/com/serotonin/mango/rt/dataSource/http/HttpImageDataSourceRT.java
@@ -223,12 +223,10 @@ public int getPriority() {
 
         @Override
         public String toString() {
-            return "ImageRetriever{" +
-                    "monitor=" + monitor +
-                    ", " + (dp == null ? null : LoggingUtils.dataPointInfo(dp.getVO())) +
+            return "ImageRetriever{dp='" + (dp == null ? null : LoggingUtils.dataPointInfo(dp.getVO())) + '\'' +
                     ", time=" + time +
-                    ", retrievalFailure=" + retrievalFailure +
-                    ", saveFailure=" + saveFailure +
+                    ", retrievalFailure='" + (retrievalFailure == null ? null : retrievalFailure.getLocalizedMessage(Common.getBundle())) + '\'' +
+                    ", saveFailure='" + (saveFailure == null ? null : saveFailure.getLocalizedMessage(Common.getBundle())) + '\'' +
                     '}';
         }
         @Override

diff --git a/src/com/serotonin/mango/rt/dataSource/persistent/PersistentDataSourceRT.java b/src/com/serotonin/mango/rt/dataSource/persistent/PersistentDataSourceRT.java
@@ -666,8 +666,7 @@ public String getDetails() {
 
             @Override
             public String toString() {
-                return "RangeCountHandler{" +
-                        "details='" + details + '\'' +
+                return "RangeCountHandler{details='" + details + '\'' +
                         ", requestId=" + requestId +
                         ", index=" + index +
                         ", from=" + from +
@@ -688,8 +687,7 @@ public String getDetails() {
 
         @Override
         public String toString() {
-            return "ConnectionHandler{" +
-                    ", version=" + version +
+            return "ConnectionHandler{version=" + version +
                     ", indexedXids=" + indexedXids +
                     ", details='" + details + '\'' +
                     ", connectionTime=" + connectionTime +

diff --git a/src/com/serotonin/mango/rt/maint/work/ProcessWorkItem.java b/src/com/serotonin/mango/rt/maint/work/ProcessWorkItem.java
@@ -273,7 +273,7 @@ public String toString() {
         return "ProcessWorkItem{" +
                 "command='" + command + '\'' +
                 ", details='" + details + '\'' +
-                "} " + super.toString();
+                "}";
     }
 
     @Override

diff --git a/src/com/serotonin/timer/sync/SingleExecutorSingleWaiter.java b/src/com/serotonin/timer/sync/SingleExecutorSingleWaiter.java
@@ -90,9 +90,7 @@ public int getPriority() {
 
         @Override
         public String toString() {
-            return "TaskWrapper{" +
-                    "command=" + command +
-                    ", details='" + details + '\'' +
+            return "TaskWrapper{details='" + details + '\'' +
                     '}';
         }
 

diff --git a/src/org/scada_lts/mango/service/PointValueService.java b/src/org/scada_lts/mango/service/PointValueService.java
@@ -66,7 +66,6 @@
 import com.serotonin.util.queue.ObjectQueue;
 
 import static com.serotonin.mango.util.LoggingScriptUtils.infoErrorExecutionScript;
-import static com.serotonin.mango.util.LoggingUtils.entryInfo;
 
 /**
  * Base on the PointValueDao
@@ -625,7 +624,7 @@ public int getPriority() {
 
         @Override
         public String toString() {
-            return "BatchWriteBehind{entries size: " + ENTRIES.size() + ", instances size: " + instances.size() + '}';
+            return "BatchWriteBehind{instances size: " + instances.size() + '}';
         }
 
         @Override