From a13f6c88564266528c318fc7e39f9e3da10c42d2 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Wed, 7 Aug 2019 12:30:26 -0400 Subject: [PATCH 1/5] remove deprecated methods --- .../json/webtoken/JsonWebSignature.java | 33 ------------------- 1 file changed, 33 deletions(-) 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} From a460171cba1829614128bdfd59e4d6d5ba77f16e Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Wed, 7 Aug 2019 12:53:26 -0400 Subject: [PATCH 2/5] ignore differences --- clirr-ignored-differences.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/clirr-ignored-differences.xml b/clirr-ignored-differences.xml index bb01b2b4d..ef545a671 100644 --- a/clirr-ignored-differences.xml +++ b/clirr-ignored-differences.xml @@ -2,6 +2,17 @@ + + 7002 + com/google/api/client/json/webtoken/JsonWebSignature/Header + getX509Certificate + + + 7002 + com/google/api/client/json/webtoken/JsonWebSignature/Header + setX509Certificate + + 8001 From 20e9a73bf6124f63803557c4a0617a9d65cd0f8c Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Wed, 7 Aug 2019 12:58:08 -0400 Subject: [PATCH 3/5] full method signature --- clirr-ignored-differences.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clirr-ignored-differences.xml b/clirr-ignored-differences.xml index ef545a671..4ff797284 100644 --- a/clirr-ignored-differences.xml +++ b/clirr-ignored-differences.xml @@ -5,12 +5,12 @@ 7002 com/google/api/client/json/webtoken/JsonWebSignature/Header - getX509Certificate + String getX509Certificate() 7002 com/google/api/client/json/webtoken/JsonWebSignature/Header - setX509Certificate + Header setX509Certificate(String) From ffc7f0578c2c9e4dbc71e8a8ccb2c8dbbbea75c0 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Wed, 7 Aug 2019 13:05:42 -0400 Subject: [PATCH 4/5] package qulify types --- clirr-ignored-differences.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clirr-ignored-differences.xml b/clirr-ignored-differences.xml index 4ff797284..d7b3b1530 100644 --- a/clirr-ignored-differences.xml +++ b/clirr-ignored-differences.xml @@ -5,12 +5,12 @@ 7002 com/google/api/client/json/webtoken/JsonWebSignature/Header - String getX509Certificate() + java.lang.String getX509Certificate() 7002 com/google/api/client/json/webtoken/JsonWebSignature/Header - Header setX509Certificate(String) + com.google.api.client.json.webtoken.JsonWebSignature$Header setX509Certificate(java.lang.String) From 25869120aadb08b1af612edf50ecce1bea2f21ab Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Wed, 7 Aug 2019 13:13:21 -0400 Subject: [PATCH 5/5] fix ignore syntax --- clirr-ignored-differences.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/clirr-ignored-differences.xml b/clirr-ignored-differences.xml index d7b3b1530..0ee7ebcaf 100644 --- a/clirr-ignored-differences.xml +++ b/clirr-ignored-differences.xml @@ -4,13 +4,13 @@ 7002 - com/google/api/client/json/webtoken/JsonWebSignature/Header - java.lang.String getX509Certificate() + com/google/api/client/json/webtoken/* + java.lang.String getX509Certificate() 7002 - com/google/api/client/json/webtoken/JsonWebSignature/Header - com.google.api.client.json.webtoken.JsonWebSignature$Header setX509Certificate(java.lang.String) + com/google/api/client/json/webtoken/* + com.google.api.client.json.webtoken.JsonWebSignature$Header setX509Certificate(java.lang.String)