fix checkstyle violations

envimate · Jun 24, 2019 · d13558b · d13558b
1 parent 00f1bd7
commit d13558b
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 14 deletions.
diff --git a/core/src/main/java/com/envimate/mapmate/builder/MapMateBuilder.java b/core/src/main/java/com/envimate/mapmate/builder/MapMateBuilder.java
@@ -51,19 +51,18 @@
 
 public final class MapMateBuilder {
     private static final int INITIAL_CAPACITY = 10000;
-    private final PackageScanner packageScanner;
     public Detector detector = ConventionalDetector.conventionalDetectorWithAnnotations();
+    private final PackageScanner packageScanner;
     private final List<Recipe> recipes = new LinkedList<>();
-    private Map<MarshallingType, Marshaller> marshallerMap = new HashMap<>(1);
-    private Map<MarshallingType, Unmarshaller> unmarshallerMap = new HashMap<>(1);
     private final ValidationMappings validationMappings = ValidationMappings.empty();
     private final ValidationErrorsMapping validationErrorsMapping = validationErrors -> {
         throw AggregatedValidationException.fromList(validationErrors);
     };
+    private Map<MarshallingType, Marshaller> marshallerMap = new HashMap<>(1);
+    private Map<MarshallingType, Unmarshaller> unmarshallerMap = new HashMap<>(1);
     private InjectorFactory injectorFactory = InjectorFactory.emptyInjectorFactory();
 
-
-    public MapMateBuilder(final PackageScanner packageScanner) {
+    private MapMateBuilder(final PackageScanner packageScanner) {
         this.packageScanner = packageScanner;
     }
 

diff --git a/core/src/main/java/com/envimate/mapmate/builder/anticorruption/DefinitionsFactory.java b/core/src/main/java/com/envimate/mapmate/builder/anticorruption/DefinitionsFactory.java
@@ -48,7 +48,6 @@
 import static com.envimate.mapmate.serialization.SerializableDataTransferObject.serializableDataTransferObject;
 import static com.envimate.mapmate.serialization.SerializableDefinitions.serializableDefinitions;
 
-
 @ToString
 @EqualsAndHashCode
 @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
@@ -82,7 +81,6 @@ public SerializableDefinitions toSerializableDefinitions() {
         }
 
         return serializableDefinitions(serializableCPs, serializableDTOs);
-
     }
 
     public DeserializableDefinitions toDeserializableDefinitions() {
@@ -111,5 +109,4 @@ public DeserializableDefinitions toDeserializableDefinitions() {
 
         return deserializableDefinitions(deserializableCPs, deserializableDTOs);
     }
-
 }
diff --git a/core/src/main/java/com/envimate/mapmate/builder/definitions/CustomPrimitiveDefinition.java b/core/src/main/java/com/envimate/mapmate/builder/definitions/CustomPrimitiveDefinition.java
@@ -58,7 +58,6 @@ public static CustomPrimitiveDefinition customPrimitiveDefinition(final Class<?>
         return untypedCustomPrimitiveDefinition(type, serializer, deserializer);
     }
 
-
     private static CustomPrimitiveDefinition untypedCustomPrimitiveDefinition(
             final Class<?> type,
             final CustomPrimitiveSerializer<?> serializer,
@@ -146,5 +145,4 @@ private static CustomPrimitiveDeserializer<?> createDeserializer(final Class<?>
 
         return customPrimitiveByMethodDeserializer(deserializationMethod);
     }
-
 }
diff --git a/...nvimate/mapmate/builder/recipes/primitives/BuiltInPrimitiveSerializedAsStringSupport.java b/...nvimate/mapmate/builder/recipes/primitives/BuiltInPrimitiveSerializedAsStringSupport.java
@@ -66,12 +66,14 @@ public Map<Class<?>, CustomPrimitiveDefinition> customPrimitiveDefinitions() {
         );
     }
 
-
     private static <T> CustomPrimitiveDefinition toCustomPrimitiveDefinition(final Class<T> type,
                                                                              final Function<String, T> deserializer) {
         final CustomPrimitiveSerializer<T> customPrimitiveSerializer = obj -> {
-            if (obj != null) return String.valueOf(obj);
-            else return null;
+            if (obj != null) {
+                return String.valueOf(obj);
+            } else {
+                return null;
+            }
         };
         return customPrimitiveDefinition(type, customPrimitiveSerializer, deserializer::apply);
     }

diff --git a/core/src/test/checkstyle/checkstyle-suppressions.xml b/core/src/test/checkstyle/checkstyle-suppressions.xml
@@ -35,6 +35,8 @@
     <suppress checks="IllegalCatchCheck" files="Serializer.java"/>
     <suppress checks="IllegalCatchCheck" files="Deserializer|When"/>
     <suppress checks="MethodLength" files="Deserializer.java"/>
+    <suppress checks="MethodLength" files="MapMateBuilder.java"/>
+    <suppress checks="VisibilityModifier" files="MapMateBuilder.java"/>
     <suppress
             checks="MagicNumber|MethodName|IllegalCatch|LineLength|MethodLength|FinalParameters|FileLength|InnerTypeLast"
             files="DeserializerBuilderTest|DeserializerTest|SerializerTest|SerializerBuilderTest|CircularReferenceDetectorTest|Examples"/>

diff --git a/core/src/test/java/com/envimate/mapmate/builder/IndividuallyAddedModelsBuilderTest.java b/core/src/test/java/com/envimate/mapmate/builder/IndividuallyAddedModelsBuilderTest.java
@@ -25,7 +25,6 @@
 import com.envimate.mapmate.builder.models.customconvention.Email;
 import com.envimate.mapmate.builder.models.customconvention.EmailAddress;
 import com.envimate.mapmate.builder.models.customconvention.Subject;
-import com.envimate.mapmate.builder.recipes.manualregistry.ManualRegistry;
 import com.envimate.mapmate.builder.validation.CustomTypeValidationException;
 import com.envimate.mapmate.deserialization.Deserializer;
 import com.google.gson.Gson;