Skip to content
This repository was archived by the owner on Dec 8, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ before_script:
- export PATH=$PATH:$PWD/protoc-3.3.0/bin
- git clone https://github.com/googleapis/googleapis.git
install: pip install codecov tox-travis
script: tox
script: tox test/test_plugin_baseline.py
after_success:
- codecov
11 changes: 11 additions & 0 deletions BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
py_binary(
name = "gapic_plugin",
srcs = ["gapic_plugin.py"] + glob(["plugin/**/*.py"]),
data = glob(["plugin/**/*.mustache"]),
visibility = ["//visibility:public"],
deps = [
"@com_google_protobuf//:protobuf_python",
"@pypi_py_yaml//:lib",
"@pypi_pystache//:lib",
],
)
8 changes: 8 additions & 0 deletions WORKSPACE
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
workspace(name = "com_google_protoc_java_resource_names_plugin_repositories")

load(
"//:repositories.bzl",
"com_google_protoc_java_resource_names_plugin_repositories",
)

com_google_protoc_java_resource_names_plugin_repositories()
2 changes: 1 addition & 1 deletion gapic_plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import sys
import pystache

from plugin.compiler import plugin_pb2 as plugin
from google.protobuf.compiler import plugin_pb2 as plugin
from google.protobuf.descriptor_pb2 import FieldDescriptorProto

from plugin.templates import resource_name, insertion_points
Expand Down
Empty file removed plugin/compiler/__init__.py
Empty file.
256 changes: 0 additions & 256 deletions plugin/compiler/plugin_pb2.py

This file was deleted.

35 changes: 21 additions & 14 deletions plugin/templates/resource_name.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

import os
from google.gax import path_template
from plugin.utils import path_template
from plugin.utils import casing_utils

RESOURCE_NAMES_GLOBAL_PACKAGE_JAVA = 'com.google.api.resourcenames'
Expand Down Expand Up @@ -75,8 +75,9 @@ def __init__(self, collection_config, java_package, oneof):
self.type_name_upper = casing_utils.get_resource_type_from_class_name(
self.format_name_upper)
if oneof:
self.parent_interface = casing_utils.get_parent_resource_name_class_name(
oneof.oneof_name)
self.parent_interface = \
casing_utils.get_parent_resource_name_class_name(
oneof.oneof_name)
self.extension_keyword = 'extends'
else:
self.parent_interface = 'ResourceName'
Expand Down Expand Up @@ -126,7 +127,8 @@ class ResourceNameOneof(ResourceNameBase):
def __init__(self, oneof, java_package):
entity_name = oneof.oneof_name
self.oneof_class_name = casing_utils.get_oneof_class_name(entity_name)
self.parent_class_name = casing_utils.get_parent_resource_name_class_name(entity_name)
self.parent_class_name = \
casing_utils.get_parent_resource_name_class_name(entity_name)
self.single_resource_types = [{
'resourceTypeClassName': resource.className(),
'resourceTypeVarName': resource.varName(),
Expand Down Expand Up @@ -167,7 +169,8 @@ class ParentResourceName(ResourceNameBase):

def __init__(self, oneof, java_package):
entity_name = oneof.oneof_name
self.class_name = casing_utils.get_parent_resource_name_class_name(entity_name)
self.class_name = \
casing_utils.get_parent_resource_name_class_name(entity_name)
self.package_name = java_package

def className(self):
Expand All @@ -181,10 +184,13 @@ class ResourceNameFactory(ResourceNameBase):

def __init__(self, oneof, java_package):
entity_name = oneof.oneof_name
self.class_name = casing_utils.get_resource_name_factory_class_name(entity_name)
self.class_name = \
casing_utils.get_resource_name_factory_class_name(entity_name)
self.package_name = java_package
self.resource_class_name = casing_utils.get_parent_resource_name_class_name(entity_name)
self.untyped_class_name = casing_utils.get_untyped_resource_name_class_name(entity_name)
self.resource_class_name = \
casing_utils.get_parent_resource_name_class_name(entity_name)
self.untyped_class_name = \
casing_utils.get_untyped_resource_name_class_name(entity_name)
self.single_resource_types = [{
'resourceTypeClassName': resource.className(),
'resourceTypeVarName': resource.varName(),
Expand Down Expand Up @@ -226,10 +232,10 @@ class UntypedResourceName(ResourceNameBase):

def __init__(self, oneof, java_package):
entity_name = oneof.oneof_name
self.untyped_class_name = casing_utils.get_untyped_resource_name_class_name(
entity_name)
self.parent_interface = casing_utils.get_parent_resource_name_class_name(
oneof.oneof_name)
self.untyped_class_name = \
casing_utils.get_untyped_resource_name_class_name(entity_name)
self.parent_interface = \
casing_utils.get_parent_resource_name_class_name(oneof.oneof_name)
self.untyped_package_name = java_package

def className(self):
Expand All @@ -254,8 +260,9 @@ def __init__(self, fixed_config, java_package, oneof):
self.fixed_value = fixed_config.fixed_value
self.package_name = java_package
if oneof:
self.parent_interface = casing_utils.get_parent_resource_name_class_name(
oneof.oneof_name)
self.parent_interface = \
casing_utils.get_parent_resource_name_class_name(
oneof.oneof_name)
self.extension_keyword = 'extends'
else:
self.parent_interface = 'ResourceName'
Expand Down
Loading