Minor cleanups

Author: haikalpribadi

pattern/Conjunction.java

@@ -26,7 +26,6 @@
 import com.vaticle.typeql.lang.pattern.variable.BoundVariable;
 import com.vaticle.typeql.lang.pattern.variable.UnboundVariable;
 import com.vaticle.typeql.lang.pattern.variable.Variable;
-
 import java.util.AbstractList;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -37,7 +36,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import static com.vaticle.typedb.common.collection.Collections.list;
 import static com.vaticle.typeql.lang.common.TypeQLToken.Char.CURLY_CLOSE;
 import static com.vaticle.typeql.lang.common.TypeQLToken.Char.CURLY_OPEN;
@@ -124,8 +122,8 @@ public Disjunction<Conjunction<Conjunctable>> normalise() {
     public String toString() {
         StringBuilder pattern = new StringBuilder();
         pattern.append(CURLY_OPEN).append(SPACE);
-        pattern.append(patterns.stream().map(Objects::toString).collect(joining("" + SEMICOLON + SPACE)));
-        pattern.append(SEMICOLON).append(SPACE).append(CURLY_CLOSE);
+        pattern.append(patterns.stream().map(Objects::toString).collect(joining("" + SEMICOLON + SPACE))).append(SEMICOLON);
+        pattern.append(SPACE).append(CURLY_CLOSE);
         return pattern.toString();
     }
 

pattern/variable/ConceptVariable.java

@@ -69,7 +69,7 @@ public Optional<ConceptConstraint.Is> is() {
     @Override
     public String toString() {
         if (isConstraint == null) return reference.toString();
-        return reference.toString() + SPACE + isConstraint.toString();
+        return reference.toString() + SPACE + isConstraint;
     }
 
     @Override

query/builder/Sortable.java

@@ -30,7 +30,10 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import static com.vaticle.typeql.lang.common.TypeQLToken.Char.COMMA_SPACE;
+import static com.vaticle.typeql.lang.common.TypeQLToken.Char.SPACE;
 import static com.vaticle.typeql.lang.common.exception.ErrorMessage.INVALID_SORTING_ORDER;
+import static java.util.stream.Collectors.joining;
 import static java.util.stream.Stream.concat;
 import static java.util.stream.Stream.of;
 
@@ -93,8 +96,8 @@ public TypeQLArg.Order order() {
         @Override
         public String toString() {
             StringBuilder sort = new StringBuilder();
-            sort.append(vars.stream().map(UnboundVariable::toString).reduce((a, b) -> a + ", " + b).get());
-            if (order != null) sort.append(TypeQLToken.Char.SPACE).append(order);
+            sort.append(vars.stream().map(Objects::toString).collect(joining(COMMA_SPACE.toString())));
+            if (order != null) sort.append(SPACE).append(order);
             return sort.toString();
         }