From 9d8bb12f08b74316bec9f25f0de5fa01247e17ce Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 19 Nov 2019 13:01:40 -0800 Subject: [PATCH] docs: regenerate javadoc, update common templates (#35) --- .github/release-please.yml | 1 + .kokoro/build.sh | 14 +++++++--- .kokoro/dependencies.sh | 6 +++- .../DataLabelingServiceClientTest.java | 3 +- .../v1beta1/HumanAnnotationConfig.java | 28 +++++++++---------- .../HumanAnnotationConfigOrBuilder.java | 8 +++--- .../datalabeling/v1beta1/OutputConfig.java | 24 ++++++++-------- .../v1beta1/OutputConfigOrBuilder.java | 6 ++-- .../cloud/datalabeling/v1beta1/dataset.proto | 2 +- .../v1beta1/human_annotation_config.proto | 4 +-- synth.metadata | 10 +++---- 11 files changed, 59 insertions(+), 47 deletions(-) diff --git a/.github/release-please.yml b/.github/release-please.yml index 82744682..dce2c845 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -1 +1,2 @@ releaseType: java-yoshi +bumpMinorPreMajor: true \ No newline at end of file diff --git a/.kokoro/build.sh b/.kokoro/build.sh index fa132f41..dc2936ef 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -27,6 +27,7 @@ echo ${JOB_TYPE} mvn install -B -V \ -DskipTests=true \ -Dclirr.skip=true \ + -Denforcer.skip=true \ -Dmaven.javadoc.skip=true \ -Dgcloud.download.skip=true \ -T 1C @@ -38,7 +39,7 @@ fi case ${JOB_TYPE} in test) - mvn test -B -Dclirr.skip=true + mvn test -B -Dclirr.skip=true -Denforcer.skip=true bash ${KOKORO_GFILE_DIR}/codecov.sh bash .kokoro/coerce_logs.sh ;; @@ -49,12 +50,17 @@ javadoc) mvn javadoc:javadoc javadoc:test-javadoc ;; integration) - mvn -B ${INTEGRATION_TEST_ARGS} -DtrimStackTrace=false -Dclirr.skip=true -fae verify + mvn -B ${INTEGRATION_TEST_ARGS} \ + -DtrimStackTrace=false \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -fae \ + verify bash .kokoro/coerce_logs.sh ;; clirr) - mvn -B clirr:check + mvn -B -Denforcer.skip=true clirr:check ;; *) ;; -esac \ No newline at end of file +esac diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index a7c629a9..a4d08428 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -23,5 +23,9 @@ echo $JOB_TYPE export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" -mvn install -DskipTests=true -B -V +# this should run maven enforcer +mvn install -B -V \ + -DskipTests=true \ + -Dclirr.skip=true + mvn -B dependency:analyze -DfailOnWarning=true diff --git a/google-cloud-datalabeling/src/test/java/com/google/cloud/datalabeling/v1beta1/DataLabelingServiceClientTest.java b/google-cloud-datalabeling/src/test/java/com/google/cloud/datalabeling/v1beta1/DataLabelingServiceClientTest.java index cbbfa706..5e0b7ba5 100644 --- a/google-cloud-datalabeling/src/test/java/com/google/cloud/datalabeling/v1beta1/DataLabelingServiceClientTest.java +++ b/google-cloud-datalabeling/src/test/java/com/google/cloud/datalabeling/v1beta1/DataLabelingServiceClientTest.java @@ -44,6 +44,7 @@ import java.io.IOException; import java.util.Arrays; import java.util.List; +import java.util.UUID; import java.util.concurrent.ExecutionException; import org.junit.After; import org.junit.AfterClass; @@ -64,7 +65,7 @@ public static void startStaticServer() { mockDataLabelingService = new MockDataLabelingService(); serviceHelper = new MockServiceHelper( - "in-process-1", Arrays.asList(mockDataLabelingService)); + UUID.randomUUID().toString(), Arrays.asList(mockDataLabelingService)); serviceHelper.start(); } diff --git a/proto-google-cloud-datalabeling-v1beta1/src/main/java/com/google/cloud/datalabeling/v1beta1/HumanAnnotationConfig.java b/proto-google-cloud-datalabeling-v1beta1/src/main/java/com/google/cloud/datalabeling/v1beta1/HumanAnnotationConfig.java index 7d5112cf..0a77dc82 100644 --- a/proto-google-cloud-datalabeling-v1beta1/src/main/java/com/google/cloud/datalabeling/v1beta1/HumanAnnotationConfig.java +++ b/proto-google-cloud-datalabeling-v1beta1/src/main/java/com/google/cloud/datalabeling/v1beta1/HumanAnnotationConfig.java @@ -187,7 +187,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * * * 
-   * Required except for LabelAudio case. Instruction resource name.
+   * Required. Instruction resource name.
    *
* * string instruction = 1; @@ -207,7 +207,7 @@ public java.lang.String getInstruction() { * * * 
-   * Required except for LabelAudio case. Instruction resource name.
+   * Required. Instruction resource name.
    *
* * string instruction = 1; @@ -371,7 +371,7 @@ public com.google.protobuf.ByteString getLabelGroupBytes() { * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt). * Default value is en-US. * Only need to set this when task is language related. For example, French - * text classification or Chinese audio transcription. + * text classification. * * * string language_code = 5; @@ -395,7 +395,7 @@ public java.lang.String getLanguageCode() { * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt). * Default value is en-US. * Only need to set this when task is language related. For example, French - * text classification or Chinese audio transcription. + * text classification. * * * string language_code = 5; @@ -1075,7 +1075,7 @@ public Builder mergeFrom( * * * 
-     * Required except for LabelAudio case. Instruction resource name.
+     * Required. Instruction resource name.
      *
* * string instruction = 1; @@ -1095,7 +1095,7 @@ public java.lang.String getInstruction() { * * * 
-     * Required except for LabelAudio case. Instruction resource name.
+     * Required. Instruction resource name.
      *
* * string instruction = 1; @@ -1115,7 +1115,7 @@ public com.google.protobuf.ByteString getInstructionBytes() { * * * 
-     * Required except for LabelAudio case. Instruction resource name.
+     * Required. Instruction resource name.
      *
* * string instruction = 1; @@ -1133,7 +1133,7 @@ public Builder setInstruction(java.lang.String value) { * * * 
-     * Required except for LabelAudio case. Instruction resource name.
+     * Required. Instruction resource name.
      *
* * string instruction = 1; @@ -1148,7 +1148,7 @@ public Builder clearInstruction() { * * * 
-     * Required except for LabelAudio case. Instruction resource name.
+     * Required. Instruction resource name.
      *
* * string instruction = 1; @@ -1475,7 +1475,7 @@ public Builder setLabelGroupBytes(com.google.protobuf.ByteString value) { * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt). * Default value is en-US. * Only need to set this when task is language related. For example, French - * text classification or Chinese audio transcription. + * text classification. * * * string language_code = 5; @@ -1499,7 +1499,7 @@ public java.lang.String getLanguageCode() { * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt). * Default value is en-US. * Only need to set this when task is language related. For example, French - * text classification or Chinese audio transcription. + * text classification. * * * string language_code = 5; @@ -1523,7 +1523,7 @@ public com.google.protobuf.ByteString getLanguageCodeBytes() { * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt). * Default value is en-US. * Only need to set this when task is language related. For example, French - * text classification or Chinese audio transcription. + * text classification. * * * string language_code = 5; @@ -1545,7 +1545,7 @@ public Builder setLanguageCode(java.lang.String value) { * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt). * Default value is en-US. * Only need to set this when task is language related. For example, French - * text classification or Chinese audio transcription. + * text classification. * * * string language_code = 5; @@ -1564,7 +1564,7 @@ public Builder clearLanguageCode() { * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt). * Default value is en-US. * Only need to set this when task is language related. For example, French - * text classification or Chinese audio transcription. + * text classification. * * * string language_code = 5; diff --git a/proto-google-cloud-datalabeling-v1beta1/src/main/java/com/google/cloud/datalabeling/v1beta1/HumanAnnotationConfigOrBuilder.java b/proto-google-cloud-datalabeling-v1beta1/src/main/java/com/google/cloud/datalabeling/v1beta1/HumanAnnotationConfigOrBuilder.java index 89c4127a..5634c3f6 100644 --- a/proto-google-cloud-datalabeling-v1beta1/src/main/java/com/google/cloud/datalabeling/v1beta1/HumanAnnotationConfigOrBuilder.java +++ b/proto-google-cloud-datalabeling-v1beta1/src/main/java/com/google/cloud/datalabeling/v1beta1/HumanAnnotationConfigOrBuilder.java @@ -27,7 +27,7 @@ public interface HumanAnnotationConfigOrBuilder * * * 
-   * Required except for LabelAudio case. Instruction resource name.
+   * Required. Instruction resource name.
    *
* * string instruction = 1; @@ -37,7 +37,7 @@ public interface HumanAnnotationConfigOrBuilder * * * 
-   * Required except for LabelAudio case. Instruction resource name.
+   * Required. Instruction resource name.
    *
* * string instruction = 1; @@ -123,7 +123,7 @@ public interface HumanAnnotationConfigOrBuilder * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt). * Default value is en-US. * Only need to set this when task is language related. For example, French - * text classification or Chinese audio transcription. + * text classification. * * * string language_code = 5; @@ -137,7 +137,7 @@ public interface HumanAnnotationConfigOrBuilder * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt). * Default value is en-US. * Only need to set this when task is language related. For example, French - * text classification or Chinese audio transcription. + * text classification. * * * string language_code = 5; diff --git a/proto-google-cloud-datalabeling-v1beta1/src/main/java/com/google/cloud/datalabeling/v1beta1/OutputConfig.java b/proto-google-cloud-datalabeling-v1beta1/src/main/java/com/google/cloud/datalabeling/v1beta1/OutputConfig.java index 121ca2b2..5768ceeb 100644 --- a/proto-google-cloud-datalabeling-v1beta1/src/main/java/com/google/cloud/datalabeling/v1beta1/OutputConfig.java +++ b/proto-google-cloud-datalabeling-v1beta1/src/main/java/com/google/cloud/datalabeling/v1beta1/OutputConfig.java @@ -183,7 +183,7 @@ public DestinationCase getDestinationCase() { * * 
    * Output to a file in Cloud Storage. Should be used for labeling output
-   * other thanimage segmentation.
+   * other than image segmentation.
    *
* * .google.cloud.datalabeling.v1beta1.GcsDestination gcs_destination = 1; @@ -196,7 +196,7 @@ public boolean hasGcsDestination() { * * 
    * Output to a file in Cloud Storage. Should be used for labeling output
-   * other thanimage segmentation.
+   * other than image segmentation.
    *
* * .google.cloud.datalabeling.v1beta1.GcsDestination gcs_destination = 1; @@ -212,7 +212,7 @@ public com.google.cloud.datalabeling.v1beta1.GcsDestination getGcsDestination() * * 
    * Output to a file in Cloud Storage. Should be used for labeling output
-   * other thanimage segmentation.
+   * other than image segmentation.
    *
* * .google.cloud.datalabeling.v1beta1.GcsDestination gcs_destination = 1; @@ -675,7 +675,7 @@ public Builder clearDestination() { * * 
      * Output to a file in Cloud Storage. Should be used for labeling output
-     * other thanimage segmentation.
+     * other than image segmentation.
      *
* * .google.cloud.datalabeling.v1beta1.GcsDestination gcs_destination = 1; @@ -688,7 +688,7 @@ public boolean hasGcsDestination() { * * 
      * Output to a file in Cloud Storage. Should be used for labeling output
-     * other thanimage segmentation.
+     * other than image segmentation.
      *
* * .google.cloud.datalabeling.v1beta1.GcsDestination gcs_destination = 1; @@ -711,7 +711,7 @@ public com.google.cloud.datalabeling.v1beta1.GcsDestination getGcsDestination() * * 
      * Output to a file in Cloud Storage. Should be used for labeling output
-     * other thanimage segmentation.
+     * other than image segmentation.
      *
* * .google.cloud.datalabeling.v1beta1.GcsDestination gcs_destination = 1; @@ -734,7 +734,7 @@ public Builder setGcsDestination(com.google.cloud.datalabeling.v1beta1.GcsDestin * * 
      * Output to a file in Cloud Storage. Should be used for labeling output
-     * other thanimage segmentation.
+     * other than image segmentation.
      *
* * .google.cloud.datalabeling.v1beta1.GcsDestination gcs_destination = 1; @@ -755,7 +755,7 @@ public Builder setGcsDestination( * * 
      * Output to a file in Cloud Storage. Should be used for labeling output
-     * other thanimage segmentation.
+     * other than image segmentation.
      *
* * .google.cloud.datalabeling.v1beta1.GcsDestination gcs_destination = 1; @@ -788,7 +788,7 @@ public Builder mergeGcsDestination(com.google.cloud.datalabeling.v1beta1.GcsDest * * 
      * Output to a file in Cloud Storage. Should be used for labeling output
-     * other thanimage segmentation.
+     * other than image segmentation.
      *
* * .google.cloud.datalabeling.v1beta1.GcsDestination gcs_destination = 1; @@ -814,7 +814,7 @@ public Builder clearGcsDestination() { * * 
      * Output to a file in Cloud Storage. Should be used for labeling output
-     * other thanimage segmentation.
+     * other than image segmentation.
      *
* * .google.cloud.datalabeling.v1beta1.GcsDestination gcs_destination = 1; @@ -827,7 +827,7 @@ public com.google.cloud.datalabeling.v1beta1.GcsDestination.Builder getGcsDestin * * 
      * Output to a file in Cloud Storage. Should be used for labeling output
-     * other thanimage segmentation.
+     * other than image segmentation.
      *
* * .google.cloud.datalabeling.v1beta1.GcsDestination gcs_destination = 1; @@ -848,7 +848,7 @@ public com.google.cloud.datalabeling.v1beta1.GcsDestination.Builder getGcsDestin * * 
      * Output to a file in Cloud Storage. Should be used for labeling output
-     * other thanimage segmentation.
+     * other than image segmentation.
      *
* * .google.cloud.datalabeling.v1beta1.GcsDestination gcs_destination = 1; diff --git a/proto-google-cloud-datalabeling-v1beta1/src/main/java/com/google/cloud/datalabeling/v1beta1/OutputConfigOrBuilder.java b/proto-google-cloud-datalabeling-v1beta1/src/main/java/com/google/cloud/datalabeling/v1beta1/OutputConfigOrBuilder.java index 4e74ac02..ab31a716 100644 --- a/proto-google-cloud-datalabeling-v1beta1/src/main/java/com/google/cloud/datalabeling/v1beta1/OutputConfigOrBuilder.java +++ b/proto-google-cloud-datalabeling-v1beta1/src/main/java/com/google/cloud/datalabeling/v1beta1/OutputConfigOrBuilder.java @@ -28,7 +28,7 @@ public interface OutputConfigOrBuilder * * 
    * Output to a file in Cloud Storage. Should be used for labeling output
-   * other thanimage segmentation.
+   * other than image segmentation.
    *
* * .google.cloud.datalabeling.v1beta1.GcsDestination gcs_destination = 1; @@ -39,7 +39,7 @@ public interface OutputConfigOrBuilder * * 
    * Output to a file in Cloud Storage. Should be used for labeling output
-   * other thanimage segmentation.
+   * other than image segmentation.
    *
* * .google.cloud.datalabeling.v1beta1.GcsDestination gcs_destination = 1; @@ -50,7 +50,7 @@ public interface OutputConfigOrBuilder * * 
    * Output to a file in Cloud Storage. Should be used for labeling output
-   * other thanimage segmentation.
+   * other than image segmentation.
    *
* * .google.cloud.datalabeling.v1beta1.GcsDestination gcs_destination = 1; diff --git a/proto-google-cloud-datalabeling-v1beta1/src/main/proto/google/cloud/datalabeling/v1beta1/dataset.proto b/proto-google-cloud-datalabeling-v1beta1/src/main/proto/google/cloud/datalabeling/v1beta1/dataset.proto index 5289abcc..02117c94 100644 --- a/proto-google-cloud-datalabeling-v1beta1/src/main/proto/google/cloud/datalabeling/v1beta1/dataset.proto +++ b/proto-google-cloud-datalabeling-v1beta1/src/main/proto/google/cloud/datalabeling/v1beta1/dataset.proto @@ -135,7 +135,7 @@ message OutputConfig { // Required. Location to output data to. oneof destination { // Output to a file in Cloud Storage. Should be used for labeling output - // other thanimage segmentation. + // other than image segmentation. GcsDestination gcs_destination = 1; // Output to a folder in Cloud Storage. Should be used for image diff --git a/proto-google-cloud-datalabeling-v1beta1/src/main/proto/google/cloud/datalabeling/v1beta1/human_annotation_config.proto b/proto-google-cloud-datalabeling-v1beta1/src/main/proto/google/cloud/datalabeling/v1beta1/human_annotation_config.proto index d392aca7..67f3c81e 100644 --- a/proto-google-cloud-datalabeling-v1beta1/src/main/proto/google/cloud/datalabeling/v1beta1/human_annotation_config.proto +++ b/proto-google-cloud-datalabeling-v1beta1/src/main/proto/google/cloud/datalabeling/v1beta1/human_annotation_config.proto @@ -39,7 +39,7 @@ enum StringAggregationType { // Configuration for how human labeling task should be done. message HumanAnnotationConfig { - // Required except for LabelAudio case. Instruction resource name. + // Required. Instruction resource name. string instruction = 1; // Required. A human-readable name for AnnotatedDataset defined by @@ -59,7 +59,7 @@ message HumanAnnotationConfig { // [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt). // Default value is en-US. // Only need to set this when task is language related. For example, French - // text classification or Chinese audio transcription. + // text classification. string language_code = 5; // Optional. Replication of questions. Each question will be sent to up to diff --git a/synth.metadata b/synth.metadata index 18b097ea..d9c245d8 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-11-14T08:48:19.752657Z", + "updateTime": "2019-11-19T19:45:13.958729Z", "sources": [ { "generator": { "name": "artman", - "version": "0.41.1", - "dockerImage": "googleapis/artman@sha256:545c758c76c3f779037aa259023ec3d1ef2d57d2c8cd00a222cb187d63ceac5e" + "version": "0.42.1", + "dockerImage": "googleapis/artman@sha256:c773192618c608a7a0415dd95282f841f8e6bcdef7dd760a988c93b77a64bd57" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "bc76ffd87360ce1cd34e3a6eac28afd5e1efda76", - "internalRef": "280356106" + "sha": "5af83f47b9656261cafcf88b0b3334521ab266b3", + "internalRef": "281334391" } }, {