Skip to content

Update dependencies and remove deprecations #47

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

Merged
RaHery merged 12 commits into from
Nov 4, 2019
Merged

Update dependencies and remove deprecations #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3663364
Update Gradle to latest 5.x
Oct 25, 2019
96c53b1
Update compile dependencies
Oct 25, 2019
1dfe28c
Update Mockito and fix tests
Oct 25, 2019
1afbd9a
Update deps in discovery-client
Oct 25, 2019
57550ed
Remove all code related to RPC (not supported)
Oct 25, 2019
262a156
Update Mockito calls for deprecations
Oct 25, 2019
1d8e722
Remove restricted servlet init param and related peer authenticators
Oct 25, 2019
61e2634
Remove deprecated root and backendRoot on @Api
Oct 25, 2019
a55b613
Remove deprecated method level cache control
Oct 25, 2019
a34f82f
Remove code for legacy servlet mode
Oct 25, 2019
370e08f
Various code updates for deprecated methods
Oct 25, 2019
4088d76
Update to 2.4.0
Oct 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions discovery-client/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ apply plugin: 'maven'

group = 'com.google.apis'
archivesBaseName = 'google-api-services-discovery'
version = 'v1-rev20151119-1.20.0'
version = 'v1-rev20190129-1.30.1'

sourceCompatibility = 1.6
targetCompatibility = 1.6
sourceCompatibility = 1.8
targetCompatibility = 1.8
jar.manifest.attributes("Built-By": "Google")
jar.manifest.attributes("Build-Jdk": "1.6.x")
jar.manifest.attributes("Build-Jdk": "1.8.x")

task sourceJar(type: Jar) {
classifier = 'sources'
Expand All @@ -40,11 +40,11 @@ repositories {
}

dependencies {
compile module(group: 'com.google.api-client', name: 'google-api-client', version: '1.21.0') {
module(group: 'com.google.http-client', name: 'google-http-client-jackson2', version: '1.21.0') {
dependency('com.fasterxml.jackson.core:jackson-core:2.6.4')
dependency('com.google.http-client:google-http-client:1.21.0')
compile module(group: 'com.google.api-client', name: 'google-api-client', version: "1.30.4") {
module(group: 'com.google.http-client', name: 'google-http-client-jackson2', version: "1.32.1") {
dependency("com.fasterxml.jackson.core:jackson-core:2.10.0")
dependency("com.google.http-client:google-http-client:1.32.1")
}
dependency('com.google.oauth-client:google-oauth-client:1.21.0')
dependency("com.google.oauth-client:google-oauth-client:1.30.4")
}
}
206 changes: 2 additions & 204 deletions discovery-client/src/main/java/com/google/api/services/discovery/Discovery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,85 +295,7 @@ public GenerateRest set(String parameterName, Object value) {
return (GenerateRest) super.set(parameterName, value);
}
}
/**
* Generates the Discovery Document of an API given its configuration.
*
* Create a request for the method "apis.generateRpc".
*
* This request holds the parameters needed by the discovery server. After setting any optional
* parameters, call the {@link GenerateRpc#execute()} method to invoke the remote operation.
*
* @param content the {@link com.google.api.services.discovery.model.ApiConfig}
* @return the request
*/
public GenerateRpc generateRpc(com.google.api.services.discovery.model.ApiConfig content) throws java.io.IOException {
GenerateRpc result = new GenerateRpc(content);
initialize(result);
return result;
}

public class GenerateRpc extends DiscoveryRequest<com.google.api.services.discovery.model.RpcDescription> {

private static final String REST_PATH = "apis/generate/rpc";

/**
* Generates the Discovery Document of an API given its configuration.
*
* Create a request for the method "apis.generateRpc".
*
* This request holds the parameters needed by the the discovery server. After setting any
* optional parameters, call the {@link GenerateRpc#execute()} method to invoke the remote
* operation. <p> {@link
* GenerateRpc#initialize(com.google.api.client.googleapis.services.AbstractGoogleClientRequest)}
* must be called to initialize this instance immediately after invoking the constructor. </p>
*
* @param content the {@link com.google.api.services.discovery.model.ApiConfig}
* @since 1.13
*/
protected GenerateRpc(com.google.api.services.discovery.model.ApiConfig content) {
super(Discovery.this, "POST", REST_PATH, content, com.google.api.services.discovery.model.RpcDescription.class);
}

@Override
public GenerateRpc setAlt(java.lang.String alt) {
return (GenerateRpc) super.setAlt(alt);
}

@Override
public GenerateRpc setFields(java.lang.String fields) {
return (GenerateRpc) super.setFields(fields);
}

@Override
public GenerateRpc setKey(java.lang.String key) {
return (GenerateRpc) super.setKey(key);
}

@Override
public GenerateRpc setOauthToken(java.lang.String oauthToken) {
return (GenerateRpc) super.setOauthToken(oauthToken);
}

@Override
public GenerateRpc setPrettyPrint(java.lang.Boolean prettyPrint) {
return (GenerateRpc) super.setPrettyPrint(prettyPrint);
}

@Override
public GenerateRpc setQuotaUser(java.lang.String quotaUser) {
return (GenerateRpc) super.setQuotaUser(quotaUser);
}

@Override
public GenerateRpc setUserIp(java.lang.String userIp) {
return (GenerateRpc) super.setUserIp(userIp);
}

@Override
public GenerateRpc set(String parameterName, Object value) {
return (GenerateRpc) super.set(parameterName, value);
}
}

/**
* Retrieve the description of a particular version of an api.
*
Expand Down Expand Up @@ -499,131 +421,7 @@ public GetRest set(String parameterName, Object value) {
return (GetRest) super.set(parameterName, value);
}
}
/**
* Retrieve the description of a particular version of an api.
*
* Create a request for the method "apis.getRpc".
*
* This request holds the parameters needed by the discovery server. After setting any optional
* parameters, call the {@link GetRpc#execute()} method to invoke the remote operation.
*
* @param api The name of the API.
* @param version The version of the API.
* @return the request
*/
public GetRpc getRpc(java.lang.String api, java.lang.String version) throws java.io.IOException {
GetRpc result = new GetRpc(api, version);
initialize(result);
return result;
}

public class GetRpc extends DiscoveryRequest<com.google.api.services.discovery.model.RpcDescription> {

private static final String REST_PATH = "apis/{api}/{version}/rpc";

/**
* Retrieve the description of a particular version of an api.
*
* Create a request for the method "apis.getRpc".
*
* This request holds the parameters needed by the the discovery server. After setting any
* optional parameters, call the {@link GetRpc#execute()} method to invoke the remote operation.
* <p> {@link
* GetRpc#initialize(com.google.api.client.googleapis.services.AbstractGoogleClientRequest)} must
* be called to initialize this instance immediately after invoking the constructor. </p>
*
* @param api The name of the API.
* @param version The version of the API.
* @since 1.13
*/
protected GetRpc(java.lang.String api, java.lang.String version) {
super(Discovery.this, "GET", REST_PATH, null, com.google.api.services.discovery.model.RpcDescription.class);
this.api = com.google.api.client.util.Preconditions.checkNotNull(api, "Required parameter api must be specified.");
this.version = com.google.api.client.util.Preconditions.checkNotNull(version, "Required parameter version must be specified.");
}

@Override
public com.google.api.client.http.HttpResponse executeUsingHead() throws java.io.IOException {
return super.executeUsingHead();
}

@Override
public com.google.api.client.http.HttpRequest buildHttpRequestUsingHead() throws java.io.IOException {
return super.buildHttpRequestUsingHead();
}

@Override
public GetRpc setAlt(java.lang.String alt) {
return (GetRpc) super.setAlt(alt);
}

@Override
public GetRpc setFields(java.lang.String fields) {
return (GetRpc) super.setFields(fields);
}

@Override
public GetRpc setKey(java.lang.String key) {
return (GetRpc) super.setKey(key);
}

@Override
public GetRpc setOauthToken(java.lang.String oauthToken) {
return (GetRpc) super.setOauthToken(oauthToken);
}

@Override
public GetRpc setPrettyPrint(java.lang.Boolean prettyPrint) {
return (GetRpc) super.setPrettyPrint(prettyPrint);
}

@Override
public GetRpc setQuotaUser(java.lang.String quotaUser) {
return (GetRpc) super.setQuotaUser(quotaUser);
}

@Override
public GetRpc setUserIp(java.lang.String userIp) {
return (GetRpc) super.setUserIp(userIp);
}

/** The name of the API. */
@com.google.api.client.util.Key
private java.lang.String api;

/** The name of the API.
*/
public java.lang.String getApi() {
return api;
}

/** The name of the API. */
public GetRpc setApi(java.lang.String api) {
this.api = api;
return this;
}

/** The version of the API. */
@com.google.api.client.util.Key
private java.lang.String version;

/** The version of the API.
*/
public java.lang.String getVersion() {
return version;
}

/** The version of the API. */
public GetRpc setVersion(java.lang.String version) {
this.version = version;
return this;
}

@Override
public GetRpc set(String parameterName, Object value) {
return (GetRpc) super.set(parameterName, value);
}
}

/**
* Retrieve the list of APIs supported at this endpoint.
*
Expand Down
Loading