Metamorph, TestMetamorphBasics: Cosmetics.

Author: blackwinter

metamorph/src/main/java/org/metafacture/metamorph/Metamorph.java

@@ -122,7 +122,6 @@ public Metamorph(final String morphDef, final InterceptorFactory interceptorFact
 
     public Metamorph(final String morphDef, final Map<String, String> vars,
             final InterceptorFactory interceptorFactory) {
-
         this(getInputSource(morphDef), vars, interceptorFactory);
     }
 
@@ -140,7 +139,6 @@ public Metamorph(final Reader morphDef, final InterceptorFactory interceptorFact
 
     public Metamorph(final Reader morphDef, final Map<String, String> vars,
             final InterceptorFactory interceptorFactory) {
-
         this(new InputSource(morphDef), vars, interceptorFactory);
     }
 
@@ -158,7 +156,6 @@ public Metamorph(final InputStream morphDef, final InterceptorFactory intercepto
 
     public Metamorph(final InputStream morphDef, final Map<String, String> vars,
             final InterceptorFactory interceptorFactory) {
-
         this(new InputSource(morphDef), vars, interceptorFactory);
     }
 
@@ -224,14 +221,16 @@ public void setErrorHandler(final MorphErrorHandler errorHandler) {
 
     protected void registerNamedValueReceiver(final String source, final NamedValueReceiver data) {
         if (ELSE_NESTED_KEYWORD.equals(source)) {
-            this.elseNested = true;
+            elseNested = true;
         }
+
         if (ELSE_KEYWORD.equals(source) || ELSE_FLATTENED_KEYWORD.equals(source) || elseNested) {
-            if (elseSources.isEmpty())
+            if (elseSources.isEmpty()) {
                 elseSources.add(data);
-            else
-                LOG.warn(
-                        "Only one of '_else', '_elseFlattened' and '_elseNested' is allowed. Ignoring the superflous ones.");
+            }
+            else {
+                LOG.warn("Only one of '_else', '_elseFlattened' and '_elseNested' is allowed. Ignoring the superflous ones.");
+            }
         } else {
             dataRegistry.register(source, data);
         }
@@ -258,7 +257,6 @@ public void startRecord(final String identifier) {
 
     @Override
     public void endRecord() {
-
         for(final FlushListener listener: recordEndListener){
             listener.flush(recordCount, currentEntityCount);
         }
@@ -290,14 +288,12 @@ public void endEntity() {
         dispatch(flattener.getCurrentPath(), "", null);
         currentEntityCount = entityCountStack.pop().intValue();
         flattener.endEntity();
-
     }
 
 
     @Override
     public void literal(final String name, final String value) {
         flattener.literal(name, value);
-
     }
 
     @Override

metamorph/src/test/java/org/metafacture/metamorph/TestMetamorphBasics.java

@@ -87,24 +87,19 @@ public void shouldHandleUnmatchedLiteralsInElseSource() {
 
     @Test
     public void shouldHandleUnmatchedLiteralsAndEntitiesInElseSource() {
-        testElseData(
-                "<rules>" +
-                "    <data source='_else'/>" +
-                "</rules>"
-        );
+        testElseData("_else");
     }
 
     @Test
     public void shouldHandleUnmatchedLiteralsAndEntitiesInElseFlattenedSource() {
-        testElseData(
-                "<rules>" +
-                "    <data source='_elseFlattened'/>" +
-                "</rules>"
-        );
+        testElseData("_elseFlattened");
     }
 
-    private void testElseData(final String morphDef) {
-        assertMorph(receiver, morphDef,
+    private void testElseData(final String elseKeyword) {
+        assertMorph(receiver,
+                "<rules>" +
+                "  <data source='" + elseKeyword + "'/>" +
+                "</rules>",
                 i -> {
                     i.startRecord("1");
                     i.literal("Shikotan", "Aekap");