Skip to content

Commit 54ec3c7

Browse files
authored
Merge pull request #46317 from michalvavrik/feature/oidc-mark-former-config-class-fields-for-removal
Mark former OIDC config class fields for removal
2 parents be7e613 + 2c49226 commit 54ec3c7

File tree

4 files changed

+122
-122
lines changed

4 files changed

+122
-122
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* @deprecated create {@link io.quarkus.oidc.client.runtime.OidcClientConfig} with the {@link OidcClientConfigBuilder}
1313
* for example, you can use the {@link io.quarkus.oidc.client.runtime.OidcClientConfig#builder()} method.
1414
*/
15-
@Deprecated(since = "3.18")
15+
@Deprecated(since = "3.18", forRemoval = true)
1616
public class OidcClientConfig extends OidcClientCommonConfig implements io.quarkus.oidc.client.runtime.OidcClientConfig {
1717

1818
public OidcClientConfig() {

extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcClientCommonConfig.java

+16-16
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ protected OidcClientCommonConfig(io.quarkus.oidc.common.runtime.config.OidcClien
2828
*
2929
* @deprecated use the {@link #tokenPath()} method instead
3030
*/
31-
@Deprecated(since = "3.18")
31+
@Deprecated(since = "3.18", forRemoval = true)
3232
public Optional<String> tokenPath = Optional.empty();
3333

3434
/**
3535
* The relative path or absolute URL of the OIDC token revocation endpoint.
3636
*
3737
* @deprecated use the {@link #revokePath()} method instead
3838
*/
39-
@Deprecated(since = "3.18")
39+
@Deprecated(since = "3.18", forRemoval = true)
4040
public Optional<String> revokePath = Optional.empty();
4141

4242
/**
@@ -45,7 +45,7 @@ protected OidcClientCommonConfig(io.quarkus.oidc.common.runtime.config.OidcClien
4545
*
4646
* @deprecated use the {@link #clientId()} method instead
4747
*/
48-
@Deprecated(since = "3.18")
48+
@Deprecated(since = "3.18", forRemoval = true)
4949
public Optional<String> clientId = Optional.empty();
5050

5151
/**
@@ -56,15 +56,15 @@ protected OidcClientCommonConfig(io.quarkus.oidc.common.runtime.config.OidcClien
5656
*
5757
* @deprecated use the {@link #clientName()} method instead
5858
*/
59-
@Deprecated(since = "3.18")
59+
@Deprecated(since = "3.18", forRemoval = true)
6060
public Optional<String> clientName = Optional.empty();
6161

6262
/**
6363
* Credentials the OIDC adapter uses to authenticate to the OIDC server.
6464
*
6565
* @deprecated use the {@link #credentials()} method instead
6666
*/
67-
@Deprecated(since = "3.18")
67+
@Deprecated(since = "3.18", forRemoval = true)
6868
public Credentials credentials = new Credentials();
6969

7070
@Override
@@ -95,7 +95,7 @@ public io.quarkus.oidc.common.runtime.config.OidcClientCommonConfig.Credentials
9595
/**
9696
* @deprecated use {@link io.quarkus.oidc.common.runtime.config.OidcClientCommonConfigBuilder.CredentialsBuilder}
9797
*/
98-
@Deprecated(since = "3.18")
98+
@Deprecated(since = "3.18", forRemoval = true)
9999
public static class Credentials implements io.quarkus.oidc.common.runtime.config.OidcClientCommonConfig.Credentials {
100100

101101
/**
@@ -663,79 +663,79 @@ public Optional<String> key() {
663663
/**
664664
* @deprecated use the {@link #tokenPath()} method instead
665665
*/
666-
@Deprecated(since = "3.18")
666+
@Deprecated(since = "3.18", forRemoval = true)
667667
public Optional<String> getTokenPath() {
668668
return tokenPath;
669669
}
670670

671671
/**
672672
* @deprecated use {@link io.quarkus.oidc.common.runtime.config.OidcClientCommonConfigBuilder}
673673
*/
674-
@Deprecated(since = "3.18")
674+
@Deprecated(since = "3.18", forRemoval = true)
675675
public void setTokenPath(String tokenPath) {
676676
this.tokenPath = Optional.of(tokenPath);
677677
}
678678

679679
/**
680680
* @deprecated use the {@link #revokePath()} method instead
681681
*/
682-
@Deprecated(since = "3.18")
682+
@Deprecated(since = "3.18", forRemoval = true)
683683
public Optional<String> getRevokePath() {
684684
return revokePath;
685685
}
686686

687687
/**
688688
* @deprecated use {@link io.quarkus.oidc.common.runtime.config.OidcClientCommonConfigBuilder}
689689
*/
690-
@Deprecated(since = "3.18")
690+
@Deprecated(since = "3.18", forRemoval = true)
691691
public void setRevokePath(String revokePath) {
692692
this.revokePath = Optional.of(revokePath);
693693
}
694694

695695
/**
696696
* @deprecated use the {@link #clientId()} method instead
697697
*/
698-
@Deprecated(since = "3.18")
698+
@Deprecated(since = "3.18", forRemoval = true)
699699
public Optional<String> getClientId() {
700700
return clientId;
701701
}
702702

703703
/**
704704
* @deprecated use {@link io.quarkus.oidc.common.runtime.config.OidcClientCommonConfigBuilder}
705705
*/
706-
@Deprecated(since = "3.18")
706+
@Deprecated(since = "3.18", forRemoval = true)
707707
public void setClientId(String clientId) {
708708
this.clientId = Optional.of(clientId);
709709
}
710710

711711
/**
712712
* @deprecated use the {@link #clientName()} method instead
713713
*/
714-
@Deprecated(since = "3.18")
714+
@Deprecated(since = "3.18", forRemoval = true)
715715
public Optional<String> getClientName() {
716716
return clientName;
717717
}
718718

719719
/**
720720
* @deprecated use {@link io.quarkus.oidc.common.runtime.config.OidcClientCommonConfigBuilder}
721721
*/
722-
@Deprecated(since = "3.18")
722+
@Deprecated(since = "3.18", forRemoval = true)
723723
public void setClientName(String clientName) {
724724
this.clientName = Optional.of(clientName);
725725
}
726726

727727
/**
728728
* @deprecated use the {@link #credentials()} method instead
729729
*/
730-
@Deprecated(since = "3.18")
730+
@Deprecated(since = "3.18", forRemoval = true)
731731
public Credentials getCredentials() {
732732
return credentials;
733733
}
734734

735735
/**
736736
* @deprecated use {@link io.quarkus.oidc.common.runtime.config.OidcClientCommonConfigBuilder}
737737
*/
738-
@Deprecated(since = "3.18")
738+
@Deprecated(since = "3.18", forRemoval = true)
739739
public void setCredentials(Credentials credentials) {
740740
this.credentials = credentials;
741741
}

0 commit comments

Comments
 (0)