From 5faa6685ec028d44afd4235dc408090ddbcc410e Mon Sep 17 00:00:00 2001 From: yongjunhong Date: Sat, 7 Dec 2024 01:39:10 +0900 Subject: [PATCH] Reduce code duplication Signed-off-by: yongjunhong --- .../fixturemonkey/FixtureMonkeyBuilder.java | 26 +++++-------------- .../customizer/PriorityMatcherOperator.java | 7 ----- 2 files changed, 6 insertions(+), 27 deletions(-) diff --git a/fixture-monkey/src/main/java/com/navercorp/fixturemonkey/FixtureMonkeyBuilder.java b/fixture-monkey/src/main/java/com/navercorp/fixturemonkey/FixtureMonkeyBuilder.java index 4d96aabceb..62df03d0ac 100644 --- a/fixture-monkey/src/main/java/com/navercorp/fixturemonkey/FixtureMonkeyBuilder.java +++ b/fixture-monkey/src/main/java/com/navercorp/fixturemonkey/FixtureMonkeyBuilder.java @@ -74,6 +74,8 @@ @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 registeredArbitraryBuilders = new ArrayList<>(); private ManipulatorOptimizer manipulatorOptimizer = new NoneManipulatorOptimizer(); @@ -314,7 +316,7 @@ public FixtureMonkeyBuilder register( Class type, Function> registeredArbitraryBuilder ) { - return this.register(MatcherOperator.assignableTypeMatchOperator(type, registeredArbitraryBuilder)); + return this.register(type, registeredArbitraryBuilder, DEFAULT_PRIORITY); } public FixtureMonkeyBuilder register( @@ -342,8 +344,7 @@ public FixtureMonkeyBuilder registerAssignableType( public FixtureMonkeyBuilder register( MatcherOperator>> registeredArbitraryBuilder ) { - this.registeredArbitraryBuilders.add(new PriorityMatcherOperator(registeredArbitraryBuilder)); - return this; + return this.register(registeredArbitraryBuilder, DEFAULT_PRIORITY); } public FixtureMonkeyBuilder register( @@ -393,15 +394,7 @@ public FixtureMonkeyBuilder registerGroup(Class... arbitraryBuilderGroups) { public FixtureMonkeyBuilder registerGroup(ArbitraryBuilderGroup... arbitraryBuilderGroups) { for (ArbitraryBuilderGroup arbitraryBuilderGroup : arbitraryBuilderGroups) { - List> candidates = arbitraryBuilderGroup.generateCandidateList() - .getCandidates(); - - for (ArbitraryBuilderCandidate candidate : candidates) { - this.register( - candidate.getClassType(), - candidate.getArbitraryBuilderRegisterer() - ); - } + this.registerGroup(arbitraryBuilderGroup, DEFAULT_PRIORITY); } return this; } @@ -428,14 +421,7 @@ public FixtureMonkeyBuilder registeredName( Class type, Function> arbitraryBuilder ) { - if (registeredArbitraryListByRegisteredName.containsKey(registeredName)) { - throw new IllegalArgumentException("Duplicated ArbitraryBuilder name: " + registeredName); - } - MatcherOperator>> 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( diff --git a/fixture-monkey/src/main/java/com/navercorp/fixturemonkey/customizer/PriorityMatcherOperator.java b/fixture-monkey/src/main/java/com/navercorp/fixturemonkey/customizer/PriorityMatcherOperator.java index 0963223991..621367df29 100644 --- a/fixture-monkey/src/main/java/com/navercorp/fixturemonkey/customizer/PriorityMatcherOperator.java +++ b/fixture-monkey/src/main/java/com/navercorp/fixturemonkey/customizer/PriorityMatcherOperator.java @@ -37,13 +37,6 @@ public PriorityMatcherOperator( this.priority = priority; } - public PriorityMatcherOperator( - final MatcherOperator>> matcherOperator - ) { - this.priority = Integer.MAX_VALUE; - this.matcherOperator = matcherOperator; - } - public int getPriority() { return priority; }