Make project.properties path independent per API by shinfan · Pull Request #1863 · googleapis/google-cloud-java

shinfan · 2017-04-05T10:10:52Z

Previously we generate all project.properties files into root which is
incorrect
Now the caller API client needs to pass in package path to retrieve the
corresponding version
Create project.properties for Veneer-only clients as well

The new properties file will be stored at:
{ROOT}/com/google/cloud/{api}/project.properties

Follow-up: Update Gapic clients

- Previously we generate all project.properties files into root which is incorrect - Now the caller API client needs to pass in artifact ID to retrieve the corresponding version - Create project.properties for Veneer-only clients as well

coveralls · 2017-04-05T11:01:29Z

Changes Unknown when pulling b72db11 on shinfan:master into ** on GoogleCloudPlatform:master**.

Sign in to view

-      }
+      String projectPropertiesPath = PROPERTIES_ROOT
+          + artifactId + "/"
+          + PROPERTIES_FILE;


Sign in to view

+  public static String getLibraryVersion(String artifactId) {
+    String version = getPomVersion(artifactId);
+    if (version == null) {
+      version = getManifestVersion();


Sign in to view

   */
-  public HttpRequestInitializer getHttpRequestInitializer(ServiceOptions<?, ?> serviceOptions) {
+  public HttpRequestInitializer getHttpRequestInitializer(
+      ServiceOptions<?, ?> serviceOptions, final String artifactId) {


Sign in to view

        Attributes manifestAttributes = manifest.getMainAttributes();
-        String artifactId = manifestAttributes.getValue(MANIFEST_ARTIFACT_ID_KEY);
-        if (artifactId != null && artifactId.equals(ARTIFACT_ID)) {
+        String currentArtifactId = manifestAttributes.getValue(MANIFEST_ARTIFACT_ID_KEY);


Sign in to view

 import com.google.api.gax.grpc.UnaryCallable;
+import com.google.cloud.logging.spi.v2.PagedResponseWrappers.ListLogEntriesPagedResponse;
+import com.google.cloud.logging.spi.v2.PagedResponseWrappers.ListLogsPagedResponse;
+import com.google.cloud.logging.spi.v2.PagedResponseWrappers.ListMonitoredResourceDescriptorsPagedResponse;


Sign in to view

    HttpTransport transport = transportOptions.getHttpTransportFactory().create();
-    HttpRequestInitializer initializer = transportOptions.getHttpRequestInitializer(options);
+    HttpRequestInitializer initializer =
+        transportOptions.getHttpRequestInitializer(options);


Sign in to view

  public static ChannelProvider setUpChannelProvider(
-      InstantiatingChannelProvider.Builder providerBuilder, ServiceOptions<?, ?> serviceOptions) {
+      InstantiatingChannelProvider.Builder providerBuilder,
+      ServiceOptions<?, ?> serviceOptions) {


Sign in to view

            </goals>
            <configuration>
-                <outputFile>${project.build.outputDirectory}/project.properties</outputFile>
+              <outputFile>${project.build.outputDirectory}/properties/${project.artifactId}/project.properties</outputFile>


…java

shinfan · 2017-04-11T03:29:20Z

@garrettjonesgoogle PTAL

As discussed offline, I have modified the properties file path to be /{package_path}/project.properties

Sign in to view

+  private String getPackagePath() {
+    List<String> fullClassName = Splitter.on(".").splitToList(this.getClass().getCanonicalName());
+    if (fullClassName.size() > 2) {
+      return String.join("/", fullClassName.subList(0, fullClassName.size() - 1));


garrettjonesgoogle · 2017-04-12T02:33:08Z

LGTM if tests pass

shinfan · 2017-04-12T18:17:36Z

3 of 4 tests passed and 1 failed for timeout (most likely due to the flakiness of pubsub) Going to merge

…v6.83.0 (googleapis#1863)

…o v1.126.0 (#1863) * chore(deps): update dependency com.google.cloud:google-cloud-pubsub to v1.126.0 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

Make project.properties path be API independente

b72db11

- Previously we generate all project.properties files into root which is incorrect - Now the caller API client needs to pass in artifact ID to retrieve the corresponding version - Create project.properties for Veneer-only clients as well

shinfan assigned bjwatson, garrettjonesgoogle and michaelbausor Apr 5, 2017

googlebot added the cla: yes This human has signed the Contributor License Agreement. label Apr 5, 2017

shinfan mentioned this pull request Apr 5, 2017

Update properties file path in Java XSettings googleapis/gapic-generator#1166

Merged

garrettjonesgoogle reviewed Apr 5, 2017

View reviewed changes

shinfan added 2 commits April 6, 2017 13:09

update PR comments

3391879

restore settings

23287a8

garrettjonesgoogle reviewed Apr 6, 2017

View reviewed changes

Fix formatting. Revert files

6b9cb12

garrettjonesgoogle reviewed Apr 6, 2017

View reviewed changes

shinfan added 5 commits April 6, 2017 14:27

Fix tests

dc88e2c

Merge branch 'master' of github.com:GoogleCloudPlatform/google-cloud-…

d40e142

…java

Change path

403009e

Update PR comments

c18c378

Remove eclipse auto format change

6a2c4c9

garrettjonesgoogle reviewed Apr 11, 2017

View reviewed changes

Update PR comment

b36d408

shinfan merged commit 3f0f645 into googleapis:master Apr 12, 2017

theacodes unassigned bjwatson and michaelbausor Sep 28, 2018

suztomo pushed a commit to suztomo/google-cloud-java that referenced this pull request Mar 23, 2026

deps: update dependency com.google.cloud:google-cloud-spanner-bom to …

bcb40d5

…v6.83.0 (googleapis#1863)

meltsufin pushed a commit that referenced this pull request May 2, 2026

chore(main): release 3.27.1-SNAPSHOT (#1863)

756fa1d

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

Conversation

shinfan commented Apr 5, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

coveralls commented Apr 5, 2017

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

shinfan commented Apr 11, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

garrettjonesgoogle commented Apr 12, 2017

Uh oh!

shinfan commented Apr 12, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

shinfan commented Apr 5, 2017 •

edited

Loading

shinfan commented Apr 11, 2017 •

edited

Loading