Skip to content

Commit 43e59aa

Browse files
committed
Apply comment
Signed-off-by: yongjunhong <[email protected]>
1 parent 36c424a commit 43e59aa

File tree

2 files changed

+23
-15
lines changed

2 files changed

+23
-15
lines changed

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

+5
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,18 @@
1818

1919
package com.navercorp.fixturemonkey.annotation;
2020

21+
import static org.apiguardian.api.API.Status.EXPERIMENTAL;
22+
2123
import java.lang.annotation.ElementType;
2224
import java.lang.annotation.Retention;
2325
import java.lang.annotation.RetentionPolicy;
2426
import java.lang.annotation.Target;
2527

28+
import org.apiguardian.api.API;
29+
2630
@Retention(RetentionPolicy.RUNTIME)
2731
@Target({ElementType.TYPE})
32+
@API(since = "1.1.10", status = EXPERIMENTAL)
2833
public @interface Order {
2934
int value() default 0;
3035
}

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

+18-15
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
package com.navercorp.fixturemonkey.customizer;
2020

21+
import static java.util.stream.Collectors.toList;
22+
2123
import java.util.ArrayList;
2224
import java.util.Collections;
2325
import java.util.Comparator;
@@ -202,21 +204,8 @@ private DefaultArbitraryBuilder<?> findRegisteredArbitraryBuilder(
202204
.sorted(Comparator.comparingInt(PriorityMatcherOperator::getPriority))
203205
.collect(Collectors.toList());
204206

205-
return getHighestPriorityOperator(priorityOperators);
206-
}
207-
208-
private DefaultArbitraryBuilder<?> getHighestPriorityOperator(
209-
List<PriorityMatcherOperator<? extends ArbitraryBuilder<?>>> priorityOperators
210-
) {
211-
if (priorityOperators.isEmpty()) {
212-
return null;
213-
}
214-
215-
int highestPriority = priorityOperators.get(0).getPriority();
216-
List<PriorityMatcherOperator<? extends ArbitraryBuilder<?>>> highestPriorityOperators = priorityOperators
217-
.stream()
218-
.filter(it -> it.getPriority() == highestPriority)
219-
.collect(Collectors.toList());
207+
List<PriorityMatcherOperator<? extends ArbitraryBuilder<?>>> highestPriorityOperators
208+
= getHighestPriorityOperators(priorityOperators);
220209

221210
if (highestPriorityOperators.size() > 1) {
222211
Collections.shuffle(highestPriorityOperators, Randoms.current());
@@ -229,6 +218,20 @@ private DefaultArbitraryBuilder<?> getHighestPriorityOperator(
229218
.orElse(null);
230219
}
231220

221+
private List<PriorityMatcherOperator<? extends ArbitraryBuilder<?>>> getHighestPriorityOperators(
222+
List<PriorityMatcherOperator<? extends ArbitraryBuilder<?>>> priorityOperators
223+
) {
224+
if (priorityOperators.isEmpty()) {
225+
return priorityOperators;
226+
}
227+
228+
int highestPriority = priorityOperators.get(0).getPriority();
229+
230+
return priorityOperators.stream()
231+
.filter(it -> it.getPriority() == highestPriority)
232+
.collect(toList());
233+
}
234+
232235
public ManipulatorSet newManipulatorSet(ManipulatorHolderSet manipulatorHolderSet) {
233236
int baseSequence = sequence.getAndIncrement();
234237

0 commit comments

Comments
 (0)