Remove the Big Reactive Rename config compatibility layer

We did the change in 3.9 and the deprecations will be in 3.15 LTS so we can get rid of them.
quarkusio · Sep 5, 2024 · fd78192 · fd78192
1 parent 1d73b94
commit fd78192
Show file tree

Hide file tree

Showing 30 changed files with 6 additions and 444 deletions.
diff --git a/...r/deployment/src/test/java/io/quarkus/oidc/client/filter/OidcClientFilterDevModeTest.java b/...r/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/...idc-client-filter/deployment/src/test/resources/application-oidc-client-filter.properties b/...idc-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/...java/io/quarkus/oidc/client/filter/runtime/OidcClientFilterConfigFallbackInterceptor.java b/...java/io/quarkus/oidc/client/filter/runtime/OidcClientFilterConfigFallbackInterceptor.java
diff --git a/...java/io/quarkus/oidc/client/filter/runtime/OidcClientFilterConfigRelocateInterceptor.java b/...java/io/quarkus/oidc/client/filter/runtime/OidcClientFilterConfigRelocateInterceptor.java
diff --git a/...r/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor b/...r/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor
diff --git a/...idc/client/reactive/filter/runtime/OidcClientReactiveFilterConfigFallbackInterceptor.java b/...idc/client/reactive/filter/runtime/OidcClientReactiveFilterConfigFallbackInterceptor.java
diff --git a/...idc/client/reactive/filter/runtime/OidcClientReactiveFilterConfigRelocateInterceptor.java b/...idc/client/reactive/filter/runtime/OidcClientReactiveFilterConfigRelocateInterceptor.java
diff --git a/...r/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor b/...r/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor
diff --git a/...idc/token/propagation/reactive/OidcTokenPropagationReactiveConfigFallbackInterceptor.java b/...idc/token/propagation/reactive/OidcTokenPropagationReactiveConfigFallbackInterceptor.java
diff --git a/...idc/token/propagation/reactive/OidcTokenPropagationReactiveConfigRelocateInterceptor.java b/...idc/token/propagation/reactive/OidcTokenPropagationReactiveConfigRelocateInterceptor.java
diff --git a/...e/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor b/...e/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor
diff --git a/...quarkus/oidc/token/propagation/runtime/OidcTokenPropagationConfigFallbackInterceptor.java b/...quarkus/oidc/token/propagation/runtime/OidcTokenPropagationConfigFallbackInterceptor.java
diff --git a/...quarkus/oidc/token/propagation/runtime/OidcTokenPropagationConfigRelocateInterceptor.java b/...quarkus/oidc/token/propagation/runtime/OidcTokenPropagationConfigRelocateInterceptor.java
diff --git a/...n/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor b/...n/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor
diff --git a/...g/runtime/src/main/java/io/quarkus/restclient/config/AbstractRestClientConfigBuilder.java b/...g/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/...test/java/io/quarkus/rest/client/reactive/provider/ProviderDisabledAutodiscoveryTest.java b/...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/...ive/rest-client/deployment/src/test/resources/mp-global-scope-test-application.properties b/...ive/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
+quarkus.rest-client.scope=jakarta.enterprise.context.Dependent
diff --git a/.../io/quarkus/rest/client/reactive/runtime/RestClientReactiveConfigFallbackInterceptor.java b/.../io/quarkus/rest/client/reactive/runtime/RestClientReactiveConfigFallbackInterceptor.java
diff --git a/.../io/quarkus/rest/client/reactive/runtime/RestClientReactiveConfigRelocateInterceptor.java b/.../io/quarkus/rest/client/reactive/runtime/RestClientReactiveConfigRelocateInterceptor.java
diff --git a/...t/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor b/...t/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor
diff --git a/...o/quarkus/resteasy/reactive/common/runtime/ResteasyReactiveConfigFallbackInterceptor.java b/...o/quarkus/resteasy/reactive/common/runtime/ResteasyReactiveConfigFallbackInterceptor.java
diff --git a/...o/quarkus/resteasy/reactive/common/runtime/ResteasyReactiveConfigRelocateInterceptor.java b/...o/quarkus/resteasy/reactive/common/runtime/ResteasyReactiveConfigRelocateInterceptor.java
diff --git a/...n/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor b/...n/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor