Reduce code duplication

Signed-off-by: yongjunhong <[email protected]>

Author: YongGoose

fixture-monkey/src/main/java/com/navercorp/fixturemonkey/FixtureMonkey.java

@@ -25,6 +25,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -60,26 +61,25 @@ public final class FixtureMonkey {
 	private final MonkeyContext monkeyContext;
 	private final List<MatcherOperator<? extends ArbitraryBuilder<?>>> registeredArbitraryBuilders = new ArrayList<>();
 	private final MonkeyManipulatorFactory monkeyManipulatorFactory;
-	private final Map<Integer, List<MatcherOperator<? extends ArbitraryBuilder<?>>>>
-		priorityGroupedMatchers = new HashMap<>();
 
 	public FixtureMonkey(
 		FixtureMonkeyOptions fixtureMonkeyOptions,
 		ArbitraryTraverser traverser,
 		ManipulatorOptimizer manipulatorOptimizer,
 		MonkeyContext monkeyContext,
-		List<PriorityMatcherOperator> registeredArbitraryBuilders,
+		List<PriorityMatcherOperator> registeredArbitraryBuildersWithPriority,
 		MonkeyManipulatorFactory monkeyManipulatorFactory,
-		Map<String, PriorityMatcherOperator> mapsByRegisteredName
+		Map<String, PriorityMatcherOperator> registeredPriorityMatchersByName
 	) {
 		this.fixtureMonkeyOptions = fixtureMonkeyOptions;
 		this.traverser = traverser;
 		this.manipulatorOptimizer = manipulatorOptimizer;
 		this.monkeyContext = monkeyContext;
 		this.monkeyManipulatorFactory = monkeyManipulatorFactory;
-		groupMatchersByPriorityFromList(registeredArbitraryBuilders);
-		groupMatchersByPriorityFromNamedMap(mapsByRegisteredName);
-		shuffleAndRegisterByPriority(priorityGroupedMatchers);
+		Map<Integer, List<MatcherOperator<? extends ArbitraryBuilder<?>>>> registeredGroupMatchersListByPriority =
+			groupMatchersByPriority(registeredArbitraryBuildersWithPriority);
+		groupMatchersByPriorityFromNamedMap(registeredPriorityMatchersByName, registeredGroupMatchersListByPriority);
+		shuffleAndRegisterByPriority(registeredGroupMatchersListByPriority);
 	}
 
 	public static FixtureMonkeyBuilder builder() {
@@ -196,29 +196,29 @@ public <T> Arbitrary<T> giveMeArbitrary(TypeReference<T> typeReference) {
 		return this.giveMeBuilder(typeReference).build();
 	}
 
-	private void groupMatchersByPriorityFromList(
-		List<PriorityMatcherOperator> registeredArbitraryBuilders
+	private Map<Integer, List<MatcherOperator<? extends ArbitraryBuilder<?>>>> groupMatchersByPriority(
+		List<PriorityMatcherOperator> registeredArbitraryBuildersWithPriority
 	) {
-		priorityGroupedMatchers.putAll(
-			registeredArbitraryBuilders
-				.stream()
-				.collect(Collectors.groupingBy(
-					PriorityMatcherOperator::getPriority,
-					Collectors.mapping(
-						it -> new MatcherOperator<>(
-							it.getMatcherOperator(), it.getMatcherOperator().getOperator().apply(this)
-						),
-						Collectors.toList()
-					)
-				))
+		return new HashMap<>(registeredArbitraryBuildersWithPriority
+			.stream()
+			.collect(Collectors.groupingBy(
+				PriorityMatcherOperator::getPriority,
+				Collectors.mapping(
+					it -> new MatcherOperator<>(
+						it.getMatcherOperator(), it.getMatcherOperator().getOperator().apply(this)
+					),
+					Collectors.toList()
+				)
+			))
 		);
 	}
 
 	private void groupMatchersByPriorityFromNamedMap(
-		Map<String, PriorityMatcherOperator> mapsByRegisteredName
+		Map<String, PriorityMatcherOperator> registeredPriorityMatchersByName,
+		Map<Integer, List<MatcherOperator<? extends ArbitraryBuilder<?>>>> registeredGroupMatchersListByPriority
 	) {
-		priorityGroupedMatchers.putAll(
-			mapsByRegisteredName.entrySet().stream()
+		registeredGroupMatchersListByPriority.putAll(
+			registeredPriorityMatchersByName.entrySet().stream()
 				.collect(Collectors.groupingBy(
 					entry -> entry.getValue().getPriority(),
 					Collectors.mapping(
@@ -233,10 +233,10 @@ private void groupMatchersByPriorityFromNamedMap(
 	}
 
 	private void shuffleAndRegisterByPriority(
-		Map<Integer, List<MatcherOperator<? extends ArbitraryBuilder<?>>>> groupedByPriority
+		Map<Integer, List<MatcherOperator<? extends ArbitraryBuilder<?>>>> registeredGroupMatchersListByPriority
 	) {
-		TreeMap<Integer, List<MatcherOperator<? extends ArbitraryBuilder<?>>>> sortedGroupedByPriority =
-			new TreeMap<>(groupedByPriority);
+		SortedMap<Integer, List<MatcherOperator<? extends ArbitraryBuilder<?>>>> sortedGroupedByPriority =
+			new TreeMap<>(registeredGroupMatchersListByPriority);
 
 		sortedGroupedByPriority.forEach((priority, matcherOperators) -> {
 			Collections.shuffle(matcherOperators, Randoms.current());

fixture-monkey/src/main/java/com/navercorp/fixturemonkey/FixtureMonkeyBuilder.java

@@ -74,12 +74,14 @@
 @SuppressWarnings("unused")
 @API(since = "0.4.0", status = Status.MAINTAINED)
 public final class FixtureMonkeyBuilder {
+	private static final int DEFAULT_PRIORITY = Integer.MAX_VALUE;
+
 	private final FixtureMonkeyOptionsBuilder fixtureMonkeyOptionsBuilder = FixtureMonkeyOptions.builder();
-	private final List<PriorityMatcherOperator> registeredArbitraryBuilders = new ArrayList<>();
+	private final List<PriorityMatcherOperator> registeredArbitraryBuildersWithPriority = new ArrayList<>();
 	private ManipulatorOptimizer manipulatorOptimizer = new NoneManipulatorOptimizer();
 	private MonkeyExpressionFactory monkeyExpressionFactory = new ArbitraryExpressionFactory();
 	private final MonkeyContextBuilder monkeyContextBuilder = MonkeyContext.builder();
-	private final Map<String, PriorityMatcherOperator> registeredArbitraryListByRegisteredName = new HashMap<>();
+	private final Map<String, PriorityMatcherOperator> registeredPriorityMatchersByName = new HashMap<>();
 	private long seed = System.nanoTime();
 
 	// The default plugins are listed below.
@@ -314,7 +316,7 @@ public FixtureMonkeyBuilder register(
 		Class<?> type,
 		Function<FixtureMonkey, ? extends ArbitraryBuilder<?>> registeredArbitraryBuilder
 	) {
-		return this.register(MatcherOperator.assignableTypeMatchOperator(type, registeredArbitraryBuilder));
+		return this.register(type, registeredArbitraryBuilder, DEFAULT_PRIORITY);
 	}
 
 	public FixtureMonkeyBuilder register(
@@ -342,15 +344,16 @@ public FixtureMonkeyBuilder registerAssignableType(
 	public FixtureMonkeyBuilder register(
 		MatcherOperator<Function<FixtureMonkey, ? extends ArbitraryBuilder<?>>> registeredArbitraryBuilder
 	) {
-		this.registeredArbitraryBuilders.add(new PriorityMatcherOperator(registeredArbitraryBuilder));
-		return this;
+		return this.register(registeredArbitraryBuilder, DEFAULT_PRIORITY);
 	}
 
 	public FixtureMonkeyBuilder register(
 		MatcherOperator<Function<FixtureMonkey, ? extends ArbitraryBuilder<?>>> registeredArbitraryBuilder,
 		int priority
 	) {
-		this.registeredArbitraryBuilders.add(new PriorityMatcherOperator(registeredArbitraryBuilder, priority));
+		this.registeredArbitraryBuildersWithPriority.add(
+			new PriorityMatcherOperator(registeredArbitraryBuilder, priority)
+		);
 		return this;
 	}
 
@@ -393,15 +396,7 @@ public FixtureMonkeyBuilder registerGroup(Class<?>... arbitraryBuilderGroups) {
 
 	public FixtureMonkeyBuilder registerGroup(ArbitraryBuilderGroup... arbitraryBuilderGroups) {
 		for (ArbitraryBuilderGroup arbitraryBuilderGroup : arbitraryBuilderGroups) {
-			List<ArbitraryBuilderCandidate<?>> candidates = arbitraryBuilderGroup.generateCandidateList()
-				.getCandidates();
-
-			for (ArbitraryBuilderCandidate<?> candidate : candidates) {
-				this.register(
-					candidate.getClassType(),
-					candidate.getArbitraryBuilderRegisterer()
-				);
-			}
+			this.registerGroup(arbitraryBuilderGroup, DEFAULT_PRIORITY);
 		}
 		return this;
 	}
@@ -428,14 +423,7 @@ public FixtureMonkeyBuilder registeredName(
 		Class<?> type,
 		Function<FixtureMonkey, ? extends ArbitraryBuilder<?>> arbitraryBuilder
 	) {
-		if (registeredArbitraryListByRegisteredName.containsKey(registeredName)) {
-			throw new IllegalArgumentException("Duplicated ArbitraryBuilder name: " + registeredName);
-		}
-		MatcherOperator<Function<FixtureMonkey, ? extends ArbitraryBuilder<?>>> matcherOperator =
-			MatcherOperator.assignableTypeMatchOperator(type, arbitraryBuilder);
-
-		this.registeredArbitraryListByRegisteredName.put(registeredName, new PriorityMatcherOperator(matcherOperator));
-		return this;
+		return this.registeredName(registeredName, type, arbitraryBuilder, DEFAULT_PRIORITY);
 	}
 
 	public FixtureMonkeyBuilder registeredName(
@@ -444,13 +432,13 @@ public FixtureMonkeyBuilder registeredName(
 		Function<FixtureMonkey, ? extends ArbitraryBuilder<?>> arbitraryBuilder,
 		int priority
 	) {
-		if (registeredArbitraryListByRegisteredName.containsKey(registeredName)) {
+		if (registeredPriorityMatchersByName.containsKey(registeredName)) {
 			throw new IllegalArgumentException("Duplicated ArbitraryBuilder name: " + registeredName);
 		}
 		MatcherOperator<Function<FixtureMonkey, ? extends ArbitraryBuilder<?>>> matcherOperator =
 			MatcherOperator.assignableTypeMatchOperator(type, arbitraryBuilder);
 
-		this.registeredArbitraryListByRegisteredName.put(
+		this.registeredPriorityMatchersByName.put(
 			registeredName, new PriorityMatcherOperator(matcherOperator, priority)
 		);
 		return this;
@@ -626,9 +614,9 @@ public FixtureMonkey build() {
 			traverser,
 			manipulatorOptimizer,
 			monkeyContext,
-			registeredArbitraryBuilders,
+			registeredArbitraryBuildersWithPriority,
 			monkeyManipulatorFactory,
-			registeredArbitraryListByRegisteredName
+			registeredPriorityMatchersByName
 		);
 	}
 }

fixture-monkey/src/main/java/com/navercorp/fixturemonkey/customizer/PriorityMatcherOperator.java

@@ -37,13 +37,6 @@ public PriorityMatcherOperator(
 		this.priority = priority;
 	}
 
-	public PriorityMatcherOperator(
-		final MatcherOperator<Function<FixtureMonkey, ? extends ArbitraryBuilder<?>>> matcherOperator
-	) {
-		this.priority = Integer.MAX_VALUE;
-		this.matcherOperator = matcherOperator;
-	}
-
 	public int getPriority() {
 		return priority;
 	}