beccasaurus · July 29, 2019 21:09
diff --git a/. tl;dr - pom generator.md b/. tl;dr - pom generator.md
diff --git a/.. Generating Java code samples and sample-tester manifest and running sample-tester .md b/.. Generating Java code samples and sample-tester manifest and running sample-tester .md
diff --git a/generate-pom b/generate-pom
 #! /usr/bin/env ruby

 def usage!
  puts "Usage: $0 api_name api_version path/to/java/dir/containing/a/src/dir"
  exit 1
 end

 usage! unless ARGV.length == 3

 POM_TEMPLATE = "pom.xml.erb"

 API_NAME    = ARGV.shift
 API_VERSION = ARGV.shift
 SRC_DIR     = ARGV.shift

 usage! unless File.directory? SRC_DIR

 library_name = "google-cloud-#{API_NAME}"

 ##
 # Create a mapping of region_tags to their class names (based on file names)
 #
 # "language_analyze_text" => "LanguageAnalyzeText"
 #
 # This could lazily simply presume every JavaClass.java has a java_class region tag
 ##
 region_tags_to_class_names = {}

 java_files = Dir.glob File.join(SRC_DIR, "**", "*.java")

 java_files.each do |path|
  class_name  = File.basename path, ".java"
  java_source = File.read path
  region_tags = java_source.scan(/\[START ([^\]]+)\]/).flatten.
                  reject { |region_tag| region_tag.end_with? "_core" } # ignore _core region tags
  region_tags.each do |region_tag|
    region_tags_to_class_names[region_tag] = class_name
  end
 end

 ##
 # Lookup the latest version of the Maven packagbe
 ##

 require "httparty" # gem install httparty (could use backed in Net::HTTP but I'm lazy)

 url           = %{http://search.maven.org/solrsearch/select?q=g:"com.google.cloud"+AND+a:"#{library_name}"&rows=20&core=gav}
 response      = HTTParty.get url
 packages      = response["response"]["docs"]
 first_package = packages.first

 if first_package && (first_package["a"] == library_name)
  library_version = first_package["v"]
 else
  STDERR.puts "Couldn't find package: #{library_name}"
  exit
 end

 ##
 # Render pom.xml template (prints it to STDOUT)
 ##

 template_variables = {
  api_name:                   API_NAME,
  api_version:                API_VERSION,
  library_name:               library_name,
  library_version:            library_version,
  region_tags_to_class_names: region_tags_to_class_names
 }

 require "erb"

 puts ERB.new(File.read POM_TEMPLATE).result_with_hash(template_variables)
diff --git a/pom.xml b/pom.xml
 <?xml version="1.0"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
  <artifactId>google-cloud-language</artifactId>
  <version>1.65.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-language:current} -->
  <packaging>jar</packaging>
  <name>Google Cloud Natural Language</name>
  <url>https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-language
  </url>
  <description>
    Java idiomatic client for Google Cloud Natural Language.
  </description>
  <parent>
    <groupId>com.google.cloud</groupId>
    <artifactId>google-cloud-clients</artifactId>
    <version>0.83.1-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-clients:current} -->
  </parent>
  <properties>
    <site.installationModule>google-cloud-language</site.installationModule>
  </properties>
  <dependencies>
    <dependency>
      <groupId>${project.groupId}</groupId>
      <artifactId>google-cloud-core</artifactId>
    </dependency>
    <dependency>
      <groupId>${project.groupId}</groupId>
      <artifactId>google-cloud-core-grpc</artifactId>
    </dependency>
    <dependency>
      <groupId>com.google.api.grpc</groupId>
      <artifactId>proto-google-cloud-language-v1</artifactId>
    </dependency>
    <dependency>
      <groupId>com.google.api.grpc</groupId>
      <artifactId>proto-google-cloud-language-v1beta2</artifactId>
    </dependency>
    <dependency>
      <groupId>io.grpc</groupId>
      <artifactId>grpc-netty-shaded</artifactId>
    </dependency>
    <dependency>
      <groupId>io.grpc</groupId>
      <artifactId>grpc-stub</artifactId>
    </dependency>
    <dependency>
      <groupId>io.grpc</groupId>
      <artifactId>grpc-auth</artifactId>
    </dependency>

    <!-- Test dependencies -->
    <dependency>
      <groupId>junit</groupId>
      <artifactId>junit</artifactId>
      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>org.easymock</groupId>
      <artifactId>easymock</artifactId>
      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>org.objenesis</groupId>
      <artifactId>objenesis</artifactId>
      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>com.google.api.grpc</groupId>
      <artifactId>grpc-google-cloud-language-v1</artifactId>
      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>com.google.api.grpc</groupId>
      <artifactId>grpc-google-cloud-language-v1beta2</artifactId>
      <scope>test</scope>
    </dependency>
    <!-- Need testing utility classes for generated gRPC clients tests -->
    <dependency>
      <groupId>com.google.api</groupId>
      <artifactId>gax-grpc</artifactId>
      <classifier>testlib</classifier>
      <scope>test</scope>
    </dependency>
  </dependencies>
 </project>
diff --git a/pom.xml.erb b/pom.xml.erb
 <!--
  Copyright 2019, Google Inc.

  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
 <project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>ccom.google.cloud.examples.language.v1h</groupId>
  <artifactId>language-v1-google-cloud-samples</artifactId>
  <packaging>jar</packaging>

  <parent>
    <groupId>com.google.cloud.samples</groupId>
    <artifactId>shared-configuration</artifactId>
    <version>1.0.10</version>
  </parent>

  <properties>
    <maven.compiler.target>1.8</maven.compiler.target>
    <maven.compiler.source>1.8</maven.compiler.source>
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  </properties>

  <dependencies>

    <!-- Published GAPIC Client Library -->
    <!-- Latest version via Maven Central -->
    <dependency>
      <groupId>com.google.cloud</groupId>
      <artifactId><%= library_name %></artifactId>
      <version><%= library_version %></version>
    </dependency>

    <!-- Command Line Arguments for Samples -->
    <dependency>
      <groupId>commons-cli</groupId>
      <artifactId>commons-cli</artifactId>
      <version>1.4</version>
    </dependency>
  </dependencies>

  <profiles>
    <!-- Profiles for `mvn exec:java -D[profile name]` for each sample -->
    <% region_tags_to_class_names.each do |region_tag, main_class| %>
    <profile>
      <id><%= region_tag %></id>
      <activation>
        <property>
          <name><%= region_tag %></name>
        </property>
      </activation>
      <build>
        <plugins>
          <plugin>
            <groupId>org.codehaus.mojo</groupId>
            <artifactId>exec-maven-plugin</artifactId>
            <version>1.6.0</version>
            <executions>
              <execution>
                <goals>
                  <goal>java</goal>
                </goals>
              </execution>
            </executions>
            <configuration>
              <mainClass>com.google.cloud.examples.<%= api_name %>.<%= api_version %>.<%= main_class %></mainClass>
              <cleanupDaemonThreads>false</cleanupDaemonThreads>
            </configuration>
          </plugin>
        </plugins>
      </build>
    </profile>
    <% end %>
  </profiles>

 </project>
diff --git a/synth.py b/synth.py
 # Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.

 """This script is used to synthesize generated parts of this library."""

 import synthtool as s
 import synthtool.gcp as gcp
 import synthtool.languages.java as java

 gapic = gcp.GAPICGenerator()

 service = 'language'
 versions = ['v1', 'v1beta2']
 config_pattern = '/google/cloud/language/artman_language_{version}.yaml'

 for version in versions:
    library = gapic.java_library(
        service=service,
        version=version,
        config_path=config_pattern.format(version=version),
        artman_output_name='', generator_args=["--dev_samples"])

    s.copy(library / f'gapic-google-cloud-{service}-{version}/src', 'src')
    s.copy(library / f'gapic-google-cloud-{service}-{version}/samples', f'samples/{version}')
    s.copy(library / f'grpc-google-cloud-{service}-{version}/src', f'../../google-api-grpc/grpc-google-cloud-{service}-{version}/src')
    s.copy(library / f'proto-google-cloud-{service}-{version}/src', f'../../google-api-grpc/proto-google-cloud-{service}-{version}/src')

    java.format_code('./src')
    java.format_code(f'../../google-api-grpc/grpc-google-cloud-{service}-{version}/src')
    java.format_code(f'../../google-api-grpc/proto-google-cloud-{service}-{version}/src')
	#! /usr/bin/env ruby

	def usage!
	puts "Usage: $0 api_name api_version path/to/java/dir/containing/a/src/dir"
	exit 1
	end

	usage! unless ARGV.length == 3

	POM_TEMPLATE = "pom.xml.erb"

	API_NAME = ARGV.shift
	API_VERSION = ARGV.shift
	SRC_DIR = ARGV.shift

	usage! unless File.directory? SRC_DIR

	library_name = "google-cloud-#{API_NAME}"

	##
	# Create a mapping of region_tags to their class names (based on file names)
	#
	# "language_analyze_text" => "LanguageAnalyzeText"
	#
	# This could lazily simply presume every JavaClass.java has a java_class region tag
	##
	region_tags_to_class_names = {}

	java_files = Dir.glob File.join(SRC_DIR, "*", ".java")

	java_files.each do \|path\|
	class_name = File.basename path, ".java"
	java_source = File.read path
	region_tags = java_source.scan(/\[START ([^\]]+)\]/).flatten.
	reject { \|region_tag\| region_tag.end_with? "_core" } # ignore _core region tags
	region_tags.each do \|region_tag\|
	region_tags_to_class_names[region_tag] = class_name
	end
	end

	##
	# Lookup the latest version of the Maven packagbe
	##

	require "httparty" # gem install httparty (could use backed in Net::HTTP but I'm lazy)

	url = %{http://search.maven.org/solrsearch/select?q=g:"com.google.cloud"+AND+a:"#{library_name}"&rows=20&core=gav}
	response = HTTParty.get url
	packages = response["response"]["docs"]
	first_package = packages.first

	if first_package && (first_package["a"] == library_name)
	library_version = first_package["v"]
	else
	STDERR.puts "Couldn't find package: #{library_name}"
	exit
	end

	##
	# Render pom.xml template (prints it to STDOUT)
	##

	template_variables = {
	api_name: API_NAME,
	api_version: API_VERSION,
	library_name: library_name,
	library_version: library_version,
	region_tags_to_class_names: region_tags_to_class_names
	}

	require "erb"

	puts ERB.new(File.read POM_TEMPLATE).result_with_hash(template_variables)
	<?xml version="1.0"?>
	<project xmlns="http://maven.apache.org/POM/4.0.0"
	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
	<modelVersion>4.0.0</modelVersion>
	<artifactId>google-cloud-language</artifactId>
	<version>1.65.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-language:current} -->
	<packaging>jar</packaging>
	<name>Google Cloud Natural Language</name>
	<url>https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-language
	</url>
	<description>
	Java idiomatic client for Google Cloud Natural Language.
	</description>
	<parent>
	<groupId>com.google.cloud</groupId>
	<artifactId>google-cloud-clients</artifactId>
	<version>0.83.1-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-clients:current} -->
	</parent>
	<properties>
	<site.installationModule>google-cloud-language</site.installationModule>
	</properties>
	<dependencies>
	<dependency>
	<groupId>${project.groupId}</groupId>
	<artifactId>google-cloud-core</artifactId>
	</dependency>
	<dependency>
	<groupId>${project.groupId}</groupId>
	<artifactId>google-cloud-core-grpc</artifactId>
	</dependency>
	<dependency>
	<groupId>com.google.api.grpc</groupId>
	<artifactId>proto-google-cloud-language-v1</artifactId>
	</dependency>
	<dependency>
	<groupId>com.google.api.grpc</groupId>
	<artifactId>proto-google-cloud-language-v1beta2</artifactId>
	</dependency>
	<dependency>
	<groupId>io.grpc</groupId>
	<artifactId>grpc-netty-shaded</artifactId>
	</dependency>
	<dependency>
	<groupId>io.grpc</groupId>
	<artifactId>grpc-stub</artifactId>
	</dependency>
	<dependency>
	<groupId>io.grpc</groupId>
	<artifactId>grpc-auth</artifactId>
	</dependency>

	<!-- Test dependencies -->
	<dependency>
	<groupId>junit</groupId>
	<artifactId>junit</artifactId>
	<scope>test</scope>
	</dependency>
	<dependency>
	<groupId>org.easymock</groupId>
	<artifactId>easymock</artifactId>
	<scope>test</scope>
	</dependency>
	<dependency>
	<groupId>org.objenesis</groupId>
	<artifactId>objenesis</artifactId>
	<scope>test</scope>
	</dependency>
	<dependency>
	<groupId>com.google.api.grpc</groupId>
	<artifactId>grpc-google-cloud-language-v1</artifactId>
	<scope>test</scope>
	</dependency>
	<dependency>
	<groupId>com.google.api.grpc</groupId>
	<artifactId>grpc-google-cloud-language-v1beta2</artifactId>
	<scope>test</scope>
	</dependency>
	<!-- Need testing utility classes for generated gRPC clients tests -->
	<dependency>
	<groupId>com.google.api</groupId>
	<artifactId>gax-grpc</artifactId>
	<classifier>testlib</classifier>
	<scope>test</scope>
	</dependency>
	</dependencies>
	</project>
	<!--
	Copyright 2019, Google Inc.

	Licensed under the Apache License, Version 2.0 (the "License");
	you may not use this file except in compliance with the License.
	You may obtain a copy of the License at

	http://www.apache.org/licenses/LICENSE-2.0

	Unless required by applicable law or agreed to in writing, software
	distributed under the License is distributed on an "AS IS" BASIS,
	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	See the License for the specific language governing permissions and
	limitations under the License.
	-->
	<project>
	<modelVersion>4.0.0</modelVersion>
	<groupId>ccom.google.cloud.examples.language.v1h</groupId>
	<artifactId>language-v1-google-cloud-samples</artifactId>
	<packaging>jar</packaging>

	<parent>
	<groupId>com.google.cloud.samples</groupId>
	<artifactId>shared-configuration</artifactId>
	<version>1.0.10</version>
	</parent>

	<properties>
	<maven.compiler.target>1.8</maven.compiler.target>
	<maven.compiler.source>1.8</maven.compiler.source>
	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
	</properties>

	<dependencies>

	<!-- Published GAPIC Client Library -->
	<!-- Latest version via Maven Central -->
	<dependency>
	<groupId>com.google.cloud</groupId>
	<artifactId><%= library_name %></artifactId>
	<version><%= library_version %></version>
	</dependency>

	<!-- Command Line Arguments for Samples -->
	<dependency>
	<groupId>commons-cli</groupId>
	<artifactId>commons-cli</artifactId>
	<version>1.4</version>
	</dependency>
	</dependencies>

	<profiles>
	<!-- Profiles for `mvn exec:java -D[profile name]` for each sample -->
	<% region_tags_to_class_names.each do \|region_tag, main_class\| %>
	<profile>
	<id><%= region_tag %></id>
	<activation>
	<property>
	<name><%= region_tag %></name>
	</property>
	</activation>
	<build>
	<plugins>
	<plugin>
	<groupId>org.codehaus.mojo</groupId>
	<artifactId>exec-maven-plugin</artifactId>
	<version>1.6.0</version>
	<executions>
	<execution>
	<goals>
	<goal>java</goal>
	</goals>
	</execution>
	</executions>
	<configuration>
	<mainClass>com.google.cloud.examples.<%= api_name %>.<%= api_version %>.<%= main_class %></mainClass>
	<cleanupDaemonThreads>false</cleanupDaemonThreads>
	</configuration>
	</plugin>
	</plugins>
	</build>
	</profile>
	<% end %>
	</profiles>

	</project>
	# Copyright 2018 Google LLC
	#
	# Licensed under the Apache License, Version 2.0 (the "License");
	# you may not use this file except in compliance with the License.
	# You may obtain a copy of the License at
	#
	# http://www.apache.org/licenses/LICENSE-2.0
	#
	# Unless required by applicable law or agreed to in writing, software
	# distributed under the License is distributed on an "AS IS" BASIS,
	# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	# See the License for the specific language governing permissions and
	# limitations under the License.

	"""This script is used to synthesize generated parts of this library."""

	import synthtool as s
	import synthtool.gcp as gcp
	import synthtool.languages.java as java

	gapic = gcp.GAPICGenerator()

	service = 'language'
	versions = ['v1', 'v1beta2']
	config_pattern = '/google/cloud/language/artman_language_{version}.yaml'

	for version in versions:
	library = gapic.java_library(
	service=service,
	version=version,
	config_path=config_pattern.format(version=version),
	artman_output_name='', generator_args=["--dev_samples"])

	s.copy(library / f'gapic-google-cloud-{service}-{version}/src', 'src')
	s.copy(library / f'gapic-google-cloud-{service}-{version}/samples', f'samples/{version}')
	s.copy(library / f'grpc-google-cloud-{service}-{version}/src', f'../../google-api-grpc/grpc-google-cloud-{service}-{version}/src')
	s.copy(library / f'proto-google-cloud-{service}-{version}/src', f'../../google-api-grpc/proto-google-cloud-{service}-{version}/src')

	java.format_code('./src')
	java.format_code(f'../../google-api-grpc/grpc-google-cloud-{service}-{version}/src')
	java.format_code(f'../../google-api-grpc/proto-google-cloud-{service}-{version}/src')