Skip to content

Commit 68fda0a

Browse files
authored
Remove unimplemented feature selectName (#1205)
1 parent 55c0f9b commit 68fda0a

File tree

12 files changed

+14
-537
lines changed

12 files changed

+14
-537
lines changed

docs/content/v1.1.x-kor/docs/customizing-objects/registerByName.md

Lines changed: 0 additions & 116 deletions
This file was deleted.

docs/content/v1.1.x/docs/customizing-objects/registerByName.md

Lines changed: 0 additions & 117 deletions
This file was deleted.

fixture-monkey-kotlin/src/main/kotlin/com/navercorp/fixturemonkey/kotlin/FixtureMonkeyBuilderExtensions.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,6 @@ inline fun <reified T> FixtureMonkeyBuilder.register(
117117
noinline arbitraryBuilderGenerator: (fixtureMonkey: FixtureMonkey) -> ArbitraryBuilder<out T>
118118
): FixtureMonkeyBuilder = this.register(T::class.java, arbitraryBuilderGenerator)
119119

120-
inline fun <reified T> FixtureMonkeyBuilder.registerByName(
121-
registeredName: String,
122-
noinline arbitraryBuilderGenerator: (fixtureMonkey: FixtureMonkey) -> ArbitraryBuilder<out T>
123-
): FixtureMonkeyBuilder = this.registerByName(registeredName, T::class.java, arbitraryBuilderGenerator)
124-
125120
inline fun <reified T> FixtureMonkeyBuilder.registerExactType(
126121
noinline arbitraryBuilderGenerator: (fixtureMonkey: FixtureMonkey) -> ArbitraryBuilder<out T>
127122
): FixtureMonkeyBuilder = this.registerExactType(T::class.java, arbitraryBuilderGenerator)

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

Lines changed: 6 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.apiguardian.api.API;
3333
import org.apiguardian.api.API.Status;
3434

35-
import com.navercorp.fixturemonkey.annotation.Order;
3635
import com.navercorp.fixturemonkey.api.constraint.JavaConstraintGenerator;
3736
import com.navercorp.fixturemonkey.api.container.DecomposedContainerValueFactory;
3837
import com.navercorp.fixturemonkey.api.generator.ArbitraryContainerInfoGenerator;
@@ -398,11 +397,12 @@ public FixtureMonkeyBuilder registerGroup(Class<?>... arbitraryBuilderGroups) {
398397
}
399398
};
400399

401-
if (arbitraryBuilderGroup.isAnnotationPresent(Order.class)) {
402-
Order order = arbitraryBuilderGroup.getAnnotation(Order.class);
403-
this.register(actualType, registerArbitraryBuilder, order.value());
404-
continue;
405-
}
400+
// TODO: Support Order annotation
401+
// if (arbitraryBuilderGroup.isAnnotationPresent(Order.class)) {
402+
// Order order = arbitraryBuilderGroup.getAnnotation(Order.class);
403+
// this.register(actualType, registerArbitraryBuilder, order.value());
404+
// continue;
405+
// }
406406
this.register(actualType, registerArbitraryBuilder);
407407
} catch (Exception ex) {
408408
// ignored
@@ -428,34 +428,6 @@ public FixtureMonkeyBuilder registerGroup(ArbitraryBuilderGroup... arbitraryBuil
428428
return this;
429429
}
430430

431-
public FixtureMonkeyBuilder registerByName(
432-
String registeredName,
433-
Class<?> type,
434-
Function<FixtureMonkey, ? extends ArbitraryBuilder<?>> arbitraryBuilder
435-
) {
436-
return this.registerByName(registeredName, type, arbitraryBuilder, DEFAULT_PRIORITY);
437-
}
438-
439-
public FixtureMonkeyBuilder registerByName(
440-
String registeredName,
441-
Class<?> type,
442-
Function<FixtureMonkey, ? extends ArbitraryBuilder<?>> arbitraryBuilder,
443-
int priority
444-
) {
445-
if (registeredPriorityMatchersByName.containsKey(registeredName)) {
446-
throw new IllegalArgumentException("Duplicated ArbitraryBuilder name: " + registeredName);
447-
}
448-
MatcherOperator<Function<FixtureMonkey, ? extends ArbitraryBuilder<?>>> matcherOperator =
449-
MatcherOperator.assignableTypeMatchOperator(type, arbitraryBuilder);
450-
451-
this.registeredPriorityMatchersByName.put(
452-
registeredName, new PriorityMatcherOperator<>(
453-
matcherOperator.getMatcher(), matcherOperator.getOperator(), priority
454-
)
455-
);
456-
return this;
457-
}
458-
459431
public FixtureMonkeyBuilder plugin(Plugin plugin) {
460432
fixtureMonkeyOptionsBuilder.plugin(plugin);
461433
return this;

fixture-monkey/src/main/java/com/navercorp/fixturemonkey/annotation/Order.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
@Retention(RetentionPolicy.RUNTIME)
3131
@Target({ElementType.TYPE})
3232
@API(since = "1.1.15", status = EXPERIMENTAL)
33-
public @interface Order {
33+
@interface Order {
3434
int value() default Integer.MAX_VALUE;
3535
}

fixture-monkey/src/main/java/com/navercorp/fixturemonkey/builder/ArbitraryBuilderContext.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
public final class ArbitraryBuilderContext {
6868
private final List<ArbitraryManipulator> manipulators;
6969
private final List<ContainerInfoManipulator> containerInfoManipulators;
70-
private final List<String> selectNames;
7170
private final Map<Class<?>, List<Property>> propertyConfigurers;
7271
private final Map<Class<?>, ArbitraryIntrospector> arbitraryIntrospectorsByType;
7372
private final MonkeyContext monkeyContext;
@@ -86,7 +85,6 @@ public final class ArbitraryBuilderContext {
8685
private ArbitraryBuilderContext(
8786
List<ArbitraryManipulator> manipulators,
8887
List<ContainerInfoManipulator> containerInfoManipulators,
89-
List<String> selectNames,
9088
Map<Class<?>, List<Property>> propertyConfigurers,
9189
Map<Class<?>, ArbitraryIntrospector> arbitraryIntrospectorsByType,
9290
@Nullable FixedState fixedState,
@@ -95,7 +93,6 @@ private ArbitraryBuilderContext(
9593
) {
9694
this.manipulators = manipulators;
9795
this.containerInfoManipulators = containerInfoManipulators;
98-
this.selectNames = selectNames;
9996
this.propertyConfigurers = propertyConfigurers;
10097
this.arbitraryIntrospectorsByType = arbitraryIntrospectorsByType;
10198
this.fixedState = fixedState;
@@ -110,7 +107,6 @@ private ArbitraryBuilderContext(
110107
@Deprecated
111108
public static ArbitraryBuilderContext newBuilderContext(MonkeyContext monkeyContext) {
112109
return new ArbitraryBuilderContext(
113-
new ArrayList<>(),
114110
new ArrayList<>(),
115111
new ArrayList<>(),
116112
new HashMap<>(),
@@ -128,7 +124,6 @@ public ArbitraryBuilderContext copy() {
128124
return new ArbitraryBuilderContext(
129125
new ArrayList<>(this.manipulators),
130126
copiedContainerInfoManipulators,
131-
new ArrayList<>(this.selectNames),
132127
new HashMap<>(propertyConfigurers),
133128
new HashMap<>(arbitraryIntrospectorsByType),
134129
fixedState,
@@ -161,18 +156,6 @@ public List<TreeNodeManipulator> getContainerInfoManipulators() {
161156
return Collections.unmodifiableList(containerInfoManipulators);
162157
}
163158

164-
public void addSelectedNames(List<String> selectNames) {
165-
for (String selectName : selectNames) {
166-
if (!this.selectNames.contains(selectName)) {
167-
this.selectNames.add(0, selectName);
168-
}
169-
}
170-
}
171-
172-
public List<String> getSelectedNames() {
173-
return this.selectNames;
174-
}
175-
176159
public void putPropertyConfigurer(Class<?> type, List<Property> propertyConfigurer) {
177160
this.propertyConfigurers.put(type, propertyConfigurer);
178161
}

0 commit comments

Comments
 (0)