metamorph-api/ (main): Fix Checkstyle violations.

blackwinter · blackwinter · commit 1ff966294c34 · 2021-09-07T20:11:21.000+02:00
diff --git a/metamorph-api/src/main/java/org/metafacture/metamorph/api/Collect.java b/metamorph-api/src/main/java/org/metafacture/metamorph/api/Collect.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.metafacture.metamorph.api;
 
 /**
@@ -21,10 +22,9 @@
  * @author Markus Michael Geipel
  *
  */
-public interface Collect extends FlushListener, ConditionAware,
-        NamedValuePipe {
+public interface Collect extends FlushListener, ConditionAware, NamedValuePipe {
 
-    void setWaitForFlush(final boolean waitForFlush);
+    void setWaitForFlush(boolean waitForFlush);
 
     void setSameEntity(boolean sameEntity);
 
diff --git a/metamorph-api/src/main/java/org/metafacture/metamorph/api/ConditionAware.java b/metamorph-api/src/main/java/org/metafacture/metamorph/api/ConditionAware.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.metafacture.metamorph.api;
 
 /**
diff --git a/metamorph-api/src/main/java/org/metafacture/metamorph/api/FlushListener.java b/metamorph-api/src/main/java/org/metafacture/metamorph/api/FlushListener.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.metafacture.metamorph.api;
 
 /**
@@ -22,6 +23,6 @@
  */
 public interface FlushListener {
 
-    void flush(final int recordCount, final int entityCount);
+    void flush(int recordCount, int entityCount);
 
 }
diff --git a/metamorph-api/src/main/java/org/metafacture/metamorph/api/Function.java b/metamorph-api/src/main/java/org/metafacture/metamorph/api/Function.java
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.metafacture.metamorph.api;
 
+package org.metafacture.metamorph.api;
 
 /**
  * Interface for functions used in Metamorph.
@@ -25,6 +25,7 @@
 public interface Function extends NamedValuePipe, FlushListener {
 
     void putValue(String key, String value);
+
     void setMaps(Maps maps);
 
 }
diff --git a/metamorph-api/src/main/java/org/metafacture/metamorph/api/InterceptorFactory.java b/metamorph-api/src/main/java/org/metafacture/metamorph/api/InterceptorFactory.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.metafacture.metamorph.api;
 
 /**
diff --git a/metamorph-api/src/main/java/org/metafacture/metamorph/api/KnowsSourceLocation.java b/metamorph-api/src/main/java/org/metafacture/metamorph/api/KnowsSourceLocation.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.metafacture.metamorph.api;
 
 /**
@@ -31,7 +32,7 @@ public interface KnowsSourceLocation {
      *
      * @param sourceLocation a source location
      */
-    void setSourceLocation(final SourceLocation sourceLocation);
+    void setSourceLocation(SourceLocation sourceLocation);
 
     /**
      * Gets the location object for the location in the morph definition file
diff --git a/metamorph-api/src/main/java/org/metafacture/metamorph/api/Maps.java b/metamorph-api/src/main/java/org/metafacture/metamorph/api/Maps.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.metafacture.metamorph.api;
 
 import java.util.Collection;
diff --git a/metamorph-api/src/main/java/org/metafacture/metamorph/api/MorphBuildException.java b/metamorph-api/src/main/java/org/metafacture/metamorph/api/MorphBuildException.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.metafacture.metamorph.api;
 
 /**
diff --git a/metamorph-api/src/main/java/org/metafacture/metamorph/api/MorphErrorHandler.java b/metamorph-api/src/main/java/org/metafacture/metamorph/api/MorphErrorHandler.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.metafacture.metamorph.api;
 
 /**
diff --git a/metamorph-api/src/main/java/org/metafacture/metamorph/api/MorphExecutionException.java b/metamorph-api/src/main/java/org/metafacture/metamorph/api/MorphExecutionException.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.metafacture.metamorph.api;
 
 /**
diff --git a/metamorph-api/src/main/java/org/metafacture/metamorph/api/NamedValuePipe.java b/metamorph-api/src/main/java/org/metafacture/metamorph/api/NamedValuePipe.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.metafacture.metamorph.api;
 
 /**
diff --git a/metamorph-api/src/main/java/org/metafacture/metamorph/api/NamedValueReceiver.java b/metamorph-api/src/main/java/org/metafacture/metamorph/api/NamedValueReceiver.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.metafacture.metamorph.api;
 
 /**
@@ -24,9 +25,8 @@
  */
 public interface NamedValueReceiver extends KnowsSourceLocation {
 
-    void receive(String name, String value, NamedValueSource source,
-            int recordCount, int entityCount);
+    void receive(String name, String value, NamedValueSource source, int recordCount, int entityCount);
 
-    void addNamedValueSource(final NamedValueSource namedValueSource);
+    void addNamedValueSource(NamedValueSource namedValueSource);
 
 }
diff --git a/metamorph-api/src/main/java/org/metafacture/metamorph/api/NamedValueSource.java b/metamorph-api/src/main/java/org/metafacture/metamorph/api/NamedValueSource.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.metafacture.metamorph.api;
 
 /**
diff --git a/metamorph-api/src/main/java/org/metafacture/metamorph/api/SourceLocation.java b/metamorph-api/src/main/java/org/metafacture/metamorph/api/SourceLocation.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.metafacture.metamorph.api;
 
 /**
diff --git a/metamorph-api/src/main/java/org/metafacture/metamorph/api/helpers/AbstractCollect.java b/metamorph-api/src/main/java/org/metafacture/metamorph/api/helpers/AbstractCollect.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.metafacture.metamorph.api.helpers;
 
 import org.metafacture.metamorph.api.Collect;
@@ -130,17 +131,22 @@ protected final boolean isSameRecord(final int currentRecord) {
         return currentRecord == oldRecord;
     }
 
+    protected final boolean sameEntityConstraintSatisfied(final int entityCount) {
+        return !sameEntity || oldEntity == entityCount;
+    }
+
     @Override
-    public final void receive(final String name, final String value,
+    public final void receive(final String currentName, final String currentValue,
             final NamedValueSource source, final int recordCount,
             final int entityCount) {
 
         updateCounts(recordCount, entityCount);
 
         if (source == conditionSource) {
             conditionMet = true;
-        } else {
-            receive(name, value, source);
+        }
+        else {
+            receive(currentName, currentValue, source);
         }
 
         if (!waitForFlush && isConditionMet() && isComplete()) {
@@ -152,12 +158,7 @@ public final void receive(final String name, final String value,
         }
     }
 
-    protected final boolean sameEntityConstraintSatisfied(final int entityCount) {
-        return !sameEntity || oldEntity == entityCount;
-    }
-
-    protected abstract void receive(final String name, final String value,
-            final NamedValueSource source);
+    protected abstract void receive(String currentName, String currentValue, NamedValueSource source);
 
     protected abstract boolean isComplete();
 
diff --git a/metamorph-api/src/main/java/org/metafacture/metamorph/api/helpers/AbstractFilter.java b/metamorph-api/src/main/java/org/metafacture/metamorph/api/helpers/AbstractFilter.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.metafacture.metamorph.api.helpers;
 
 /**
@@ -26,15 +27,15 @@ public abstract class AbstractFilter extends AbstractSimpleStatelessFunction {
 
     @Override
     public final String process(final String value) {
-        if(accept(value)){
+        if (accept(value)) {
             return value;
         }
         return null;
     }
 
     protected abstract boolean accept(String value);
 
-    protected final  String getString() {
+    protected final String getString() {
         return string;
     }
 
diff --git a/metamorph-api/src/main/java/org/metafacture/metamorph/api/helpers/AbstractFlushingCollect.java b/metamorph-api/src/main/java/org/metafacture/metamorph/api/helpers/AbstractFlushingCollect.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.metafacture.metamorph.api.helpers;
 
 /**
@@ -33,7 +34,7 @@ public final void setFlushIncomplete(final boolean flushIncomplete) {
     @Override
     public final void flush(final int recordCount, final int entityCount) {
         if (isSameRecord(recordCount) && sameEntityConstraintSatisfied(entityCount)) {
-            if(isConditionMet() && (flushIncomplete || isComplete())) {
+            if (isConditionMet() && (flushIncomplete || isComplete())) {
                 emit();
             }
             if (getReset()) {
diff --git a/metamorph-api/src/main/java/org/metafacture/metamorph/api/helpers/AbstractFunction.java b/metamorph-api/src/main/java/org/metafacture/metamorph/api/helpers/AbstractFunction.java
@@ -13,14 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.metafacture.metamorph.api.helpers;
 
-import java.util.HashMap;
-import java.util.Map;
+package org.metafacture.metamorph.api.helpers;
 
 import org.metafacture.metamorph.api.Function;
 import org.metafacture.metamorph.api.Maps;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * Base class for functions.
  *
@@ -33,8 +34,8 @@ public abstract class AbstractFunction extends AbstractNamedValuePipe
     private Map<String, String> localMap;
     private String mapName;
 
-    protected final String getValue(final String mapName, final String key) {
-        return maps.getValue(mapName, key);
+    protected final String getValue(final String currentMapName, final String key) {
+        return maps.getValue(currentMapName, key);
     }
 
     protected final String getLocalValue(final String key) {
@@ -55,8 +56,8 @@ public final Map<String, String> getMap() {
         return localMap;
     }
 
-    public final void setMap(final String mapName) {
-        this.mapName = mapName;
+    public final void setMap(final String newMapName) {
+        mapName = newMapName;
     }
 
     @Override
diff --git a/metamorph-api/src/main/java/org/metafacture/metamorph/api/helpers/AbstractNamedValuePipe.java b/metamorph-api/src/main/java/org/metafacture/metamorph/api/helpers/AbstractNamedValuePipe.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.metafacture.metamorph.api.helpers;
 
 import org.metafacture.metamorph.api.NamedValuePipe;
diff --git a/metamorph-api/src/main/java/org/metafacture/metamorph/api/helpers/AbstractReadOnlyMap.java b/metamorph-api/src/main/java/org/metafacture/metamorph/api/helpers/AbstractReadOnlyMap.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.metafacture.metamorph.api.helpers;
 
 import java.util.Collection;
diff --git a/metamorph-api/src/main/java/org/metafacture/metamorph/api/helpers/AbstractSimpleStatelessFunction.java b/metamorph-api/src/main/java/org/metafacture/metamorph/api/helpers/AbstractSimpleStatelessFunction.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.metafacture.metamorph.api.helpers;
 
 import org.metafacture.metamorph.api.Function;
diff --git a/metamorph-api/src/main/java/org/metafacture/metamorph/api/helpers/AbstractStatefulFunction.java b/metamorph-api/src/main/java/org/metafacture/metamorph/api/helpers/AbstractStatefulFunction.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.metafacture.metamorph.api.helpers;
 
 import org.metafacture.metamorph.api.NamedValueSource;
@@ -46,36 +47,35 @@ protected final String getLastName() {
     }
 
     @Override
-    public final void receive(final String name, final String value,
-            final NamedValueSource source, final int recordCount,
-            final int entityCount) {
+    public final void receive(final String currentName, final String value,
+            final NamedValueSource currentSource, final int currentRecordCount,
+            final int currentEntityCount) {
 
-        if (!sameRecord(recordCount)) {
+        if (!sameRecord(currentRecordCount)) {
             reset();
-            this.recordCount = recordCount;
+            recordCount = currentRecordCount;
         }
-        if (entityClearNeeded(entityCount)) {
+        if (entityClearNeeded(currentEntityCount)) {
             reset();
         }
-        this.entityCount = entityCount;
-        this.source = source;
-        this.lastName = name;
+        entityCount = currentEntityCount;
+        source = currentSource;
+        lastName = currentName;
 
         final String processedValue = process(value);
         if (processedValue == null) {
             return;
         }
 
-        getNamedValueReceiver().receive(name, processedValue, this,
-                recordCount, entityCount);
+        getNamedValueReceiver().receive(currentName, processedValue, this, currentRecordCount, currentEntityCount);
     }
 
-    private boolean entityClearNeeded(final int entityCount) {
-        return doResetOnEntityChange() && this.entityCount != entityCount;
+    private boolean entityClearNeeded(final int currentEntityCount) {
+        return doResetOnEntityChange() && entityCount != currentEntityCount;
     }
 
-    private boolean sameRecord(final int recordCount) {
-        return this.recordCount == recordCount;
+    private boolean sameRecord(final int currentRecordCount) {
+        return recordCount == currentRecordCount;
     }
 
     protected abstract String process(String value);
