diff --git a/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/OidcClientFilterDevModeTest.java b/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/OidcClientFilterDevModeTest.java index 97cbbb8d7868c..38b6cfd27366b 100644 --- a/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/OidcClientFilterDevModeTest.java +++ b/extensions/oidc-client-filter/deployment/src/test/java/io/quarkus/oidc/client/filter/OidcClientFilterDevModeTest.java @@ -46,8 +46,8 @@ public void testGetUserName() { .then() .statusCode(401) .body(equalTo("ProtectedResourceService requires a token")); - test.modifyResourceFile("application.properties", s -> s.replace("#quarkus.oidc-client-filter.register-filter", - "quarkus.oidc-client-filter.register-filter")); + test.modifyResourceFile("application.properties", s -> s.replace("#quarkus.resteasy-client-oidc-filter.register-filter", + "quarkus.resteasy-client-oidc-filter.register-filter")); // OidcClient configuration is not complete - Quarkus should start - but 500 returned RestAssured.when().get("/frontend/user-before-registering-provider") diff --git a/extensions/oidc-client-filter/deployment/src/test/resources/application-oidc-client-filter.properties b/extensions/oidc-client-filter/deployment/src/test/resources/application-oidc-client-filter.properties index e633ad9ba461c..6531888bf275b 100644 --- a/extensions/oidc-client-filter/deployment/src/test/resources/application-oidc-client-filter.properties +++ b/extensions/oidc-client-filter/deployment/src/test/resources/application-oidc-client-filter.properties @@ -18,7 +18,7 @@ quarkus.oidc-client.named.grant.type=password quarkus.oidc-client.named.grant-options.password.username=jdoe quarkus.oidc-client.named.grant-options.password.password=jdoe -#quarkus.oidc-client-filter.register-filter=true +#quarkus.resteasy-client-oidc-filter.register-filter=true quarkus.oidc-client.refresh-token-time-skew=5S io.quarkus.oidc.client.filter.ProtectedResourceService/mp-rest/url=http://localhost:8080/protected diff --git a/extensions/oidc-client-filter/runtime/src/main/java/io/quarkus/oidc/client/filter/runtime/OidcClientFilterConfigFallbackInterceptor.java b/extensions/oidc-client-filter/runtime/src/main/java/io/quarkus/oidc/client/filter/runtime/OidcClientFilterConfigFallbackInterceptor.java deleted file mode 100644 index 5f00c5c7e8bee..0000000000000 --- a/extensions/oidc-client-filter/runtime/src/main/java/io/quarkus/oidc/client/filter/runtime/OidcClientFilterConfigFallbackInterceptor.java +++ /dev/null @@ -1,26 +0,0 @@ -package io.quarkus.oidc.client.filter.runtime; - -import java.util.function.Function; - -import io.quarkus.runtime.util.StringUtil; -import io.smallrye.config.FallbackConfigSourceInterceptor; - -/** - * @deprecated maps the old config to the new config, should be removed at some point - */ -@Deprecated(forRemoval = true, since = "3.9") -public class OidcClientFilterConfigFallbackInterceptor extends FallbackConfigSourceInterceptor { - - private static final String OLD_PREFIX = "quarkus.oidc-client-filter."; - private static final String NEW_PREFIX = "quarkus.resteasy-client-oidc-filter."; - private static final Function RENAME_FUNCTION = new Function() { - @Override - public String apply(String s) { - return StringUtil.changePrefix(s, NEW_PREFIX, OLD_PREFIX); - } - }; - - public OidcClientFilterConfigFallbackInterceptor() { - super(RENAME_FUNCTION); - } -} diff --git a/extensions/oidc-client-filter/runtime/src/main/java/io/quarkus/oidc/client/filter/runtime/OidcClientFilterConfigRelocateInterceptor.java b/extensions/oidc-client-filter/runtime/src/main/java/io/quarkus/oidc/client/filter/runtime/OidcClientFilterConfigRelocateInterceptor.java deleted file mode 100644 index 98de22cfa9460..0000000000000 --- a/extensions/oidc-client-filter/runtime/src/main/java/io/quarkus/oidc/client/filter/runtime/OidcClientFilterConfigRelocateInterceptor.java +++ /dev/null @@ -1,26 +0,0 @@ -package io.quarkus.oidc.client.filter.runtime; - -import java.util.function.Function; - -import io.quarkus.runtime.util.StringUtil; -import io.smallrye.config.RelocateConfigSourceInterceptor; - -/** - * @deprecated maps the old config to the new config, should be removed at some point - */ -@Deprecated(forRemoval = true, since = "3.9") -public class OidcClientFilterConfigRelocateInterceptor extends RelocateConfigSourceInterceptor { - - private static final String OLD_PREFIX = "quarkus.oidc-client-filter."; - private static final String NEW_PREFIX = "quarkus.resteasy-client-oidc-filter."; - private static final Function RENAME_FUNCTION = new Function() { - @Override - public String apply(String s) { - return StringUtil.changePrefix(s, OLD_PREFIX, NEW_PREFIX); - } - }; - - public OidcClientFilterConfigRelocateInterceptor() { - super(RENAME_FUNCTION); - } -} diff --git a/extensions/oidc-client-filter/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor b/extensions/oidc-client-filter/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor deleted file mode 100644 index ab4c9fa2fd5f6..0000000000000 --- a/extensions/oidc-client-filter/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor +++ /dev/null @@ -1,2 +0,0 @@ -io.quarkus.oidc.client.filter.runtime.OidcClientFilterConfigFallbackInterceptor -io.quarkus.oidc.client.filter.runtime.OidcClientFilterConfigRelocateInterceptor \ No newline at end of file diff --git a/extensions/oidc-client-reactive-filter/runtime/src/main/java/io/quarkus/oidc/client/reactive/filter/runtime/OidcClientReactiveFilterConfigFallbackInterceptor.java b/extensions/oidc-client-reactive-filter/runtime/src/main/java/io/quarkus/oidc/client/reactive/filter/runtime/OidcClientReactiveFilterConfigFallbackInterceptor.java deleted file mode 100644 index 82b6714506695..0000000000000 --- a/extensions/oidc-client-reactive-filter/runtime/src/main/java/io/quarkus/oidc/client/reactive/filter/runtime/OidcClientReactiveFilterConfigFallbackInterceptor.java +++ /dev/null @@ -1,26 +0,0 @@ -package io.quarkus.oidc.client.reactive.filter.runtime; - -import java.util.function.Function; - -import io.quarkus.runtime.util.StringUtil; -import io.smallrye.config.FallbackConfigSourceInterceptor; - -/** - * @deprecated maps the old config to the new config, should be removed at some point - */ -@Deprecated(forRemoval = true, since = "3.9") -public class OidcClientReactiveFilterConfigFallbackInterceptor extends FallbackConfigSourceInterceptor { - - private static final String OLD_PREFIX = "quarkus.oidc-client-reactive-filter."; - private static final String NEW_PREFIX = "quarkus.rest-client-oidc-filter."; - private static final Function RENAME_FUNCTION = new Function() { - @Override - public String apply(String s) { - return StringUtil.changePrefix(s, NEW_PREFIX, OLD_PREFIX); - } - }; - - public OidcClientReactiveFilterConfigFallbackInterceptor() { - super(RENAME_FUNCTION); - } -} diff --git a/extensions/oidc-client-reactive-filter/runtime/src/main/java/io/quarkus/oidc/client/reactive/filter/runtime/OidcClientReactiveFilterConfigRelocateInterceptor.java b/extensions/oidc-client-reactive-filter/runtime/src/main/java/io/quarkus/oidc/client/reactive/filter/runtime/OidcClientReactiveFilterConfigRelocateInterceptor.java deleted file mode 100644 index 89d377d17c9a4..0000000000000 --- a/extensions/oidc-client-reactive-filter/runtime/src/main/java/io/quarkus/oidc/client/reactive/filter/runtime/OidcClientReactiveFilterConfigRelocateInterceptor.java +++ /dev/null @@ -1,26 +0,0 @@ -package io.quarkus.oidc.client.reactive.filter.runtime; - -import java.util.function.Function; - -import io.quarkus.runtime.util.StringUtil; -import io.smallrye.config.RelocateConfigSourceInterceptor; - -/** - * @deprecated maps the old config to the new config, should be removed at some point - */ -@Deprecated(forRemoval = true, since = "3.9") -public class OidcClientReactiveFilterConfigRelocateInterceptor extends RelocateConfigSourceInterceptor { - - private static final String OLD_PREFIX = "quarkus.oidc-client-reactive-filter."; - private static final String NEW_PREFIX = "quarkus.rest-client-oidc-filter."; - private static final Function RENAME_FUNCTION = new Function() { - @Override - public String apply(String s) { - return StringUtil.changePrefix(s, OLD_PREFIX, NEW_PREFIX); - } - }; - - public OidcClientReactiveFilterConfigRelocateInterceptor() { - super(RENAME_FUNCTION); - } -} diff --git a/extensions/oidc-client-reactive-filter/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor b/extensions/oidc-client-reactive-filter/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor deleted file mode 100644 index d65f08c177e53..0000000000000 --- a/extensions/oidc-client-reactive-filter/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor +++ /dev/null @@ -1,2 +0,0 @@ -io.quarkus.oidc.client.reactive.filter.runtime.OidcClientReactiveFilterConfigFallbackInterceptor -io.quarkus.oidc.client.reactive.filter.runtime.OidcClientReactiveFilterConfigRelocateInterceptor \ No newline at end of file diff --git a/extensions/oidc-token-propagation-reactive/runtime/src/main/java/io/quarkus/oidc/token/propagation/reactive/OidcTokenPropagationReactiveConfigFallbackInterceptor.java b/extensions/oidc-token-propagation-reactive/runtime/src/main/java/io/quarkus/oidc/token/propagation/reactive/OidcTokenPropagationReactiveConfigFallbackInterceptor.java deleted file mode 100644 index fef24668e390f..0000000000000 --- a/extensions/oidc-token-propagation-reactive/runtime/src/main/java/io/quarkus/oidc/token/propagation/reactive/OidcTokenPropagationReactiveConfigFallbackInterceptor.java +++ /dev/null @@ -1,26 +0,0 @@ -package io.quarkus.oidc.token.propagation.reactive; - -import java.util.function.Function; - -import io.quarkus.runtime.util.StringUtil; -import io.smallrye.config.FallbackConfigSourceInterceptor; - -/** - * @deprecated maps the old config to the new config, should be removed at some point - */ -@Deprecated(forRemoval = true, since = "3.9") -public class OidcTokenPropagationReactiveConfigFallbackInterceptor extends FallbackConfigSourceInterceptor { - - private static final String OLD_PREFIX = "quarkus.oidc-token-propagation."; - private static final String NEW_PREFIX = "quarkus.rest-client-oidc-token-propagation."; - private static final Function RENAME_FUNCTION = new Function() { - @Override - public String apply(String s) { - return StringUtil.changePrefix(s, NEW_PREFIX, OLD_PREFIX); - } - }; - - public OidcTokenPropagationReactiveConfigFallbackInterceptor() { - super(RENAME_FUNCTION); - } -} diff --git a/extensions/oidc-token-propagation-reactive/runtime/src/main/java/io/quarkus/oidc/token/propagation/reactive/OidcTokenPropagationReactiveConfigRelocateInterceptor.java b/extensions/oidc-token-propagation-reactive/runtime/src/main/java/io/quarkus/oidc/token/propagation/reactive/OidcTokenPropagationReactiveConfigRelocateInterceptor.java deleted file mode 100644 index 86ea56f4b9866..0000000000000 --- a/extensions/oidc-token-propagation-reactive/runtime/src/main/java/io/quarkus/oidc/token/propagation/reactive/OidcTokenPropagationReactiveConfigRelocateInterceptor.java +++ /dev/null @@ -1,26 +0,0 @@ -package io.quarkus.oidc.token.propagation.reactive; - -import java.util.function.Function; - -import io.quarkus.runtime.util.StringUtil; -import io.smallrye.config.RelocateConfigSourceInterceptor; - -/** - * @deprecated maps the old config to the new config, should be removed at some point - */ -@Deprecated(forRemoval = true, since = "3.9") -public class OidcTokenPropagationReactiveConfigRelocateInterceptor extends RelocateConfigSourceInterceptor { - - private static final String OLD_PREFIX = "quarkus.oidc-token-propagation."; - private static final String NEW_PREFIX = "quarkus.rest-client-oidc-token-propagation."; - private static final Function RENAME_FUNCTION = new Function() { - @Override - public String apply(String s) { - return StringUtil.changePrefix(s, OLD_PREFIX, NEW_PREFIX); - } - }; - - public OidcTokenPropagationReactiveConfigRelocateInterceptor() { - super(RENAME_FUNCTION); - } -} diff --git a/extensions/oidc-token-propagation-reactive/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor b/extensions/oidc-token-propagation-reactive/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor deleted file mode 100644 index a5febeb8d6da1..0000000000000 --- a/extensions/oidc-token-propagation-reactive/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor +++ /dev/null @@ -1,2 +0,0 @@ -io.quarkus.oidc.token.propagation.reactive.OidcTokenPropagationReactiveConfigFallbackInterceptor -io.quarkus.oidc.token.propagation.reactive.OidcTokenPropagationReactiveConfigRelocateInterceptor \ No newline at end of file diff --git a/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/runtime/OidcTokenPropagationConfigFallbackInterceptor.java b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/runtime/OidcTokenPropagationConfigFallbackInterceptor.java deleted file mode 100644 index 1737b25f0f7bd..0000000000000 --- a/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/runtime/OidcTokenPropagationConfigFallbackInterceptor.java +++ /dev/null @@ -1,26 +0,0 @@ -package io.quarkus.oidc.token.propagation.runtime; - -import java.util.function.Function; - -import io.quarkus.runtime.util.StringUtil; -import io.smallrye.config.FallbackConfigSourceInterceptor; - -/** - * @deprecated maps the old config to the new config, should be removed at some point - */ -@Deprecated(forRemoval = true, since = "3.9") -public class OidcTokenPropagationConfigFallbackInterceptor extends FallbackConfigSourceInterceptor { - - private static final String OLD_PREFIX = "quarkus.oidc-token-propagation."; - private static final String NEW_PREFIX = "quarkus.resteasy-client-oidc-token-propagation."; - private static final Function RENAME_FUNCTION = new Function() { - @Override - public String apply(String s) { - return StringUtil.changePrefix(s, NEW_PREFIX, OLD_PREFIX); - } - }; - - public OidcTokenPropagationConfigFallbackInterceptor() { - super(RENAME_FUNCTION); - } -} diff --git a/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/runtime/OidcTokenPropagationConfigRelocateInterceptor.java b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/runtime/OidcTokenPropagationConfigRelocateInterceptor.java deleted file mode 100644 index e50703726822e..0000000000000 --- a/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/runtime/OidcTokenPropagationConfigRelocateInterceptor.java +++ /dev/null @@ -1,26 +0,0 @@ -package io.quarkus.oidc.token.propagation.runtime; - -import java.util.function.Function; - -import io.quarkus.runtime.util.StringUtil; -import io.smallrye.config.RelocateConfigSourceInterceptor; - -/** - * @deprecated maps the old config to the new config, should be removed at some point - */ -@Deprecated(forRemoval = true, since = "3.9") -public class OidcTokenPropagationConfigRelocateInterceptor extends RelocateConfigSourceInterceptor { - - private static final String OLD_PREFIX = "quarkus.oidc-token-propagation."; - private static final String NEW_PREFIX = "quarkus.resteasy-client-oidc-token-propagation."; - private static final Function RENAME_FUNCTION = new Function() { - @Override - public String apply(String s) { - return StringUtil.changePrefix(s, OLD_PREFIX, NEW_PREFIX); - } - }; - - public OidcTokenPropagationConfigRelocateInterceptor() { - super(RENAME_FUNCTION); - } -} diff --git a/extensions/oidc-token-propagation/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor b/extensions/oidc-token-propagation/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor deleted file mode 100644 index 65c7bbe52b859..0000000000000 --- a/extensions/oidc-token-propagation/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor +++ /dev/null @@ -1,2 +0,0 @@ -io.quarkus.oidc.token.propagation.runtime.OidcTokenPropagationConfigFallbackInterceptor -io.quarkus.oidc.token.propagation.runtime.OidcTokenPropagationConfigRelocateInterceptor \ No newline at end of file diff --git a/extensions/resteasy-classic/rest-client-config/runtime/src/main/java/io/quarkus/restclient/config/AbstractRestClientConfigBuilder.java b/extensions/resteasy-classic/rest-client-config/runtime/src/main/java/io/quarkus/restclient/config/AbstractRestClientConfigBuilder.java index 93a7292af3c29..28a3827bad812 100644 --- a/extensions/resteasy-classic/rest-client-config/runtime/src/main/java/io/quarkus/restclient/config/AbstractRestClientConfigBuilder.java +++ b/extensions/resteasy-classic/rest-client-config/runtime/src/main/java/io/quarkus/restclient/config/AbstractRestClientConfigBuilder.java @@ -93,9 +93,6 @@ static int indexOfRestClient(final String name) { if (name.startsWith("quarkus.rest-client.")) { return 20; } - if (name.startsWith("quarkus.rest-client-reactive.")) { - return 29; - } return -1; } } diff --git a/extensions/resteasy-reactive/rest-client/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ProviderDisabledAutodiscoveryTest.java b/extensions/resteasy-reactive/rest-client/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ProviderDisabledAutodiscoveryTest.java index 6c2816c37988a..1fdd747e6c73a 100644 --- a/extensions/resteasy-reactive/rest-client/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ProviderDisabledAutodiscoveryTest.java +++ b/extensions/resteasy-reactive/rest-client/deployment/src/test/java/io/quarkus/rest/client/reactive/provider/ProviderDisabledAutodiscoveryTest.java @@ -28,7 +28,7 @@ public class ProviderDisabledAutodiscoveryTest { .addAsResource( new StringAsset(setUrlForClass(HelloClient.class) + setUrlForClass(HelloClient2.class) - + "quarkus.rest-client-reactive.provider-autodiscovery=false"), + + "quarkus.rest-client.provider-autodiscovery=false"), "application.properties")); @RestClient diff --git a/extensions/resteasy-reactive/rest-client/deployment/src/test/resources/mp-global-scope-test-application.properties b/extensions/resteasy-reactive/rest-client/deployment/src/test/resources/mp-global-scope-test-application.properties index d6de308a9245d..240b7ef82eba3 100644 --- a/extensions/resteasy-reactive/rest-client/deployment/src/test/resources/mp-global-scope-test-application.properties +++ b/extensions/resteasy-reactive/rest-client/deployment/src/test/resources/mp-global-scope-test-application.properties @@ -1,3 +1,3 @@ hello2/mp-rest/url=http://localhost:${quarkus.http.test-port:8081}/hello -quarkus.rest-client-reactive.scope=jakarta.enterprise.context.Dependent \ No newline at end of file +quarkus.rest-client.scope=jakarta.enterprise.context.Dependent \ No newline at end of file diff --git a/extensions/resteasy-reactive/rest-client/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/RestClientReactiveConfigFallbackInterceptor.java b/extensions/resteasy-reactive/rest-client/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/RestClientReactiveConfigFallbackInterceptor.java deleted file mode 100644 index 37b7b082f80b4..0000000000000 --- a/extensions/resteasy-reactive/rest-client/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/RestClientReactiveConfigFallbackInterceptor.java +++ /dev/null @@ -1,26 +0,0 @@ -package io.quarkus.rest.client.reactive.runtime; - -import java.util.function.Function; - -import io.quarkus.runtime.util.StringUtil; -import io.smallrye.config.FallbackConfigSourceInterceptor; - -/** - * @deprecated maps the old config to the new config, should be removed at some point - */ -@Deprecated(forRemoval = true, since = "3.9") -public class RestClientReactiveConfigFallbackInterceptor extends FallbackConfigSourceInterceptor { - - private static final String OLD_PREFIX = "quarkus.rest-client-reactive."; - private static final String NEW_PREFIX = "quarkus.rest-client."; - private static final Function RENAME_FUNCTION = new Function() { - @Override - public String apply(String s) { - return StringUtil.changePrefix(s, NEW_PREFIX, OLD_PREFIX); - } - }; - - public RestClientReactiveConfigFallbackInterceptor() { - super(RENAME_FUNCTION); - } -} diff --git a/extensions/resteasy-reactive/rest-client/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/RestClientReactiveConfigRelocateInterceptor.java b/extensions/resteasy-reactive/rest-client/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/RestClientReactiveConfigRelocateInterceptor.java deleted file mode 100644 index 0018aecedaf92..0000000000000 --- a/extensions/resteasy-reactive/rest-client/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/RestClientReactiveConfigRelocateInterceptor.java +++ /dev/null @@ -1,27 +0,0 @@ -package io.quarkus.rest.client.reactive.runtime; - -import java.util.function.Function; - -import io.quarkus.runtime.util.StringUtil; -import io.smallrye.config.RelocateConfigSourceInterceptor; - -/** - * @deprecated maps the old config to the new config, should be removed at some point - */ -@Deprecated(forRemoval = true, since = "3.9") -public class RestClientReactiveConfigRelocateInterceptor extends RelocateConfigSourceInterceptor { - - private static final String OLD_PREFIX = "quarkus.rest-client-reactive."; - private static final String NEW_PREFIX = "quarkus.rest-client."; - private static final Function RENAME_FUNCTION = new Function() { - @Override - public String apply(String s) { - return StringUtil.changePrefix(s, OLD_PREFIX, NEW_PREFIX); - } - }; - - public RestClientReactiveConfigRelocateInterceptor() { - super(RENAME_FUNCTION); - } - -} diff --git a/extensions/resteasy-reactive/rest-client/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor b/extensions/resteasy-reactive/rest-client/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor deleted file mode 100644 index fd14a16d8b75d..0000000000000 --- a/extensions/resteasy-reactive/rest-client/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor +++ /dev/null @@ -1,2 +0,0 @@ -io.quarkus.rest.client.reactive.runtime.RestClientReactiveConfigFallbackInterceptor -io.quarkus.rest.client.reactive.runtime.RestClientReactiveConfigRelocateInterceptor \ No newline at end of file diff --git a/extensions/resteasy-reactive/rest-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/ResteasyReactiveConfigFallbackInterceptor.java b/extensions/resteasy-reactive/rest-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/ResteasyReactiveConfigFallbackInterceptor.java deleted file mode 100644 index 53ca588f5febd..0000000000000 --- a/extensions/resteasy-reactive/rest-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/ResteasyReactiveConfigFallbackInterceptor.java +++ /dev/null @@ -1,27 +0,0 @@ -package io.quarkus.resteasy.reactive.common.runtime; - -import java.util.function.Function; - -import io.quarkus.runtime.util.StringUtil; -import io.smallrye.config.FallbackConfigSourceInterceptor; - -/** - * @deprecated maps the old config to the new config, should be removed at some point - */ -@Deprecated(forRemoval = true, since = "3.9") -public class ResteasyReactiveConfigFallbackInterceptor extends FallbackConfigSourceInterceptor { - - private static final String OLD_PREFIX = "quarkus.resteasy-reactive."; - private static final String NEW_PREFIX = "quarkus.rest."; - private static final Function RENAME_FUNCTION = new Function() { - @Override - public String apply(String s) { - return StringUtil.changePrefix(s, NEW_PREFIX, OLD_PREFIX); - } - }; - - public ResteasyReactiveConfigFallbackInterceptor() { - super(RENAME_FUNCTION); - } - -} diff --git a/extensions/resteasy-reactive/rest-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/ResteasyReactiveConfigRelocateInterceptor.java b/extensions/resteasy-reactive/rest-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/ResteasyReactiveConfigRelocateInterceptor.java deleted file mode 100644 index e5eea71480392..0000000000000 --- a/extensions/resteasy-reactive/rest-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/ResteasyReactiveConfigRelocateInterceptor.java +++ /dev/null @@ -1,26 +0,0 @@ -package io.quarkus.resteasy.reactive.common.runtime; - -import java.util.function.Function; - -import io.quarkus.runtime.util.StringUtil; -import io.smallrye.config.RelocateConfigSourceInterceptor; - -/** - * @deprecated maps the old config to the new config, should be removed at some point - */ -@Deprecated(forRemoval = true, since = "3.9") -public class ResteasyReactiveConfigRelocateInterceptor extends RelocateConfigSourceInterceptor { - - private static final String OLD_PREFIX = "quarkus.resteasy-reactive."; - private static final String NEW_PREFIX = "quarkus.rest."; - private static final Function RENAME_FUNCTION = new Function() { - @Override - public String apply(String s) { - return StringUtil.changePrefix(s, OLD_PREFIX, NEW_PREFIX); - } - }; - - public ResteasyReactiveConfigRelocateInterceptor() { - super(RENAME_FUNCTION); - } -} diff --git a/extensions/resteasy-reactive/rest-common/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor b/extensions/resteasy-reactive/rest-common/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor deleted file mode 100644 index 66a915f2fed2e..0000000000000 --- a/extensions/resteasy-reactive/rest-common/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor +++ /dev/null @@ -1,2 +0,0 @@ -io.quarkus.resteasy.reactive.common.runtime.ResteasyReactiveConfigFallbackInterceptor -io.quarkus.resteasy.reactive.common.runtime.ResteasyReactiveConfigRelocateInterceptor \ No newline at end of file diff --git a/extensions/resteasy-reactive/rest-csrf/runtime/src/main/java/io/quarkus/csrf/reactive/runtime/CsrfReactiveConfigFallbackInterceptor.java b/extensions/resteasy-reactive/rest-csrf/runtime/src/main/java/io/quarkus/csrf/reactive/runtime/CsrfReactiveConfigFallbackInterceptor.java deleted file mode 100644 index a11140b267b3b..0000000000000 --- a/extensions/resteasy-reactive/rest-csrf/runtime/src/main/java/io/quarkus/csrf/reactive/runtime/CsrfReactiveConfigFallbackInterceptor.java +++ /dev/null @@ -1,27 +0,0 @@ -package io.quarkus.csrf.reactive.runtime; - -import java.util.function.Function; - -import io.quarkus.runtime.util.StringUtil; -import io.smallrye.config.FallbackConfigSourceInterceptor; - -/** - * @deprecated maps the old config to the new config, should be removed at some point - */ -@Deprecated(forRemoval = true, since = "3.9") -public class CsrfReactiveConfigFallbackInterceptor extends FallbackConfigSourceInterceptor { - - private static final String OLD_PREFIX = "quarkus.csrf-reactive."; - private static final String NEW_PREFIX = "quarkus.rest-csrf."; - private static final Function RENAME_FUNCTION = new Function() { - @Override - public String apply(String s) { - return StringUtil.changePrefix(s, NEW_PREFIX, OLD_PREFIX); - } - }; - - public CsrfReactiveConfigFallbackInterceptor() { - super(RENAME_FUNCTION); - } - -} diff --git a/extensions/resteasy-reactive/rest-csrf/runtime/src/main/java/io/quarkus/csrf/reactive/runtime/CsrfReactiveConfigRelocateInterceptor.java b/extensions/resteasy-reactive/rest-csrf/runtime/src/main/java/io/quarkus/csrf/reactive/runtime/CsrfReactiveConfigRelocateInterceptor.java deleted file mode 100644 index 1d0b86f5fb9da..0000000000000 --- a/extensions/resteasy-reactive/rest-csrf/runtime/src/main/java/io/quarkus/csrf/reactive/runtime/CsrfReactiveConfigRelocateInterceptor.java +++ /dev/null @@ -1,26 +0,0 @@ -package io.quarkus.csrf.reactive.runtime; - -import java.util.function.Function; - -import io.quarkus.runtime.util.StringUtil; -import io.smallrye.config.RelocateConfigSourceInterceptor; - -/** - * @deprecated maps the old config to the new config, should be removed at some point - */ -@Deprecated(forRemoval = true, since = "3.9") -public class CsrfReactiveConfigRelocateInterceptor extends RelocateConfigSourceInterceptor { - - private static final String OLD_PREFIX = "quarkus.csrf-reactive."; - private static final String NEW_PREFIX = "quarkus.rest-csrf."; - private static final Function RENAME_FUNCTION = new Function() { - @Override - public String apply(String s) { - return StringUtil.changePrefix(s, OLD_PREFIX, NEW_PREFIX); - } - }; - - public CsrfReactiveConfigRelocateInterceptor() { - super(RENAME_FUNCTION); - } -} diff --git a/extensions/resteasy-reactive/rest-csrf/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor b/extensions/resteasy-reactive/rest-csrf/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor deleted file mode 100644 index 8d05f1803f2d6..0000000000000 --- a/extensions/resteasy-reactive/rest-csrf/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor +++ /dev/null @@ -1,2 +0,0 @@ -io.quarkus.csrf.reactive.runtime.CsrfReactiveConfigFallbackInterceptor -io.quarkus.csrf.reactive.runtime.CsrfReactiveConfigRelocateInterceptor \ No newline at end of file diff --git a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/ReactiveMessagingConfigFallbackInterceptor.java b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/ReactiveMessagingConfigFallbackInterceptor.java deleted file mode 100644 index 46a867cab1ca4..0000000000000 --- a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/ReactiveMessagingConfigFallbackInterceptor.java +++ /dev/null @@ -1,26 +0,0 @@ -package io.quarkus.smallrye.reactivemessaging.runtime; - -import java.util.function.Function; - -import io.quarkus.runtime.util.StringUtil; -import io.smallrye.config.FallbackConfigSourceInterceptor; - -/** - * @deprecated maps the old config to the new config, should be removed at some point - */ -@Deprecated(forRemoval = true, since = "3.9") -public class ReactiveMessagingConfigFallbackInterceptor extends FallbackConfigSourceInterceptor { - - private static final String OLD_PREFIX = "quarkus.reactive-messaging."; - private static final String NEW_PREFIX = "quarkus.messaging."; - private static final Function RENAME_FUNCTION = new Function() { - @Override - public String apply(String s) { - return StringUtil.changePrefix(s, NEW_PREFIX, OLD_PREFIX); - } - }; - - public ReactiveMessagingConfigFallbackInterceptor() { - super(RENAME_FUNCTION); - } -} diff --git a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/ReactiveMessagingConfigRelocateInterceptor.java b/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/ReactiveMessagingConfigRelocateInterceptor.java deleted file mode 100644 index cf65f18a323b2..0000000000000 --- a/extensions/smallrye-reactive-messaging/runtime/src/main/java/io/quarkus/smallrye/reactivemessaging/runtime/ReactiveMessagingConfigRelocateInterceptor.java +++ /dev/null @@ -1,26 +0,0 @@ -package io.quarkus.smallrye.reactivemessaging.runtime; - -import java.util.function.Function; - -import io.quarkus.runtime.util.StringUtil; -import io.smallrye.config.RelocateConfigSourceInterceptor; - -/** - * @deprecated maps the old config to the new config, should be removed at some point - */ -@Deprecated(forRemoval = true, since = "3.9") -public class ReactiveMessagingConfigRelocateInterceptor extends RelocateConfigSourceInterceptor { - - private static final String OLD_PREFIX = "quarkus.reactive-messaging."; - private static final String NEW_PREFIX = "quarkus.messaging."; - private static final Function RENAME_FUNCTION = new Function() { - @Override - public String apply(String s) { - return StringUtil.changePrefix(s, OLD_PREFIX, NEW_PREFIX); - } - }; - - public ReactiveMessagingConfigRelocateInterceptor() { - super(RENAME_FUNCTION); - } -} diff --git a/extensions/smallrye-reactive-messaging/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor b/extensions/smallrye-reactive-messaging/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor deleted file mode 100644 index 65b423bffffe4..0000000000000 --- a/extensions/smallrye-reactive-messaging/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor +++ /dev/null @@ -1,2 +0,0 @@ -io.quarkus.smallrye.reactivemessaging.runtime.ReactiveMessagingConfigRelocateInterceptor -io.quarkus.smallrye.reactivemessaging.runtime.ReactiveMessagingConfigFallbackInterceptor \ No newline at end of file diff --git a/tcks/resteasy-reactive/pom.xml b/tcks/resteasy-reactive/pom.xml index a87fa4bd61279..d72dfd45dee5f 100644 --- a/tcks/resteasy-reactive/pom.xml +++ b/tcks/resteasy-reactive/pom.xml @@ -17,7 +17,7 @@ - c8b7402a9fdd6aa4e267a6e9e12d936b246e2a75 + 09267f0600c682aed769b8b4e52ea0ca5ab4b639 ${skipTests} ${exec.skip}