From 668af0c8671eb86d734ca74568a5fed79b659c93 Mon Sep 17 00:00:00 2001 From: Andrea Lin Date: Tue, 29 Jan 2019 09:06:08 -0800 Subject: [PATCH] add SERVICE_ADDRESS to generated resource names toString() --- .../com/google/api/codegen/java/resource_name.snip | 2 +- .../java/java_simplecompute.v1.json.baseline | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/resources/com/google/api/codegen/java/resource_name.snip b/src/main/resources/com/google/api/codegen/java/resource_name.snip index 9fa3929fb4..95d0197f34 100644 --- a/src/main/resources/com/google/api/codegen/java/resource_name.snip +++ b/src/main/resources/com/google/api/codegen/java/resource_name.snip @@ -101,7 +101,7 @@ @private toString(resourceName) @@Override public String toString() { - return PATH_TEMPLATE.instantiate( + return SERVICE_ADDRESS + PATH_TEMPLATE.instantiate( @join property : resourceName.pathParams on ",".add(BREAK) "{@property.name}", {@property.name} @end diff --git a/src/test/java/com/google/api/codegen/discogapic/testdata/java/java_simplecompute.v1.json.baseline b/src/test/java/com/google/api/codegen/discogapic/testdata/java/java_simplecompute.v1.json.baseline index 9c127d1af5..e1c89ce7f5 100644 --- a/src/test/java/com/google/api/codegen/discogapic/testdata/java/java_simplecompute.v1.json.baseline +++ b/src/test/java/com/google/api/codegen/discogapic/testdata/java/java_simplecompute.v1.json.baseline @@ -167,7 +167,7 @@ public final class ProjectDummyObjectName implements ResourceName { @Override public String toString() { - return PATH_TEMPLATE.instantiate( + return SERVICE_ADDRESS + PATH_TEMPLATE.instantiate( "dummyObject", dummyObject, "project", project ); @@ -366,7 +366,7 @@ public final class ProjectDummyObjectResourceName implements ResourceName { @Override public String toString() { - return PATH_TEMPLATE.instantiate( + return SERVICE_ADDRESS + PATH_TEMPLATE.instantiate( "project", project, "resource", resource ); @@ -565,7 +565,7 @@ public final class ProjectGlobalAddressName implements ResourceName { @Override public String toString() { - return PATH_TEMPLATE.instantiate( + return SERVICE_ADDRESS + PATH_TEMPLATE.instantiate( "address", address, "project", project ); @@ -743,7 +743,7 @@ public final class ProjectName implements ResourceName { @Override public String toString() { - return PATH_TEMPLATE.instantiate( + return SERVICE_ADDRESS + PATH_TEMPLATE.instantiate( "project", project ); } @@ -960,7 +960,7 @@ public final class ProjectRegionAddressName implements ResourceName { @Override public String toString() { - return PATH_TEMPLATE.instantiate( + return SERVICE_ADDRESS + PATH_TEMPLATE.instantiate( "address", address, "project", project, "region", region @@ -1162,7 +1162,7 @@ public final class ProjectRegionName implements ResourceName { @Override public String toString() { - return PATH_TEMPLATE.instantiate( + return SERVICE_ADDRESS + PATH_TEMPLATE.instantiate( "project", project, "region", region );