Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove deprecated methods #769

Merged
merged 6 commits into from Aug 8, 2019
Merged

remove deprecated methods #769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a13f6c8
remove deprecated methods
elharo Aug 7, 2019
a460171
ignore differences
elharo Aug 7, 2019
20e9a73
full method signature
elharo Aug 7, 2019
ffc7f05
package qulify types
elharo Aug 7, 2019
2586912
fix ignore syntax
elharo Aug 7, 2019
6656999
merge to master
elharo Aug 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 10 additions & 1 deletion clirr-ignored-differences.xml
View file
Open in desktop
@@ -1,7 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->

<differences>
<difference>
<differenceType>7002</differenceType>
<className>com/google/api/client/json/webtoken/*</className>
<method>java.lang.String getX509Certificate()</method>
</difference>
<difference>
<differenceType>7002</differenceType>
<className>com/google/api/client/json/webtoken/*</className>
<method>com.google.api.client.json.webtoken.JsonWebSignature$Header setX509Certificate(java.lang.String)</method>
</difference>
<difference>
<differenceType>7002</differenceType>
<className>com/google/api/client/testing/http/MockHttpTransport</className>
Expand Down
33 changes: 0 additions & 33 deletions google-http-client/src/main/java/com/google/api/client/json/webtoken/JsonWebSignature.java
View file
Open in desktop
Expand Up @@ -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.
*
* <p>@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
Expand All @@ -303,24 +288,6 @@ public final List<String> 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.
*
* <p>Overriding is only supported for the purpose of calling the super implementation and
* changing the return type, but nothing else.
*
* <p>@deprecated Since release 1.19.1, replaced by {@link #setX509Certificates(List
* x509Certificates)}.
*/
@Deprecated
public Header setX509Certificate(String x509Certificate) {
ArrayList<String> x509Certificates = new ArrayList<String>();
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}
Expand Down