From 45ab2494be3e3ea84764bd1998db294db7421ac3 Mon Sep 17 00:00:00 2001 From: Martin Kouba Date: Wed, 27 Nov 2024 10:56:17 +0100 Subject: [PATCH] ArC: remove some deprecated stuff marked for removal - the target release is Quarkus 3.18 --- .../ConfigInjectionStaticInitBuildItem.java | 22 ------------ .../deployment/devui/DevInterceptorInfo.java | 19 +++++----- .../resources/dev-ui/qwc-arc-interceptors.js | 15 +------- .../io/quarkus/arc/processor/BeanInfo.java | 17 --------- .../io/quarkus/arc/processor/DotNames.java | 6 ---- .../arc/processor/InterceptorInfo.java | 36 ------------------- .../java/io/quarkus/arc/ArcInitConfig.java | 27 -------------- .../io/quarkus/arc/test/ArcTestContainer.java | 1 - 8 files changed, 9 insertions(+), 134 deletions(-) delete mode 100644 extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigInjectionStaticInitBuildItem.java diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigInjectionStaticInitBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigInjectionStaticInitBuildItem.java deleted file mode 100644 index 78be1302d7c80..0000000000000 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigInjectionStaticInitBuildItem.java +++ /dev/null @@ -1,22 +0,0 @@ -package io.quarkus.arc.deployment; - -import org.jboss.jandex.DotName; - -import io.quarkus.builder.item.MultiBuildItem; - -/** - * - * @deprecated This build item is not used anymore - */ -@Deprecated(forRemoval = true) -public final class ConfigInjectionStaticInitBuildItem extends MultiBuildItem { - private final DotName declaringCandidate; - - public ConfigInjectionStaticInitBuildItem(final DotName declaringCandidate) { - this.declaringCandidate = declaringCandidate; - } - - public DotName getDeclaringCandidate() { - return declaringCandidate; - } -} diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devui/DevInterceptorInfo.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devui/DevInterceptorInfo.java index bc44c69ddb9e0..fa4050b126dd2 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devui/DevInterceptorInfo.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/devui/DevInterceptorInfo.java @@ -1,14 +1,11 @@ package io.quarkus.arc.deployment.devui; -import java.util.HashMap; import java.util.HashSet; -import java.util.Map; import java.util.Set; import jakarta.enterprise.inject.spi.InterceptionType; import org.jboss.jandex.AnnotationInstance; -import org.jboss.jandex.MethodInfo; import io.quarkus.arc.deployment.CompletedApplicationClassPredicateBuildItem; import io.quarkus.arc.processor.InterceptorInfo; @@ -21,18 +18,18 @@ public static DevInterceptorInfo from(InterceptorInfo interceptor, CompletedAppl for (AnnotationInstance binding : interceptor.getBindings()) { bindings.add(Name.from(binding)); } - Map intercepts = new HashMap<>(); + Set intercepts = new HashSet<>(); if (interceptor.intercepts(InterceptionType.AROUND_INVOKE)) { - intercepts.put(InterceptionType.AROUND_INVOKE, interceptor.getAroundInvoke()); + intercepts.add(InterceptionType.AROUND_INVOKE); } if (interceptor.intercepts(InterceptionType.AROUND_CONSTRUCT)) { - intercepts.put(InterceptionType.AROUND_CONSTRUCT, interceptor.getAroundConstruct()); + intercepts.add(InterceptionType.AROUND_CONSTRUCT); } if (interceptor.intercepts(InterceptionType.POST_CONSTRUCT)) { - intercepts.put(InterceptionType.POST_CONSTRUCT, interceptor.getPostConstruct()); + intercepts.add(InterceptionType.POST_CONSTRUCT); } if (interceptor.intercepts(InterceptionType.PRE_DESTROY)) { - intercepts.put(InterceptionType.PRE_DESTROY, interceptor.getPreDestroy()); + intercepts.add(InterceptionType.PRE_DESTROY); } return new DevInterceptorInfo(interceptor.getIdentifier(), Name.from(interceptor.getBeanClass()), bindings, interceptor.getPriority(), intercepts, @@ -43,11 +40,11 @@ public static DevInterceptorInfo from(InterceptorInfo interceptor, CompletedAppl private final Name interceptorClass; private final Set bindings; private final int priority; - private final Map intercepts; + private final Set intercepts; private final boolean isApplicationBean; DevInterceptorInfo(String id, Name interceptorClass, Set bindings, int priority, - Map intercepts, boolean isApplicationBean) { + Set intercepts, boolean isApplicationBean) { this.id = id; this.interceptorClass = interceptorClass; this.bindings = bindings; @@ -72,7 +69,7 @@ public int getPriority() { return priority; } - public Map getIntercepts() { + public Set getIntercepts() { return intercepts; } diff --git a/extensions/arc/deployment/src/main/resources/dev-ui/qwc-arc-interceptors.js b/extensions/arc/deployment/src/main/resources/dev-ui/qwc-arc-interceptors.js index fc26abb7ef5b2..faf6c5eee118e 100644 --- a/extensions/arc/deployment/src/main/resources/dev-ui/qwc-arc-interceptors.js +++ b/extensions/arc/deployment/src/main/resources/dev-ui/qwc-arc-interceptors.js @@ -20,10 +20,6 @@ export class QwcArcInterceptors extends LitElement { font-size: 85%; } - .method { - color: var(--lumo-primary-text-color); - } - .annotation { color: var(--lumo-contrast-50pct); } @@ -92,20 +88,11 @@ export class QwcArcInterceptors extends LitElement { } _typeRenderer(bean){ - let i = JSON.stringify(bean.intercepts); - const typeTemplates = []; - for (const [key, value] of Object.entries(bean.intercepts)) { - typeTemplates.push(html`${this._printIntercepterType(key)}`); - } - + bean.intercepts.forEach((interceptionType) => typeTemplates.push(html`${this._printIntercepterType(interceptionType)}`)); return html` ${typeTemplates} -
- ${bean.interceptorClass.simpleName} - #${bean.methodName}() -
`; } diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanInfo.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanInfo.java index 72764ffe513f8..89b33586ba9ff 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanInfo.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanInfo.java @@ -550,14 +550,6 @@ public boolean isAlternative() { return alternative; } - /** - * @deprecated use {@link #getPriority()} - */ - @Deprecated(forRemoval = true) - public Integer getAlternativePriority() { - return alternative ? priority : null; - } - public Integer getPriority() { return priority; } @@ -1218,15 +1210,6 @@ Builder disposer(DisposerInfo disposer) { return this; } - /** - * @deprecated use {@link #alternative(boolean)} and {@link #priority(Integer)}; - * this method will be removed at some time after Quarkus 3.6 - */ - @Deprecated(forRemoval = true, since = "3.0") - Builder alternativePriority(Integer alternativePriority) { - return alternative(true).priority(alternativePriority); - } - Builder alternative(boolean value) { this.alternative = value; return this; diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DotNames.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DotNames.java index fec0bbc8130d6..3e1f1a114ce3c 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DotNames.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DotNames.java @@ -148,12 +148,6 @@ public final class DotNames { public static final DotName INTERCEPTION_PROXY = create(InterceptionProxy.class); public static final DotName BINDINGS_SOURCE = create(BindingsSource.class); - /** - * @deprecated use {@link KotlinUtils}; this constant will be removed at some time after Quarkus 3.6 - */ - @Deprecated(forRemoval = true, since = "3.0") - public static final DotName KOTLIN_METADATA_ANNOTATION = create("kotlin.Metadata"); - public static final DotName BOOLEAN = create(Boolean.class); public static final DotName BYTE = create(Byte.class); public static final DotName CHARACTER = create(Character.class); diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorInfo.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorInfo.java index a3878f4ee298f..ee0583a561447 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorInfo.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorInfo.java @@ -233,42 +233,6 @@ public List getPreDestroys() { return preDestroys; } - /** - * - * @deprecated Use {@link #getAroundInvokes()} instead - */ - @Deprecated(since = "3.1", forRemoval = true) - public MethodInfo getAroundInvoke() { - return aroundInvokes.get(aroundInvokes.size() - 1); - } - - /** - * - * @deprecated Use {@link #getAroundConstructs()} instead - */ - @Deprecated(since = "3.1", forRemoval = true) - public MethodInfo getAroundConstruct() { - return aroundConstructs.get(aroundConstructs.size() - 1); - } - - /** - * - * @deprecated Use {@link #getPostConstructs()} instead - */ - @Deprecated(since = "3.1", forRemoval = true) - public MethodInfo getPostConstruct() { - return postConstructs.get(postConstructs.size() - 1); - } - - /** - * - * @deprecated Use {@link #getPreDestroys()} instead - */ - @Deprecated(since = "3.1", forRemoval = true) - public MethodInfo getPreDestroy() { - return preDestroys.get(preDestroys.size() - 1); - } - public boolean intercepts(InterceptionType interceptionType) { if (isSynthetic()) { return interceptionType == this.interceptionType; diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcInitConfig.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcInitConfig.java index 79464ba3eb135..596b0535a0230 100644 --- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcInitConfig.java +++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/ArcInitConfig.java @@ -24,12 +24,10 @@ public static Builder builder() { private ArcInitConfig(Builder builder) { this.currentContextFactory = builder.currentContextFactory; this.strictCompatibility = builder.strictCompatibility; - this.optimizeContexts = builder.optimizeContexts; } private final boolean strictCompatibility; private final CurrentContextFactory currentContextFactory; - private final boolean optimizeContexts; public boolean isStrictCompatibility() { return strictCompatibility; @@ -39,26 +37,14 @@ public CurrentContextFactory getCurrentContextFactory() { return currentContextFactory; } - /** - * - * @return {@code true} if optimized contexts should be used, {@code false} otherwise - * @deprecated This method was never used and will be removed at some point after Quarkus 3.10 - */ - @Deprecated(since = "3.7", forRemoval = true) - public boolean isOptimizeContexts() { - return optimizeContexts; - } - public static class Builder { private boolean strictCompatibility; private CurrentContextFactory currentContextFactory; - private boolean optimizeContexts; private Builder() { // init all values with their defaults this.strictCompatibility = false; this.currentContextFactory = null; - this.optimizeContexts = false; } public Builder setStrictCompatibility(boolean strictCompatibility) { @@ -71,19 +57,6 @@ public Builder setCurrentContextFactory(CurrentContextFactory currentContextFact return this; } - /** - * The value was actually never used. - * - * @param value - * @return this - * @deprecated This value was never used; this method will be removed at some point after Quarkus 3.10 - */ - @Deprecated(since = "3.7", forRemoval = true) - public Builder setOptimizeContexts(boolean value) { - optimizeContexts = value; - return this; - } - public ArcInitConfig build() { return new ArcInitConfig(this); } diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/ArcTestContainer.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/ArcTestContainer.java index 094bf5a6db279..6eb6e9ab4e5bc 100644 --- a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/ArcTestContainer.java +++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/ArcTestContainer.java @@ -504,7 +504,6 @@ public void writeResource(Resource resource) throws IOException { // Now we are ready to initialize Arc ArcInitConfig.Builder initConfigBuilder = ArcInitConfig.builder(); initConfigBuilder.setStrictCompatibility(strictCompatibility); - initConfigBuilder.setOptimizeContexts(optimizeContexts); Arc.initialize(initConfigBuilder.build()); } catch (Throwable e) {