Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Get rid of a lambda in Arc runtime code #25555

Merged
merged 1 commit into from
May 13, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,20 @@
import java.util.Comparator;
import java.util.List;
import java.util.Set;
import java.util.function.Predicate;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import javax.enterprise.context.Dependent;
import javax.enterprise.inject.spi.InjectionPoint;

public final class Instances {

static final Annotation[] EMPTY_ANNOTATION_ARRAY = new Annotation[] {};

static final Comparator<InjectableBean<?>> PRIORITY_COMPARATOR = Collections
.reverseOrder(Comparator.comparingInt(InjectableBean::getPriority));
static final Comparator<InjectableBean<?>> PRIORITY_COMPARATOR = new Comparator<>() {
@Override
public int compare(InjectableBean<?> ib1, InjectableBean<?> ib2) {
return Integer.compare(ib2.getPriority(), ib1.getPriority());
}
};

private Instances() {
}
Expand All @@ -32,12 +34,16 @@ public static List<InjectableBean<?>> resolveBeans(Type requiredType, Set<Annota
}

public static List<InjectableBean<?>> resolveBeans(Type requiredType, Annotation... requiredQualifiers) {
return ArcContainerImpl.instance()
.getResolvedBeans(requiredType, requiredQualifiers)
.stream()
.filter(Predicate.not(InjectableBean::isSuppressed))
.sorted(PRIORITY_COMPARATOR)
.collect(Collectors.toUnmodifiableList());
Set<InjectableBean<?>> resolvedBeans = ArcContainerImpl.instance()
.getResolvedBeans(requiredType, requiredQualifiers);
List<InjectableBean<?>> nonSuppressed = new ArrayList<>(resolvedBeans.size());
for (InjectableBean<?> injectableBean : resolvedBeans) {
if (!injectableBean.isSuppressed()) {
nonSuppressed.add(injectableBean);
}
}
nonSuppressed.sort(PRIORITY_COMPARATOR);
return List.copyOf(nonSuppressed);
}

@SuppressWarnings("unchecked")
Expand Down