From 8c6e4e1bea125c9bc965fc7d0f695ed1eabcb98d Mon Sep 17 00:00:00 2001 From: Summer Ji Date: Tue, 8 Dec 2020 17:15:29 -0800 Subject: [PATCH 1/5] [samplecode][1/3]Implement Pure Unary RPC sample code (#573) --- .../google/api/generator/gapic/composer/BUILD.bazel | 1 + test/integration/goldens/logging/MetricsClient.java | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel b/src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel index 85f368b65e..480c9ff45a 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel +++ b/src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel @@ -38,6 +38,7 @@ TEST_DEPS = [ "//src/test/java/com/google/api/generator/gapic/testdata:showcase_java_proto", "//src/test/java/com/google/api/generator/gapic/testdata:testgapic_java_proto", "//src/test/java/com/google/api/generator/gapic/composer/constants", + "@com_google_api_api_common//jar", "@com_google_api_gax_java//gax", "@com_google_api_api_common", "@com_google_googleapis//google/logging/v2:logging_java_proto", diff --git a/test/integration/goldens/logging/MetricsClient.java b/test/integration/goldens/logging/MetricsClient.java index 0c5310dc93..f4ff98db83 100644 --- a/test/integration/goldens/logging/MetricsClient.java +++ b/test/integration/goldens/logging/MetricsClient.java @@ -277,7 +277,7 @@ public final ListLogMetricsPagedResponse listLogMetrics(ListLogMetricsRequest re * } * } * - * @param metricName Required. The resource name of the desired metric: + * @param metric_name Required. The resource name of the desired metric: *

"projects/[PROJECT_ID]/metrics/[METRIC_ID]" * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -302,7 +302,7 @@ public final LogMetric getLogMetric(LogMetricName metricName) { * } * } * - * @param metricName Required. The resource name of the desired metric: + * @param metric_name Required. The resource name of the desired metric: *

"projects/[PROJECT_ID]/metrics/[METRIC_ID]" * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -450,7 +450,7 @@ public final UnaryCallable createLogMetricCal * } * } * - * @param metricName Required. The resource name of the metric to update: + * @param metric_name Required. The resource name of the metric to update: *

"projects/[PROJECT_ID]/metrics/[METRIC_ID]" *

The updated metric must be provided in the request and it's `name` field must be the * same as `[METRIC_ID]` If the metric does not exist in `[PROJECT_ID]`, then a new metric is @@ -481,7 +481,7 @@ public final LogMetric updateLogMetric(LogMetricName metricName, LogMetric metri * } * } * - * @param metricName Required. The resource name of the metric to update: + * @param metric_name Required. The resource name of the metric to update: *

"projects/[PROJECT_ID]/metrics/[METRIC_ID]" *

The updated metric must be provided in the request and it's `name` field must be the * same as `[METRIC_ID]` If the metric does not exist in `[PROJECT_ID]`, then a new metric is @@ -542,7 +542,7 @@ public final UnaryCallable updateLogMetricCal * } * } * - * @param metricName Required. The resource name of the metric to delete: + * @param metric_name Required. The resource name of the metric to delete: *

"projects/[PROJECT_ID]/metrics/[METRIC_ID]" * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -567,7 +567,7 @@ public final void deleteLogMetric(LogMetricName metricName) { * } * } * - * @param metricName Required. The resource name of the metric to delete: + * @param metric_name Required. The resource name of the metric to delete: *

"projects/[PROJECT_ID]/metrics/[METRIC_ID]" * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ From 46cc06c4b3af60e4fcc4d7ac1d447a097959ea38 Mon Sep 17 00:00:00 2001 From: Summer Ji Date: Tue, 8 Dec 2020 17:15:29 -0800 Subject: [PATCH 2/5] [samplecode][1/3]Implement Pure Unary RPC sample code (#573) --- .../java/com/google/api/generator/gapic/composer/BUILD.bazel | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel b/src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel index 480c9ff45a..f588392118 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel +++ b/src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel @@ -39,6 +39,7 @@ TEST_DEPS = [ "//src/test/java/com/google/api/generator/gapic/testdata:testgapic_java_proto", "//src/test/java/com/google/api/generator/gapic/composer/constants", "@com_google_api_api_common//jar", + "@com_google_api_api_common//jar", "@com_google_api_gax_java//gax", "@com_google_api_api_common", "@com_google_googleapis//google/logging/v2:logging_java_proto", From 0f4db93465923d6cb899680d28d56bc15926cf7d Mon Sep 17 00:00:00 2001 From: summerji Date: Tue, 29 Dec 2020 00:04:17 -0800 Subject: [PATCH 3/5] Move ServiceClientSampleCodeComposerTest into correct dir --- .../com/google/api/generator/gapic/composer/BUILD.bazel | 1 - .../api/generator/gapic/composer/samplecode/BUILD.bazel | 6 ++++++ .../ServiceClientSampleCodeComposerTest.java | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) rename src/test/java/com/google/api/generator/gapic/composer/{ => samplecode}/ServiceClientSampleCodeComposerTest.java (99%) diff --git a/src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel b/src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel index f588392118..0d0bceec9d 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel +++ b/src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel @@ -19,7 +19,6 @@ UPDATE_GOLDENS_TESTS = [ TESTS = UPDATE_GOLDENS_TESTS + [ "RetrySettingsComposerTest", - "ServiceClientSampleCodeComposerTest", ] TEST_DEPS = [ diff --git a/src/test/java/com/google/api/generator/gapic/composer/samplecode/BUILD.bazel b/src/test/java/com/google/api/generator/gapic/composer/samplecode/BUILD.bazel index 963b826dae..f5135007ec 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/samplecode/BUILD.bazel +++ b/src/test/java/com/google/api/generator/gapic/composer/samplecode/BUILD.bazel @@ -5,6 +5,7 @@ package(default_visibility = ["//visibility:public"]) TESTS = [ "SampleCodeJavaFormatterTest", "SampleCodeWriterTest", + "ServiceClientSampleCodeComposerTest", ] filegroup( @@ -21,8 +22,13 @@ filegroup( "//src/main/java/com/google/api/generator/engine/writer", "//src/main/java/com/google/api/generator/gapic/composer/samplecode", "//src/main/java/com/google/api/generator/gapic/model", + "//src/main/java/com/google/api/generator/gapic/protoparser", + "//src/test/java/com/google/api/generator/gapic/testdata:showcase_java_proto", "//src/test/java/com/google/api/generator/testutils", + "@com_google_api_api_common//jar", "@com_google_api_gax_java//gax", + "@com_google_googleapis//google/rpc:rpc_java_proto", + "@com_google_protobuf//:protobuf_java", "@com_google_truth_truth//jar", "@junit_junit//jar", ], diff --git a/src/test/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientSampleCodeComposerTest.java similarity index 99% rename from src/test/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposerTest.java rename to src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientSampleCodeComposerTest.java index 1cb575fa3c..0fc7c33c67 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/ServiceClientSampleCodeComposerTest.java +++ b/src/test/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientSampleCodeComposerTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.api.generator.gapic.composer; +package com.google.api.generator.gapic.composer.samplecode; import static junit.framework.Assert.assertEquals; import static org.junit.Assert.assertThrows; From d752d077d7f6d9fbda8b21b7154b8bd7b510327f Mon Sep 17 00:00:00 2001 From: summerji Date: Wed, 30 Dec 2020 17:16:44 -0800 Subject: [PATCH 4/5] rebase #616 --- .../java/com/google/api/generator/gapic/composer/BUILD.bazel | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel b/src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel index 0d0bceec9d..8c5e1861f4 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel +++ b/src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel @@ -38,7 +38,6 @@ TEST_DEPS = [ "//src/test/java/com/google/api/generator/gapic/testdata:testgapic_java_proto", "//src/test/java/com/google/api/generator/gapic/composer/constants", "@com_google_api_api_common//jar", - "@com_google_api_api_common//jar", "@com_google_api_gax_java//gax", "@com_google_api_api_common", "@com_google_googleapis//google/logging/v2:logging_java_proto", From f28314a212e6a548e445aeeacee74004abda9330 Mon Sep 17 00:00:00 2001 From: summerji Date: Tue, 5 Jan 2021 14:17:41 -0800 Subject: [PATCH 5/5] rebase samplecode with dev_composer --- test/integration/goldens/logging/MetricsClient.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/integration/goldens/logging/MetricsClient.java b/test/integration/goldens/logging/MetricsClient.java index f4ff98db83..0c5310dc93 100644 --- a/test/integration/goldens/logging/MetricsClient.java +++ b/test/integration/goldens/logging/MetricsClient.java @@ -277,7 +277,7 @@ public final ListLogMetricsPagedResponse listLogMetrics(ListLogMetricsRequest re * } * } * - * @param metric_name Required. The resource name of the desired metric: + * @param metricName Required. The resource name of the desired metric: *

"projects/[PROJECT_ID]/metrics/[METRIC_ID]" * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -302,7 +302,7 @@ public final LogMetric getLogMetric(LogMetricName metricName) { * } * } * - * @param metric_name Required. The resource name of the desired metric: + * @param metricName Required. The resource name of the desired metric: *

"projects/[PROJECT_ID]/metrics/[METRIC_ID]" * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -450,7 +450,7 @@ public final UnaryCallable createLogMetricCal * } * } * - * @param metric_name Required. The resource name of the metric to update: + * @param metricName Required. The resource name of the metric to update: *

"projects/[PROJECT_ID]/metrics/[METRIC_ID]" *

The updated metric must be provided in the request and it's `name` field must be the * same as `[METRIC_ID]` If the metric does not exist in `[PROJECT_ID]`, then a new metric is @@ -481,7 +481,7 @@ public final LogMetric updateLogMetric(LogMetricName metricName, LogMetric metri * } * } * - * @param metric_name Required. The resource name of the metric to update: + * @param metricName Required. The resource name of the metric to update: *

"projects/[PROJECT_ID]/metrics/[METRIC_ID]" *

The updated metric must be provided in the request and it's `name` field must be the * same as `[METRIC_ID]` If the metric does not exist in `[PROJECT_ID]`, then a new metric is @@ -542,7 +542,7 @@ public final UnaryCallable updateLogMetricCal * } * } * - * @param metric_name Required. The resource name of the metric to delete: + * @param metricName Required. The resource name of the metric to delete: *

"projects/[PROJECT_ID]/metrics/[METRIC_ID]" * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ @@ -567,7 +567,7 @@ public final void deleteLogMetric(LogMetricName metricName) { * } * } * - * @param metric_name Required. The resource name of the metric to delete: + * @param metricName Required. The resource name of the metric to delete: *

"projects/[PROJECT_ID]/metrics/[METRIC_ID]" * @throws com.google.api.gax.rpc.ApiException if the remote call fails */