Improve toString() to be more helpful

- Improve code style
neo4j · Mar 3, 2016 · 0de79ea · 0de79ea
1 parent 4a60b64
commit 0de79ea
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 13 deletions.
diff --git a/.../cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/ListMatcher.java b/.../cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/ListMatcher.java
@@ -41,9 +41,7 @@ public boolean matches( Object value )
             {
                 for ( int i = 0; i < list.size(); ++i )
                 {
-                    ValueMatcher valueMatcher = list.get( i );
-                    Object value1 = realList.get( i );
-                    match &= valueMatcher.matches( value1 );
+                    match &= list.get( i ).matches( realList.get( i ) );
                 }
             }
             return match;

diff --git a/...y/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/MapMatcher.java b/...y/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/MapMatcher.java
@@ -59,6 +59,6 @@ public boolean matches( Object value )
     @Override
     public String toString()
     {
-        return "MapMatcher for " + map.toString();
+        return "MapMatcher {" + map.toString();
     }
 }
diff --git a/.../cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/NodeMatcher.java b/.../cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/NodeMatcher.java
@@ -61,6 +61,6 @@ public boolean matches( Object value )
     @Override
     public String toString()
     {
-        return "NodeMatcher for a node with labelNames: " + labelNames + " and properties: " + propertyMatcher;
+        return "NodeMatcher (" + labelNames + ") " + propertyMatcher;
     }
 }
diff --git a/...her/compatibility-suite/src/main/java/cypher/feature/parser/matchers/PathLinkMatcher.java b/...her/compatibility-suite/src/main/java/cypher/feature/parser/matchers/PathLinkMatcher.java
@@ -65,7 +65,7 @@ public void setRightNode( NodeMatcher rightNode )
     @Override
     public String toString()
     {
-        return "PathLinkMatcher for "
+        return "PathLinkMatcher "
                + leftNode + (outgoing ? "-" : "<-")
                + relMatcher + (outgoing ? "->" : "-")
                + rightNode;

diff --git a/.../cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/PathMatcher.java b/.../cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/PathMatcher.java
@@ -62,7 +62,8 @@ public boolean matches( Object value )
                 if ( matches )
                 {
                     Iterator<Relationship> relationships = path.relationships().iterator();
-                    for (PathLinkMatcher pathLink : pathLinks) {
+                    for ( PathLinkMatcher pathLink : pathLinks )
+                    {
                         pathLink.matches( relationships.next() );
                     }
                 }
@@ -75,10 +76,12 @@ public boolean matches( Object value )
     @Override
     public String toString()
     {
-        if (pathLinks.isEmpty())
+        if ( pathLinks.isEmpty() )
+        {
+            return "PathMatcher for " + singleNodePath;
+        }
+        else
         {
-        return "PathMatcher for " + singleNodePath;
-        } else {
             return "PathMatcher for " + pathLinks;
         }
     }

diff --git a/...compatibility-suite/src/main/java/cypher/feature/parser/matchers/RelationshipMatcher.java b/...compatibility-suite/src/main/java/cypher/feature/parser/matchers/RelationshipMatcher.java
@@ -48,6 +48,6 @@ public boolean matches( Object value )
     @Override
     public String toString()
     {
-        return "RelationshipMatcher for type " + relationshipTypeName + " and properties: " + propertyMatcher;
+        return "RelationshipMatcher [" + relationshipTypeName + "] " + propertyMatcher;
     }
 }
diff --git a/...y/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/RowMatcher.java b/...y/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/RowMatcher.java
@@ -49,6 +49,6 @@ public boolean matches( Map<String,Object> value )
     @Override
     public String toString()
     {
-        return "RowMatcher with " + values;
+        return "RowMatcher(" + values + ")";
     }
 }
diff --git a/...ypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/StringMatcher.java b/...ypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/StringMatcher.java
@@ -37,6 +37,6 @@ public boolean matches( Object value )
     @Override
     public String toString()
     {
-        return "StringMatcher for " + string;
+        return "StringMatcher(" + string + ")";
     }
 }