Deprecating *Type and getType() for resource names (#40)

garrettjonesgoogle · web-flow · commit b9790c6fe95b · 2018-02-06T12:02:40.000-08:00
diff --git a/sdk-platform-java/api-common-java/src/main/java/com/google/api/resourcenames/ResourceName.java b/sdk-platform-java/api-common-java/src/main/java/com/google/api/resourcenames/ResourceName.java
@@ -37,6 +37,11 @@
 @BetaApi
 public interface ResourceName {
 
-  /** The ResourceNameType of the resource name object. */
+  /**
+   * The ResourceNameType of the resource name object.
+   *
+   * @deprecated With Oneof types being converted to use inheritance, this is no longer necessary.
+   */
+  @Deprecated
   public ResourceNameType getType();
 }
diff --git a/sdk-platform-java/api-common-java/src/main/java/com/google/api/resourcenames/ResourceNameType.java b/sdk-platform-java/api-common-java/src/main/java/com/google/api/resourcenames/ResourceNameType.java
@@ -36,6 +36,9 @@
 /**
  * An interface that resource name types must implement. A ResourceNameType class is required for
  * any class that implements {@link ResourceName}.
+ *
+ * @deprecated With Oneof types being converted to use inheritance, this is no longer necessary.
  */
 @BetaApi
+@Deprecated
 public interface ResourceNameType {}
diff --git a/sdk-platform-java/api-common-java/src/main/java/com/google/api/resourcenames/UntypedResourceName.java b/sdk-platform-java/api-common-java/src/main/java/com/google/api/resourcenames/UntypedResourceName.java
@@ -48,10 +48,18 @@ private UntypedResourceName(String rawValue) {
     this.rawValue = Preconditions.checkNotNull(rawValue);
   }
 
+  /**
+   * @deprecated use {@link #of(ResourceName)} instead.
+   */
+  @Deprecated
   public static UntypedResourceName from(ResourceName resourceName) {
     return new UntypedResourceName(resourceName.toString());
   }
 
+  public static UntypedResourceName of(ResourceName resourceName) {
+    return new UntypedResourceName(resourceName.toString());
+  }
+
   public static UntypedResourceName parse(String formattedString) {
     return new UntypedResourceName(formattedString);
   }
@@ -60,7 +68,12 @@ public static boolean isParsableFrom(String formattedString) {
     return true;
   }
 
+  /*
+   * @deprecated With Oneof types being converted to use inheritance, this is
+   * no longer necessary.
+   */
   @Override
+  @Deprecated
   public ResourceNameType getType() {
     return UntypedResourceNameType.instance();
   }
diff --git a/sdk-platform-java/api-common-java/src/main/java/com/google/api/resourcenames/UntypedResourceNameType.java b/sdk-platform-java/api-common-java/src/main/java/com/google/api/resourcenames/UntypedResourceNameType.java
@@ -33,8 +33,13 @@
 
 import com.google.api.core.BetaApi;
 
-/** The ResourceNameType for {@link UntypedResourceName}. */
+/**
+ * The ResourceNameType for {@link UntypedResourceName}.
+ *
+ * @deprecated With Oneof types being converted to use inheritance, this is no longer necessary.
+ */
 @BetaApi
+@Deprecated
 public class UntypedResourceNameType implements ResourceNameType {
 
   private static UntypedResourceNameType instance = new UntypedResourceNameType();

Original file line number	Diff line number	Diff line change
`@@ -48,10 +48,18 @@ private UntypedResourceName(String rawValue) {`
`48`	`48`	`this.rawValue = Preconditions.checkNotNull(rawValue);`
`49`	`49`	`}`
`50`	`50`
	`51`	`+ /**`
	`52`	`+ * @deprecated use {@link #of(ResourceName)} instead.`
	`53`	`+ */`
	`54`	`+ @Deprecated`
`51`	`55`	`public static UntypedResourceName from(ResourceName resourceName) {`
`52`	`56`	`return new UntypedResourceName(resourceName.toString());`
`53`	`57`	`}`
`54`	`58`
	`59`	`+ public static UntypedResourceName of(ResourceName resourceName) {`
	`60`	`+ return new UntypedResourceName(resourceName.toString());`
	`61`	`+ }`
	`62`	`+`
`55`	`63`	`public static UntypedResourceName parse(String formattedString) {`
`56`	`64`	`return new UntypedResourceName(formattedString);`
`57`	`65`	`}`
`@@ -60,7 +68,12 @@ public static boolean isParsableFrom(String formattedString) {`
`60`	`68`	`return true;`
`61`	`69`	`}`
`62`	`70`
	`71`	`+ /*`
	`72`	`+ * @deprecated With Oneof types being converted to use inheritance, this is`
	`73`	`+ * no longer necessary.`
	`74`	`+ */`
`63`	`75`	`@Override`
	`76`	`+ @Deprecated`
`64`	`77`	`public ResourceNameType getType() {`
`65`	`78`	`return UntypedResourceNameType.instance();`
`66`	`79`	`}`