From 5643ff76263adf834bbfa1ff8494b564dc39e52c Mon Sep 17 00:00:00 2001 From: Praful Makani Date: Thu, 27 Jun 2019 14:44:10 +0530 Subject: [PATCH 1/3] made public ResourceId and added method of() --- .../java/com/google/cloud/resourcemanager/ProjectInfo.java | 6 +++++- .../com/google/cloud/resourcemanager/ProjectInfoTest.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java b/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java index d20c3ccd86e3..53059f436e37 100644 --- a/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java +++ b/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java @@ -106,7 +106,7 @@ public static State[] values() { } } - static class ResourceId implements Serializable { + public static class ResourceId implements Serializable { private static final long serialVersionUID = -325199985993344726L; @@ -118,6 +118,10 @@ static class ResourceId implements Serializable { this.type = checkNotNull(type); } + public static ResourceId of(String id, String type) { + return new ResourceId(checkNotNull(id), checkNotNull(type)); + } + String getId() { return id; } diff --git a/google-cloud-clients/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectInfoTest.java b/google-cloud-clients/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectInfoTest.java index 823f8462faf7..e87956b20813 100644 --- a/google-cloud-clients/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectInfoTest.java +++ b/google-cloud-clients/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectInfoTest.java @@ -33,7 +33,7 @@ public class ProjectInfoTest { private static final Long CREATE_TIME_MILLIS = 123456789L; private static final ProjectInfo.State STATE = ProjectInfo.State.DELETE_REQUESTED; private static final ProjectInfo.ResourceId PARENT = - new ProjectInfo.ResourceId("id", "organization"); + ProjectInfo.ResourceId.of("id", "organization"); private static final ProjectInfo FULL_PROJECT_INFO = ProjectInfo.newBuilder(PROJECT_ID) .setName(NAME) From 9e31ac26bb8b238804b2efe2e49730f31da688ed Mon Sep 17 00:00:00 2001 From: Praful Makani Date: Thu, 27 Jun 2019 15:22:04 +0530 Subject: [PATCH 2/3] fix setParent --- .../java/com/google/cloud/resourcemanager/Project.java | 2 +- .../com/google/cloud/resourcemanager/ProjectInfo.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Project.java b/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Project.java index 1d7bfc1d06b1..fe8b310f6565 100644 --- a/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Project.java +++ b/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Project.java @@ -105,7 +105,7 @@ Builder setCreateTimeMillis(Long createTimeMillis) { } @Override - Builder setParent(ResourceId parent) { + public Builder setParent(ResourceId parent) { infoBuilder.setParent(parent); return this; } diff --git a/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java b/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java index 53059f436e37..7fa020b62a46 100644 --- a/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java +++ b/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java @@ -122,11 +122,11 @@ public static ResourceId of(String id, String type) { return new ResourceId(checkNotNull(id), checkNotNull(type)); } - String getId() { + public String getId() { return id; } - String type() { + public String getType() { return type; } @@ -205,7 +205,7 @@ public abstract static class Builder { abstract Builder setCreateTimeMillis(Long createTimeMillis); - abstract Builder setParent(ResourceId parent); + public abstract Builder setParent(ResourceId parent); public abstract ProjectInfo build(); } @@ -289,7 +289,7 @@ Builder setCreateTimeMillis(Long createTimeMillis) { } @Override - Builder setParent(ResourceId parent) { + public Builder setParent(ResourceId parent) { this.parent = parent; return this; } From 98845298eb2e286db4e50bd748f52c10b024e097 Mon Sep 17 00:00:00 2001 From: Praful Makani Date: Thu, 27 Jun 2019 15:36:03 +0530 Subject: [PATCH 3/3] modified code --- .../java/com/google/cloud/resourcemanager/ProjectInfoTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-clients/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectInfoTest.java b/google-cloud-clients/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectInfoTest.java index e87956b20813..823f8462faf7 100644 --- a/google-cloud-clients/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectInfoTest.java +++ b/google-cloud-clients/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectInfoTest.java @@ -33,7 +33,7 @@ public class ProjectInfoTest { private static final Long CREATE_TIME_MILLIS = 123456789L; private static final ProjectInfo.State STATE = ProjectInfo.State.DELETE_REQUESTED; private static final ProjectInfo.ResourceId PARENT = - ProjectInfo.ResourceId.of("id", "organization"); + new ProjectInfo.ResourceId("id", "organization"); private static final ProjectInfo FULL_PROJECT_INFO = ProjectInfo.newBuilder(PROJECT_ID) .setName(NAME)