diff --git a/CHANGELOG.md b/CHANGELOG.md index af2e51ce..88e321ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [0.119.2](https://www.github.com/googleapis/java-resourcemanager/compare/v0.119.1...v0.119.2) (2021-04-20) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.21.1 ([#456](https://www.github.com/googleapis/java-resourcemanager/issues/456)) ([8a2d42d](https://www.github.com/googleapis/java-resourcemanager/commit/8a2d42d20814ff1baeece60a914625a5a18d5757)) + ### [0.119.1](https://www.github.com/googleapis/java-resourcemanager/compare/v0.119.0...v0.119.1) (2021-04-12) diff --git a/google-cloud-resourcemanager-bom/pom.xml b/google-cloud-resourcemanager-bom/pom.xml index fd865052..abfea6c4 100644 --- a/google-cloud-resourcemanager-bom/pom.xml +++ b/google-cloud-resourcemanager-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-resourcemanager-bom - 0.119.2-alpha-SNAPSHOT + 0.119.3-alpha-SNAPSHOT pom com.google.cloud @@ -56,17 +56,17 @@ com.google.cloud google-cloud-resourcemanager - 0.119.2-alpha-SNAPSHOT + 0.119.3-alpha-SNAPSHOT com.google.api.grpc grpc-google-cloud-resourcemanager-v3 - 0.119.2-alpha-SNAPSHOT + 0.119.3-alpha-SNAPSHOT com.google.api.grpc proto-google-cloud-resourcemanager-v3 - 0.119.2-alpha-SNAPSHOT + 0.119.3-alpha-SNAPSHOT diff --git a/google-cloud-resourcemanager/pom.xml b/google-cloud-resourcemanager/pom.xml index 662f374f..31398b83 100644 --- a/google-cloud-resourcemanager/pom.xml +++ b/google-cloud-resourcemanager/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-resourcemanager jar - 0.119.2-alpha-SNAPSHOT + 0.119.3-alpha-SNAPSHOT Google Cloud Resource Manager https://github.com/googleapis/java-resourcemanager @@ -14,7 +14,7 @@ com.google.cloud google-cloud-resourcemanager-parent - 0.119.2-alpha-SNAPSHOT + 0.119.3-alpha-SNAPSHOT diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ConstraintInfo.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ConstraintInfo.java index b6ddc915..f180c508 100644 --- a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ConstraintInfo.java +++ b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ConstraintInfo.java @@ -27,7 +27,9 @@ * * @see Constraint + * @deprecated v3 GAPIC client of ResourceManager is now available */ +@Deprecated public class ConstraintInfo { static final Function FROM_PROTOBUF_FUNCTION = 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 7f6a427a..10169083 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 @@ -23,7 +23,12 @@ import java.io.Serializable; import java.util.Objects; -/** Base class for Resource Manager operation options. */ +/** + * Base class for Resource Manager operation options. + * + * @deprecated v3 GAPIC client of ResourceManager is now available + */ +@Deprecated abstract class Option implements Serializable { private static final long serialVersionUID = 2655177550880762967L; diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/OrgPolicyInfo.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/OrgPolicyInfo.java index 55dc2001..09971fc4 100644 --- a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/OrgPolicyInfo.java +++ b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/OrgPolicyInfo.java @@ -29,7 +29,10 @@ * *

Defines a Cloud Organization Policy which specifies constraints for configurations of Cloud * Platform resources. + * + * @deprecated v3 GAPIC client of ResourceManager is now available */ +@Deprecated public class OrgPolicyInfo { static final Function FROM_PROTOBUF_FUNCTION = diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/PolicyMarshaller.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/PolicyMarshaller.java index cb824c37..5e0d5beb 100644 --- a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/PolicyMarshaller.java +++ b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/PolicyMarshaller.java @@ -31,6 +31,8 @@ import java.util.Map; import java.util.Set; +/** @deprecated v3 GAPIC client of ResourceManager is now available */ +@Deprecated final class PolicyMarshaller extends Marshaller { 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 fe8b310f..3c4d76ef 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 @@ -32,7 +32,10 @@ * AppEngine Apps, VMs, and other Google Cloud Platform resources. This class' member variables are * immutable. Methods that change or update the underlying Project information return a new Project * instance. {@code Project} adds a layer of service-related functionality over {@link ProjectInfo}. + * + * @deprecated v3 GAPIC client of ResourceManager is now available */ +@Deprecated public class Project extends ProjectInfo { private static final long serialVersionUID = 6767630161335155133L; 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 7fa020b6..1ffd9c43 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 @@ -37,7 +37,10 @@ * A Google Cloud Resource Manager project metadata object. A Project is a high-level Google Cloud * Platform entity. It is a container for ACLs, APIs, AppEngine Apps, VMs, and other Google Cloud * Platform resources. + * + * @deprecated v3 GAPIC client of ResourceManager is now available */ +@Deprecated public class ProjectInfo implements Serializable { public static final DateTimeFormatter DATE_TIME_FORMATTER = diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManager.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManager.java index 873db051..4b412220 100644 --- a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManager.java +++ b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManager.java @@ -22,7 +22,15 @@ import com.google.cloud.Policy; import com.google.cloud.Service; import com.google.cloud.resourcemanager.spi.v1beta1.ResourceManagerRpc; +import com.google.cloud.resourcemanager.v3.GetProjectRequest; +import com.google.cloud.resourcemanager.v3.ListProjectsRequest; +import com.google.cloud.resourcemanager.v3.ProjectName; +import com.google.cloud.resourcemanager.v3.ProjectsSettings; +import com.google.cloud.resourcemanager.v3.UndeleteProjectRequest; +import com.google.cloud.resourcemanager.v3.UpdateProjectRequest; import com.google.common.collect.ImmutableList; +import com.google.iam.v1.GetIamPolicyRequest; +import com.google.iam.v1.TestIamPermissionsRequest; import java.util.List; import java.util.Map; @@ -30,7 +38,9 @@ * An interface for Google Cloud Resource Manager. * * @see Google Cloud Resource Manager + * @deprecated v3 GAPIC client of ResourceManager is now available */ +@Deprecated public interface ResourceManager extends Service { String DEFAULT_CONTENT_TYPE = "application/octet-stream"; @@ -176,7 +186,10 @@ public static ProjectListOption fields(ProjectField... fields) { * @see Cloud * Resource Manager create + * @deprecated Please use {@link + * com.google.cloud.resourcemanager.v3.ProjectsClient#create(ProjectsSettings)} instead */ + @Deprecated Project create(ProjectInfo project); /** @@ -202,7 +215,10 @@ public static ProjectListOption fields(ProjectField... fields) { * @see Cloud * Resource Manager delete + * @deprecated Please use {@link + * com.google.cloud.resourcemanager.v3.ProjectsClient#deleteProjectAsync(ProjectName)} instead */ + @Deprecated void delete(String projectId); /** @@ -214,7 +230,10 @@ public static ProjectListOption fields(ProjectField... fields) { * @throws ResourceManagerException upon failure * @see * Cloud Resource Manager get + * @deprecated Please use {@link + * com.google.cloud.resourcemanager.v3.ProjectsClient#getProject(GetProjectRequest)} instead */ + @Deprecated Project get(String projectId, ProjectGetOption... options); /** @@ -229,7 +248,11 @@ public static ProjectListOption fields(ProjectField... fields) { * @see Cloud * Resource Manager list + * @deprecated Please use {@link + * com.google.cloud.resourcemanager.v3.ProjectsClient#listProjects(ListProjectsRequest)} + * instead */ + @Deprecated Page list(ProjectListOption... options); /** @@ -242,7 +265,11 @@ public static ProjectListOption fields(ProjectField... fields) { * @see Cloud * Resource Manager update + * @deprecated Please use {@link + * com.google.cloud.resourcemanager.v3.ProjectsClient#updateProjectAsync(UpdateProjectRequest)} + * instead */ + @Deprecated Project replace(ProjectInfo newProject); /** @@ -257,7 +284,11 @@ public static ProjectListOption fields(ProjectField... fields) { * @see Cloud * Resource Manager undelete + * @deprecated Please use {@link + * com.google.cloud.resourcemanager.v3.ProjectsClient#undeleteProjectAsync(UndeleteProjectRequest)} + * instead */ + @Deprecated void undelete(String projectId); /** @@ -269,7 +300,11 @@ public static ProjectListOption fields(ProjectField... fields) { * @see * Resource Manager getIamPolicy + * @deprecated Please use {@link + * com.google.cloud.resourcemanager.v3.ProjectsClient#getIamPolicy(GetIamPolicyRequest)} + * instead */ + @Deprecated Policy getPolicy(String projectId); /** @@ -316,7 +351,9 @@ public static ProjectListOption fields(ProjectField... fields) { * @see * Resource Manager setIamPolicy + * @deprecated */ + @Deprecated Policy replacePolicy(String projectId, Policy newPolicy); /** @@ -336,7 +373,10 @@ public static ProjectListOption fields(ProjectField... fields) { * Resource Manager testIamPermissions * @see Supported Cloud * Platform Services + * @deprecated {@link + * com.google.cloud.resourcemanager.v3.ProjectsClient#testIamPermissions(TestIamPermissionsRequest)} */ + @Deprecated List testPermissions(String projectId, List permissions); /** Class for specifying project list options. */ @@ -379,7 +419,9 @@ public static ListOption pageSize(int pageSize) { * @see * Resource Manager testIamPermissions + * @deprecated */ + @Deprecated Map testOrgPermissions(String resource, List permissions); /** @@ -403,7 +445,9 @@ public static ListOption pageSize(int pageSize) { * @see Resource * Manager getEffectiveOrgPolicy + * @deprecated */ + @Deprecated OrgPolicyInfo getEffectiveOrgPolicy(String resource, String constraint); /** @@ -427,7 +471,9 @@ public static ListOption pageSize(int pageSize) { * @see Resource * Manager listAvailableOrgPolicyConstraints + * @deprecated */ + @Deprecated Page listAvailableOrgPolicyConstraints(String resource, ListOption... options); /** @@ -437,7 +483,9 @@ public static ListOption pageSize(int pageSize) { * @see Resource * Manager listOrgPolicies + * @deprecated */ + @Deprecated Page listOrgPolicies(String resource, ListOption... options); /** @@ -450,6 +498,8 @@ public static ListOption pageSize(int pageSize) { * @see Resource * Manager setOrgPolicy + * @deprecated */ + @Deprecated OrgPolicyInfo replaceOrgPolicy(String resource, OrgPolicyInfo orgPolicy); } diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerException.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerException.java index cc820ee0..27c243ef 100644 --- a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerException.java +++ b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerException.java @@ -28,7 +28,9 @@ * * @see Google Cloud * Resource Manager error codes + * @deprecated v3 GAPIC client of ResourceManager is now available */ +@Deprecated public final class ResourceManagerException extends BaseHttpServiceException { // see https://cloud.google.com/resource-manager/v1/errors/core_errors diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerFactory.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerFactory.java index 8048c0d7..75550355 100644 --- a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerFactory.java +++ b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerFactory.java @@ -18,6 +18,11 @@ import com.google.cloud.ServiceFactory; -/** An interface for ResourceManager factories. */ +/** + * An interface for ResourceManager factories. + * + * @deprecated v3 GAPIC client of ResourceManager is now available + */ +@Deprecated public interface ResourceManagerFactory extends ServiceFactory {} 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 f26d0e9b..615967fa 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 @@ -40,6 +40,8 @@ import java.util.Map; import java.util.concurrent.Callable; +/** @deprecated v3 GAPIC client of ResourceManager is now available */ +@Deprecated final class ResourceManagerImpl extends BaseService implements ResourceManager { diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerOptions.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerOptions.java index 34ad43ed..f6e1bc7f 100644 --- a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerOptions.java +++ b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerOptions.java @@ -27,6 +27,8 @@ import com.google.common.collect.ImmutableSet; import java.util.Set; +/** @deprecated v3 GAPIC client of ResourceManager is now available */ +@Deprecated public class ResourceManagerOptions extends ServiceOptions { diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/ResourceManagerRpcFactory.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/ResourceManagerRpcFactory.java index a6dbe01e..74ba38ca 100644 --- a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/ResourceManagerRpcFactory.java +++ b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/ResourceManagerRpcFactory.java @@ -22,5 +22,8 @@ /** * An interface for Resource Manager RPC factory. Implementation will be loaded via {@link * java.util.ServiceLoader}. + * + * @deprecated v3 GAPIC client of ResourceManager is now available */ +@Deprecated public interface ResourceManagerRpcFactory extends ServiceRpcFactory {} diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/v1beta1/HttpResourceManagerRpc.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/v1beta1/HttpResourceManagerRpc.java index 1995fcfb..3bdb6c6e 100644 --- a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/v1beta1/HttpResourceManagerRpc.java +++ b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/v1beta1/HttpResourceManagerRpc.java @@ -66,6 +66,8 @@ import java.util.concurrent.Callable; import org.threeten.bp.Duration; +/** @deprecated v3 GAPIC client of ResourceManager is now available */ +@Deprecated public class HttpResourceManagerRpc implements ResourceManagerRpc { private static final JsonFactory JSON_FACTORY = new JacksonFactory(); diff --git a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/v1beta1/ResourceManagerRpc.java b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/v1beta1/ResourceManagerRpc.java index ee091999..6f214145 100644 --- a/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/v1beta1/ResourceManagerRpc.java +++ b/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/spi/v1beta1/ResourceManagerRpc.java @@ -28,6 +28,8 @@ import java.util.List; import java.util.Map; +/** @deprecated v3 GAPIC client of ResourceManager is now available */ +@Deprecated public interface ResourceManagerRpc extends ServiceRpc { enum Option { 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 bbaa25d7..d26b2aab 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 @@ -89,7 +89,10 @@ *

  • The messages in the error responses given by this mock do not necessarily match the * messages given by the actual service. * + * + * @deprecated v3 GAPIC client of ResourceManager is now available */ +@Deprecated @SuppressWarnings("restriction") public class LocalResourceManagerHelper { private static final Logger log = Logger.getLogger(LocalResourceManagerHelper.class.getName()); diff --git a/grpc-google-cloud-resourcemanager-v3/pom.xml b/grpc-google-cloud-resourcemanager-v3/pom.xml index a3925cd2..8f573797 100644 --- a/grpc-google-cloud-resourcemanager-v3/pom.xml +++ b/grpc-google-cloud-resourcemanager-v3/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-resourcemanager-v3 - 0.119.2-alpha-SNAPSHOT + 0.119.3-alpha-SNAPSHOT grpc-google-cloud-resourcemanager-v3 GRPC library for google-cloud-resourcemanager com.google.cloud google-cloud-resourcemanager-parent - 0.119.2-alpha-SNAPSHOT + 0.119.3-alpha-SNAPSHOT diff --git a/pom.xml b/pom.xml index 6e8cdbce..1d938e35 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-resourcemanager-parent pom - 0.119.2-alpha-SNAPSHOT + 0.119.3-alpha-SNAPSHOT Google Resource Manager API Parent https://github.com/googleapis/java-resourcemanager @@ -60,18 +60,18 @@ com.google.cloud google-cloud-resourcemanager - 0.119.2-alpha-SNAPSHOT + 0.119.3-alpha-SNAPSHOT com.google.api.grpc proto-google-cloud-resourcemanager-v3 - 0.119.2-alpha-SNAPSHOT + 0.119.3-alpha-SNAPSHOT com.google.api.grpc grpc-google-cloud-resourcemanager-v3 - 0.119.2-alpha-SNAPSHOT + 0.119.3-alpha-SNAPSHOT com.google.cloud diff --git a/proto-google-cloud-resourcemanager-v3/pom.xml b/proto-google-cloud-resourcemanager-v3/pom.xml index 1fb62ab4..cce20d1c 100644 --- a/proto-google-cloud-resourcemanager-v3/pom.xml +++ b/proto-google-cloud-resourcemanager-v3/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-resourcemanager-v3 - 0.119.2-alpha-SNAPSHOT + 0.119.3-alpha-SNAPSHOT proto-google-cloud-resourcemanager-v3 Proto library for google-cloud-resourcemanager com.google.cloud google-cloud-resourcemanager-parent - 0.119.2-alpha-SNAPSHOT + 0.119.3-alpha-SNAPSHOT diff --git a/versions.txt b/versions.txt index 3fc975db..ab87f776 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-resourcemanager:0.119.1-alpha:0.119.2-alpha-SNAPSHOT -grpc-google-cloud-resourcemanager-v3:0.119.1-alpha:0.119.2-alpha-SNAPSHOT -proto-google-cloud-resourcemanager-v3:0.119.1-alpha:0.119.2-alpha-SNAPSHOT +google-cloud-resourcemanager:0.119.2-alpha:0.119.3-alpha-SNAPSHOT +grpc-google-cloud-resourcemanager-v3:0.119.2-alpha:0.119.3-alpha-SNAPSHOT +proto-google-cloud-resourcemanager-v3:0.119.2-alpha:0.119.3-alpha-SNAPSHOT