Skip to content

Commit 65e9445

Browse files
authored
fix: deprecate handwritten code (googleapis#458)
1 parent 91bc312 commit 65e9445

15 files changed

Lines changed: 91 additions & 2 deletions

java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ConstraintInfo.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727
*
2828
* @see <a
2929
* href="https://cloud.google.com/resource-manager/reference/rest/v1/ListAvailableOrgPolicyConstraintsResponse#Constraint">Constraint</a>
30+
* @deprecated v3 GAPIC client of ResourceManager is now available
3031
*/
32+
@Deprecated
3133
public class ConstraintInfo {
3234

3335
static final Function<Constraint, ConstraintInfo> FROM_PROTOBUF_FUNCTION =

java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Option.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,12 @@
2323
import java.io.Serializable;
2424
import java.util.Objects;
2525

26-
/** Base class for Resource Manager operation options. */
26+
/**
27+
* Base class for Resource Manager operation options.
28+
*
29+
* @deprecated v3 GAPIC client of ResourceManager is now available
30+
*/
31+
@Deprecated
2732
abstract class Option implements Serializable {
2833

2934
private static final long serialVersionUID = 2655177550880762967L;

java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/OrgPolicyInfo.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@
2929
*
3030
* <p>Defines a Cloud Organization Policy which specifies constraints for configurations of Cloud
3131
* Platform resources.
32+
*
33+
* @deprecated v3 GAPIC client of ResourceManager is now available
3234
*/
35+
@Deprecated
3336
public class OrgPolicyInfo {
3437

3538
static final Function<OrgPolicy, OrgPolicyInfo> FROM_PROTOBUF_FUNCTION =

java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/PolicyMarshaller.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
import java.util.Map;
3232
import java.util.Set;
3333

34+
/** @deprecated v3 GAPIC client of ResourceManager is now available */
35+
@Deprecated
3436
final class PolicyMarshaller
3537
extends Marshaller<com.google.api.services.cloudresourcemanager.model.Policy> {
3638

java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/Project.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@
3232
* AppEngine Apps, VMs, and other Google Cloud Platform resources. This class' member variables are
3333
* immutable. Methods that change or update the underlying Project information return a new Project
3434
* instance. {@code Project} adds a layer of service-related functionality over {@link ProjectInfo}.
35+
*
36+
* @deprecated v3 GAPIC client of ResourceManager is now available
3537
*/
38+
@Deprecated
3639
public class Project extends ProjectInfo {
3740

3841
private static final long serialVersionUID = 6767630161335155133L;

java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@
3737
* A Google Cloud Resource Manager project metadata object. A Project is a high-level Google Cloud
3838
* Platform entity. It is a container for ACLs, APIs, AppEngine Apps, VMs, and other Google Cloud
3939
* Platform resources.
40+
*
41+
* @deprecated v3 GAPIC client of ResourceManager is now available
4042
*/
43+
@Deprecated
4144
public class ProjectInfo implements Serializable {
4245

4346
public static final DateTimeFormatter DATE_TIME_FORMATTER =

java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManager.java

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,25 @@
2222
import com.google.cloud.Policy;
2323
import com.google.cloud.Service;
2424
import com.google.cloud.resourcemanager.spi.v1beta1.ResourceManagerRpc;
25+
import com.google.cloud.resourcemanager.v3.GetProjectRequest;
26+
import com.google.cloud.resourcemanager.v3.ListProjectsRequest;
27+
import com.google.cloud.resourcemanager.v3.ProjectName;
28+
import com.google.cloud.resourcemanager.v3.ProjectsSettings;
29+
import com.google.cloud.resourcemanager.v3.UndeleteProjectRequest;
30+
import com.google.cloud.resourcemanager.v3.UpdateProjectRequest;
2531
import com.google.common.collect.ImmutableList;
32+
import com.google.iam.v1.GetIamPolicyRequest;
33+
import com.google.iam.v1.TestIamPermissionsRequest;
2634
import java.util.List;
2735
import java.util.Map;
2836

2937
/**
3038
* An interface for Google Cloud Resource Manager.
3139
*
3240
* @see <a href="https://cloud.google.com/resource-manager/">Google Cloud Resource Manager</a>
41+
* @deprecated v3 GAPIC client of ResourceManager is now available
3342
*/
43+
@Deprecated
3444
public interface ResourceManager extends Service<ResourceManagerOptions> {
3545

3646
String DEFAULT_CONTENT_TYPE = "application/octet-stream";
@@ -176,7 +186,10 @@ public static ProjectListOption fields(ProjectField... fields) {
176186
* @see <a href=
177187
* "https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/create">Cloud
178188
* Resource Manager create</a>
189+
* @deprecated Please use {@link
190+
* com.google.cloud.resourcemanager.v3.ProjectsClient#create(ProjectsSettings)} instead
179191
*/
192+
@Deprecated
180193
Project create(ProjectInfo project);
181194

182195
/**
@@ -202,7 +215,10 @@ public static ProjectListOption fields(ProjectField... fields) {
202215
* @see <a href=
203216
* "https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/delete">Cloud
204217
* Resource Manager delete</a>
218+
* @deprecated Please use {@link
219+
* com.google.cloud.resourcemanager.v3.ProjectsClient#deleteProjectAsync(ProjectName)} instead
205220
*/
221+
@Deprecated
206222
void delete(String projectId);
207223

208224
/**
@@ -214,7 +230,10 @@ public static ProjectListOption fields(ProjectField... fields) {
214230
* @throws ResourceManagerException upon failure
215231
* @see <a href="https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/get">
216232
* Cloud Resource Manager get</a>
233+
* @deprecated Please use {@link
234+
* com.google.cloud.resourcemanager.v3.ProjectsClient#getProject(GetProjectRequest)} instead
217235
*/
236+
@Deprecated
218237
Project get(String projectId, ProjectGetOption... options);
219238

220239
/**
@@ -229,7 +248,11 @@ public static ProjectListOption fields(ProjectField... fields) {
229248
* @see <a href=
230249
* "https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/list">Cloud
231250
* Resource Manager list</a>
251+
* @deprecated Please use {@link
252+
* com.google.cloud.resourcemanager.v3.ProjectsClient#listProjects(ListProjectsRequest)}
253+
* instead
232254
*/
255+
@Deprecated
233256
Page<Project> list(ProjectListOption... options);
234257

235258
/**
@@ -242,7 +265,11 @@ public static ProjectListOption fields(ProjectField... fields) {
242265
* @see <a href=
243266
* "https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/update">Cloud
244267
* Resource Manager update</a>
268+
* @deprecated Please use {@link
269+
* com.google.cloud.resourcemanager.v3.ProjectsClient#updateProjectAsync(UpdateProjectRequest)}
270+
* instead
245271
*/
272+
@Deprecated
246273
Project replace(ProjectInfo newProject);
247274

248275
/**
@@ -257,7 +284,11 @@ public static ProjectListOption fields(ProjectField... fields) {
257284
* @see <a href=
258285
* "https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/undelete">Cloud
259286
* Resource Manager undelete</a>
287+
* @deprecated Please use {@link
288+
* com.google.cloud.resourcemanager.v3.ProjectsClient#undeleteProjectAsync(UndeleteProjectRequest)}
289+
* instead
260290
*/
291+
@Deprecated
261292
void undelete(String projectId);
262293

263294
/**
@@ -269,7 +300,11 @@ public static ProjectListOption fields(ProjectField... fields) {
269300
* @see <a href=
270301
* "https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/getIamPolicy">
271302
* Resource Manager getIamPolicy</a>
303+
* @deprecated Please use {@link
304+
* com.google.cloud.resourcemanager.v3.ProjectsClient#getIamPolicy(GetIamPolicyRequest)}
305+
* instead
272306
*/
307+
@Deprecated
273308
Policy getPolicy(String projectId);
274309

275310
/**
@@ -316,7 +351,9 @@ public static ProjectListOption fields(ProjectField... fields) {
316351
* @see <a href=
317352
* "https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/setIamPolicy">
318353
* Resource Manager setIamPolicy</a>
354+
* @deprecated
319355
*/
356+
@Deprecated
320357
Policy replacePolicy(String projectId, Policy newPolicy);
321358

322359
/**
@@ -336,7 +373,10 @@ public static ProjectListOption fields(ProjectField... fields) {
336373
* Resource Manager testIamPermissions</a>
337374
* @see <a href= "https://cloud.google.com/iam/#supported_cloud_platform_services">Supported Cloud
338375
* Platform Services</a>
376+
* @deprecated {@link
377+
* com.google.cloud.resourcemanager.v3.ProjectsClient#testIamPermissions(TestIamPermissionsRequest)}
339378
*/
379+
@Deprecated
340380
List<Boolean> testPermissions(String projectId, List<String> permissions);
341381

342382
/** Class for specifying project list options. */
@@ -379,7 +419,9 @@ public static ListOption pageSize(int pageSize) {
379419
* @see <a href=
380420
* "https://cloud.google.com/resource-manager/reference/rest/v1/organizations/testIamPermissions">
381421
* Resource Manager testIamPermissions</a>
422+
* @deprecated
382423
*/
424+
@Deprecated
383425
Map<String, Boolean> testOrgPermissions(String resource, List<String> permissions);
384426

385427
/**
@@ -403,7 +445,9 @@ public static ListOption pageSize(int pageSize) {
403445
* @see <a
404446
* href="https://cloud.google.com/resource-manager/reference/rest/v1/folders/getEffectiveOrgPolicy">Resource
405447
* Manager getEffectiveOrgPolicy</a>
448+
* @deprecated
406449
*/
450+
@Deprecated
407451
OrgPolicyInfo getEffectiveOrgPolicy(String resource, String constraint);
408452

409453
/**
@@ -427,7 +471,9 @@ public static ListOption pageSize(int pageSize) {
427471
* @see <a
428472
* href="https://cloud.google.com/resource-manager/reference/rest/v1/folders/listAvailableOrgPolicyConstraints">Resource
429473
* Manager listAvailableOrgPolicyConstraints</a>
474+
* @deprecated
430475
*/
476+
@Deprecated
431477
Page<ConstraintInfo> listAvailableOrgPolicyConstraints(String resource, ListOption... options);
432478

433479
/**
@@ -437,7 +483,9 @@ public static ListOption pageSize(int pageSize) {
437483
* @see <a
438484
* href="https://cloud.google.com/resource-manager/reference/rest/v1/folders/listOrgPolicies">Resource
439485
* Manager listOrgPolicies</a>
486+
* @deprecated
440487
*/
488+
@Deprecated
441489
Page<OrgPolicyInfo> listOrgPolicies(String resource, ListOption... options);
442490

443491
/**
@@ -450,6 +498,8 @@ public static ListOption pageSize(int pageSize) {
450498
* @see <a
451499
* href="https://cloud.google.com/resource-manager/reference/rest/v1/folders/setOrgPolicy">Resource
452500
* Manager setOrgPolicy</a>
501+
* @deprecated
453502
*/
503+
@Deprecated
454504
OrgPolicyInfo replaceOrgPolicy(String resource, OrgPolicyInfo orgPolicy);
455505
}

java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerException.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@
2828
*
2929
* @see <a href="https://cloud.google.com/resource-manager/v1/errors/core_errors">Google Cloud
3030
* Resource Manager error codes</a>
31+
* @deprecated v3 GAPIC client of ResourceManager is now available
3132
*/
33+
@Deprecated
3234
public final class ResourceManagerException extends BaseHttpServiceException {
3335

3436
// see https://cloud.google.com/resource-manager/v1/errors/core_errors

java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerFactory.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@
1818

1919
import com.google.cloud.ServiceFactory;
2020

21-
/** An interface for ResourceManager factories. */
21+
/**
22+
* An interface for ResourceManager factories.
23+
*
24+
* @deprecated v3 GAPIC client of ResourceManager is now available
25+
*/
26+
@Deprecated
2227
public interface ResourceManagerFactory
2328
extends ServiceFactory<ResourceManager, ResourceManagerOptions> {}

java-resourcemanager/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ResourceManagerImpl.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
import java.util.Map;
4141
import java.util.concurrent.Callable;
4242

43+
/** @deprecated v3 GAPIC client of ResourceManager is now available */
44+
@Deprecated
4345
final class ResourceManagerImpl extends BaseService<ResourceManagerOptions>
4446
implements ResourceManager {
4547

0 commit comments

Comments
 (0)