From 0de79eafdac86f631f4cc01237d4c4f8eb62cc72 Mon Sep 17 00:00:00 2001 From: Mats Rydberg Date: Tue, 1 Mar 2016 10:38:40 +0100 Subject: [PATCH] Improve `toString()` to be more helpful - Improve code style --- .../cypher/feature/parser/matchers/ListMatcher.java | 4 +--- .../cypher/feature/parser/matchers/MapMatcher.java | 2 +- .../cypher/feature/parser/matchers/NodeMatcher.java | 2 +- .../feature/parser/matchers/PathLinkMatcher.java | 2 +- .../cypher/feature/parser/matchers/PathMatcher.java | 11 +++++++---- .../feature/parser/matchers/RelationshipMatcher.java | 2 +- .../cypher/feature/parser/matchers/RowMatcher.java | 2 +- .../cypher/feature/parser/matchers/StringMatcher.java | 2 +- 8 files changed, 14 insertions(+), 13 deletions(-) diff --git a/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/ListMatcher.java b/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/ListMatcher.java index 20be1b45e4c75..7bb1955a1f009 100644 --- a/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/ListMatcher.java +++ b/community/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/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/MapMatcher.java b/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/MapMatcher.java index b6b55e7c89186..5cca8458557b9 100644 --- a/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/MapMatcher.java +++ b/community/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/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/NodeMatcher.java b/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/NodeMatcher.java index f4ef9225fbb03..b78de93bc9270 100644 --- a/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/NodeMatcher.java +++ b/community/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/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/PathLinkMatcher.java b/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/PathLinkMatcher.java index 78345f05b8aef..b60bb8b333928 100644 --- a/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/PathLinkMatcher.java +++ b/community/cypher/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/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/PathMatcher.java b/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/PathMatcher.java index a6f5abaf3fea6..ad71a07b3f06b 100644 --- a/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/PathMatcher.java +++ b/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/PathMatcher.java @@ -62,7 +62,8 @@ public boolean matches( Object value ) if ( matches ) { Iterator 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/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/RelationshipMatcher.java b/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/RelationshipMatcher.java index c92f00e549e24..8e57fcd4ef062 100644 --- a/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/RelationshipMatcher.java +++ b/community/cypher/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/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/RowMatcher.java b/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/RowMatcher.java index 903945027bb31..64b1a695559d5 100644 --- a/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/RowMatcher.java +++ b/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/RowMatcher.java @@ -49,6 +49,6 @@ public boolean matches( Map value ) @Override public String toString() { - return "RowMatcher with " + values; + return "RowMatcher(" + values + ")"; } } diff --git a/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/StringMatcher.java b/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/StringMatcher.java index 7f27353768eeb..22300704792a2 100644 --- a/community/cypher/compatibility-suite/src/main/java/cypher/feature/parser/matchers/StringMatcher.java +++ b/community/cypher/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 + ")"; } }