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

Regenerate google-cloud-compute #4213

Merged
merged 2 commits into from
Dec 17, 2018
Merged

Regenerate google-cloud-compute #4213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8019ee7
regen from gapic-generator:fix_resource_name_parsing and from the cor…
andreamlin Dec 11, 2018
c0d6aaf
remove trimUrl() hack from ITComputeTest.java
andreamlin Dec 11, 2018
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
16 changes: 13 additions & 3 deletions ...gle-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalAddressName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ public final class ProjectGlobalAddressName implements ResourceName {
private final String address;
private final String project;
private static final PathTemplate PATH_TEMPLATE =
PathTemplate.createWithoutUrlEncoding("projects/{project}/global/addresses/{address}");
PathTemplate.createWithoutUrlEncoding("{project}/global/addresses/{address}");

public static final String SERVICE_ADDRESS = "https://www.googleapis.com/compute/v1/projects/";

private volatile Map<String, String> fieldValuesMap;

Expand Down Expand Up @@ -92,14 +94,22 @@ public ProjectGlobalAddressName parse(String formattedString) {
}

public static ProjectGlobalAddressName parse(String formattedString) {
String resourcePath = formattedString;
if (formattedString.startsWith(SERVICE_ADDRESS)) {
resourcePath = formattedString.substring(SERVICE_ADDRESS.length());
}
Map<String, String> matchMap =
PATH_TEMPLATE.validatedMatch(
formattedString, "ProjectGlobalAddressName.parse: formattedString not in valid format");
resourcePath, "ProjectGlobalAddressName.parse: formattedString not in valid format");
return of(matchMap.get("address"), matchMap.get("project"));
}

public static boolean isParsableFrom(String formattedString) {
return PATH_TEMPLATE.matches(formattedString);
String resourcePath = formattedString;
if (formattedString.startsWith(SERVICE_ADDRESS)) {
resourcePath = formattedString.substring(SERVICE_ADDRESS.length());
}
return PATH_TEMPLATE.matches(resourcePath);
}

public static class Builder {
Expand Down
17 changes: 13 additions & 4 deletions ...oud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalBackendBucketName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@ public final class ProjectGlobalBackendBucketName implements ResourceName {
private final String backendBucket;
private final String project;
private static final PathTemplate PATH_TEMPLATE =
PathTemplate.createWithoutUrlEncoding(
"projects/{project}/global/backendBuckets/{backendBucket}");
PathTemplate.createWithoutUrlEncoding("{project}/global/backendBuckets/{backendBucket}");

public static final String SERVICE_ADDRESS = "https://www.googleapis.com/compute/v1/projects/";

private volatile Map<String, String> fieldValuesMap;

Expand Down Expand Up @@ -93,15 +94,23 @@ public ProjectGlobalBackendBucketName parse(String formattedString) {
}

public static ProjectGlobalBackendBucketName parse(String formattedString) {
String resourcePath = formattedString;
if (formattedString.startsWith(SERVICE_ADDRESS)) {
resourcePath = formattedString.substring(SERVICE_ADDRESS.length());
}
Map<String, String> matchMap =
PATH_TEMPLATE.validatedMatch(
formattedString,
resourcePath,
"ProjectGlobalBackendBucketName.parse: formattedString not in valid format");
return of(matchMap.get("backendBucket"), matchMap.get("project"));
}

public static boolean isParsableFrom(String formattedString) {
return PATH_TEMPLATE.matches(formattedString);
String resourcePath = formattedString;
if (formattedString.startsWith(SERVICE_ADDRESS)) {
resourcePath = formattedString.substring(SERVICE_ADDRESS.length());
}
return PATH_TEMPLATE.matches(resourcePath);
}

public static class Builder {
Expand Down
17 changes: 13 additions & 4 deletions ...ud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalBackendServiceName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@ public final class ProjectGlobalBackendServiceName implements ResourceName {
private final String backendService;
private final String project;
private static final PathTemplate PATH_TEMPLATE =
PathTemplate.createWithoutUrlEncoding(
"projects/{project}/global/backendServices/{backendService}");
PathTemplate.createWithoutUrlEncoding("{project}/global/backendServices/{backendService}");

public static final String SERVICE_ADDRESS = "https://www.googleapis.com/compute/v1/projects/";

private volatile Map<String, String> fieldValuesMap;

Expand Down Expand Up @@ -93,15 +94,23 @@ public ProjectGlobalBackendServiceName parse(String formattedString) {
}

public static ProjectGlobalBackendServiceName parse(String formattedString) {
String resourcePath = formattedString;
if (formattedString.startsWith(SERVICE_ADDRESS)) {
resourcePath = formattedString.substring(SERVICE_ADDRESS.length());
}
Map<String, String> matchMap =
PATH_TEMPLATE.validatedMatch(
formattedString,
resourcePath,
"ProjectGlobalBackendServiceName.parse: formattedString not in valid format");
return of(matchMap.get("backendService"), matchMap.get("project"));
}

public static boolean isParsableFrom(String formattedString) {
return PATH_TEMPLATE.matches(formattedString);
String resourcePath = formattedString;
if (formattedString.startsWith(SERVICE_ADDRESS)) {
resourcePath = formattedString.substring(SERVICE_ADDRESS.length());
}
return PATH_TEMPLATE.matches(resourcePath);
}

public static class Builder {
Expand Down
17 changes: 13 additions & 4 deletions ...le-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalFirewallName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ public final class ProjectGlobalFirewallName implements ResourceName {
private final String firewall;
private final String project;
private static final PathTemplate PATH_TEMPLATE =
PathTemplate.createWithoutUrlEncoding("projects/{project}/global/firewalls/{firewall}");
PathTemplate.createWithoutUrlEncoding("{project}/global/firewalls/{firewall}");

public static final String SERVICE_ADDRESS = "https://www.googleapis.com/compute/v1/projects/";

private volatile Map<String, String> fieldValuesMap;

Expand Down Expand Up @@ -92,15 +94,22 @@ public ProjectGlobalFirewallName parse(String formattedString) {
}

public static ProjectGlobalFirewallName parse(String formattedString) {
String resourcePath = formattedString;
if (formattedString.startsWith(SERVICE_ADDRESS)) {
resourcePath = formattedString.substring(SERVICE_ADDRESS.length());
}
Map<String, String> matchMap =
PATH_TEMPLATE.validatedMatch(
formattedString,
"ProjectGlobalFirewallName.parse: formattedString not in valid format");
resourcePath, "ProjectGlobalFirewallName.parse: formattedString not in valid format");
return of(matchMap.get("firewall"), matchMap.get("project"));
}

public static boolean isParsableFrom(String formattedString) {
return PATH_TEMPLATE.matches(formattedString);
String resourcePath = formattedString;
if (formattedString.startsWith(SERVICE_ADDRESS)) {
resourcePath = formattedString.substring(SERVICE_ADDRESS.length());
}
return PATH_TEMPLATE.matches(resourcePath);
}

public static class Builder {
Expand Down
17 changes: 13 additions & 4 deletions ...ud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalForwardingRuleName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@ public final class ProjectGlobalForwardingRuleName implements ResourceName {
private final String forwardingRule;
private final String project;
private static final PathTemplate PATH_TEMPLATE =
PathTemplate.createWithoutUrlEncoding(
"projects/{project}/global/forwardingRules/{forwardingRule}");
PathTemplate.createWithoutUrlEncoding("{project}/global/forwardingRules/{forwardingRule}");

public static final String SERVICE_ADDRESS = "https://www.googleapis.com/compute/v1/projects/";

private volatile Map<String, String> fieldValuesMap;

Expand Down Expand Up @@ -93,15 +94,23 @@ public ProjectGlobalForwardingRuleName parse(String formattedString) {
}

public static ProjectGlobalForwardingRuleName parse(String formattedString) {
String resourcePath = formattedString;
if (formattedString.startsWith(SERVICE_ADDRESS)) {
resourcePath = formattedString.substring(SERVICE_ADDRESS.length());
}
Map<String, String> matchMap =
PATH_TEMPLATE.validatedMatch(
formattedString,
resourcePath,
"ProjectGlobalForwardingRuleName.parse: formattedString not in valid format");
return of(matchMap.get("forwardingRule"), matchMap.get("project"));
}

public static boolean isParsableFrom(String formattedString) {
return PATH_TEMPLATE.matches(formattedString);
String resourcePath = formattedString;
if (formattedString.startsWith(SERVICE_ADDRESS)) {
resourcePath = formattedString.substring(SERVICE_ADDRESS.length());
}
return PATH_TEMPLATE.matches(resourcePath);
}

public static class Builder {
Expand Down
16 changes: 13 additions & 3 deletions ...cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalHealthCheckName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ public final class ProjectGlobalHealthCheckName implements ResourceName {
private final String healthCheck;
private final String project;
private static final PathTemplate PATH_TEMPLATE =
PathTemplate.createWithoutUrlEncoding("projects/{project}/global/healthChecks/{healthCheck}");
PathTemplate.createWithoutUrlEncoding("{project}/global/healthChecks/{healthCheck}");

public static final String SERVICE_ADDRESS = "https://www.googleapis.com/compute/v1/projects/";

private volatile Map<String, String> fieldValuesMap;

Expand Down Expand Up @@ -92,15 +94,23 @@ public ProjectGlobalHealthCheckName parse(String formattedString) {
}

public static ProjectGlobalHealthCheckName parse(String formattedString) {
String resourcePath = formattedString;
if (formattedString.startsWith(SERVICE_ADDRESS)) {
resourcePath = formattedString.substring(SERVICE_ADDRESS.length());
}
Map<String, String> matchMap =
PATH_TEMPLATE.validatedMatch(
formattedString,
resourcePath,
"ProjectGlobalHealthCheckName.parse: formattedString not in valid format");
return of(matchMap.get("healthCheck"), matchMap.get("project"));
}

public static boolean isParsableFrom(String formattedString) {
return PATH_TEMPLATE.matches(formattedString);
String resourcePath = formattedString;
if (formattedString.startsWith(SERVICE_ADDRESS)) {
resourcePath = formattedString.substring(SERVICE_ADDRESS.length());
}
return PATH_TEMPLATE.matches(resourcePath);
}

public static class Builder {
Expand Down
17 changes: 13 additions & 4 deletions ...d-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalHttpHealthCheckName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@ public final class ProjectGlobalHttpHealthCheckName implements ResourceName {
private final String httpHealthCheck;
private final String project;
private static final PathTemplate PATH_TEMPLATE =
PathTemplate.createWithoutUrlEncoding(
"projects/{project}/global/httpHealthChecks/{httpHealthCheck}");
PathTemplate.createWithoutUrlEncoding("{project}/global/httpHealthChecks/{httpHealthCheck}");

public static final String SERVICE_ADDRESS = "https://www.googleapis.com/compute/v1/projects/";

private volatile Map<String, String> fieldValuesMap;

Expand Down Expand Up @@ -93,15 +94,23 @@ public ProjectGlobalHttpHealthCheckName parse(String formattedString) {
}

public static ProjectGlobalHttpHealthCheckName parse(String formattedString) {
String resourcePath = formattedString;
if (formattedString.startsWith(SERVICE_ADDRESS)) {
resourcePath = formattedString.substring(SERVICE_ADDRESS.length());
}
Map<String, String> matchMap =
PATH_TEMPLATE.validatedMatch(
formattedString,
resourcePath,
"ProjectGlobalHttpHealthCheckName.parse: formattedString not in valid format");
return of(matchMap.get("httpHealthCheck"), matchMap.get("project"));
}

public static boolean isParsableFrom(String formattedString) {
return PATH_TEMPLATE.matches(formattedString);
String resourcePath = formattedString;
if (formattedString.startsWith(SERVICE_ADDRESS)) {
resourcePath = formattedString.substring(SERVICE_ADDRESS.length());
}
return PATH_TEMPLATE.matches(resourcePath);
}

public static class Builder {
Expand Down
16 changes: 13 additions & 3 deletions ...-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalHttpsHealthCheckName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ public final class ProjectGlobalHttpsHealthCheckName implements ResourceName {
private final String project;
private static final PathTemplate PATH_TEMPLATE =
PathTemplate.createWithoutUrlEncoding(
"projects/{project}/global/httpsHealthChecks/{httpsHealthCheck}");
"{project}/global/httpsHealthChecks/{httpsHealthCheck}");

public static final String SERVICE_ADDRESS = "https://www.googleapis.com/compute/v1/projects/";

private volatile Map<String, String> fieldValuesMap;

Expand Down Expand Up @@ -93,15 +95,23 @@ public ProjectGlobalHttpsHealthCheckName parse(String formattedString) {
}

public static ProjectGlobalHttpsHealthCheckName parse(String formattedString) {
String resourcePath = formattedString;
if (formattedString.startsWith(SERVICE_ADDRESS)) {
resourcePath = formattedString.substring(SERVICE_ADDRESS.length());
}
Map<String, String> matchMap =
PATH_TEMPLATE.validatedMatch(
formattedString,
resourcePath,
"ProjectGlobalHttpsHealthCheckName.parse: formattedString not in valid format");
return of(matchMap.get("httpsHealthCheck"), matchMap.get("project"));
}

public static boolean isParsableFrom(String formattedString) {
return PATH_TEMPLATE.matches(formattedString);
String resourcePath = formattedString;
if (formattedString.startsWith(SERVICE_ADDRESS)) {
resourcePath = formattedString.substring(SERVICE_ADDRESS.length());
}
return PATH_TEMPLATE.matches(resourcePath);
}

public static class Builder {
Expand Down
16 changes: 13 additions & 3 deletions ...cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalImageFamilyName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ public final class ProjectGlobalImageFamilyName implements ResourceName {
private final String family;
private final String project;
private static final PathTemplate PATH_TEMPLATE =
PathTemplate.createWithoutUrlEncoding("projects/{project}/global/images/family/{family}");
PathTemplate.createWithoutUrlEncoding("{project}/global/images/family/{family}");

public static final String SERVICE_ADDRESS = "https://www.googleapis.com/compute/v1/projects/";

private volatile Map<String, String> fieldValuesMap;

Expand Down Expand Up @@ -92,15 +94,23 @@ public ProjectGlobalImageFamilyName parse(String formattedString) {
}

public static ProjectGlobalImageFamilyName parse(String formattedString) {
String resourcePath = formattedString;
if (formattedString.startsWith(SERVICE_ADDRESS)) {
resourcePath = formattedString.substring(SERVICE_ADDRESS.length());
}
Map<String, String> matchMap =
PATH_TEMPLATE.validatedMatch(
formattedString,
resourcePath,
"ProjectGlobalImageFamilyName.parse: formattedString not in valid format");
return of(matchMap.get("family"), matchMap.get("project"));
}

public static boolean isParsableFrom(String formattedString) {
return PATH_TEMPLATE.matches(formattedString);
String resourcePath = formattedString;
if (formattedString.startsWith(SERVICE_ADDRESS)) {
resourcePath = formattedString.substring(SERVICE_ADDRESS.length());
}
return PATH_TEMPLATE.matches(resourcePath);
}

public static class Builder {
Expand Down
16 changes: 13 additions & 3 deletions ...oogle-cloud-compute/src/main/java/com/google/cloud/compute/v1/ProjectGlobalImageName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ public final class ProjectGlobalImageName implements ResourceName {
private final String image;
private final String project;
private static final PathTemplate PATH_TEMPLATE =
PathTemplate.createWithoutUrlEncoding("projects/{project}/global/images/{image}");
PathTemplate.createWithoutUrlEncoding("{project}/global/images/{image}");

public static final String SERVICE_ADDRESS = "https://www.googleapis.com/compute/v1/projects/";

private volatile Map<String, String> fieldValuesMap;

Expand Down Expand Up @@ -92,14 +94,22 @@ public ProjectGlobalImageName parse(String formattedString) {
}

public static ProjectGlobalImageName parse(String formattedString) {
String resourcePath = formattedString;
if (formattedString.startsWith(SERVICE_ADDRESS)) {
resourcePath = formattedString.substring(SERVICE_ADDRESS.length());
}
Map<String, String> matchMap =
PATH_TEMPLATE.validatedMatch(
formattedString, "ProjectGlobalImageName.parse: formattedString not in valid format");
resourcePath, "ProjectGlobalImageName.parse: formattedString not in valid format");
return of(matchMap.get("image"), matchMap.get("project"));
}

public static boolean isParsableFrom(String formattedString) {
return PATH_TEMPLATE.matches(formattedString);
String resourcePath = formattedString;
if (formattedString.startsWith(SERVICE_ADDRESS)) {
resourcePath = formattedString.substring(SERVICE_ADDRESS.length());
}
return PATH_TEMPLATE.matches(resourcePath);
}

public static class Builder {
Expand Down
Loading