refactoring

Author: h908714124

core/src/main/java/net/jbock/coerce/CoercionProvider.java

@@ -6,10 +6,10 @@
 import com.squareup.javapoet.TypeName;
 import net.jbock.coerce.collector.AbstractCollector;
 import net.jbock.coerce.collector.DefaultCollector;
+import net.jbock.coerce.collectorabsent.mapperabsent.CollectorAbsentMapperAbsent;
+import net.jbock.coerce.collectorabsent.mapperpresent.CollectorAbsentMapperPresent;
 import net.jbock.coerce.mapper.MapperType;
 import net.jbock.coerce.mapper.ReferenceMapperType;
-import net.jbock.coerce.mapperabsent.CollectorAbsentMapperAbsent;
-import net.jbock.coerce.mapperpresent.CollectorAbsentMapperPresent;
 import net.jbock.compiler.ParamName;
 import net.jbock.compiler.TypeTool;
 
@@ -40,7 +40,8 @@ public static Coercion flagCoercion(ExecutableElement sourceMethod, ParamName pa
         name,
         FieldSpec.builder(TypeName.get(sourceMethod.getReturnType()), paramName.snake(), FINAL).build(),
         CodeBlock.of("$N", name),
-        FLAG, paramName);
+        FLAG,
+        paramName);
   }
 
   public static Coercion findCoercion(
@@ -57,30 +58,21 @@ public static Coercion findCoercion(
 
   private Coercion run() {
     if (basicInfo.collectorClass().isPresent()) {
-      return handleRepeatable();
+      if (basicInfo.mapperClass().isPresent()) {
+        return handleCollectorPresentMapperPresent(basicInfo.mapperClass().get());
+      } else {
+        return handleCollectorPresentMapperAbsent();
+      }
     } else {
-      return handleNotRepeatable();
+      if (basicInfo.mapperClass().isPresent()) {
+        return new CollectorAbsentMapperPresent(basicInfo, basicInfo.mapperClass().get()).findCoercion();
+      } else {
+        return new CollectorAbsentMapperAbsent(basicInfo).findCoercion();
+      }
     }
   }
 
-  private Coercion handleNotRepeatable() {
-    if (basicInfo.mapperClass().isPresent()) {
-      return new CollectorAbsentMapperPresent(basicInfo, basicInfo.mapperClass().get()).findCoercion();
-    } else {
-      return new CollectorAbsentMapperAbsent(basicInfo).findCoercion();
-    }
-  }
-
-  private Coercion handleRepeatable() {
-    if (basicInfo.mapperClass().isPresent()) {
-      return handleRepeatableExplicitMapper(basicInfo.mapperClass().get());
-    } else {
-      return handleRepeatableAutoMapper();
-    }
-  }
-
-
-  private Coercion handleRepeatableAutoMapper() {
+  private Coercion handleCollectorPresentMapperAbsent() {
     AbstractCollector collectorInfo = collectorInfo();
     CodeBlock mapExpr = basicInfo.findMapExpr(collectorInfo.inputType())
         .orElseThrow(() -> basicInfo.asValidationException("Unknown parameter type. Define a custom mapper."));
@@ -90,7 +82,7 @@ private Coercion handleRepeatableAutoMapper() {
     return Coercion.getCoercion(basicInfo, Optional.of(collectorInfo), mapperType, extractExpr, constructorParamType, REPEATABLE);
   }
 
-  private Coercion handleRepeatableExplicitMapper(TypeElement mapperClass) {
+  private Coercion handleCollectorPresentMapperPresent(TypeElement mapperClass) {
     AbstractCollector collectorInfo = collectorInfo();
     ReferenceMapperType mapperType = new MapperClassValidator(basicInfo, collectorInfo.inputType(), mapperClass).checkReturnType();
     Function<ParameterSpec, CodeBlock> extractExpr = p -> CodeBlock.of("$N", p);

core/src/main/java/net/jbock/coerce/SuppliedClassValidator.java

@@ -6,9 +6,9 @@
 import javax.lang.model.element.NestingKind;
 import javax.lang.model.element.TypeElement;
 
-abstract class SuppliedClassValidator {
+public abstract class SuppliedClassValidator {
 
-  static void commonChecks(BasicInfo basicInfo, TypeElement classToCheck, String name) {
+  public static void commonChecks(BasicInfo basicInfo, TypeElement classToCheck, String name) {
     if (classToCheck.getNestingKind() == NestingKind.MEMBER &&
         !classToCheck.getModifiers().contains(Modifier.STATIC)) {
       throw basicInfo.asValidationException(

core/src/main/java/net/jbock/coerce/CanonicalOptional.java renamed to core/src/main/java/net/jbock/coerce/collectorabsent/CanonicalOptional.java

@@ -1,4 +1,4 @@
-package net.jbock.coerce;
+package net.jbock.coerce.collectorabsent;
 
 import com.squareup.javapoet.CodeBlock;
 import com.squareup.javapoet.ParameterSpec;

core/src/main/java/net/jbock/coerce/MapperClassAnalyzer.java renamed to core/src/main/java/net/jbock/coerce/collectorabsent/MapperClassAnalyzer.java

@@ -1,5 +1,6 @@
-package net.jbock.coerce;
+package net.jbock.coerce.collectorabsent;
 
+import net.jbock.coerce.BasicInfo;
 import net.jbock.coerce.either.Either;
 import net.jbock.coerce.either.Left;
 import net.jbock.coerce.either.Right;
@@ -22,7 +23,6 @@
 import static net.jbock.coerce.SuppliedClassValidator.commonChecks;
 import static net.jbock.coerce.reference.ReferenceTool.Expectation.MAPPER;
 
-// for when there's no collector
 public final class MapperClassAnalyzer {
 
   private final BasicInfo basicInfo;

core/src/main/java/net/jbock/coerce/MapperFailure.java renamed to core/src/main/java/net/jbock/coerce/collectorabsent/MapperFailure.java

@@ -1,4 +1,4 @@
-package net.jbock.coerce;
+package net.jbock.coerce.collectorabsent;
 
 public class MapperFailure {
 

core/src/main/java/net/jbock/coerce/mapperabsent/Attempt.java renamed to core/src/main/java/net/jbock/coerce/collectorabsent/mapperabsent/Attempt.java

@@ -1,4 +1,4 @@
-package net.jbock.coerce.mapperabsent;
+package net.jbock.coerce.collectorabsent.mapperabsent;
 
 import com.squareup.javapoet.CodeBlock;
 import com.squareup.javapoet.ParameterSpec;

core/src/main/java/net/jbock/coerce/mapperabsent/CollectorAbsentMapperAbsent.java renamed to core/src/main/java/net/jbock/coerce/collectorabsent/mapperabsent/CollectorAbsentMapperAbsent.java

@@ -1,8 +1,8 @@
-package net.jbock.coerce.mapperabsent;
+package net.jbock.coerce.collectorabsent.mapperabsent;
 
 import com.squareup.javapoet.CodeBlock;
 import net.jbock.coerce.BasicInfo;
-import net.jbock.coerce.CanonicalOptional;
+import net.jbock.coerce.collectorabsent.CanonicalOptional;
 import net.jbock.coerce.Coercion;
 import net.jbock.compiler.TypeTool;
 
@@ -18,7 +18,7 @@ public class CollectorAbsentMapperAbsent {
 
   private final BasicInfo basicInfo;
 
-  CollectorAbsentMapperAbsent(BasicInfo basicInfo) {
+  public CollectorAbsentMapperAbsent(BasicInfo basicInfo) {
     this.basicInfo = basicInfo;
   }
 

core/src/main/java/net/jbock/coerce/mapperpresent/Attempt.java renamed to core/src/main/java/net/jbock/coerce/collectorabsent/mapperpresent/Attempt.java

@@ -1,11 +1,11 @@
-package net.jbock.coerce.mapperpresent;
+package net.jbock.coerce.collectorabsent.mapperpresent;
 
 import com.squareup.javapoet.CodeBlock;
 import com.squareup.javapoet.ParameterSpec;
 import net.jbock.coerce.BasicInfo;
 import net.jbock.coerce.Coercion;
-import net.jbock.coerce.MapperClassAnalyzer;
-import net.jbock.coerce.MapperFailure;
+import net.jbock.coerce.collectorabsent.MapperClassAnalyzer;
+import net.jbock.coerce.collectorabsent.MapperFailure;
 import net.jbock.coerce.ParameterType;
 import net.jbock.coerce.collector.AbstractCollector;
 import net.jbock.coerce.collector.DefaultCollector;

core/src/main/java/net/jbock/coerce/mapperpresent/CollectorAbsentMapperPresent.java renamed to core/src/main/java/net/jbock/coerce/collectorabsent/mapperpresent/CollectorAbsentMapperPresent.java

@@ -1,8 +1,8 @@
-package net.jbock.coerce.mapperpresent;
+package net.jbock.coerce.collectorabsent.mapperpresent;
 
 import com.squareup.javapoet.CodeBlock;
 import net.jbock.coerce.BasicInfo;
-import net.jbock.coerce.CanonicalOptional;
+import net.jbock.coerce.collectorabsent.CanonicalOptional;
 import net.jbock.coerce.Coercion;
 import net.jbock.coerce.either.Either;
 import net.jbock.coerce.either.Left;
@@ -24,7 +24,7 @@ public class CollectorAbsentMapperPresent {
   private final TypeElement mapperClass;
   private final BasicInfo basicInfo;
 
-  CollectorAbsentMapperPresent(BasicInfo basicInfo, TypeElement mapperClass) {
+  public CollectorAbsentMapperPresent(BasicInfo basicInfo, TypeElement mapperClass) {
     this.mapperClass = mapperClass;
     this.basicInfo = basicInfo;
   }

core/src/test/java/net/jbock/coerce/CanonicalOptionalTest.java

@@ -1,5 +1,6 @@
 package net.jbock.coerce;
 
+import net.jbock.coerce.collectorabsent.CanonicalOptional;
 import net.jbock.compiler.EvaluatingProcessor;
 import net.jbock.compiler.TypeTool;
 import org.junit.jupiter.api.Test;