A little cleanup, mostly whitespace. (#241)

Author: blackwinter

metafix/src/main/java/org/metafacture/metafix/FixMethod.java

@@ -124,7 +124,6 @@ public void apply(final Metafix metafix, final Record record, final List<String>
                 record.addNested(newName, oldValue); // we're actually aliasing
             }));
         }
-
     },
     format {
         @Override

metafix/src/main/java/org/metafacture/metafix/FixPath.java

@@ -64,8 +64,8 @@ private FixPath(final String[] path) {
     }
 
     /*package-private*/ Value findIn(final Array array) {
-
         final Value result;
+
         if (path.length == 0) {
             result = new Value(array);
         }
@@ -96,8 +96,8 @@ else if (isReference(currentSegment)) {
                 result = Value.newArray(a -> array.forEach(v -> a.add(findInValue(v, path))));
             }
         }
-        return result;
 
+        return result;
     }
 
     private Value findInValue(final Value value, final String[] p) {
@@ -124,6 +124,7 @@ public String toString() {
 
     /*package-private*/ FixPath to(final Value value, final int i) {
         final FixPath result;
+
         // One *, no matching path: replace with index of current result
         if (countAsterisks() == 1 && !matches(value.getPath())) {
             result = new FixPath(replaceInPath(ASTERISK, i));
@@ -135,6 +136,7 @@ else if (value.getPath() != null && hasWildcard()) {
         else {
             result = this;
         }
+
         return result;
     }
 
@@ -154,7 +156,7 @@ private long countAsterisks() {
         return Arrays.asList(path).stream().filter(s -> s.equals(ASTERISK)).count();
     }
 
-    /* package-private */ enum InsertMode {
+    /*package-private*/ enum InsertMode {
 
         REPLACE {
             @Override
@@ -246,10 +248,10 @@ private void removeNestedFrom(final Value value) {
         }
     }
 
-    /*package-private*/ private Value insertInto(final Array array, final InsertMode mode, final Value newValue) {
+    private Value insertInto(final Array array, final InsertMode mode, final Value newValue) {
         // basic idea: reuse findIn logic here? setIn(findIn(array), newValue)
-
         final String field = path[0];
+
         if (path.length == 1) {
             mode.apply(array, field, newValue);
         }
@@ -261,12 +263,14 @@ else if (isReference(field)) {
                 insertInto(getReferencedValue(array, field, newValue.getPath()), mode, newValue, field, tail(path));
             }
         }
+
         return new Value(array);
     }
 
     /*package-private*/ Value insertInto(final Hash hash, final InsertMode mode, final Value newValue) {
         // basic idea: reuse findIn logic here? setIn(findIn(hash), newValue)
         final String field = path[0];
+
         if (path.length == 1) {
             mode.apply(hash, field, newValue);
         }
@@ -276,11 +280,11 @@ else if (isReference(field)) {
             }
             insertInto(hash.get(field), mode, newValue, field, tail(path));
         }
+
         return new Value(hash);
     }
 
-    private Value insertInto(final Value value, final InsertMode mode, final Value newValue, final String field,
-            final String[] tail) {
+    private Value insertInto(final Value value, final InsertMode mode, final Value newValue, final String field, final String[] tail) {
         if (value != null) {
             final FixPath fixPath = new FixPath(tail);
             newValue.withPathSet(value.getPath());
@@ -320,10 +324,12 @@ private boolean isReference(final String field) {
     // TODO replace switch, extract to method on array?
     private Value getReferencedValue(final Array array, final String field, final String p) {
         Value referencedValue = null;
+
         if (Value.isNumber(field)) {
             final int index = Integer.valueOf(field) - 1;
             return 0 <= index && index < array.size() ? array.get(index) : null;
         }
+
         final ReservedField reservedField = ReservedField.fromString(field);
         if (reservedField != null) {
             switch (reservedField) {
@@ -341,6 +347,7 @@ private Value getReferencedValue(final Array array, final String field, final St
                     break;
             }
         }
+
         return referencedValue;
     }
 

metafix/src/main/java/org/metafacture/metafix/Value.java

@@ -100,14 +100,14 @@ public Value(final Map<String, Value> hash) {
         }
     }
 
-    public Value(final int integer) {
-        this(String.valueOf(integer));
-    }
-
     public Value(final String string) {
         this(string != null ? Type.String : null, null, null, string);
     }
 
+    public Value(final int integer) {
+        this(String.valueOf(integer));
+    }
+
     public static Value newArray() {
         return newArray(null);
     }
@@ -257,17 +257,12 @@ public String getPath() {
         return this;
     }
 
-    /*package-private*/ Value withPathAppend(final int i) {
+    private Value withPathAppend(final int i) {
         return withPathAppend(String.valueOf(i));
     }
 
-    /*package-private*/ Value withPathAppend(final String field) {
-        if (path == null || path.isEmpty()) {
-            return this.withPathSet(field);
-        }
-        else {
-            return this.withPathSet(path + "." + field);
-        }
+    private Value withPathAppend(final String field) {
+        return withPathSet(path == null || path.isEmpty() ? field : path + "." + field);
     }
 
     /*package-private*/ Value copy() {
@@ -437,8 +432,7 @@ public void remove(final int index) {
         }
 
         /*package-private*/ void set(final int index, final Value value) {
-            list.set(index, value);
-            value.withPathAppend(index + 1);
+            list.set(index, value.withPathAppend(index + 1));
         }
 
         /*package-private*/ void removeIf(final Predicate<Value> predicate) {
@@ -622,8 +616,8 @@ public void add(final String field, final Value newValue) {
                     oldValue.withPathAppend(1);
                 }
 
-                put(field, oldValue.asList(oldVals -> newValue
-                        .asList(newVals -> newVals.forEach(newVal -> oldVals.add(newVal.withPathSet(basePath))))));
+                put(field, oldValue.asList(oldVals -> newValue.asList(newVals ->
+                                newVals.forEach(newVal -> oldVals.add(newVal.withPathSet(basePath))))));
             }
         }