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 new file mode 100644 index 0000000000000..7f688e72bee0f --- /dev/null +++ b/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); + } +} 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 index 9a3aedcb2623a..ab4c9fa2fd5f6 100644 --- 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 @@ -1 +1,2 @@ -io.quarkus.oidc.client.filter.runtime.OidcClientFilterConfigFallbackInterceptor \ No newline at end of file +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/OidcClientReactiveFilterConfigRelocateInterceptor.java b/extensions/oidc-client-reactive-filter/runtime/src/main/java/io/quarkus/oidc/client/reactive/filter/runtime/OidcClientReactiveFilterConfigRelocateInterceptor.java new file mode 100644 index 0000000000000..545cc28d7a237 --- /dev/null +++ b/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); + } +} 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 index 19af3562707b4..d65f08c177e53 100644 --- 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 @@ -1 +1,2 @@ -io.quarkus.oidc.client.reactive.filter.runtime.OidcClientReactiveFilterConfigFallbackInterceptor \ No newline at end of file +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/OidcTokenPropagationReactiveConfigRelocateInterceptor.java b/extensions/oidc-token-propagation-reactive/runtime/src/main/java/io/quarkus/oidc/token/propagation/reactive/OidcTokenPropagationReactiveConfigRelocateInterceptor.java new file mode 100644 index 0000000000000..108ba67279ff9 --- /dev/null +++ b/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); + } +} 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 index a2851e80ce082..a5febeb8d6da1 100644 --- 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 @@ -1 +1,2 @@ -io.quarkus.oidc.token.propagation.reactive.OidcTokenPropagationReactiveConfigFallbackInterceptor \ No newline at end of file +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/OidcTokenPropagationConfigRelocateInterceptor.java b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/runtime/OidcTokenPropagationConfigRelocateInterceptor.java new file mode 100644 index 0000000000000..78456e81bdf4f --- /dev/null +++ b/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); + } +} 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 index 8cf5f3e7fd510..65c7bbe52b859 100644 --- 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 @@ -1 +1,2 @@ -io.quarkus.oidc.token.propagation.runtime.OidcTokenPropagationConfigFallbackInterceptor \ No newline at end of file +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-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 new file mode 100644 index 0000000000000..c001d943acc11 --- /dev/null +++ b/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); + } +} 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 index 299b43de5640a..fd14a16d8b75d 100644 --- 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 @@ -1 +1,2 @@ -io.quarkus.rest.client.reactive.runtime.RestClientReactiveConfigFallbackInterceptor \ No newline at end of file +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/ResteasyReactiveConfigRelocateInterceptor.java b/extensions/resteasy-reactive/rest-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/ResteasyReactiveConfigRelocateInterceptor.java new file mode 100644 index 0000000000000..a79a148ebd1d4 --- /dev/null +++ b/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); + } +} 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 index 035bc9735974a..66a915f2fed2e 100644 --- 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 @@ -1 +1,2 @@ -io.quarkus.resteasy.reactive.common.runtime.ResteasyReactiveConfigFallbackInterceptor \ No newline at end of file +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/CsrfReactiveConfigRelocateInterceptor.java b/extensions/resteasy-reactive/rest-csrf/runtime/src/main/java/io/quarkus/csrf/reactive/runtime/CsrfReactiveConfigRelocateInterceptor.java new file mode 100644 index 0000000000000..af8782874ad40 --- /dev/null +++ b/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); + } +} 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 index ef15a23285b14..8d05f1803f2d6 100644 --- 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 @@ -1 +1,2 @@ -io.quarkus.csrf.reactive.runtime.CsrfReactiveConfigFallbackInterceptor \ No newline at end of file +io.quarkus.csrf.reactive.runtime.CsrfReactiveConfigFallbackInterceptor +io.quarkus.csrf.reactive.runtime.CsrfReactiveConfigRelocateInterceptor \ No newline at end of file