diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index dc53bbb5..621c0d66 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:d4b2141d65566523dfd523f63c6e6899ab1281463bce182a9f600e74b0511875 + digest: sha256:94580e16bbb4ea1592fa9dd5c5df76716e17858c0dc975582d096c6ae0dc91f5 diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2425d723..05de1f60 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -8,13 +8,11 @@ jobs: units: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: java: [8, 11, 17] steps: - uses: actions/checkout@v2 - - uses: stCarolas/setup-maven@v4 - with: - maven-version: 3.8.1 - uses: actions/setup-java@v2 with: distribution: zulu @@ -27,9 +25,6 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v2 - - uses: stCarolas/setup-maven@v4 - with: - maven-version: 3.8.1 - uses: actions/setup-java@v2 with: distribution: zulu @@ -45,9 +40,6 @@ jobs: java: [8, 11, 17] steps: - uses: actions/checkout@v2 - - uses: stCarolas/setup-maven@v4 - with: - maven-version: 3.8.1 - uses: actions/setup-java@v2 with: distribution: zulu @@ -58,13 +50,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: stCarolas/setup-maven@v4 - with: - maven-version: 3.8.1 - uses: actions/setup-java@v2 with: distribution: zulu - java-version: 8 + java-version: 11 - run: java -version - run: .kokoro/build.sh env: @@ -73,9 +62,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: stCarolas/setup-maven@v4 - with: - maven-version: 3.8.1 - uses: actions/setup-java@v2 with: distribution: zulu diff --git a/.kokoro/build.sh b/.kokoro/build.sh index d3a51933..b18b4111 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -91,7 +91,6 @@ samples) pushd ${SAMPLES_DIR} mvn -B \ - -Penable-samples \ -ntp \ -DtrimStackTrace=false \ -Dclirr.skip=true \ diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 9a5105d7..d7476cfe 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -38,15 +38,13 @@ function determineMavenOpts() { | sed -E 's/^(1\.[0-9]\.0).*$/\1/g' ) - case $javaVersion in - "17") + if [[ $javaVersion == 17* ]] + then # MaxPermSize is no longer supported as of jdk 17 echo -n "-Xmx1024m" - ;; - *) + else echo -n "-Xmx1024m -XX:MaxPermSize=128m" - ;; - esac + fi } export MAVEN_OPTS=$(determineMavenOpts) diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh index e2fcb95c..aa7d51c4 100755 --- a/.kokoro/release/publish_javadoc11.sh +++ b/.kokoro/release/publish_javadoc11.sh @@ -36,13 +36,9 @@ mvn clean install -B -q -DskipTests=true export NAME=google-cloud-language export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) -# V3 generates docfx yml from javadoc -# generate yml -mvn clean site -B -q -P docFX - -# copy README to docfx-yml dir and rename index.md -cp README.md target/docfx-yml/index.md -# copy CHANGELOG to docfx-yml dir and rename history.md +# cloud RAD generation +mvn clean javadoc:aggregate -B -q -P docFX +# include CHANGELOG cp CHANGELOG.md target/docfx-yml/history.md pushd target/docfx-yml diff --git a/CHANGELOG.md b/CHANGELOG.md index 6354bed7..e9add52a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +### [2.1.4](https://www.github.com/googleapis/java-language/compare/v2.1.3...v2.1.4) (2021-12-03) + + +### Bug Fixes + +* **java:** java 17 dependency arguments ([#1266](https://www.github.com/googleapis/java-language/issues/1266)) ([#742](https://www.github.com/googleapis/java-language/issues/742)) ([48defbf](https://www.github.com/googleapis/java-language/commit/48defbf121efb9a8075cd64051bc7c93f21de8de)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.5.0 ([#752](https://www.github.com/googleapis/java-language/issues/752)) ([3b5753c](https://www.github.com/googleapis/java-language/commit/3b5753c76dad7ee1199a304bfd76e118b31ec2a8)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.5.1 ([#760](https://www.github.com/googleapis/java-language/issues/760)) ([14a9f32](https://www.github.com/googleapis/java-language/commit/14a9f326e88cdc599366aef1a53eee49ba55d1b9)) + ### [2.1.3](https://www.github.com/googleapis/java-language/compare/v2.1.2...v2.1.3) (2021-10-20) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f2dbdee0..b65dd279 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -53,12 +53,12 @@ mvn -Penable-integration-tests clean verify ## Code Samples -Code Samples must be bundled in separate Maven modules, and guarded by a -Maven profile with the name `enable-samples`. +All code samples must be in compliance with the [java sample formatting guide][3]. +Code Samples must be bundled in separate Maven modules. The samples must be separate from the primary project for a few reasons: -1. Primary projects have a minimum Java version of Java 7 whereas samples have - a minimum Java version of Java 8. Due to this we need the ability to +1. Primary projects have a minimum Java version of Java 8 whereas samples can have + Java version of Java 11. Due to this we need the ability to selectively exclude samples from a build run. 2. Many code samples depend on external GCP services and need credentials to access the service. @@ -68,39 +68,16 @@ The samples must be separate from the primary project for a few reasons: ### Building ```bash -mvn -Penable-samples clean verify +mvn clean verify ``` Some samples require access to GCP services and require a service account: ```bash export GOOGLE_APPLICATION_CREDENTIALS=/path/to/service/account.json -mvn -Penable-samples clean verify +mvn clean verify ``` -### Profile Config - -1. To add samples in a profile to your Maven project, add the following to your -`pom.xml` - - ```xml - - [...] - - - enable-samples - - sample - - - - [...] - - ``` - -2. [Activate](#profile-activation) the profile. -3. Define your samples in a normal Maven project in the `samples/` directory. - ### Code Formatting Code in this repo is formatted with @@ -110,30 +87,6 @@ To run formatting on your project, you can run: mvn com.coveo:fmt-maven-plugin:format ``` -### Profile Activation - -To include code samples when building and testing the project, enable the -`enable-samples` Maven profile. - -#### Command line - -To activate the Maven profile on the command line add `-Penable-samples` to your -Maven command. - -#### Maven `settings.xml` - -To activate the Maven profile in your `~/.m2/settings.xml` add an entry of -`enable-samples` following the instructions in [Active Profiles][2]. - -This method has the benefit of applying to all projects you build (and is -respected by IntelliJ IDEA) and is recommended if you are going to be -contributing samples to several projects. - -#### IntelliJ IDEA - -To activate the Maven Profile inside IntelliJ IDEA, follow the instructions in -[Activate Maven profiles][3] to activate `enable-samples`. - [1]: https://cloud.google.com/docs/authentication/getting-started#creating_a_service_account [2]: https://maven.apache.org/settings.html#Active_Profiles -[3]: https://www.jetbrains.com/help/idea/work-with-maven-profiles.html#activate_maven_profiles +[3]: https://github.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md \ No newline at end of file diff --git a/README.md b/README.md index da890104..1ea074fd 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud libraries-bom - 23.1.0 + 24.0.0 pom import @@ -41,7 +41,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-language - 2.1.2 + 2.1.3 ``` @@ -49,20 +49,20 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies ```Groovy -implementation platform('com.google.cloud:libraries-bom:23.1.0') +implementation platform('com.google.cloud:libraries-bom:24.0.0') implementation 'com.google.cloud:google-cloud-language' ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -implementation 'com.google.cloud:google-cloud-language:2.1.2' +implementation 'com.google.cloud:google-cloud-language:2.1.3' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-language" % "2.1.2" +libraryDependencies += "com.google.cloud" % "google-cloud-language" % "2.1.3" ``` ## Authentication @@ -155,7 +155,7 @@ Natural Language uses gRPC for the transport layer. ## Supported Java Versions -Java 7 or above is required for using this client. +Java 8 or above is required for using this client. Google's Java client libraries, [Google Cloud Client Libraries][cloudlibs] @@ -224,7 +224,6 @@ Apache 2.0 - See [LICENSE][license] for more information. Java Version | Status ------------ | ------ -Java 7 | [![Kokoro CI][kokoro-badge-image-1]][kokoro-badge-link-1] Java 8 | [![Kokoro CI][kokoro-badge-image-2]][kokoro-badge-link-2] Java 8 OSX | [![Kokoro CI][kokoro-badge-image-3]][kokoro-badge-link-3] Java 8 Windows | [![Kokoro CI][kokoro-badge-image-4]][kokoro-badge-link-4] diff --git a/google-cloud-language-bom/pom.xml b/google-cloud-language-bom/pom.xml index 304e6548..de113bd9 100644 --- a/google-cloud-language-bom/pom.xml +++ b/google-cloud-language-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-language-bom - 2.1.3 + 2.1.4 pom com.google.cloud google-cloud-shared-config - 1.1.0 + 1.2.2 Google Cloud language BOM @@ -52,27 +52,27 @@ com.google.cloud google-cloud-language - 2.1.3 + 2.1.4 com.google.api.grpc grpc-google-cloud-language-v1 - 2.1.3 + 2.1.4 com.google.api.grpc grpc-google-cloud-language-v1beta2 - 0.88.3 + 0.88.4 com.google.api.grpc proto-google-cloud-language-v1 - 2.1.3 + 2.1.4 com.google.api.grpc proto-google-cloud-language-v1beta2 - 0.88.3 + 0.88.4 diff --git a/google-cloud-language/pom.xml b/google-cloud-language/pom.xml index 6dd2f018..cf2d98a5 100644 --- a/google-cloud-language/pom.xml +++ b/google-cloud-language/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-language - 2.1.3 + 2.1.4 jar Google Cloud Natural Language https://github.com/googleapis/java-language @@ -11,7 +11,7 @@ com.google.cloud google-cloud-language-parent - 2.1.3 + 2.1.4 google-cloud-language diff --git a/grpc-google-cloud-language-v1/pom.xml b/grpc-google-cloud-language-v1/pom.xml index 0910b25d..859868ad 100644 --- a/grpc-google-cloud-language-v1/pom.xml +++ b/grpc-google-cloud-language-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-language-v1 - 2.1.3 + 2.1.4 grpc-google-cloud-language-v1 GRPC library for grpc-google-cloud-language-v1 com.google.cloud google-cloud-language-parent - 2.1.3 + 2.1.4 diff --git a/grpc-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/LanguageServiceGrpc.java b/grpc-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/LanguageServiceGrpc.java index 9314ee08..bf571966 100644 --- a/grpc-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/LanguageServiceGrpc.java +++ b/grpc-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/LanguageServiceGrpc.java @@ -28,6 +28,7 @@ @javax.annotation.Generated( value = "by gRPC proto compiler", comments = "Source: google/cloud/language/v1/language_service.proto") +@io.grpc.stub.annotations.GrpcGenerated public final class LanguageServiceGrpc { private LanguageServiceGrpc() {} diff --git a/grpc-google-cloud-language-v1beta2/pom.xml b/grpc-google-cloud-language-v1beta2/pom.xml index e3e0fd51..f7137fb5 100644 --- a/grpc-google-cloud-language-v1beta2/pom.xml +++ b/grpc-google-cloud-language-v1beta2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-language-v1beta2 - 0.88.3 + 0.88.4 grpc-google-cloud-language-v1beta2 GRPC library for grpc-google-cloud-language-v1beta2 com.google.cloud google-cloud-language-parent - 2.1.3 + 2.1.4 diff --git a/grpc-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/LanguageServiceGrpc.java b/grpc-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/LanguageServiceGrpc.java index 5e99337f..b167f048 100644 --- a/grpc-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/LanguageServiceGrpc.java +++ b/grpc-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/LanguageServiceGrpc.java @@ -28,6 +28,7 @@ @javax.annotation.Generated( value = "by gRPC proto compiler", comments = "Source: google/cloud/language/v1beta2/language_service.proto") +@io.grpc.stub.annotations.GrpcGenerated public final class LanguageServiceGrpc { private LanguageServiceGrpc() {} diff --git a/pom.xml b/pom.xml index 6fb29e77..bf2ee3b7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-language-parent pom - 2.1.3 + 2.1.4 Google Cloud Natural Language Parent https://github.com/googleapis/java-language @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.1.0 + 1.2.2 @@ -61,33 +61,33 @@ com.google.api.grpc proto-google-cloud-language-v1 - 2.1.3 + 2.1.4 com.google.api.grpc proto-google-cloud-language-v1beta2 - 0.88.3 + 0.88.4 com.google.api.grpc grpc-google-cloud-language-v1 - 2.1.3 + 2.1.4 com.google.api.grpc grpc-google-cloud-language-v1beta2 - 0.88.3 + 0.88.4 com.google.cloud google-cloud-language - 2.1.3 + 2.1.4 com.google.cloud google-cloud-shared-dependencies - 2.4.0 + 2.5.1 pom import diff --git a/proto-google-cloud-language-v1/pom.xml b/proto-google-cloud-language-v1/pom.xml index bb7a8673..a6f54f50 100644 --- a/proto-google-cloud-language-v1/pom.xml +++ b/proto-google-cloud-language-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-language-v1 - 2.1.3 + 2.1.4 proto-google-cloud-language-v1 PROTO library for proto-google-cloud-language-v1 com.google.cloud google-cloud-language-parent - 2.1.3 + 2.1.4 diff --git a/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitiesResponse.java b/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitiesResponse.java index d41fead7..f7a7c7b4 100644 --- a/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitiesResponse.java +++ b/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitiesResponse.java @@ -266,7 +266,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < entities_.size(); i++) { output.writeMessage(1, entities_.get(i)); } - if (!getLanguageBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(language_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, language_); } unknownFields.writeTo(output); @@ -281,7 +281,7 @@ public int getSerializedSize() { for (int i = 0; i < entities_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, entities_.get(i)); } - if (!getLanguageBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(language_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, language_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitySentimentResponse.java b/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitySentimentResponse.java index abaaa4a4..211ab391 100644 --- a/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitySentimentResponse.java +++ b/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitySentimentResponse.java @@ -267,7 +267,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < entities_.size(); i++) { output.writeMessage(1, entities_.get(i)); } - if (!getLanguageBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(language_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, language_); } unknownFields.writeTo(output); @@ -282,7 +282,7 @@ public int getSerializedSize() { for (int i = 0; i < entities_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, entities_.get(i)); } - if (!getLanguageBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(language_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, language_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSentimentResponse.java b/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSentimentResponse.java index 0ab61ac7..19f5893e 100644 --- a/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSentimentResponse.java +++ b/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSentimentResponse.java @@ -330,7 +330,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (documentSentiment_ != null) { output.writeMessage(1, getDocumentSentiment()); } - if (!getLanguageBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(language_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, language_); } for (int i = 0; i < sentences_.size(); i++) { @@ -348,7 +348,7 @@ public int getSerializedSize() { if (documentSentiment_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getDocumentSentiment()); } - if (!getLanguageBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(language_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, language_); } for (int i = 0; i < sentences_.size(); i++) { diff --git a/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSyntaxResponse.java b/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSyntaxResponse.java index 98161541..e23231aa 100644 --- a/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSyntaxResponse.java +++ b/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSyntaxResponse.java @@ -353,7 +353,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < tokens_.size(); i++) { output.writeMessage(2, tokens_.get(i)); } - if (!getLanguageBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(language_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, language_); } unknownFields.writeTo(output); @@ -371,7 +371,7 @@ public int getSerializedSize() { for (int i = 0; i < tokens_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, tokens_.get(i)); } - if (!getLanguageBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(language_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, language_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnnotateTextResponse.java b/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnnotateTextResponse.java index 566c760d..ef62d5c3 100644 --- a/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnnotateTextResponse.java +++ b/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnnotateTextResponse.java @@ -622,7 +622,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (documentSentiment_ != null) { output.writeMessage(4, getDocumentSentiment()); } - if (!getLanguageBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(language_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 5, language_); } for (int i = 0; i < categories_.size(); i++) { @@ -649,7 +649,7 @@ public int getSerializedSize() { if (documentSentiment_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getDocumentSentiment()); } - if (!getLanguageBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(language_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, language_); } for (int i = 0; i < categories_.size(); i++) { diff --git a/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassificationCategory.java b/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassificationCategory.java index b38e9196..8f5870a0 100644 --- a/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassificationCategory.java +++ b/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassificationCategory.java @@ -200,7 +200,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } if (confidence_ != 0F) { @@ -215,7 +215,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } if (confidence_ != 0F) { diff --git a/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Document.java b/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Document.java index 55893560..b5f49153 100644 --- a/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Document.java +++ b/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Document.java @@ -613,7 +613,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (sourceCase_ == 3) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, source_); } - if (!getLanguageBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(language_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 4, language_); } unknownFields.writeTo(output); @@ -634,7 +634,7 @@ public int getSerializedSize() { if (sourceCase_ == 3) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, source_); } - if (!getLanguageBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(language_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, language_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Entity.java b/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Entity.java index 6c75c994..5f35eed9 100644 --- a/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Entity.java +++ b/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Entity.java @@ -977,7 +977,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } if (type_ != com.google.cloud.language.v1.Entity.Type.UNKNOWN.getNumber()) { @@ -1003,7 +1003,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } if (type_ != com.google.cloud.language.v1.Entity.Type.UNKNOWN.getNumber()) { diff --git a/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/TextSpan.java b/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/TextSpan.java index 3a660e78..930e0b75 100644 --- a/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/TextSpan.java +++ b/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/TextSpan.java @@ -198,7 +198,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getContentBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(content_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, content_); } if (beginOffset_ != 0) { @@ -213,7 +213,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getContentBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(content_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, content_); } if (beginOffset_ != 0) { diff --git a/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Token.java b/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Token.java index 02b4a07e..8eb58d6e 100644 --- a/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Token.java +++ b/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Token.java @@ -373,7 +373,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (dependencyEdge_ != null) { output.writeMessage(3, getDependencyEdge()); } - if (!getLemmaBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(lemma_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 4, lemma_); } unknownFields.writeTo(output); @@ -394,7 +394,7 @@ public int getSerializedSize() { if (dependencyEdge_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getDependencyEdge()); } - if (!getLemmaBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(lemma_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, lemma_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-language-v1beta2/pom.xml b/proto-google-cloud-language-v1beta2/pom.xml index 5d0db3d3..8e576c53 100644 --- a/proto-google-cloud-language-v1beta2/pom.xml +++ b/proto-google-cloud-language-v1beta2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-language-v1beta2 - 0.88.3 + 0.88.4 proto-google-cloud-language-v1beta2 PROTO library for proto-google-cloud-language-v1beta2 com.google.cloud google-cloud-language-parent - 2.1.3 + 2.1.4 diff --git a/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitiesResponse.java b/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitiesResponse.java index 641adc40..fef94f28 100644 --- a/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitiesResponse.java +++ b/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitiesResponse.java @@ -266,7 +266,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < entities_.size(); i++) { output.writeMessage(1, entities_.get(i)); } - if (!getLanguageBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(language_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, language_); } unknownFields.writeTo(output); @@ -281,7 +281,7 @@ public int getSerializedSize() { for (int i = 0; i < entities_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, entities_.get(i)); } - if (!getLanguageBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(language_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, language_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitySentimentResponse.java b/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitySentimentResponse.java index e8dc6425..cfcde86d 100644 --- a/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitySentimentResponse.java +++ b/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitySentimentResponse.java @@ -267,7 +267,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < entities_.size(); i++) { output.writeMessage(1, entities_.get(i)); } - if (!getLanguageBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(language_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, language_); } unknownFields.writeTo(output); @@ -282,7 +282,7 @@ public int getSerializedSize() { for (int i = 0; i < entities_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, entities_.get(i)); } - if (!getLanguageBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(language_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, language_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSentimentResponse.java b/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSentimentResponse.java index dbb0aafd..ae6cc0f3 100644 --- a/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSentimentResponse.java +++ b/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSentimentResponse.java @@ -330,7 +330,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (documentSentiment_ != null) { output.writeMessage(1, getDocumentSentiment()); } - if (!getLanguageBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(language_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, language_); } for (int i = 0; i < sentences_.size(); i++) { @@ -348,7 +348,7 @@ public int getSerializedSize() { if (documentSentiment_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getDocumentSentiment()); } - if (!getLanguageBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(language_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, language_); } for (int i = 0; i < sentences_.size(); i++) { diff --git a/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSyntaxResponse.java b/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSyntaxResponse.java index b439e7ac..7628b778 100644 --- a/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSyntaxResponse.java +++ b/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSyntaxResponse.java @@ -353,7 +353,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < tokens_.size(); i++) { output.writeMessage(2, tokens_.get(i)); } - if (!getLanguageBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(language_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, language_); } unknownFields.writeTo(output); @@ -371,7 +371,7 @@ public int getSerializedSize() { for (int i = 0; i < tokens_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, tokens_.get(i)); } - if (!getLanguageBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(language_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, language_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnnotateTextResponse.java b/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnnotateTextResponse.java index c35230f6..744e198d 100644 --- a/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnnotateTextResponse.java +++ b/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnnotateTextResponse.java @@ -624,7 +624,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (documentSentiment_ != null) { output.writeMessage(4, getDocumentSentiment()); } - if (!getLanguageBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(language_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 5, language_); } for (int i = 0; i < categories_.size(); i++) { @@ -651,7 +651,7 @@ public int getSerializedSize() { if (documentSentiment_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(4, getDocumentSentiment()); } - if (!getLanguageBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(language_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, language_); } for (int i = 0; i < categories_.size(); i++) { diff --git a/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/ClassificationCategory.java b/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/ClassificationCategory.java index 79d43b7b..3848ad24 100644 --- a/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/ClassificationCategory.java +++ b/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/ClassificationCategory.java @@ -200,7 +200,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } if (confidence_ != 0F) { @@ -215,7 +215,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } if (confidence_ != 0F) { diff --git a/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Document.java b/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Document.java index 20ebf273..4e6060c0 100644 --- a/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Document.java +++ b/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Document.java @@ -613,7 +613,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (sourceCase_ == 3) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, source_); } - if (!getLanguageBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(language_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 4, language_); } unknownFields.writeTo(output); @@ -634,7 +634,7 @@ public int getSerializedSize() { if (sourceCase_ == 3) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, source_); } - if (!getLanguageBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(language_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, language_); } size += unknownFields.getSerializedSize(); diff --git a/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Entity.java b/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Entity.java index 715c345d..57751c30 100644 --- a/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Entity.java +++ b/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Entity.java @@ -980,7 +980,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } if (type_ != com.google.cloud.language.v1beta2.Entity.Type.UNKNOWN.getNumber()) { @@ -1006,7 +1006,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getNameBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } if (type_ != com.google.cloud.language.v1beta2.Entity.Type.UNKNOWN.getNumber()) { diff --git a/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/TextSpan.java b/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/TextSpan.java index 2e5d8c54..726aa188 100644 --- a/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/TextSpan.java +++ b/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/TextSpan.java @@ -198,7 +198,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getContentBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(content_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, content_); } if (beginOffset_ != 0) { @@ -213,7 +213,7 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getContentBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(content_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, content_); } if (beginOffset_ != 0) { diff --git a/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Token.java b/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Token.java index adce6257..871244b1 100644 --- a/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Token.java +++ b/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Token.java @@ -373,7 +373,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (dependencyEdge_ != null) { output.writeMessage(3, getDependencyEdge()); } - if (!getLemmaBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(lemma_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 4, lemma_); } unknownFields.writeTo(output); @@ -394,7 +394,7 @@ public int getSerializedSize() { if (dependencyEdge_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getDependencyEdge()); } - if (!getLemmaBytes().isEmpty()) { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(lemma_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, lemma_); } size += unknownFields.getSerializedSize(); diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index a60e9a1a..2236da8f 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-language - 2.1.2 + 2.1.3 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 97f7d380..bb1bd3e2 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-language - 2.1.2 + 2.1.3 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 9e34d315..e2a028a2 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 23.1.0 + 24.0.0 pom import diff --git a/versions.txt b/versions.txt index b9c55696..c5209818 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -google-cloud-language:2.1.3:2.1.3 -grpc-google-cloud-language-v1:2.1.3:2.1.3 -grpc-google-cloud-language-v1beta2:0.88.3:0.88.3 -proto-google-cloud-language-v1:2.1.3:2.1.3 -proto-google-cloud-language-v1beta2:0.88.3:0.88.3 +google-cloud-language:2.1.4:2.1.4 +grpc-google-cloud-language-v1:2.1.4:2.1.4 +grpc-google-cloud-language-v1beta2:0.88.4:0.88.4 +proto-google-cloud-language-v1:2.1.4:2.1.4 +proto-google-cloud-language-v1beta2:0.88.4:0.88.4