diff --git a/README.md b/README.md index c2eea2a7da6a..6db221aedda2 100644 --- a/README.md +++ b/README.md @@ -512,13 +512,13 @@ if (project != null) { .addLabel("launch-status", "in-development") .build() .replace(); - System.out.println("Updated the labels of project " + newProject.projectId() - + " to be " + newProject.labels()); + System.out.println("Updated the labels of project " + newProject.getProjectId() + + " to be " + newProject.getLabels()); } Iterator projectIterator = resourceManager.list().iterateAll(); System.out.println("Projects I can view:"); while (projectIterator.hasNext()) { - System.out.println(projectIterator.next().projectId()); + System.out.println(projectIterator.next().getProjectId()); } ``` diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/resourcemanager/ResourceManagerExample.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/resourcemanager/ResourceManagerExample.java index 118b374d305d..68589ce59582 100644 --- a/google-cloud-examples/src/main/java/com/google/cloud/examples/resourcemanager/ResourceManagerExample.java +++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/resourcemanager/ResourceManagerExample.java @@ -64,7 +64,7 @@ public void run(ResourceManager resourceManager, String... args) { } } Project project = - resourceManager.create(ProjectInfo.builder(projectId).labels(labels).build()); + resourceManager.create(ProjectInfo.newBuilder(projectId).setLabels(labels).build()); System.out.printf( "Successfully created project '%s': %s.%n", projectId, projectDetails(project)); } @@ -160,15 +160,15 @@ public String[] getOptionalParams() { private static String projectDetails(ProjectInfo project) { return new StringBuilder() .append("{projectId:") - .append(project.projectId()) + .append(project.getProjectId()) .append(", projectNumber:") - .append(project.projectNumber()) + .append(project.getProjectNumber()) .append(", createTimeMillis:") - .append(project.createTimeMillis()) + .append(project.getCreateTimeMillis()) .append(", state:") - .append(project.state()) + .append(project.getState()) .append(", labels:") - .append(project.labels()) + .append(project.getLabels()) .append("}") .toString(); } diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/resourcemanager/snippets/GetOrCreateProject.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/resourcemanager/snippets/GetOrCreateProject.java index 796e29bc3b0c..79278c77affe 100644 --- a/google-cloud-examples/src/main/java/com/google/cloud/examples/resourcemanager/snippets/GetOrCreateProject.java +++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/resourcemanager/snippets/GetOrCreateProject.java @@ -42,8 +42,8 @@ public static void main(String... args) { Project project = resourceManager.get(projectId); if (project == null) { // Create a project. - project = resourceManager.create(ProjectInfo.builder(projectId).build()); + project = resourceManager.create(ProjectInfo.newBuilder(projectId).build()); } - System.out.println("Got project " + project.projectId() + " from the server."); + System.out.println("Got project " + project.getProjectId() + " from the server."); } } diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/resourcemanager/snippets/UpdateAndListProjects.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/resourcemanager/snippets/UpdateAndListProjects.java index 2dba787279f2..0a502787316e 100644 --- a/google-cloud-examples/src/main/java/com/google/cloud/examples/resourcemanager/snippets/UpdateAndListProjects.java +++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/resourcemanager/snippets/UpdateAndListProjects.java @@ -48,15 +48,15 @@ public static void main(String... args) { .addLabel("launch-status", "in-development") .build() .replace(); - System.out.println("Updated the labels of project " + newProject.projectId() - + " to be " + newProject.labels()); + System.out.println("Updated the labels of project " + newProject.getProjectId() + + " to be " + newProject.getLabels()); } // List all the projects you have permission to view. Iterator projectIterator = resourceManager.list().iterateAll(); System.out.println("Projects I can view:"); while (projectIterator.hasNext()) { - System.out.println(projectIterator.next().projectId()); + System.out.println(projectIterator.next().getProjectId()); } } } diff --git a/google-cloud-resourcemanager/README.md b/google-cloud-resourcemanager/README.md index c41fb5593577..73ca172f3658 100644 --- a/google-cloud-resourcemanager/README.md +++ b/google-cloud-resourcemanager/README.md @@ -117,7 +117,7 @@ project ID). ```java String projectId = "my-globally-unique-project-id"; // Change to a unique project ID -Project project = resourceManager.create(ProjectInfo.builder(projectId).build()); +Project project = resourceManager.create(ProjectInfo.newBuilder(projectId).build()); ``` Note that the return value from `create` is a `Project` that includes additional read-only @@ -159,7 +159,7 @@ Then add the following code to print a list of projects you can view: Iterator projectIterator = resourceManager.list().iterateAll(); System.out.println("Projects I can view:"); while (projectIterator.hasNext()) { - System.out.println(projectIterator.next().projectId()); + System.out.println(projectIterator.next().getProjectId()); } ``` diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Option.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Option.java index ae53ad7004b4..33a0f0ecafbf 100644 --- a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Option.java +++ b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Option.java @@ -39,11 +39,11 @@ abstract class Option implements Serializable { this.value = value; } - ResourceManagerRpc.Option rpcOption() { + ResourceManagerRpc.Option getRpcOption() { return rpcOption; } - Object value() { + Object getValue() { return value; } diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Project.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Project.java index b24830c983c4..a34765c1c94b 100644 --- a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Project.java +++ b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Project.java @@ -54,14 +54,26 @@ public static class Builder extends ProjectInfo.Builder { } @Override + @Deprecated public Builder name(String name) { - infoBuilder.name(name); + return setName(name); + } + + @Override + public Builder setName(String name) { + infoBuilder.setName(name); return this; } @Override + @Deprecated public Builder projectId(String projectId) { - infoBuilder.projectId(projectId); + return setProjectId(projectId); + } + + @Override + public Builder setProjectId(String projectId) { + infoBuilder.setProjectId(projectId); return this; } @@ -84,32 +96,38 @@ public Builder clearLabels() { } @Override + @Deprecated public Builder labels(Map labels) { - infoBuilder.labels(labels); + return setLabels(labels); + } + + @Override + public Builder setLabels(Map labels) { + infoBuilder.setLabels(labels); return this; } @Override - Builder projectNumber(Long projectNumber) { - infoBuilder.projectNumber(projectNumber); + Builder setProjectNumber(Long projectNumber) { + infoBuilder.setProjectNumber(projectNumber); return this; } @Override - Builder state(State state) { - infoBuilder.state(state); + Builder setState(State state) { + infoBuilder.setState(state); return this; } @Override - Builder createTimeMillis(Long createTimeMillis) { - infoBuilder.createTimeMillis(createTimeMillis); + Builder setCreateTimeMillis(Long createTimeMillis) { + infoBuilder.setCreateTimeMillis(createTimeMillis); return this; } @Override - Builder parent(ResourceId parent) { - infoBuilder.parent(parent); + Builder setParent(ResourceId parent) { + infoBuilder.setParent(parent); return this; } @@ -128,7 +146,15 @@ public Project build() { /** * Returns the {@link ResourceManager} service object associated with this Project. */ + @Deprecated public ResourceManager resourceManager() { + return getResourceManager(); + } + + /** + * Returns the {@link ResourceManager} service object associated with this Project. + */ + public ResourceManager getResourceManager() { return resourceManager; } @@ -140,7 +166,7 @@ public ResourceManager resourceManager() { * @throws ResourceManagerException upon failure */ public Project reload() { - return resourceManager.get(projectId()); + return resourceManager.get(getProjectId()); } /** @@ -166,7 +192,7 @@ public Project reload() { * Resource Manager delete */ public void delete() { - resourceManager.delete(projectId()); + resourceManager.delete(getProjectId()); } /** @@ -183,7 +209,7 @@ public void delete() { * Resource Manager undelete */ public void undelete() { - resourceManager.undelete(projectId()); + resourceManager.undelete(getProjectId()); } /** @@ -212,7 +238,7 @@ public Project replace() { * Resource Manager getIamPolicy */ public Policy getPolicy() { - return resourceManager.getPolicy(projectId()); + return resourceManager.getPolicy(getProjectId()); } /** @@ -227,7 +253,7 @@ public Policy getPolicy() { * Resource Manager setIamPolicy */ public Policy replacePolicy(Policy newPolicy) { - return resourceManager.replacePolicy(projectId(), newPolicy); + return resourceManager.replacePolicy(getProjectId(), newPolicy); } /** @@ -250,7 +276,7 @@ public Policy replacePolicy(Policy newPolicy) { * Services */ List testPermissions(List permissions) { - return resourceManager.testPermissions(projectId(), permissions); + return resourceManager.testPermissions(getProjectId(), permissions); } @Override diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java index a477319a5108..9b8fe7c0cbe0 100644 --- a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java +++ b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java @@ -85,7 +85,7 @@ static class ResourceId implements Serializable { this.type = checkNotNull(type); } - String id() { + String getId() { return id; } @@ -129,8 +129,18 @@ public abstract static class Builder { * uppercase letters, numbers, hyphen, single-quote, double-quote, space, and exclamation point. * This field can be changed after project creation. */ + @Deprecated public abstract Builder name(String name); + /** + * Set the user-assigned name of the project. + * + *

This field is optional and can remain unset. Allowed characters are: lowercase and + * uppercase letters, numbers, hyphen, single-quote, double-quote, space, and exclamation point. + * This field can be changed after project creation. + */ + public abstract Builder setName(String name); + /** * Set the unique, user-assigned ID of the project. * @@ -138,8 +148,18 @@ public abstract static class Builder { * Trailing hyphens are prohibited. This field cannot be changed after the server creates the * project. */ + @Deprecated public abstract Builder projectId(String projectId); + /** + * Set the unique, user-assigned ID of the project. + * + *

The ID must be 6 to 30 lowercase letters, digits, or hyphens. It must start with a letter. + * Trailing hyphens are prohibited. This field cannot be changed after the server creates the + * project. + */ + public abstract Builder setProjectId(String projectId); + /** * Add a label associated with this project. * @@ -166,15 +186,27 @@ public abstract static class Builder { * more than 256 labels can be associated with a given resource. This field can be changed after * project creation. */ + @Deprecated public abstract Builder labels(Map labels); - abstract Builder projectNumber(Long projectNumber); + /** + * Set the labels associated with this project. + * + *

Label keys must be between 1 and 63 characters long and must conform to the following + * regular expression: [a-z]([-a-z0-9]*[a-z0-9])?. Label values must be between 0 and 63 + * characters long and must conform to the regular expression ([a-z]([-a-z0-9]*[a-z0-9])?)?. No + * more than 256 labels can be associated with a given resource. This field can be changed after + * project creation. + */ + public abstract Builder setLabels(Map labels); + + abstract Builder setProjectNumber(Long projectNumber); - abstract Builder state(State state); + abstract Builder setState(State state); - abstract Builder createTimeMillis(Long createTimeMillis); + abstract Builder setCreateTimeMillis(Long createTimeMillis); - abstract Builder parent(ResourceId parent); + abstract Builder setParent(ResourceId parent); public abstract ProjectInfo build(); } @@ -204,13 +236,25 @@ static class BuilderImpl extends Builder { } @Override + @Deprecated public Builder name(String name) { + return setName(name); + } + + @Override + public Builder setName(String name) { this.name = firstNonNull(name, Data.nullOf(String.class)); return this; } @Override + @Deprecated public Builder projectId(String projectId) { + return setProjectId(projectId); + } + + @Override + public Builder setProjectId(String projectId) { this.projectId = checkNotNull(projectId); return this; } @@ -234,31 +278,37 @@ public Builder clearLabels() { } @Override + @Deprecated public Builder labels(Map labels) { + return setLabels(labels); + } + + @Override + public Builder setLabels(Map labels) { this.labels = Maps.newHashMap(checkNotNull(labels)); return this; } @Override - Builder projectNumber(Long projectNumber) { + Builder setProjectNumber(Long projectNumber) { this.projectNumber = projectNumber; return this; } @Override - Builder state(State state) { + Builder setState(State state) { this.state = state; return this; } @Override - Builder createTimeMillis(Long createTimeMillis) { + Builder setCreateTimeMillis(Long createTimeMillis) { this.createTimeMillis = createTimeMillis; return this; } @Override - Builder parent(ResourceId parent) { + Builder setParent(ResourceId parent) { this.parent = parent; return this; } @@ -284,7 +334,17 @@ public ProjectInfo build() { * *

This field cannot be changed after the server creates the project. */ + @Deprecated public String projectId() { + return getProjectId(); + } + + /** + * Get the unique, user-assigned ID of the project. + * + *

This field cannot be changed after the server creates the project. + */ + public String getProjectId() { return projectId; } @@ -293,7 +353,17 @@ public String projectId() { * *

This field is optional, can remain unset, and can be changed after project creation. */ + @Deprecated public String name() { + return getName(); + } + + /** + * Get the user-assigned name of the project. + * + *

This field is optional, can remain unset, and can be changed after project creation. + */ + public String getName() { return Data.isNull(name) ? null : name; } @@ -302,14 +372,32 @@ public String name() { * *

This field is set by the server and is read-only. */ + @Deprecated public Long projectNumber() { + return getProjectNumber(); + } + + /** + * Get number uniquely identifying the project. + * + *

This field is set by the server and is read-only. + */ + public Long getProjectNumber() { return projectNumber; } /** * Get the immutable map of labels associated with this project. */ + @Deprecated public Map labels() { + return getLabels(); + } + + /** + * Get the immutable map of labels associated with this project. + */ + public Map getLabels() { return labels; } @@ -319,11 +407,22 @@ public Map labels() { *

This is a read-only field. To change the lifecycle state of your project, use the * {@code delete} or {@code undelete} method. */ + @Deprecated public State state() { return state; } - ResourceId parent() { + /** + * Get the project's lifecycle state. + * + *

This is a read-only field. To change the lifecycle state of your project, use the + * {@code delete} or {@code undelete} method. + */ + public State getState() { + return state; + } + + ResourceId getParent() { return parent; } @@ -332,7 +431,17 @@ ResourceId parent() { * *

This field is set by the server and is read-only. */ + @Deprecated public Long createTimeMillis() { + return getCreateTimeMillis(); + } + + /** + * Get the project's creation time (in milliseconds). + * + *

This field is set by the server and is read-only. + */ + public Long getCreateTimeMillis() { return createTimeMillis; } @@ -349,7 +458,12 @@ public int hashCode() { return Objects.hash(name, projectId, labels, projectNumber, state, createTimeMillis, parent); } + @Deprecated public static Builder builder(String id) { + return newBuilder(id); + } + + public static Builder newBuilder(String id) { return new BuilderImpl(id); } @@ -377,21 +491,22 @@ com.google.api.services.cloudresourcemanager.model.Project toPb() { } static ProjectInfo fromPb(com.google.api.services.cloudresourcemanager.model.Project projectPb) { - Builder builder = builder(projectPb.getProjectId()).projectNumber(projectPb.getProjectNumber()); + Builder builder = newBuilder(projectPb.getProjectId()) + .setProjectNumber(projectPb.getProjectNumber()); if (projectPb.getName() != null && !projectPb.getName().equals("Unnamed")) { - builder.name(projectPb.getName()); + builder.setName(projectPb.getName()); } if (projectPb.getLabels() != null) { - builder.labels(projectPb.getLabels()); + builder.setLabels(projectPb.getLabels()); } if (projectPb.getLifecycleState() != null) { - builder.state(State.valueOf(projectPb.getLifecycleState())); + builder.setState(State.valueOf(projectPb.getLifecycleState())); } if (projectPb.getCreateTime() != null) { - builder.createTimeMillis(DateTime.parse(projectPb.getCreateTime()).getMillis()); + builder.setCreateTimeMillis(DateTime.parse(projectPb.getCreateTime()).getMillis()); } if (projectPb.getParent() != null) { - builder.parent(ResourceId.fromPb(projectPb.getParent())); + builder.setParent(ResourceId.fromPb(projectPb.getParent())); } return builder.build(); } diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerImpl.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerImpl.java index 7b539be61402..67daa57a02b7 100644 --- a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerImpl.java +++ b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerImpl.java @@ -234,7 +234,7 @@ public List call() { private Map optionMap(Option... options) { Map temp = Maps.newEnumMap(ResourceManagerRpc.Option.class); for (Option option : options) { - Object prev = temp.put(option.rpcOption(), option.value()); + Object prev = temp.put(option.getRpcOption(), option.getValue()); checkArgument(prev == null, "Duplicate option %s", option); } return ImmutableMap.copyOf(temp); diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/package-info.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/package-info.java index 9f6285ceb1e8..3f8d94de756e 100644 --- a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/package-info.java +++ b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/package-info.java @@ -43,13 +43,13 @@ * .addLabel("launch-status", "in-development") * .build() * .replace(); - * System.out.println("Updated the labels of project " + newProject.projectId() - * + " to be " + newProject.labels()); + * System.out.println("Updated the labels of project " + newProject.getProjectId() + * + " to be " + newProject.getLabels()); * } * Iterator projectIterator = resourceManager.list().iterateAll(); * System.out.println("Projects I can view:"); * while (projectIterator.hasNext()) { - * System.out.println(projectIterator.next().projectId()); + * System.out.println(projectIterator.next().getProjectId()); * }} *

Remember that you must authenticate using the Google Cloud SDK. See more about * providing diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java index 48934d602bfe..d794514e1b2f 100644 --- a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java +++ b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java @@ -675,7 +675,15 @@ public static LocalResourceManagerHelper create() { /** * Returns a {@link ResourceManagerOptions} instance that sets the host to use the mock server. */ + @Deprecated public ResourceManagerOptions options() { + return getOptions(); + } + + /** + * Returns a {@link ResourceManagerOptions} instance that sets the host to use the mock server. + */ + public ResourceManagerOptions getOptions() { return ResourceManagerOptions.builder() .host("http://localhost:" + port) .authCredentials(AuthCredentials.noAuth()) diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/package-info.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/package-info.java index d007d00eaeab..b65d84934ac4 100644 --- a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/package-info.java +++ b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/package-info.java @@ -22,7 +22,7 @@ * 

 {@code
  * LocalResourceManagerHelper resourceManagerHelper = LocalResourceManagerHelper.create();
  * resourceManagerHelper.start();
- * ResourceManager resourceManager = resourceManagerHelper.options().service();
+ * ResourceManager resourceManager = resourceManagerHelper.getOptions().service();
  * }
* *

After the test: diff --git a/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/OptionTest.java b/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/OptionTest.java index 097a5c61c13d..352d42998b5b 100644 --- a/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/OptionTest.java +++ b/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/OptionTest.java @@ -55,11 +55,11 @@ public void testHashCode() { @Test public void testConstructor() { - assertEquals(RPC_OPTION, OPTION.rpcOption()); - assertEquals(VALUE, OPTION.value()); + assertEquals(RPC_OPTION, OPTION.getRpcOption()); + assertEquals(VALUE, OPTION.getValue()); Option option = new Option(RPC_OPTION, null) {}; - assertEquals(RPC_OPTION, option.rpcOption()); - assertNull(option.value()); + assertEquals(RPC_OPTION, option.getRpcOption()); + assertNull(option.getValue()); thrown.expect(NullPointerException.class); new Option(null, VALUE) {}; } diff --git a/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectInfoTest.java b/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectInfoTest.java index 2b276f485a72..2d3db2b13364 100644 --- a/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectInfoTest.java +++ b/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectInfoTest.java @@ -36,26 +36,51 @@ public class ProjectInfoTest { private static final ProjectInfo.State STATE = ProjectInfo.State.DELETE_REQUESTED; private static final ProjectInfo.ResourceId PARENT = new ProjectInfo.ResourceId("id", "organization"); - private static final ProjectInfo FULL_PROJECT_INFO = ProjectInfo.builder(PROJECT_ID) + private static final ProjectInfo FULL_PROJECT_INFO = ProjectInfo.newBuilder(PROJECT_ID) + .setName(NAME) + .setLabels(LABELS) + .setProjectNumber(PROJECT_NUMBER) + .setCreateTimeMillis(CREATE_TIME_MILLIS) + .setState(STATE) + .setParent(PARENT) + .build(); + private static final ProjectInfo PARTIAL_PROJECT_INFO = ProjectInfo.newBuilder(PROJECT_ID).build(); + private static final ProjectInfo UNNAMED_PROJECT_FROM_LIST = + PARTIAL_PROJECT_INFO.toBuilder().setName("Unnamed").build(); + private static final ProjectInfo DEPRECATED_PROJECT_INFO = ProjectInfo.builder(PROJECT_ID) .name(NAME) .labels(LABELS) - .projectNumber(PROJECT_NUMBER) - .createTimeMillis(CREATE_TIME_MILLIS) - .state(STATE) - .parent(PARENT) + .setProjectNumber(PROJECT_NUMBER) + .setCreateTimeMillis(CREATE_TIME_MILLIS) + .setState(STATE) + .setParent(PARENT) .build(); - private static final ProjectInfo PARTIAL_PROJECT_INFO = ProjectInfo.builder(PROJECT_ID).build(); - private static final ProjectInfo UNNAMED_PROJECT_FROM_LIST = - PARTIAL_PROJECT_INFO.toBuilder().name("Unnamed").build(); @Test public void testBuilder() { - assertEquals(PROJECT_ID, FULL_PROJECT_INFO.projectId()); - assertEquals(NAME, FULL_PROJECT_INFO.name()); - assertEquals(LABELS, FULL_PROJECT_INFO.labels()); - assertEquals(PROJECT_NUMBER, FULL_PROJECT_INFO.projectNumber()); - assertEquals(CREATE_TIME_MILLIS, FULL_PROJECT_INFO.createTimeMillis()); - assertEquals(STATE, FULL_PROJECT_INFO.state()); + assertEquals(PROJECT_ID, FULL_PROJECT_INFO.getProjectId()); + assertEquals(NAME, FULL_PROJECT_INFO.getName()); + assertEquals(LABELS, FULL_PROJECT_INFO.getLabels()); + assertEquals(PROJECT_NUMBER, FULL_PROJECT_INFO.getProjectNumber()); + assertEquals(CREATE_TIME_MILLIS, FULL_PROJECT_INFO.getCreateTimeMillis()); + assertEquals(STATE, FULL_PROJECT_INFO.getState()); + + assertEquals(PROJECT_ID, PARTIAL_PROJECT_INFO.getProjectId()); + assertEquals(null, PARTIAL_PROJECT_INFO.getName()); + assertTrue(PARTIAL_PROJECT_INFO.getLabels().isEmpty()); + assertEquals(null, PARTIAL_PROJECT_INFO.getProjectNumber()); + assertEquals(null, PARTIAL_PROJECT_INFO.getCreateTimeMillis()); + assertEquals(null, PARTIAL_PROJECT_INFO.getState()); + } + + @Test + public void testBuilderDeprecated() { + assertEquals(PROJECT_ID, DEPRECATED_PROJECT_INFO.projectId()); + assertEquals(NAME, DEPRECATED_PROJECT_INFO.name()); + assertEquals(LABELS, DEPRECATED_PROJECT_INFO.labels()); + assertEquals(PROJECT_NUMBER, DEPRECATED_PROJECT_INFO.projectNumber()); + assertEquals(CREATE_TIME_MILLIS, DEPRECATED_PROJECT_INFO.createTimeMillis()); + assertEquals(STATE, DEPRECATED_PROJECT_INFO.state()); assertEquals(PROJECT_ID, PARTIAL_PROJECT_INFO.projectId()); assertEquals(null, PARTIAL_PROJECT_INFO.name()); @@ -83,27 +108,26 @@ public void testToAndFromPb() { public void testEquals() { compareProjects( FULL_PROJECT_INFO, - ProjectInfo.builder(PROJECT_ID) - .name(NAME) - .labels(LABELS) - .projectNumber(PROJECT_NUMBER) - .createTimeMillis(CREATE_TIME_MILLIS) - .state(STATE) - .parent(PARENT) + ProjectInfo.newBuilder(PROJECT_ID) + .setName(NAME) + .setLabels(LABELS) + .setProjectNumber(PROJECT_NUMBER) + .setCreateTimeMillis(CREATE_TIME_MILLIS) + .setState(STATE) + .setParent(PARENT) .build()); - compareProjects(PARTIAL_PROJECT_INFO, ProjectInfo.builder(PROJECT_ID).build()); + compareProjects(PARTIAL_PROJECT_INFO, ProjectInfo.newBuilder(PROJECT_ID).build()); assertNotEquals(FULL_PROJECT_INFO, PARTIAL_PROJECT_INFO); } private void compareProjects(ProjectInfo expected, ProjectInfo value) { assertEquals(expected, value); - assertEquals(expected.projectId(), value.projectId()); - assertEquals(expected.name(), value.name()); - assertEquals(expected.labels(), value.labels()); - assertEquals(expected.projectNumber(), value.projectNumber()); - assertEquals(expected.createTimeMillis(), value.createTimeMillis()); - assertEquals(expected.state(), value.state()); - assertEquals(expected.parent(), value.parent()); + assertEquals(expected.getProjectId(), value.getProjectId()); + assertEquals(expected.getName(), value.getName()); + assertEquals(expected.getLabels(), value.getLabels()); + assertEquals(expected.getProjectNumber(), value.getProjectNumber()); + assertEquals(expected.getCreateTimeMillis(), value.getCreateTimeMillis()); + assertEquals(expected.getState(), value.getState()); + assertEquals(expected.getParent(), value.getParent()); } } - diff --git a/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectTest.java b/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectTest.java index 195152a87c88..bb23c8e5b1ae 100644 --- a/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectTest.java +++ b/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ProjectTest.java @@ -46,12 +46,12 @@ public class ProjectTest { private static final Long PROJECT_NUMBER = 123L; private static final Long CREATE_TIME_MILLIS = 123456789L; private static final ProjectInfo.State STATE = ProjectInfo.State.DELETE_REQUESTED; - private static final ProjectInfo PROJECT_INFO = ProjectInfo.builder(PROJECT_ID) - .name(NAME) - .labels(LABELS) - .projectNumber(PROJECT_NUMBER) - .createTimeMillis(CREATE_TIME_MILLIS) - .state(STATE) + private static final ProjectInfo PROJECT_INFO = ProjectInfo.newBuilder(PROJECT_ID) + .setName(NAME) + .setLabels(LABELS) + .setProjectNumber(PROJECT_NUMBER) + .setCreateTimeMillis(CREATE_TIME_MILLIS) + .setState(STATE) .build(); private static final Identity USER = Identity.user("abc@gmail.com"); private static final Identity SERVICE_ACCOUNT = @@ -101,45 +101,68 @@ public void testBuilder() { replay(resourceManager); Project.Builder builder = new Project.Builder(new Project(resourceManager, new ProjectInfo.BuilderImpl("wrong-id"))); - Project project = builder.projectId(PROJECT_ID) - .name(NAME) - .labels(LABELS) - .projectNumber(PROJECT_NUMBER) - .createTimeMillis(CREATE_TIME_MILLIS) - .state(STATE) + Project project = builder.setProjectId(PROJECT_ID) + .setName(NAME) + .setLabels(LABELS) + .setProjectNumber(PROJECT_NUMBER) + .setCreateTimeMillis(CREATE_TIME_MILLIS) + .setState(STATE) .build(); - assertEquals(PROJECT_ID, project.projectId()); - assertEquals(NAME, project.name()); - assertEquals(LABELS, project.labels()); - assertEquals(PROJECT_NUMBER, project.projectNumber()); - assertEquals(CREATE_TIME_MILLIS, project.createTimeMillis()); - assertEquals(STATE, project.state()); - assertEquals(resourceManager.options(), project.resourceManager().options()); - assertNull(project.parent()); + assertEquals(PROJECT_ID, project.getProjectId()); + assertEquals(NAME, project.getName()); + assertEquals(LABELS, project.getLabels()); + assertEquals(PROJECT_NUMBER, project.getProjectNumber()); + assertEquals(CREATE_TIME_MILLIS, project.getCreateTimeMillis()); + assertEquals(STATE, project.getState()); + assertEquals(resourceManager.options(), project.getResourceManager().options()); + assertNull(project.getParent()); ResourceId parent = new ResourceId("id", "type"); project = project.toBuilder() .clearLabels() .addLabel("k3", "v3") .addLabel("k4", "v4") .removeLabel("k4") - .parent(parent) + .setParent(parent) + .build(); + assertEquals(PROJECT_ID, project.getProjectId()); + assertEquals(NAME, project.getName()); + assertEquals(ImmutableMap.of("k3", "v3"), project.getLabels()); + assertEquals(PROJECT_NUMBER, project.getProjectNumber()); + assertEquals(CREATE_TIME_MILLIS, project.getCreateTimeMillis()); + assertEquals(STATE, project.getState()); + assertEquals(resourceManager.options(), project.getResourceManager().options()); + assertEquals(parent, project.getParent()); + } + + @Test + public void testBuilderDeprecated() { + expect(resourceManager.options()).andReturn(mockOptions).times(4); + replay(resourceManager); + Project.Builder builder = + new Project.Builder(new Project(resourceManager, new ProjectInfo.BuilderImpl("wrong-id"))); + Project project = builder.projectId(PROJECT_ID) + .name(NAME) + .labels(LABELS) + .setProjectNumber(PROJECT_NUMBER) + .setCreateTimeMillis(CREATE_TIME_MILLIS) + .setState(STATE) .build(); assertEquals(PROJECT_ID, project.projectId()); assertEquals(NAME, project.name()); - assertEquals(ImmutableMap.of("k3", "v3"), project.labels()); + assertEquals(LABELS, project.labels()); assertEquals(PROJECT_NUMBER, project.projectNumber()); assertEquals(CREATE_TIME_MILLIS, project.createTimeMillis()); assertEquals(STATE, project.state()); assertEquals(resourceManager.options(), project.resourceManager().options()); - assertEquals(parent, project.parent()); + assertNull(project.getParent()); } @Test public void testGet() { initializeExpectedProject(1); - expect(resourceManager.get(PROJECT_INFO.projectId())).andReturn(expectedProject); + expect(resourceManager.get(PROJECT_INFO.getProjectId())).andReturn(expectedProject); replay(resourceManager); - Project loadedProject = resourceManager.get(PROJECT_INFO.projectId()); + Project loadedProject = resourceManager.get(PROJECT_INFO.getProjectId()); assertEquals(expectedProject, loadedProject); } @@ -150,7 +173,7 @@ public void testReload() { Project expectedProject = new Project(serviceMockReturnsOptions, new ProjectInfo.BuilderImpl(newInfo)); expect(resourceManager.options()).andReturn(mockOptions); - expect(resourceManager.get(PROJECT_INFO.projectId())).andReturn(expectedProject); + expect(resourceManager.get(PROJECT_INFO.getProjectId())).andReturn(expectedProject); replay(resourceManager); initializeProject(); Project newProject = project.reload(); @@ -160,16 +183,16 @@ public void testReload() { @Test public void testLoadNull() { initializeExpectedProject(1); - expect(resourceManager.get(PROJECT_INFO.projectId())).andReturn(null); + expect(resourceManager.get(PROJECT_INFO.getProjectId())).andReturn(null); replay(resourceManager); - assertNull(resourceManager.get(PROJECT_INFO.projectId())); + assertNull(resourceManager.get(PROJECT_INFO.getProjectId())); } @Test public void testReloadNull() { initializeExpectedProject(1); expect(resourceManager.options()).andReturn(mockOptions); - expect(resourceManager.get(PROJECT_INFO.projectId())).andReturn(null); + expect(resourceManager.get(PROJECT_INFO.getProjectId())).andReturn(null); replay(resourceManager); Project reloadedProject = new Project(resourceManager, new ProjectInfo.BuilderImpl(PROJECT_INFO)).reload(); @@ -180,14 +203,14 @@ public void testReloadNull() { public void testResourceManager() { initializeExpectedProject(1); replay(resourceManager); - assertEquals(serviceMockReturnsOptions, expectedProject.resourceManager()); + assertEquals(serviceMockReturnsOptions, expectedProject.getResourceManager()); } @Test public void testDelete() { initializeExpectedProject(1); expect(resourceManager.options()).andReturn(mockOptions); - resourceManager.delete(PROJECT_INFO.projectId()); + resourceManager.delete(PROJECT_INFO.getProjectId()); replay(resourceManager); initializeProject(); project.delete(); @@ -197,7 +220,7 @@ public void testDelete() { public void testUndelete() { initializeExpectedProject(1); expect(resourceManager.options()).andReturn(mockOptions); - resourceManager.undelete(PROJECT_INFO.projectId()); + resourceManager.undelete(PROJECT_INFO.getProjectId()); replay(resourceManager); initializeProject(); project.undelete(); @@ -253,16 +276,16 @@ public void testTestPermissions() { private void compareProjects(Project expected, Project value) { assertEquals(expected, value); compareProjectInfos(expected, value); - assertEquals(expected.resourceManager().options(), value.resourceManager().options()); + assertEquals(expected.getResourceManager().options(), value.getResourceManager().options()); } private void compareProjectInfos(ProjectInfo expected, ProjectInfo value) { - assertEquals(expected.projectId(), value.projectId()); - assertEquals(expected.name(), value.name()); - assertEquals(expected.labels(), value.labels()); - assertEquals(expected.projectNumber(), value.projectNumber()); - assertEquals(expected.createTimeMillis(), value.createTimeMillis()); - assertEquals(expected.state(), value.state()); - assertEquals(expected.parent(), value.parent()); + assertEquals(expected.getProjectId(), value.getProjectId()); + assertEquals(expected.getName(), value.getName()); + assertEquals(expected.getLabels(), value.getLabels()); + assertEquals(expected.getProjectNumber(), value.getProjectNumber()); + assertEquals(expected.getCreateTimeMillis(), value.getCreateTimeMillis()); + assertEquals(expected.getState(), value.getState()); + assertEquals(expected.getParent(), value.getParent()); } } diff --git a/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerImplTest.java b/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerImplTest.java index e92c712521d5..58ea3a2f63f3 100644 --- a/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerImplTest.java +++ b/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/ResourceManagerImplTest.java @@ -56,19 +56,19 @@ public class ResourceManagerImplTest { private static final LocalResourceManagerHelper RESOURCE_MANAGER_HELPER = LocalResourceManagerHelper.create(); private static final ResourceManager RESOURCE_MANAGER = - RESOURCE_MANAGER_HELPER.options().service(); + RESOURCE_MANAGER_HELPER.getOptions().service(); private static final ProjectGetOption GET_FIELDS = ProjectGetOption.fields(ProjectField.NAME, ProjectField.CREATE_TIME); private static final ProjectListOption LIST_FIELDS = ProjectListOption.fields(ProjectField.NAME, ProjectField.LABELS); private static final ProjectListOption LIST_FILTER = ProjectListOption.filter("id:* name:myProject labels.color:blue LABELS.SIZE:*"); - private static final ProjectInfo PARTIAL_PROJECT = ProjectInfo.builder("partial-project").build(); + private static final ProjectInfo PARTIAL_PROJECT = ProjectInfo.newBuilder("partial-project").build(); private static final ResourceId PARENT = new ResourceId("id", "type"); - private static final ProjectInfo COMPLETE_PROJECT = ProjectInfo.builder("complete-project") - .name("name") - .labels(ImmutableMap.of("k1", "v1")) - .parent(PARENT) + private static final ProjectInfo COMPLETE_PROJECT = ProjectInfo.newBuilder("complete-project") + .setName("name") + .setLabels(ImmutableMap.of("k1", "v1")) + .setParent(PARENT) .build(); private static final Map EMPTY_RPC_OPTIONS = ImmutableMap.of(); private static final Policy POLICY = Policy.builder() @@ -91,7 +91,7 @@ public void setUp() { private void clearProjects() { for (Project project : RESOURCE_MANAGER.list().values()) { - RESOURCE_MANAGER_HELPER.removeProject(project.projectId()); + RESOURCE_MANAGER_HELPER.removeProject(project.getProjectId()); } } @@ -101,22 +101,22 @@ public static void afterClass() { } private void compareReadWriteFields(ProjectInfo expected, ProjectInfo actual) { - assertEquals(expected.projectId(), actual.projectId()); - assertEquals(expected.name(), actual.name()); - assertEquals(expected.labels(), actual.labels()); - assertEquals(expected.parent(), actual.parent()); + assertEquals(expected.getProjectId(), actual.getProjectId()); + assertEquals(expected.getName(), actual.getName()); + assertEquals(expected.getLabels(), actual.getLabels()); + assertEquals(expected.getParent(), actual.getParent()); } @Test public void testCreate() { Project returnedProject = RESOURCE_MANAGER.create(PARTIAL_PROJECT); compareReadWriteFields(PARTIAL_PROJECT, returnedProject); - assertEquals(ProjectInfo.State.ACTIVE, returnedProject.state()); - assertNull(returnedProject.name()); - assertNull(returnedProject.parent()); - assertNotNull(returnedProject.projectNumber()); - assertNotNull(returnedProject.createTimeMillis()); - assertSame(RESOURCE_MANAGER, returnedProject.resourceManager()); + assertEquals(ProjectInfo.State.ACTIVE, returnedProject.getState()); + assertNull(returnedProject.getName()); + assertNull(returnedProject.getParent()); + assertNotNull(returnedProject.getProjectNumber()); + assertNotNull(returnedProject.getCreateTimeMillis()); + assertSame(RESOURCE_MANAGER, returnedProject.getResourceManager()); try { RESOURCE_MANAGER.create(PARTIAL_PROJECT); fail("Should fail, project already exists."); @@ -127,18 +127,18 @@ public void testCreate() { } returnedProject = RESOURCE_MANAGER.create(COMPLETE_PROJECT); compareReadWriteFields(COMPLETE_PROJECT, returnedProject); - assertEquals(ProjectInfo.State.ACTIVE, returnedProject.state()); - assertNotNull(returnedProject.projectNumber()); - assertNotNull(returnedProject.createTimeMillis()); - assertSame(RESOURCE_MANAGER, returnedProject.resourceManager()); + assertEquals(ProjectInfo.State.ACTIVE, returnedProject.getState()); + assertNotNull(returnedProject.getProjectNumber()); + assertNotNull(returnedProject.getCreateTimeMillis()); + assertSame(RESOURCE_MANAGER, returnedProject.getResourceManager()); } @Test public void testDelete() { RESOURCE_MANAGER.create(COMPLETE_PROJECT); - RESOURCE_MANAGER.delete(COMPLETE_PROJECT.projectId()); + RESOURCE_MANAGER.delete(COMPLETE_PROJECT.getProjectId()); assertEquals(ProjectInfo.State.DELETE_REQUESTED, - RESOURCE_MANAGER.get(COMPLETE_PROJECT.projectId()).state()); + RESOURCE_MANAGER.get(COMPLETE_PROJECT.getProjectId()).getState()); try { RESOURCE_MANAGER.delete("some-nonexistant-project-id"); fail("Should fail because the project doesn't exist."); @@ -151,27 +151,27 @@ public void testDelete() { @Test public void testGet() { RESOURCE_MANAGER.create(COMPLETE_PROJECT); - Project returnedProject = RESOURCE_MANAGER.get(COMPLETE_PROJECT.projectId()); + Project returnedProject = RESOURCE_MANAGER.get(COMPLETE_PROJECT.getProjectId()); compareReadWriteFields(COMPLETE_PROJECT, returnedProject); - assertEquals(RESOURCE_MANAGER, returnedProject.resourceManager()); - RESOURCE_MANAGER_HELPER.removeProject(COMPLETE_PROJECT.projectId()); - assertNull(RESOURCE_MANAGER.get(COMPLETE_PROJECT.projectId())); + assertEquals(RESOURCE_MANAGER, returnedProject.getResourceManager()); + RESOURCE_MANAGER_HELPER.removeProject(COMPLETE_PROJECT.getProjectId()); + assertNull(RESOURCE_MANAGER.get(COMPLETE_PROJECT.getProjectId())); } @Test public void testGetWithOptions() { Project originalProject = RESOURCE_MANAGER.create(COMPLETE_PROJECT); - Project returnedProject = RESOURCE_MANAGER.get(COMPLETE_PROJECT.projectId(), GET_FIELDS); + Project returnedProject = RESOURCE_MANAGER.get(COMPLETE_PROJECT.getProjectId(), GET_FIELDS); assertFalse(COMPLETE_PROJECT.equals(returnedProject)); - assertEquals(COMPLETE_PROJECT.projectId(), returnedProject.projectId()); - assertEquals(COMPLETE_PROJECT.name(), returnedProject.name()); - assertEquals(originalProject.createTimeMillis(), returnedProject.createTimeMillis()); - assertNull(returnedProject.parent()); - assertNull(returnedProject.projectNumber()); - assertNull(returnedProject.state()); - assertTrue(returnedProject.labels().isEmpty()); - assertEquals(RESOURCE_MANAGER, originalProject.resourceManager()); - assertEquals(RESOURCE_MANAGER, returnedProject.resourceManager()); + assertEquals(COMPLETE_PROJECT.getProjectId(), returnedProject.getProjectId()); + assertEquals(COMPLETE_PROJECT.getName(), returnedProject.getName()); + assertEquals(originalProject.getCreateTimeMillis(), returnedProject.getCreateTimeMillis()); + assertNull(returnedProject.getParent()); + assertNull(returnedProject.getProjectNumber()); + assertNull(returnedProject.getState()); + assertTrue(returnedProject.getLabels().isEmpty()); + assertEquals(RESOURCE_MANAGER, originalProject.getResourceManager()); + assertEquals(RESOURCE_MANAGER, returnedProject.getResourceManager()); } @Test @@ -181,14 +181,14 @@ public void testList() { RESOURCE_MANAGER.create(PARTIAL_PROJECT); RESOURCE_MANAGER.create(COMPLETE_PROJECT); for (Project p : RESOURCE_MANAGER.list().values()) { - if (p.projectId().equals(PARTIAL_PROJECT.projectId())) { + if (p.getProjectId().equals(PARTIAL_PROJECT.getProjectId())) { compareReadWriteFields(PARTIAL_PROJECT, p); - } else if (p.projectId().equals(COMPLETE_PROJECT.projectId())) { + } else if (p.getProjectId().equals(COMPLETE_PROJECT.getProjectId())) { compareReadWriteFields(COMPLETE_PROJECT, p); } else { fail("Some unexpected project returned by list."); } - assertSame(RESOURCE_MANAGER, p.resourceManager()); + assertSame(RESOURCE_MANAGER, p.getResourceManager()); } } @@ -213,14 +213,14 @@ public void testListFieldOptions() { RESOURCE_MANAGER.create(COMPLETE_PROJECT); Page projects = RESOURCE_MANAGER.list(LIST_FIELDS); Project returnedProject = projects.iterateAll().next(); - assertEquals(COMPLETE_PROJECT.projectId(), returnedProject.projectId()); - assertEquals(COMPLETE_PROJECT.name(), returnedProject.name()); - assertEquals(COMPLETE_PROJECT.labels(), returnedProject.labels()); - assertNull(returnedProject.parent()); - assertNull(returnedProject.projectNumber()); - assertNull(returnedProject.state()); - assertNull(returnedProject.createTimeMillis()); - assertSame(RESOURCE_MANAGER, returnedProject.resourceManager()); + assertEquals(COMPLETE_PROJECT.getProjectId(), returnedProject.getProjectId()); + assertEquals(COMPLETE_PROJECT.getName(), returnedProject.getName()); + assertEquals(COMPLETE_PROJECT.getLabels(), returnedProject.getLabels()); + assertNull(returnedProject.getParent()); + assertNull(returnedProject.getProjectNumber()); + assertNull(returnedProject.getState()); + assertNull(returnedProject.getCreateTimeMillis()); + assertSame(RESOURCE_MANAGER, returnedProject.getResourceManager()); } @Test @@ -231,45 +231,45 @@ public void testListPagingWithFieldOptions() { assertNotNull(projects.nextPageCursor()); Iterator iterator = projects.values().iterator(); Project returnedProject = iterator.next(); - assertEquals(COMPLETE_PROJECT.projectId(), returnedProject.projectId()); - assertEquals(COMPLETE_PROJECT.name(), returnedProject.name()); - assertEquals(COMPLETE_PROJECT.labels(), returnedProject.labels()); - assertNull(returnedProject.parent()); - assertNull(returnedProject.projectNumber()); - assertNull(returnedProject.state()); - assertNull(returnedProject.createTimeMillis()); - assertSame(RESOURCE_MANAGER, returnedProject.resourceManager()); + assertEquals(COMPLETE_PROJECT.getProjectId(), returnedProject.getProjectId()); + assertEquals(COMPLETE_PROJECT.getName(), returnedProject.getName()); + assertEquals(COMPLETE_PROJECT.getLabels(), returnedProject.getLabels()); + assertNull(returnedProject.getParent()); + assertNull(returnedProject.getProjectNumber()); + assertNull(returnedProject.getState()); + assertNull(returnedProject.getCreateTimeMillis()); + assertSame(RESOURCE_MANAGER, returnedProject.getResourceManager()); assertFalse(iterator.hasNext()); projects = projects.nextPage(); iterator = projects.values().iterator(); returnedProject = iterator.next(); - assertEquals(PARTIAL_PROJECT.projectId(), returnedProject.projectId()); - assertEquals(PARTIAL_PROJECT.name(), returnedProject.name()); - assertEquals(PARTIAL_PROJECT.labels(), returnedProject.labels()); - assertNull(returnedProject.parent()); - assertNull(returnedProject.projectNumber()); - assertNull(returnedProject.state()); - assertNull(returnedProject.createTimeMillis()); - assertSame(RESOURCE_MANAGER, returnedProject.resourceManager()); + assertEquals(PARTIAL_PROJECT.getProjectId(), returnedProject.getProjectId()); + assertEquals(PARTIAL_PROJECT.getName(), returnedProject.getName()); + assertEquals(PARTIAL_PROJECT.getLabels(), returnedProject.getLabels()); + assertNull(returnedProject.getParent()); + assertNull(returnedProject.getProjectNumber()); + assertNull(returnedProject.getState()); + assertNull(returnedProject.getCreateTimeMillis()); + assertSame(RESOURCE_MANAGER, returnedProject.getResourceManager()); assertFalse(iterator.hasNext()); assertNull(projects.nextPageCursor()); } @Test public void testListFilterOptions() { - ProjectInfo matchingProject = ProjectInfo.builder("matching-project") - .name("MyProject") - .labels(ImmutableMap.of("color", "blue", "size", "big")) + ProjectInfo matchingProject = ProjectInfo.newBuilder("matching-project") + .setName("MyProject") + .setLabels(ImmutableMap.of("color", "blue", "size", "big")) .build(); - ProjectInfo nonMatchingProject1 = ProjectInfo.builder("non-matching-project1") - .name("myProject") - .labels(ImmutableMap.of("color", "blue")) + ProjectInfo nonMatchingProject1 = ProjectInfo.newBuilder("non-matching-project1") + .setName("myProject") + .setLabels(ImmutableMap.of("color", "blue")) .build(); - ProjectInfo nonMatchingProject2 = ProjectInfo.builder("non-matching-project2") - .name("myProj") - .labels(ImmutableMap.of("color", "blue", "size", "big")) + ProjectInfo nonMatchingProject2 = ProjectInfo.newBuilder("non-matching-project2") + .setName("myProj") + .setLabels(ImmutableMap.of("color", "blue", "size", "big")) .build(); - ProjectInfo nonMatchingProject3 = ProjectInfo.builder("non-matching-project3").build(); + ProjectInfo nonMatchingProject3 = ProjectInfo.newBuilder("non-matching-project3").build(); RESOURCE_MANAGER.create(matchingProject); RESOURCE_MANAGER.create(nonMatchingProject1); RESOURCE_MANAGER.create(nonMatchingProject2); @@ -278,7 +278,7 @@ public void testListFilterOptions() { assertFalse(p.equals(nonMatchingProject1)); assertFalse(p.equals(nonMatchingProject2)); compareReadWriteFields(matchingProject, p); - assertSame(RESOURCE_MANAGER, p.resourceManager()); + assertSame(RESOURCE_MANAGER, p.getResourceManager()); } } @@ -286,21 +286,21 @@ public void testListFilterOptions() { public void testReplace() { ProjectInfo createdProject = RESOURCE_MANAGER.create(COMPLETE_PROJECT); Map newLabels = ImmutableMap.of("new k1", "new v1"); - ProjectInfo anotherCompleteProject = ProjectInfo.builder(COMPLETE_PROJECT.projectId()) - .labels(newLabels) - .projectNumber(987654321L) - .createTimeMillis(230682061315L) - .state(ProjectInfo.State.DELETE_REQUESTED) - .parent(createdProject.parent()) + ProjectInfo anotherCompleteProject = ProjectInfo.newBuilder(COMPLETE_PROJECT.getProjectId()) + .setLabels(newLabels) + .setProjectNumber(987654321L) + .setCreateTimeMillis(230682061315L) + .setState(ProjectInfo.State.DELETE_REQUESTED) + .setParent(createdProject.getParent()) .build(); Project returnedProject = RESOURCE_MANAGER.replace(anotherCompleteProject); compareReadWriteFields(anotherCompleteProject, returnedProject); - assertEquals(createdProject.projectNumber(), returnedProject.projectNumber()); - assertEquals(createdProject.createTimeMillis(), returnedProject.createTimeMillis()); - assertEquals(createdProject.state(), returnedProject.state()); - assertEquals(RESOURCE_MANAGER, returnedProject.resourceManager()); + assertEquals(createdProject.getProjectNumber(), returnedProject.getProjectNumber()); + assertEquals(createdProject.getCreateTimeMillis(), returnedProject.getCreateTimeMillis()); + assertEquals(createdProject.getState(), returnedProject.getState()); + assertEquals(RESOURCE_MANAGER, returnedProject.getResourceManager()); ProjectInfo nonexistantProject = - ProjectInfo.builder("some-project-id-that-does-not-exist").build(); + ProjectInfo.newBuilder("some-project-id-that-does-not-exist").build(); try { RESOURCE_MANAGER.replace(nonexistantProject); fail("Should fail because the project doesn't exist."); @@ -313,14 +313,14 @@ public void testReplace() { @Test public void testUndelete() { RESOURCE_MANAGER.create(COMPLETE_PROJECT); - RESOURCE_MANAGER.delete(COMPLETE_PROJECT.projectId()); + RESOURCE_MANAGER.delete(COMPLETE_PROJECT.getProjectId()); assertEquals( ProjectInfo.State.DELETE_REQUESTED, - RESOURCE_MANAGER.get(COMPLETE_PROJECT.projectId()).state()); - RESOURCE_MANAGER.undelete(COMPLETE_PROJECT.projectId()); - ProjectInfo revivedProject = RESOURCE_MANAGER.get(COMPLETE_PROJECT.projectId()); + RESOURCE_MANAGER.get(COMPLETE_PROJECT.getProjectId()).getState()); + RESOURCE_MANAGER.undelete(COMPLETE_PROJECT.getProjectId()); + ProjectInfo revivedProject = RESOURCE_MANAGER.get(COMPLETE_PROJECT.getProjectId()); compareReadWriteFields(COMPLETE_PROJECT, revivedProject); - assertEquals(ProjectInfo.State.ACTIVE, revivedProject.state()); + assertEquals(ProjectInfo.State.ACTIVE, revivedProject.getState()); try { RESOURCE_MANAGER.undelete("invalid-project-id"); fail("Should fail because the project doesn't exist."); @@ -332,10 +332,10 @@ public void testUndelete() { @Test public void testGetPolicy() { - assertNull(RESOURCE_MANAGER.getPolicy(COMPLETE_PROJECT.projectId())); + assertNull(RESOURCE_MANAGER.getPolicy(COMPLETE_PROJECT.getProjectId())); RESOURCE_MANAGER.create(COMPLETE_PROJECT); - RESOURCE_MANAGER.replacePolicy(COMPLETE_PROJECT.projectId(), POLICY); - Policy retrieved = RESOURCE_MANAGER.getPolicy(COMPLETE_PROJECT.projectId()); + RESOURCE_MANAGER.replacePolicy(COMPLETE_PROJECT.getProjectId(), POLICY); + Policy retrieved = RESOURCE_MANAGER.getPolicy(COMPLETE_PROJECT.getProjectId()); assertEquals(POLICY.bindings(), retrieved.bindings()); assertNotNull(retrieved.etag()); assertEquals(0, retrieved.version()); @@ -351,17 +351,17 @@ public void testReplacePolicy() { assertTrue(e.getMessage().endsWith("project was not found.")); } RESOURCE_MANAGER.create(PARTIAL_PROJECT); - Policy oldPolicy = RESOURCE_MANAGER.getPolicy(PARTIAL_PROJECT.projectId()); - RESOURCE_MANAGER.replacePolicy(PARTIAL_PROJECT.projectId(), POLICY); + Policy oldPolicy = RESOURCE_MANAGER.getPolicy(PARTIAL_PROJECT.getProjectId()); + RESOURCE_MANAGER.replacePolicy(PARTIAL_PROJECT.getProjectId(), POLICY); try { - RESOURCE_MANAGER.replacePolicy(PARTIAL_PROJECT.projectId(), oldPolicy); + RESOURCE_MANAGER.replacePolicy(PARTIAL_PROJECT.getProjectId(), oldPolicy); fail("Policy with an invalid etag didn't cause error."); } catch (ResourceManagerException e) { assertEquals(409, e.code()); assertTrue(e.getMessage().contains("Policy etag mismatch")); } - String originalEtag = RESOURCE_MANAGER.getPolicy(PARTIAL_PROJECT.projectId()).etag(); - Policy newPolicy = RESOURCE_MANAGER.replacePolicy(PARTIAL_PROJECT.projectId(), POLICY); + String originalEtag = RESOURCE_MANAGER.getPolicy(PARTIAL_PROJECT.getProjectId()).etag(); + Policy newPolicy = RESOURCE_MANAGER.replacePolicy(PARTIAL_PROJECT.getProjectId(), POLICY); assertEquals(POLICY.bindings(), newPolicy.bindings()); assertNotNull(newPolicy.etag()); assertNotEquals(originalEtag, newPolicy.etag()); @@ -379,7 +379,7 @@ public void testTestPermissions() { } RESOURCE_MANAGER.create(PARTIAL_PROJECT); assertEquals(ImmutableList.of(true), - RESOURCE_MANAGER.testPermissions(PARTIAL_PROJECT.projectId(), permissions)); + RESOURCE_MANAGER.testPermissions(PARTIAL_PROJECT.getProjectId(), permissions)); } @Test @@ -393,11 +393,11 @@ public void testRetryableException() { .serviceRpcFactory(rpcFactoryMock) .build() .service(); - EasyMock.expect(resourceManagerRpcMock.get(PARTIAL_PROJECT.projectId(), EMPTY_RPC_OPTIONS)) + EasyMock.expect(resourceManagerRpcMock.get(PARTIAL_PROJECT.getProjectId(), EMPTY_RPC_OPTIONS)) .andThrow(new ResourceManagerException(500, "Internal Error")) .andReturn(PARTIAL_PROJECT.toPb()); EasyMock.replay(resourceManagerRpcMock); - Project returnedProject = resourceManagerMock.get(PARTIAL_PROJECT.projectId()); + Project returnedProject = resourceManagerMock.get(PARTIAL_PROJECT.getProjectId()); assertEquals( new Project(resourceManagerMock, new ProjectInfo.BuilderImpl(PARTIAL_PROJECT)), returnedProject); @@ -414,14 +414,14 @@ public void testNonRetryableException() { .serviceRpcFactory(rpcFactoryMock) .build() .service(); - EasyMock.expect(resourceManagerRpcMock.get(PARTIAL_PROJECT.projectId(), EMPTY_RPC_OPTIONS)) + EasyMock.expect(resourceManagerRpcMock.get(PARTIAL_PROJECT.getProjectId(), EMPTY_RPC_OPTIONS)) .andThrow(new ResourceManagerException( - 403, "Project " + PARTIAL_PROJECT.projectId() + " not found.")) + 403, "Project " + PARTIAL_PROJECT.getProjectId() + " not found.")) .once(); EasyMock.replay(resourceManagerRpcMock); thrown.expect(ResourceManagerException.class); - thrown.expectMessage("Project " + PARTIAL_PROJECT.projectId() + " not found."); - resourceManagerMock.get(PARTIAL_PROJECT.projectId()); + thrown.expectMessage("Project " + PARTIAL_PROJECT.getProjectId() + " not found."); + resourceManagerMock.get(PARTIAL_PROJECT.getProjectId()); } @Test @@ -434,11 +434,11 @@ public void testRuntimeException() { ResourceManager resourceManagerMock = ResourceManagerOptions.builder().serviceRpcFactory(rpcFactoryMock).build().service(); String exceptionMessage = "Artificial runtime exception"; - EasyMock.expect(resourceManagerRpcMock.get(PARTIAL_PROJECT.projectId(), EMPTY_RPC_OPTIONS)) + EasyMock.expect(resourceManagerRpcMock.get(PARTIAL_PROJECT.getProjectId(), EMPTY_RPC_OPTIONS)) .andThrow(new RuntimeException(exceptionMessage)); EasyMock.replay(resourceManagerRpcMock); thrown.expect(ResourceManagerException.class); thrown.expectMessage(exceptionMessage); - resourceManagerMock.get(PARTIAL_PROJECT.projectId()); + resourceManagerMock.get(PARTIAL_PROJECT.getProjectId()); } } diff --git a/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/SerializationTest.java b/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/SerializationTest.java index a650441b06e0..60f312c81813 100644 --- a/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/SerializationTest.java +++ b/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/SerializationTest.java @@ -28,13 +28,13 @@ public class SerializationTest extends BaseSerializationTest { private static final ResourceManager RESOURCE_MANAGER = ResourceManagerOptions.defaultInstance().service(); - private static final ProjectInfo PARTIAL_PROJECT_INFO = ProjectInfo.builder("id1").build(); - private static final ProjectInfo FULL_PROJECT_INFO = ProjectInfo.builder("id") - .name("name") - .labels(ImmutableMap.of("key", "value")) - .projectNumber(123L) - .state(ProjectInfo.State.ACTIVE) - .createTimeMillis(1234L) + private static final ProjectInfo PARTIAL_PROJECT_INFO = ProjectInfo.newBuilder("id1").build(); + private static final ProjectInfo FULL_PROJECT_INFO = ProjectInfo.newBuilder("id") + .setName("name") + .setLabels(ImmutableMap.of("key", "value")) + .setProjectNumber(123L) + .setState(ProjectInfo.State.ACTIVE) + .setCreateTimeMillis(1234L) .build(); private static final Project PROJECT = new Project(RESOURCE_MANAGER, new ProjectInfo.BuilderImpl(FULL_PROJECT_INFO)); diff --git a/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelperTest.java b/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelperTest.java index cfe475cb038b..9089a093082e 100644 --- a/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelperTest.java +++ b/google-cloud-resourcemanager/src/test/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelperTest.java @@ -55,7 +55,7 @@ public class LocalResourceManagerHelperTest { private static final LocalResourceManagerHelper RESOURCE_MANAGER_HELPER = LocalResourceManagerHelper.create(); private static final ResourceManagerRpc rpc = - new DefaultResourceManagerRpc(RESOURCE_MANAGER_HELPER.options()); + new DefaultResourceManagerRpc(RESOURCE_MANAGER_HELPER.getOptions()); private static final com.google.api.services.cloudresourcemanager.model.Project PARTIAL_PROJECT = new com.google.api.services.cloudresourcemanager.model.Project().setProjectId( "partial-project");