diff --git a/plugin/templates/resource_name.mustache b/plugin/templates/resource_name.mustache index 67f4387..f93291d 100644 --- a/plugin/templates/resource_name.mustache +++ b/plugin/templates/resource_name.mustache @@ -18,7 +18,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.api.pathtemplate.PathTemplate; import {{resourceNameGlobalPackageName}}.ResourceName; -import {{resourceNameGlobalPackageName}}.ResourceNameType; import java.util.Map; import java.util.ArrayList; import java.util.List; @@ -121,14 +120,6 @@ public class {{className}} {{extensionKeyword}} {{parentInterface}} { return getFieldValuesMap().get(fieldName); } - /** - * @deprecated This method is only present to satisfy the ResourceName interface. - */ - @Deprecated - public ResourceNameType getType() { - throw new UnsupportedOperationException("{{className}}.getType() not supported"); - } - @Override public String toString() { return PATH_TEMPLATE.instantiate({{#parameterList}}"{{parameter_name}}", {{parameter}}{{#not_last}}, {{/not_last}}{{/parameterList}}); diff --git a/plugin/templates/resource_name.py b/plugin/templates/resource_name.py index b143e83..42e7031 100644 --- a/plugin/templates/resource_name.py +++ b/plugin/templates/resource_name.py @@ -32,14 +32,10 @@ from plugin.utils import casing_utils RESOURCE_NAMES_GLOBAL_PACKAGE_JAVA = 'com.google.api.resourcenames' -RESOURCE_NAMES_TYPE_PACKAGE_JAVA = 'com.google.api.resourcenames.types' class ResourceNameBase(object): - def resourceNameTypePackageName(self): - return RESOURCE_NAMES_TYPE_PACKAGE_JAVA - def resourceNameGlobalPackageName(self): return RESOURCE_NAMES_GLOBAL_PACKAGE_JAVA @@ -249,20 +245,6 @@ def package(self): return self.untyped_package_name -class ResourceNameType(ResourceNameBase): - - def __init__(self, class_name, java_package): - self.type_name_upper = casing_utils.get_resource_type_from_class_name( - class_name) - self.package_name = java_package - - def className(self): - return self.type_name_upper - - def package(self): - return self.package_name - - class ResourceNameFixed(ResourceNameBase): def __init__(self, fixed_config, java_package, oneof): diff --git a/plugin/templates/resource_name_fixed.mustache b/plugin/templates/resource_name_fixed.mustache index cca8e73..9d761fb 100644 --- a/plugin/templates/resource_name_fixed.mustache +++ b/plugin/templates/resource_name_fixed.mustache @@ -15,7 +15,6 @@ package {{package}}; import {{resourceNameGlobalPackageName}}.ResourceName; -import {{resourceNameGlobalPackageName}}.ResourceNameType; import com.google.common.collect.ImmutableMap; import java.util.Map; @@ -52,14 +51,6 @@ public class {{className}} {{extensionKeyword}} {{parentInterface}} { return valueMap.get(fieldName); } - /** - * @deprecated This method is only present to satisfy the ResourceName interface. - */ - @Deprecated - public ResourceNameType getType() { - throw new UnsupportedOperationException("{{className}}.getType() not supported"); - } - @Override public String toString() { return FIXED_VALUE; diff --git a/plugin/templates/untyped_resource_name.mustache b/plugin/templates/untyped_resource_name.mustache index ca9334e..e7ea4bf 100644 --- a/plugin/templates/untyped_resource_name.mustache +++ b/plugin/templates/untyped_resource_name.mustache @@ -16,7 +16,6 @@ package {{package}}; import com.google.common.base.Preconditions; import {{resourceNameGlobalPackageName}}.ResourceName; -import {{resourceNameGlobalPackageName}}.ResourceNameType; import com.google.common.collect.ImmutableMap; import java.util.ArrayList; import java.util.List; @@ -80,14 +79,6 @@ public class {{className}} {{extensionKeyword}} {{parentInterface}} { return valueMap.get(fieldName); } - /** - * @deprecated This method is only present to satisfy the ResourceName interface. - */ - @Deprecated - public ResourceNameType getType() { - throw new UnsupportedOperationException("{{className}}.getType() not supported"); - } - @Override public String toString() { return rawValue; diff --git a/test/testdata/java_archived_book_name.baseline b/test/testdata/java_archived_book_name.baseline index f3e4e7c..47124ef 100644 --- a/test/testdata/java_archived_book_name.baseline +++ b/test/testdata/java_archived_book_name.baseline @@ -18,7 +18,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.api.pathtemplate.PathTemplate; import com.google.api.resourcenames.ResourceName; -import com.google.api.resourcenames.ResourceNameType; import java.util.Map; import java.util.ArrayList; import java.util.List; @@ -122,14 +121,6 @@ public class ArchivedBookName extends BookName { return getFieldValuesMap().get(fieldName); } - /** - * @deprecated This method is only present to satisfy the ResourceName interface. - */ - @Deprecated - public ResourceNameType getType() { - throw new UnsupportedOperationException("ArchivedBookName.getType() not supported"); - } - @Override public String toString() { return PATH_TEMPLATE.instantiate("archive_id", archiveId, "book_id", bookId); diff --git a/test/testdata/java_deleted_book.baseline b/test/testdata/java_deleted_book.baseline index 646f4ec..80e958c 100644 --- a/test/testdata/java_deleted_book.baseline +++ b/test/testdata/java_deleted_book.baseline @@ -15,7 +15,6 @@ package com.google.example.library.v1; import com.google.api.resourcenames.ResourceName; -import com.google.api.resourcenames.ResourceNameType; import com.google.common.collect.ImmutableMap; import java.util.Map; @@ -52,14 +51,6 @@ public class DeletedBook implements ResourceName { return valueMap.get(fieldName); } - /** - * @deprecated This method is only present to satisfy the ResourceName interface. - */ - @Deprecated - public ResourceNameType getType() { - throw new UnsupportedOperationException("DeletedBook.getType() not supported"); - } - @Override public String toString() { return FIXED_VALUE; diff --git a/test/testdata/java_shelf_book_name.baseline b/test/testdata/java_shelf_book_name.baseline index 173f1f0..5a85fb6 100644 --- a/test/testdata/java_shelf_book_name.baseline +++ b/test/testdata/java_shelf_book_name.baseline @@ -18,7 +18,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.api.pathtemplate.PathTemplate; import com.google.api.resourcenames.ResourceName; -import com.google.api.resourcenames.ResourceNameType; import java.util.Map; import java.util.ArrayList; import java.util.List; @@ -122,14 +121,6 @@ public class ShelfBookName extends BookName { return getFieldValuesMap().get(fieldName); } - /** - * @deprecated This method is only present to satisfy the ResourceName interface. - */ - @Deprecated - public ResourceNameType getType() { - throw new UnsupportedOperationException("ShelfBookName.getType() not supported"); - } - @Override public String toString() { return PATH_TEMPLATE.instantiate("shelf_id", shelfId, "book_id", bookId); diff --git a/test/testdata/java_shelf_name.baseline b/test/testdata/java_shelf_name.baseline index 484ff9f..4ed2fe9 100644 --- a/test/testdata/java_shelf_name.baseline +++ b/test/testdata/java_shelf_name.baseline @@ -18,7 +18,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.api.pathtemplate.PathTemplate; import com.google.api.resourcenames.ResourceName; -import com.google.api.resourcenames.ResourceNameType; import java.util.Map; import java.util.ArrayList; import java.util.List; @@ -113,14 +112,6 @@ public class ShelfName implements ResourceName { return getFieldValuesMap().get(fieldName); } - /** - * @deprecated This method is only present to satisfy the ResourceName interface. - */ - @Deprecated - public ResourceNameType getType() { - throw new UnsupportedOperationException("ShelfName.getType() not supported"); - } - @Override public String toString() { return PATH_TEMPLATE.instantiate("shelf_id", shelfId); diff --git a/test/testdata/java_untyped_book_name.baseline b/test/testdata/java_untyped_book_name.baseline index 92b952e..2f65b05 100644 --- a/test/testdata/java_untyped_book_name.baseline +++ b/test/testdata/java_untyped_book_name.baseline @@ -16,7 +16,6 @@ package com.google.example.library.v1; import com.google.common.base.Preconditions; import com.google.api.resourcenames.ResourceName; -import com.google.api.resourcenames.ResourceNameType; import com.google.common.collect.ImmutableMap; import java.util.ArrayList; import java.util.List; @@ -80,14 +79,6 @@ public class UntypedBookName extends BookName { return valueMap.get(fieldName); } - /** - * @deprecated This method is only present to satisfy the ResourceName interface. - */ - @Deprecated - public ResourceNameType getType() { - throw new UnsupportedOperationException("UntypedBookName.getType() not supported"); - } - @Override public String toString() { return rawValue;