feat: [language] Add support for V1 and V2 classification models for …

…the V1Beta2 API (googleapis#8431) - [ ] Regenerate this pull request now. PiperOrigin-RevId: 475604619 Source-Link: googleapis/googleapis@044a15c Source-Link: https://github.com/googleapis/googleapis-gen/commit/410020af934c7248f7804770d6f8ec4571bfa551 Copy-Tag: eyJwIjoiamF2YS1sYW5ndWFnZS8uT3dsQm90LnlhbWwiLCJoIjoiNDEwMDIwYWY5MzRjNzI0OGY3ODA0NzcwZDZmOGVjNDU3MWJmYTU1MSJ9 feat: [language] Add support for V1 and V2 classification models for the V1 API PiperOrigin-RevId: 475599241 Source-Link: googleapis/googleapis@05b99f9 Source-Link: https://github.com/googleapis/googleapis-gen/commit/3dcdbed8d968f634be0a2d3107237d232ee8b061 Copy-Tag: eyJwIjoiamF2YS1sYW5ndWFnZS8uT3dsQm90LnlhbWwiLCJoIjoiM2RjZGJlZDhkOTY4ZjYzNGJlMGEyZDMxMDcyMzdkMjMyZWU4YjA2MSJ9
ddixit14 · Sep 21, 2022 · 8f2889b · 8f2889b
1 parent d56d8e4
commit 8f2889b
Show file tree

Hide file tree

Showing 60 changed files with 8,831 additions and 855 deletions.
diff --git a/java-language/README.md b/java-language/README.md
@@ -11,58 +11,28 @@ Java idiomatic client for [Natural Language][product-docs].
 
 ## Quickstart
 
-If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
 
-```xml
-<dependencyManagement>
-  <dependencies>
-    <dependency>
-      <groupId>com.google.cloud</groupId>
-      <artifactId>libraries-bom</artifactId>
-      <version>26.1.1</version>
-      <type>pom</type>
-      <scope>import</scope>
-    </dependency>
-  </dependencies>
-</dependencyManagement>
-
-<dependencies>
-  <dependency>
-    <groupId>com.google.cloud</groupId>
-    <artifactId>google-cloud-language</artifactId>
-  </dependency>
-
-```
-
-If you are using Maven without BOM, add this to your dependencies:
+If you are using Maven, add this to your pom.xml file:
 
 
 ```xml
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-language</artifactId>
-  <version>2.3.2</version>
+  <version>2.3.4</version>
 </dependency>
-
 ```
 
-If you are using Gradle 5.x or later, add this to your dependencies:
-
-```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.1.1')
-
-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.3.3'
+implementation 'com.google.cloud:google-cloud-language:2.3.4'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-language" % "2.3.3"
+libraryDependencies += "com.google.cloud" % "google-cloud-language" % "2.3.4"
 ```
 
 ## Authentication
@@ -132,18 +102,6 @@ In [AnalyzeSentiment.java](https://github.com/googleapis/google-cloud-java/blob/
 
 
 
-## Samples
-
-Samples are in the [`samples/`](https://github.com/googleapis/java-language/tree/main/samples) directory.
-
-| Sample                      | Source Code                       | Try it |
-| --------------------------- | --------------------------------- | ------ |
-| Analyze Beta | [source code](https://github.com/googleapis/java-language/blob/main/samples/snippets/src/main/java/beta/example/language/AnalyzeBeta.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-language&page=editor&open_in_editor=samples/snippets/src/main/java/beta/example/language/AnalyzeBeta.java) |
-| Analyze | [source code](https://github.com/googleapis/java-language/blob/main/samples/snippets/src/main/java/com/example/language/Analyze.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-language&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/language/Analyze.java) |
-| Quickstart Sample | [source code](https://github.com/googleapis/java-language/blob/main/samples/snippets/src/main/java/com/example/language/QuickstartSample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-language&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/language/QuickstartSample.java) |
-| Set Endpoint | [source code](https://github.com/googleapis/java-language/blob/main/samples/snippets/src/main/java/com/example/language/SetEndpoint.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-language&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/language/SetEndpoint.java) |
-
-
 
 ## Troubleshooting
 

diff --git a/...ogle-cloud-language/src/main/java/com/google/cloud/language/v1/LanguageServiceClient.java b/...ogle-cloud-language/src/main/java/com/google/cloud/language/v1/LanguageServiceClient.java
@@ -189,7 +189,7 @@ public LanguageServiceStub getStub() {
    * }
    * }</pre>
    *
-   * @param document Input document.
+   * @param document Required. Input document.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final AnalyzeSentimentResponse analyzeSentiment(Document document) {
@@ -218,7 +218,7 @@ public final AnalyzeSentimentResponse analyzeSentiment(Document document) {
    * }
    * }</pre>
    *
-   * @param document Input document.
+   * @param document Required. Input document.
    * @param encodingType The encoding type used by the API to calculate sentence offsets.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
@@ -310,7 +310,7 @@ public final AnalyzeSentimentResponse analyzeSentiment(AnalyzeSentimentRequest r
    * }
    * }</pre>
    *
-   * @param document Input document.
+   * @param document Required. Input document.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final AnalyzeEntitiesResponse analyzeEntities(Document document) {
@@ -340,7 +340,7 @@ public final AnalyzeEntitiesResponse analyzeEntities(Document document) {
    * }
    * }</pre>
    *
-   * @param document Input document.
+   * @param document Required. Input document.
    * @param encodingType The encoding type used by the API to calculate offsets.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
@@ -436,7 +436,7 @@ public final AnalyzeEntitiesResponse analyzeEntities(AnalyzeEntitiesRequest requ
    * }
    * }</pre>
    *
-   * @param document Input document.
+   * @param document Required. Input document.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final AnalyzeEntitySentimentResponse analyzeEntitySentiment(Document document) {
@@ -467,7 +467,7 @@ public final AnalyzeEntitySentimentResponse analyzeEntitySentiment(Document docu
    * }
    * }</pre>
    *
-   * @param document Input document.
+   * @param document Required. Input document.
    * @param encodingType The encoding type used by the API to calculate offsets.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
@@ -565,7 +565,7 @@ public final AnalyzeEntitySentimentResponse analyzeEntitySentiment(
    * }
    * }</pre>
    *
-   * @param document Input document.
+   * @param document Required. Input document.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final AnalyzeSyntaxResponse analyzeSyntax(Document document) {
@@ -593,7 +593,7 @@ public final AnalyzeSyntaxResponse analyzeSyntax(Document document) {
    * }
    * }</pre>
    *
-   * @param document Input document.
+   * @param document Required. Input document.
    * @param encodingType The encoding type used by the API to calculate offsets.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
@@ -684,7 +684,7 @@ public final UnaryCallable<AnalyzeSyntaxRequest, AnalyzeSyntaxResponse> analyzeS
    * }
    * }</pre>
    *
-   * @param document Input document.
+   * @param document Required. Input document.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final ClassifyTextResponse classifyText(Document document) {
@@ -706,7 +706,10 @@ public final ClassifyTextResponse classifyText(Document document) {
    * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
    * try (LanguageServiceClient languageServiceClient = LanguageServiceClient.create()) {
    *   ClassifyTextRequest request =
-   *       ClassifyTextRequest.newBuilder().setDocument(Document.newBuilder().build()).build();
+   *       ClassifyTextRequest.newBuilder()
+   *           .setDocument(Document.newBuilder().build())
+   *           .setClassificationModelOptions(ClassificationModelOptions.newBuilder().build())
+   *           .build();
    *   ClassifyTextResponse response = languageServiceClient.classifyText(request);
    * }
    * }</pre>
@@ -732,7 +735,10 @@ public final ClassifyTextResponse classifyText(ClassifyTextRequest request) {
    * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
    * try (LanguageServiceClient languageServiceClient = LanguageServiceClient.create()) {
    *   ClassifyTextRequest request =
-   *       ClassifyTextRequest.newBuilder().setDocument(Document.newBuilder().build()).build();
+   *       ClassifyTextRequest.newBuilder()
+   *           .setDocument(Document.newBuilder().build())
+   *           .setClassificationModelOptions(ClassificationModelOptions.newBuilder().build())
+   *           .build();
    *   ApiFuture<ClassifyTextResponse> future =
    *       languageServiceClient.classifyTextCallable().futureCall(request);
    *   // Do something.
@@ -764,8 +770,8 @@ public final UnaryCallable<ClassifyTextRequest, ClassifyTextResponse> classifyTe
    * }
    * }</pre>
    *
-   * @param document Input document.
-   * @param features The enabled features.
+   * @param document Required. Input document.
+   * @param features Required. The enabled features.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final AnnotateTextResponse annotateText(
@@ -797,8 +803,8 @@ public final AnnotateTextResponse annotateText(
    * }
    * }</pre>
    *
-   * @param document Input document.
-   * @param features The enabled features.
+   * @param document Required. Input document.
+   * @param features Required. The enabled features.
    * @param encodingType The encoding type used by the API to calculate offsets.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */

diff --git a/...nguage/google-cloud-language/src/main/java/com/google/cloud/language/v1/package-info.java b/...nguage/google-cloud-language/src/main/java/com/google/cloud/language/v1/package-info.java
@@ -15,7 +15,9 @@
  */
 
 /**
- * The interfaces provided are listed below, along with usage samples.
+ * A client to Cloud Natural Language API
+ *
+ * <p>The interfaces provided are listed below, along with usage samples.
  *
  * <p>======================= LanguageServiceClient =======================
  *

diff --git a/...cloud-language/src/main/java/com/google/cloud/language/v1beta2/LanguageServiceClient.java b/...cloud-language/src/main/java/com/google/cloud/language/v1beta2/LanguageServiceClient.java
@@ -552,7 +552,7 @@ public final AnalyzeEntitySentimentResponse analyzeEntitySentiment(
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Analyzes the syntax of the text and provides sentence boundaries and tokenization along with
-   * part-of-speech tags, dependency trees, and other properties.
+   * part of speech tags, dependency trees, and other properties.
    *
    * <p>Sample code:
    *
@@ -579,7 +579,7 @@ public final AnalyzeSyntaxResponse analyzeSyntax(Document document) {
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Analyzes the syntax of the text and provides sentence boundaries and tokenization along with
-   * part-of-speech tags, dependency trees, and other properties.
+   * part of speech tags, dependency trees, and other properties.
    *
    * <p>Sample code:
    *
@@ -612,7 +612,7 @@ public final AnalyzeSyntaxResponse analyzeSyntax(Document document, EncodingType
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Analyzes the syntax of the text and provides sentence boundaries and tokenization along with
-   * part-of-speech tags, dependency trees, and other properties.
+   * part of speech tags, dependency trees, and other properties.
    *
    * <p>Sample code:
    *
@@ -642,7 +642,7 @@ public final AnalyzeSyntaxResponse analyzeSyntax(AnalyzeSyntaxRequest request) {
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Analyzes the syntax of the text and provides sentence boundaries and tokenization along with
-   * part-of-speech tags, dependency trees, and other properties.
+   * part of speech tags, dependency trees, and other properties.
    *
    * <p>Sample code:
    *
@@ -709,7 +709,10 @@ public final ClassifyTextResponse classifyText(Document document) {
    * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
    * try (LanguageServiceClient languageServiceClient = LanguageServiceClient.create()) {
    *   ClassifyTextRequest request =
-   *       ClassifyTextRequest.newBuilder().setDocument(Document.newBuilder().build()).build();
+   *       ClassifyTextRequest.newBuilder()
+   *           .setDocument(Document.newBuilder().build())
+   *           .setClassificationModelOptions(ClassificationModelOptions.newBuilder().build())
+   *           .build();
    *   ClassifyTextResponse response = languageServiceClient.classifyText(request);
    * }
    * }</pre>
@@ -735,7 +738,10 @@ public final ClassifyTextResponse classifyText(ClassifyTextRequest request) {
    * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
    * try (LanguageServiceClient languageServiceClient = LanguageServiceClient.create()) {
    *   ClassifyTextRequest request =
-   *       ClassifyTextRequest.newBuilder().setDocument(Document.newBuilder().build()).build();
+   *       ClassifyTextRequest.newBuilder()
+   *           .setDocument(Document.newBuilder().build())
+   *           .setClassificationModelOptions(ClassificationModelOptions.newBuilder().build())
+   *           .build();
    *   ApiFuture<ClassifyTextResponse> future =
    *       languageServiceClient.classifyTextCallable().futureCall(request);
    *   // Do something.

diff --git a/...e/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/package-info.java b/...e/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/package-info.java
@@ -15,7 +15,9 @@
  */
 
 /**
- * The interfaces provided are listed below, along with usage samples.
+ * A client to Cloud Natural Language API
+ *
+ * <p>The interfaces provided are listed below, along with usage samples.
  *
  * <p>======================= LanguageServiceClient =======================
  *

diff --git a/...gle-cloud-language-v1/src/main/java/com/google/cloud/language/v1/LanguageServiceGrpc.java b/...gle-cloud-language-v1/src/main/java/com/google/cloud/language/v1/LanguageServiceGrpc.java
@@ -408,8 +408,10 @@ public void analyzeEntities(
      *
      *
      * <pre>
-     * Finds entities, similar to [AnalyzeEntities][google.cloud.language.v1.LanguageService.AnalyzeEntities] in the text and analyzes
-     * sentiment associated with each entity and its mentions.
+     * Finds entities, similar to
+     * [AnalyzeEntities][google.cloud.language.v1.LanguageService.AnalyzeEntities]
+     * in the text and analyzes sentiment associated with each entity and its
+     * mentions.
      * </pre>
      */
     public void analyzeEntitySentiment(
@@ -576,8 +578,10 @@ public void analyzeEntities(
      *
      *
      * <pre>
-     * Finds entities, similar to [AnalyzeEntities][google.cloud.language.v1.LanguageService.AnalyzeEntities] in the text and analyzes
-     * sentiment associated with each entity and its mentions.
+     * Finds entities, similar to
+     * [AnalyzeEntities][google.cloud.language.v1.LanguageService.AnalyzeEntities]
+     * in the text and analyzes sentiment associated with each entity and its
+     * mentions.
      * </pre>
      */
     public void analyzeEntitySentiment(
@@ -697,8 +701,10 @@ public com.google.cloud.language.v1.AnalyzeEntitiesResponse analyzeEntities(
      *
      *
      * <pre>
-     * Finds entities, similar to [AnalyzeEntities][google.cloud.language.v1.LanguageService.AnalyzeEntities] in the text and analyzes
-     * sentiment associated with each entity and its mentions.
+     * Finds entities, similar to
+     * [AnalyzeEntities][google.cloud.language.v1.LanguageService.AnalyzeEntities]
+     * in the text and analyzes sentiment associated with each entity and its
+     * mentions.
      * </pre>
      */
     public com.google.cloud.language.v1.AnalyzeEntitySentimentResponse analyzeEntitySentiment(
@@ -804,8 +810,10 @@ protected LanguageServiceFutureStub build(
      *
      *
      * <pre>
-     * Finds entities, similar to [AnalyzeEntities][google.cloud.language.v1.LanguageService.AnalyzeEntities] in the text and analyzes
-     * sentiment associated with each entity and its mentions.
+     * Finds entities, similar to
+     * [AnalyzeEntities][google.cloud.language.v1.LanguageService.AnalyzeEntities]
+     * in the text and analyzes sentiment associated with each entity and its
+     * mentions.
      * </pre>
      */
     public com.google.common.util.concurrent.ListenableFuture<

diff --git a/...language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/LanguageServiceGrpc.java b/...language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/LanguageServiceGrpc.java
@@ -426,7 +426,7 @@ public void analyzeEntitySentiment(
      *
      * <pre>
      * Analyzes the syntax of the text and provides sentence boundaries and
-     * tokenization along with part-of-speech tags, dependency trees, and other
+     * tokenization along with part of speech tags, dependency trees, and other
      * properties.
      * </pre>
      */
@@ -597,7 +597,7 @@ public void analyzeEntitySentiment(
      *
      * <pre>
      * Analyzes the syntax of the text and provides sentence boundaries and
-     * tokenization along with part-of-speech tags, dependency trees, and other
+     * tokenization along with part of speech tags, dependency trees, and other
      * properties.
      * </pre>
      */
@@ -714,7 +714,7 @@ public com.google.cloud.language.v1beta2.AnalyzeEntitySentimentResponse analyzeE
      *
      * <pre>
      * Analyzes the syntax of the text and provides sentence boundaries and
-     * tokenization along with part-of-speech tags, dependency trees, and other
+     * tokenization along with part of speech tags, dependency trees, and other
      * properties.
      * </pre>
      */
@@ -823,7 +823,7 @@ protected LanguageServiceFutureStub build(
      *
      * <pre>
      * Analyzes the syntax of the text and provides sentence boundaries and
-     * tokenization along with part-of-speech tags, dependency trees, and other
+     * tokenization along with part of speech tags, dependency trees, and other
      * properties.
      * </pre>
      */