diff --git a/clirr-ignored-differences.xml b/clirr-ignored-differences.xml index 9bf04bd17..0f0a72edf 100644 --- a/clirr-ignored-differences.xml +++ b/clirr-ignored-differences.xml @@ -1,7 +1,16 @@ - + + 7002 + com/google/api/client/json/webtoken/* + java.lang.String getX509Certificate() + + + 7002 + com/google/api/client/json/webtoken/* + com.google.api.client.json.webtoken.JsonWebSignature$Header setX509Certificate(java.lang.String) + 7002 com/google/api/client/testing/http/MockHttpTransport diff --git a/google-http-client/src/main/java/com/google/api/client/json/webtoken/JsonWebSignature.java b/google-http-client/src/main/java/com/google/api/client/json/webtoken/JsonWebSignature.java index 727e93569..7e3990d40 100644 --- a/google-http-client/src/main/java/com/google/api/client/json/webtoken/JsonWebSignature.java +++ b/google-http-client/src/main/java/com/google/api/client/json/webtoken/JsonWebSignature.java @@ -277,21 +277,6 @@ public Header setX509Thumbprint(String x509Thumbprint) { return this; } - /** - * Returns the X.509 certificate chain header parameter contains the X.509 public key - * certificate or corresponding to the key used to digitally sign the JWS or {@code null} for - * none. - * - *

@deprecated Since release 1.19.1, replaced by {@link #getX509Certificates()}. - */ - @Deprecated - public final String getX509Certificate() { - if (x509Certificates == null || x509Certificates.isEmpty()) { - return null; - } - return x509Certificates.get(0); - } - /** * Returns the X.509 certificate chain header parameter contains the X.509 public key * certificate or certificate chain corresponding to the key used to digitally sign the JWS or @@ -303,24 +288,6 @@ public final List getX509Certificates() { return new ArrayList<>(x509Certificates); } - /** - * Sets the X.509 certificate chain header parameter contains the X.509 public key certificate - * corresponding to the key used to digitally sign the JWS or {@code null} for none. - * - *

Overriding is only supported for the purpose of calling the super implementation and - * changing the return type, but nothing else. - * - *

@deprecated Since release 1.19.1, replaced by {@link #setX509Certificates(List - * x509Certificates)}. - */ - @Deprecated - public Header setX509Certificate(String x509Certificate) { - ArrayList x509Certificates = new ArrayList(); - x509Certificates.add(x509Certificate); - this.x509Certificates = x509Certificates; - return this; - } - /** * Sets the X.509 certificate chain header parameter contains the X.509 public key certificate * or certificate chain corresponding to the key used to digitally sign the JWS or {@code null}