Skip to content

Commit a5136b3

Browse files
committed
Complete code refactoring
1 parent fa4a08c commit a5136b3

File tree

4 files changed

+1
-30
lines changed

4 files changed

+1
-30
lines changed

fixture-monkey-api/src/main/java/com/navercorp/fixturemonkey/api/matcher/NamedMatcher.java

-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ public NamedMatcher(Matcher matcher, String registeredName) {
1111
this.registeredName = registeredName;
1212
}
1313

14-
public boolean matchRegisteredName(String registeredName) {
15-
return this.registeredName.equals(registeredName);
16-
}
17-
1814
@Override
1915
public boolean match(Property property) {
2016
return this.matcher.match(property);

fixture-monkey-api/src/main/java/com/navercorp/fixturemonkey/api/matcher/NamedMatcherMetadata.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
package com.navercorp.fixturemonkey.api.matcher;
2020

21-
public class NamedMatcherMetadata implements MatcherMetadata {
21+
public final class NamedMatcherMetadata implements MatcherMetadata {
2222
private final String selectedName;
2323

2424
public NamedMatcherMetadata(String selectedName) {

fixture-monkey/src/main/java/com/navercorp/fixturemonkey/resolver/DefaultArbitraryBuilder.java

-13
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
import com.navercorp.fixturemonkey.api.instantiator.InstantiatorProcessor;
6060
import com.navercorp.fixturemonkey.api.lazy.LazyArbitrary;
6161
import com.navercorp.fixturemonkey.api.matcher.MatcherOperator;
62-
import com.navercorp.fixturemonkey.api.matcher.NamedMatcher;
6362
import com.navercorp.fixturemonkey.api.matcher.NamedMatcherMetadata;
6463
import com.navercorp.fixturemonkey.api.option.FixtureMonkeyOptions;
6564
import com.navercorp.fixturemonkey.api.property.PropertyNameResolver;
@@ -185,18 +184,6 @@ public ArbitraryBuilder<T> setLazy(PropertySelector propertySelector, Supplier<?
185184
}
186185

187186
public ArbitraryBuilder<T> selectName(String... names) {
188-
Stream.of(names).forEach(name -> {
189-
boolean matched = registeredArbitraryBuilders.stream()
190-
.map(MatcherOperator::getMatcher)
191-
.filter(NamedMatcher.class::isInstance)
192-
.map(NamedMatcher.class::cast)
193-
.anyMatch(operator -> operator.matchRegisteredName(name));
194-
195-
if (!matched) {
196-
throw new IllegalArgumentException("Given name is not registered. name: " + name);
197-
}
198-
});
199-
200187
ArbitraryBuilderContext builderContext = registeredArbitraryBuilders.stream()
201188
.filter(operator -> Arrays.stream(names)
202189
.anyMatch(name -> operator.match(rootProperty, new NamedMatcherMetadata(name)))

fixture-monkey/src/test/java/com/navercorp/fixturemonkey/test/FixtureMonkeyOptionsTest.java

-12
Original file line numberDiff line numberDiff line change
@@ -840,18 +840,6 @@ void registeredNameWithSameRegisteredName() {
840840
.hasMessage("Duplicated ArbitraryBuilder name: test");
841841
}
842842

843-
@Property
844-
void registeredNameWithUnregisteredName() {
845-
FixtureMonkey sut = FixtureMonkey.builder()
846-
.build();
847-
848-
thenThrownBy(() -> sut.giveMeBuilder(SimpleObject.class)
849-
.selectName("test3")
850-
.sample()
851-
).isExactlyInstanceOf(IllegalArgumentException.class)
852-
.hasMessage("Given name is not registered. name: test3");
853-
}
854-
855843
@Property
856844
void generateSampleListWithRegisteredNames() {
857845
FixtureMonkey sut = FixtureMonkey.builder()

0 commit comments

Comments
 (0)