Add relocate interceptor for each fallback interceptor

extensions/oidc-client-filter/runtime/src/main/java/io/quarkus/oidc/client/filter/runtime/OidcClientFilterConfigRelocateInterceptor.java

@@ -0,0 +1,25 @@
+package io.quarkus.oidc.client.filter.runtime;
+
+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.";
+
+    public OidcClientFilterConfigRelocateInterceptor() {
+        super(OidcClientFilterConfigRelocateInterceptor::rename);
+    }
+
+    private static String rename(String originalName) {
+        if (!originalName.startsWith(OLD_PREFIX)) {
+            return originalName;
+        }
+
+        return originalName.replaceFirst(OLD_PREFIX, NEW_PREFIX);
+    }
+}

extensions/oidc-client-filter/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor

@@ -1 +1,2 @@
-io.quarkus.oidc.client.filter.runtime.OidcClientFilterConfigFallbackInterceptor
+io.quarkus.oidc.client.filter.runtime.OidcClientFilterConfigFallbackInterceptor
+io.quarkus.oidc.client.filter.runtime.OidcClientFilterConfigRelocateInterceptor

extensions/oidc-client-reactive-filter/runtime/src/main/java/io/quarkus/oidc/client/reactive/filter/runtime/OidcClientReactiveFilterConfigRelocateInterceptor.java

@@ -0,0 +1,25 @@
+package io.quarkus.oidc.client.reactive.filter.runtime;
+
+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.";
+
+    public OidcClientReactiveFilterConfigRelocateInterceptor() {
+        super(OidcClientReactiveFilterConfigRelocateInterceptor::rename);
+    }
+
+    private static String rename(String originalName) {
+        if (!originalName.startsWith(OLD_PREFIX)) {
+            return originalName;
+        }
+
+        return originalName.replaceFirst(OLD_PREFIX, NEW_PREFIX);
+    }
+}

extensions/oidc-client-reactive-filter/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor

@@ -1 +1,2 @@
-io.quarkus.oidc.client.reactive.filter.runtime.OidcClientReactiveFilterConfigFallbackInterceptor
+io.quarkus.oidc.client.reactive.filter.runtime.OidcClientReactiveFilterConfigFallbackInterceptor
+io.quarkus.oidc.client.reactive.filter.runtime.OidcClientReactiveFilterConfigRelocateInterceptor

extensions/oidc-token-propagation-reactive/runtime/src/main/java/io/quarkus/oidc/token/propagation/reactive/OidcTokenPropagationReactiveConfigRelocateInterceptor.java

@@ -0,0 +1,25 @@
+package io.quarkus.oidc.token.propagation.reactive;
+
+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.";
+
+    public OidcTokenPropagationReactiveConfigRelocateInterceptor() {
+        super(OidcTokenPropagationReactiveConfigRelocateInterceptor::rename);
+    }
+
+    private static String rename(String originalName) {
+        if (!originalName.startsWith(OLD_PREFIX)) {
+            return originalName;
+        }
+
+        return originalName.replaceFirst(OLD_PREFIX, NEW_PREFIX);
+    }
+}

extensions/oidc-token-propagation-reactive/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor

@@ -1 +1,2 @@
-io.quarkus.oidc.token.propagation.reactive.OidcTokenPropagationReactiveConfigFallbackInterceptor
+io.quarkus.oidc.token.propagation.reactive.OidcTokenPropagationReactiveConfigFallbackInterceptor
+io.quarkus.oidc.token.propagation.reactive.OidcTokenPropagationReactiveConfigRelocateInterceptor

extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/runtime/OidcTokenPropagationConfigRelocateInterceptor.java

@@ -0,0 +1,25 @@
+package io.quarkus.oidc.token.propagation.runtime;
+
+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.";
+
+    public OidcTokenPropagationConfigRelocateInterceptor() {
+        super(OidcTokenPropagationConfigRelocateInterceptor::rename);
+    }
+
+    private static String rename(String originalName) {
+        if (!originalName.startsWith(OLD_PREFIX)) {
+            return originalName;
+        }
+
+        return originalName.replaceFirst(OLD_PREFIX, NEW_PREFIX);
+    }
+}

extensions/oidc-token-propagation/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor

@@ -1 +1,2 @@
-io.quarkus.oidc.token.propagation.runtime.OidcTokenPropagationConfigFallbackInterceptor
+io.quarkus.oidc.token.propagation.runtime.OidcTokenPropagationConfigFallbackInterceptor
+io.quarkus.oidc.token.propagation.runtime.OidcTokenPropagationConfigRelocateInterceptor

extensions/resteasy-reactive/rest-client/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/RestClientReactiveConfigRelocateInterceptor.java

@@ -0,0 +1,25 @@
+package io.quarkus.rest.client.reactive.runtime;
+
+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.";
+
+    public RestClientReactiveConfigRelocateInterceptor() {
+        super(RestClientReactiveConfigRelocateInterceptor::rename);
+    }
+
+    private static String rename(String originalName) {
+        if (!originalName.startsWith(OLD_PREFIX)) {
+            return originalName;
+        }
+
+        return originalName.replaceFirst(OLD_PREFIX, NEW_PREFIX);
+    }
+}

extensions/resteasy-reactive/rest-client/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor

@@ -1 +1,2 @@
-io.quarkus.rest.client.reactive.runtime.RestClientReactiveConfigFallbackInterceptor
+io.quarkus.rest.client.reactive.runtime.RestClientReactiveConfigFallbackInterceptor
+io.quarkus.rest.client.reactive.runtime.RestClientReactiveConfigRelocateInterceptor

extensions/resteasy-reactive/rest-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/ResteasyReactiveConfigRelocateInterceptor.java

@@ -0,0 +1,25 @@
+package io.quarkus.resteasy.reactive.common.runtime;
+
+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.";
+
+    public ResteasyReactiveConfigRelocateInterceptor() {
+        super(ResteasyReactiveConfigRelocateInterceptor::rename);
+    }
+
+    private static String rename(String originalName) {
+        if (!originalName.startsWith(OLD_PREFIX)) {
+            return originalName;
+        }
+
+        return originalName.replaceFirst(OLD_PREFIX, NEW_PREFIX);
+    }
+}

extensions/resteasy-reactive/rest-common/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor

@@ -1 +1,2 @@
-io.quarkus.resteasy.reactive.common.runtime.ResteasyReactiveConfigFallbackInterceptor
+io.quarkus.resteasy.reactive.common.runtime.ResteasyReactiveConfigFallbackInterceptor
+io.quarkus.resteasy.reactive.common.runtime.ResteasyReactiveConfigRelocateInterceptor

extensions/resteasy-reactive/rest-csrf/runtime/src/main/java/io/quarkus/csrf/reactive/runtime/CsrfReactiveConfigRelocateInterceptor.java

@@ -0,0 +1,25 @@
+package io.quarkus.csrf.reactive.runtime;
+
+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.";
+
+    public CsrfReactiveConfigRelocateInterceptor() {
+        super(CsrfReactiveConfigRelocateInterceptor::rename);
+    }
+
+    private static String rename(String originalName) {
+        if (!originalName.startsWith(OLD_PREFIX)) {
+            return originalName;
+        }
+
+        return originalName.replaceFirst(OLD_PREFIX, NEW_PREFIX);
+    }
+}

extensions/resteasy-reactive/rest-csrf/runtime/src/main/resources/META-INF/services/io.smallrye.config.ConfigSourceInterceptor

@@ -1 +1,2 @@
-io.quarkus.csrf.reactive.runtime.CsrfReactiveConfigFallbackInterceptor
+io.quarkus.csrf.reactive.runtime.CsrfReactiveConfigFallbackInterceptor
+io.quarkus.csrf.reactive.runtime.CsrfReactiveConfigRelocateInterceptor