matchers: CompareToComparator lazy creation of converted actual map (#1572)

Author: MykolaGolubyev

webtau-core/src/main/java/org/testingisdocumenting/webtau/expectation/equality/CompareToComparator.java

@@ -61,7 +61,7 @@ public String getMessage() {
     private final CompareToResult compareToResult = new CompareToResult();
 
     // when actual value was converted for comparison, e.g. bean to Map, it will go into this map
-    private final Map<ValuePath, Object> convertedActualByPath = new HashMap<>();
+    private Map<ValuePath, Object> convertedActualByPath;
     private Object topLevelExpected;
     private Object convertedTopLevelExpected;
 
@@ -86,12 +86,14 @@ public ValueConverter createValueConverter() {
                 return convertedTopLevelExpected;
             }
 
-            return convertedActualByPath.getOrDefault(path, original);
+            return convertedActualByPath == null ? original :
+                    convertedActualByPath.getOrDefault(path, original);
         };
     }
 
     public Map<ValuePath, Object> getConvertedActualByPath() {
-        return Collections.unmodifiableMap(convertedActualByPath);
+        return convertedActualByPath == null ? Collections.emptyMap() :
+                Collections.unmodifiableMap(convertedActualByPath);
     }
 
     public boolean compareIsEqual(ValuePath actualPath, Object actual, Object expected) {
@@ -339,6 +341,10 @@ private void recordConvertedActual(ValuePath actualPath, Object actual, Object c
             return;
         }
 
+        if (convertedActualByPath == null) {
+            convertedActualByPath = new HashMap<>();
+        }
+
         convertedActualByPath.put(actualPath, convertedActual);
     }
 
@@ -369,7 +375,13 @@ private void validateAssertionModeIsPresent() {
 
     private void mergeResults(CompareToComparator comparator) {
         compareToResult.merge(comparator.compareToResult);
-        convertedActualByPath.putAll(comparator.convertedActualByPath);
+        if (comparator.convertedActualByPath != null) {
+            if (convertedActualByPath == null) {
+                convertedActualByPath = new HashMap<>();
+            }
+
+            convertedActualByPath.putAll(comparator.convertedActualByPath);
+        }
     }
 
     private static CompareToHandler findCompareToGreaterLessHandler(Object actual, Object expected) {

webtau-core/src/main/java/org/testingisdocumenting/webtau/expectation/equality/ValuePathLazyMessageList.java

@@ -40,7 +40,7 @@ public void add(ValuePathMessage message) {
             if (singleMessage == null) {
                 singleMessage = message;
             } else {
-                messages = new ArrayList<>();
+                messages = new ArrayList<>(SIZE_LIMIT);
                 messages.add(singleMessage);
                 messages.add(message);
                 singleMessage = null;
@@ -69,8 +69,12 @@ public void addAll(Iterable<ValuePathMessage> messages) {
     }
 
     public void merge(ValuePathLazyMessageList list) {
-        for (ValuePathMessage message : list) {
-            add(message);
+        if (list.size == 1) {
+            add(list.first());
+        } else {
+            for (ValuePathMessage message : list) {
+                add(message);
+            }
         }
     }