Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(java): allow overriding the destination service folder name #387

Merged
merged 1 commit into from Jan 28, 2020
Merged

feat(java): allow overriding the destination service folder name #387

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 25 additions & 7 deletions synthtool/languages/java.py
View file
Open in desktop
Expand Up @@ -153,7 +153,12 @@ def version_from_maven_metadata(metadata: str) -> Optional[str]:


def _common_generation(
service: str, version: str, library: Path, package_pattern: str, suffix: str = ""
service: str,
version: str,
library: Path,
package_pattern: str,
suffix: str = "",
destination_name: str = None,
):
"""Helper function to execution the common generation cleanup actions.

Expand All @@ -168,8 +173,13 @@ def _common_generation(
package_pattern (str): Package name template for fixing file headers.
suffix (str, optional): Suffix that the generated library folder. The
artman output differs from bazel's output directory. Defaults to "".
destination_name (str, optional): Override the service name for the
destination of the output code. Defaults to the service name.
"""

if destination_name is None:
destination_name = service

package_name = package_pattern.format(service=service, version=version)
fix_proto_headers(library / f"proto-google-cloud-{service}-{version}{suffix}")
fix_grpc_headers(
Expand All @@ -178,15 +188,15 @@ def _common_generation(

s.copy(
[library / f"gapic-google-cloud-{service}-{version}{suffix}/src"],
f"google-cloud-{service}/src",
f"google-cloud-{destination_name}/src",
)
s.copy(
[library / f"grpc-google-cloud-{service}-{version}{suffix}/src"],
f"grpc-google-cloud-{service}-{version}/src",
f"grpc-google-cloud-{destination_name}-{version}/src",
)
s.copy(
[library / f"proto-google-cloud-{service}-{version}{suffix}/src"],
f"proto-google-cloud-{service}-{version}/src",
f"proto-google-cloud-{destination_name}-{version}/src",
)
s.copy(
[library / f"gapic-google-cloud-{service}-{version}{suffix}/samples/src"],
Expand All @@ -205,9 +215,9 @@ def _common_generation(
f"samples/src/main/java/com/google/cloud/examples/{service}/{version}/{service}.manifest.yaml",
)

format_code(f"google-cloud-{service}/src")
format_code(f"grpc-google-cloud-{service}-{version}/src")
format_code(f"proto-google-cloud-{service}-{version}/src")
format_code(f"google-cloud-{destination_name}/src")
format_code(f"grpc-google-cloud-{destination_name}-{version}/src")
format_code(f"proto-google-cloud-{destination_name}-{version}/src")
format_code("samples/src")


Expand All @@ -217,6 +227,7 @@ def gapic_library(
config_pattern: str = "/google/cloud/{service}/artman_{service}_{version}.yaml",
package_pattern: str = "com.google.cloud.{service}.{version}",
gapic: gcp.GAPICGenerator = None,
destination_name: str = None,
**kwargs,
) -> Path:
"""Generate a Java library using the gapic-generator via artman via Docker.
Expand All @@ -232,6 +243,8 @@ def gapic_library(
package_pattern (str, optional): Package name template for fixing file
headers. Defaults to "com.google.cloud.{service}.{version}".
gapic (GAPICGenerator, optional): Generator instance.
destination_name (str, optional): Override the service name for the
destination of the output code. Defaults to the service name.
**kwargs: Additional options for gapic.java_library()

Returns:
Expand All @@ -255,6 +268,7 @@ def gapic_library(
version=version,
library=library,
package_pattern=package_pattern,
destination_name=destination_name,
)

return library
Expand All @@ -265,6 +279,7 @@ def bazel_library(
version: str,
package_pattern: str = "com.google.cloud.{service}.{version}",
gapic: gcp.GAPICBazel = None,
destination_name: str = None,
**kwargs,
) -> Path:
"""Generate a Java library using the gapic-generator via bazel.
Expand All @@ -278,6 +293,8 @@ def bazel_library(
package_pattern (str, optional): Package name template for fixing file
headers. Defaults to "com.google.cloud.{service}.{version}".
gapic (GAPICBazel, optional): Generator instance.
destination_name (str, optional): Override the service name for the
destination of the output code. Defaults to the service name.
**kwargs: Additional options for gapic.java_library()

Returns:
Expand All @@ -294,6 +311,7 @@ def bazel_library(
library=library / f"google-cloud-{service}-{version}-java",
package_pattern=package_pattern,
suffix="-java",
destination_name=destination_name,
)

return library