From c3d990dd34d81e7e935041e7147fb9dd27f8a557 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Thu, 14 Mar 2019 00:46:10 -0700 Subject: [PATCH] Regenerate language client --- .../language/v1/ClassificationCategory.java | 21 +- .../v1/ClassificationCategoryOrBuilder.java | 6 +- .../cloud/language/v1/EncodingType.java | 4 +- .../com/google/cloud/language/v1/Entity.java | 110 ++++++ .../language/v1/LanguageServiceProto.java | 355 +++++++++--------- .../cloud/language/v1/language_service.proto | 73 ++-- .../language/v1/LanguageServiceClient.java | 1 + .../language/v1/LanguageServiceSettings.java | 1 + .../cloud/language/v1/package-info.java | 2 +- .../GrpcLanguageServiceCallableFactory.java | 2 +- .../v1/stub/GrpcLanguageServiceStub.java | 2 +- .../language/v1/stub/LanguageServiceStub.java | 2 +- .../v1/stub/LanguageServiceStubSettings.java | 10 +- .../google-cloud-language/synth.metadata | 10 +- 14 files changed, 371 insertions(+), 228 deletions(-) diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassificationCategory.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassificationCategory.java index 17a1820bb174..ab38b272191c 100644 --- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassificationCategory.java +++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassificationCategory.java @@ -103,7 +103,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * * * 
-   * The name of the category representing the document.
+   * The name of the category representing the document, from the [predefined
+   * taxonomy](/natural-language/docs/categories).
    *
* * string name = 1; @@ -123,7 +124,8 @@ public java.lang.String getName() { * * * 
-   * The name of the category representing the document.
+   * The name of the category representing the document, from the [predefined
+   * taxonomy](/natural-language/docs/categories).
    *
* * string name = 1; @@ -498,7 +500,8 @@ public Builder mergeFrom( * * * 
-     * The name of the category representing the document.
+     * The name of the category representing the document, from the [predefined
+     * taxonomy](/natural-language/docs/categories).
      *
* * string name = 1; @@ -518,7 +521,8 @@ public java.lang.String getName() { * * * 
-     * The name of the category representing the document.
+     * The name of the category representing the document, from the [predefined
+     * taxonomy](/natural-language/docs/categories).
      *
* * string name = 1; @@ -538,7 +542,8 @@ public com.google.protobuf.ByteString getNameBytes() { * * * 
-     * The name of the category representing the document.
+     * The name of the category representing the document, from the [predefined
+     * taxonomy](/natural-language/docs/categories).
      *
* * string name = 1; @@ -556,7 +561,8 @@ public Builder setName(java.lang.String value) { * * * 
-     * The name of the category representing the document.
+     * The name of the category representing the document, from the [predefined
+     * taxonomy](/natural-language/docs/categories).
      *
* * string name = 1; @@ -571,7 +577,8 @@ public Builder clearName() { * * * 
-     * The name of the category representing the document.
+     * The name of the category representing the document, from the [predefined
+     * taxonomy](/natural-language/docs/categories).
      *
* * string name = 1; diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassificationCategoryOrBuilder.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassificationCategoryOrBuilder.java index a02325759a50..b2f2ba38881c 100644 --- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassificationCategoryOrBuilder.java +++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassificationCategoryOrBuilder.java @@ -12,7 +12,8 @@ public interface ClassificationCategoryOrBuilder * * * 
-   * The name of the category representing the document.
+   * The name of the category representing the document, from the [predefined
+   * taxonomy](/natural-language/docs/categories).
    *
* * string name = 1; @@ -22,7 +23,8 @@ public interface ClassificationCategoryOrBuilder * * * 
-   * The name of the category representing the document.
+   * The name of the category representing the document, from the [predefined
+   * taxonomy](/natural-language/docs/categories).
    *
* * string name = 1; diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/EncodingType.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/EncodingType.java index 3d265e4c6975..85ba351dc931 100644 --- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/EncodingType.java +++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/EncodingType.java @@ -45,7 +45,7 @@ public enum EncodingType implements com.google.protobuf.ProtocolMessageEnum { * * 
    * Encoding-dependent information (such as `begin_offset`) is calculated based
-   * on the UTF-16 encoding of the input. Java and Javascript are examples of
+   * on the UTF-16 encoding of the input. Java and JavaScript are examples of
    * languages that use this encoding natively.
    *
* @@ -95,7 +95,7 @@ public enum EncodingType implements com.google.protobuf.ProtocolMessageEnum { * * 
    * Encoding-dependent information (such as `begin_offset`) is calculated based
-   * on the UTF-16 encoding of the input. Java and Javascript are examples of
+   * on the UTF-16 encoding of the input. Java and JavaScript are examples of
    * languages that use this encoding natively.
    *
* diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Entity.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Entity.java index 558c7566c5b2..426957652208 100644 --- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Entity.java +++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Entity.java @@ -254,6 +254,56 @@ public enum Type implements com.google.protobuf.ProtocolMessageEnum { * OTHER = 7; */ OTHER(7), + /** + * + * + * 
+     * Phone number
+     *
+ * + * PHONE_NUMBER = 9; + */ + PHONE_NUMBER(9), + /** + * + * + * 
+     * Address
+     *
+ * + * ADDRESS = 10; + */ + ADDRESS(10), + /** + * + * + * 
+     * Date
+     *
+ * + * DATE = 11; + */ + DATE(11), + /** + * + * + * 
+     * Number
+     *
+ * + * NUMBER = 12; + */ + NUMBER(12), + /** + * + * + * 
+     * Price
+     *
+ * + * PRICE = 13; + */ + PRICE(13), UNRECOGNIZED(-1), ; @@ -337,6 +387,56 @@ public enum Type implements com.google.protobuf.ProtocolMessageEnum { * OTHER = 7; */ public static final int OTHER_VALUE = 7; + /** + * + * + * 
+     * Phone number
+     *
+ * + * PHONE_NUMBER = 9; + */ + public static final int PHONE_NUMBER_VALUE = 9; + /** + * + * + * 
+     * Address
+     *
+ * + * ADDRESS = 10; + */ + public static final int ADDRESS_VALUE = 10; + /** + * + * + * 
+     * Date
+     *
+ * + * DATE = 11; + */ + public static final int DATE_VALUE = 11; + /** + * + * + * 
+     * Number
+     *
+ * + * NUMBER = 12; + */ + public static final int NUMBER_VALUE = 12; + /** + * + * + * 
+     * Price
+     *
+ * + * PRICE = 13; + */ + public static final int PRICE_VALUE = 13; public final int getNumber() { if (this == UNRECOGNIZED) { @@ -370,6 +470,16 @@ public static Type forNumber(int value) { return CONSUMER_GOOD; case 7: return OTHER; + case 9: + return PHONE_NUMBER; + case 10: + return ADDRESS; + case 11: + return DATE; + case 12: + return NUMBER; + case 13: + return PRICE; default: return null; } diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/LanguageServiceProto.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/LanguageServiceProto.java index ae901f09e6b1..73123aa81c2e 100644 --- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/LanguageServiceProto.java +++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/LanguageServiceProto.java @@ -127,7 +127,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "T\020\001\022\010\n\004HTML\020\002B\010\n\006source\"t\n\010Sentence\0220\n\004t" + "ext\030\001 \001(\0132\".google.cloud.language.v1.Tex" + "tSpan\0226\n\tsentiment\030\002 \001(\0132#.google.cloud." - + "language.v1.Sentiment\"\276\003\n\006Entity\022\014\n\004name" + + "language.v1.Sentiment\"\377\003\n\006Entity\022\014\n\004name" + "\030\001 \001(\t\0223\n\004type\030\002 \001(\0162%.google.cloud.lang" + "uage.v1.Entity.Type\022@\n\010metadata\030\003 \003(\0132.." + "google.cloud.language.v1.Entity.Metadata" @@ -135,183 +135,184 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\0132\'.google.cloud.language.v1.EntityMenti" + "on\0226\n\tsentiment\030\006 \001(\0132#.google.cloud.lan" + "guage.v1.Sentiment\032/\n\rMetadataEntry\022\013\n\003k" - + "ey\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"y\n\004Type\022\013\n\007U" - + "NKNOWN\020\000\022\n\n\006PERSON\020\001\022\014\n\010LOCATION\020\002\022\020\n\014OR" - + "GANIZATION\020\003\022\t\n\005EVENT\020\004\022\017\n\013WORK_OF_ART\020\005" - + "\022\021\n\rCONSUMER_GOOD\020\006\022\t\n\005OTHER\020\007\"\313\001\n\005Token" - + "\0220\n\004text\030\001 \001(\0132\".google.cloud.language.v" - + "1.TextSpan\022>\n\016part_of_speech\030\002 \001(\0132&.goo" - + "gle.cloud.language.v1.PartOfSpeech\022A\n\017de" - + "pendency_edge\030\003 \001(\0132(.google.cloud.langu" - + "age.v1.DependencyEdge\022\r\n\005lemma\030\004 \001(\t\"-\n\t" - + "Sentiment\022\021\n\tmagnitude\030\002 \001(\002\022\r\n\005score\030\003 " - + "\001(\002\"\243\020\n\014PartOfSpeech\0227\n\003tag\030\001 \001(\0162*.goog" - + "le.cloud.language.v1.PartOfSpeech.Tag\022=\n" - + "\006aspect\030\002 \001(\0162-.google.cloud.language.v1" - + ".PartOfSpeech.Aspect\0229\n\004case\030\003 \001(\0162+.goo" - + "gle.cloud.language.v1.PartOfSpeech.Case\022" - + "9\n\004form\030\004 \001(\0162+.google.cloud.language.v1" - + ".PartOfSpeech.Form\022=\n\006gender\030\005 \001(\0162-.goo" - + "gle.cloud.language.v1.PartOfSpeech.Gende" - + "r\0229\n\004mood\030\006 \001(\0162+.google.cloud.language." - + "v1.PartOfSpeech.Mood\022=\n\006number\030\007 \001(\0162-.g" - + "oogle.cloud.language.v1.PartOfSpeech.Num" - + "ber\022=\n\006person\030\010 \001(\0162-.google.cloud.langu" - + "age.v1.PartOfSpeech.Person\022=\n\006proper\030\t \001" - + "(\0162-.google.cloud.language.v1.PartOfSpee" - + "ch.Proper\022G\n\013reciprocity\030\n \001(\01622.google." - + "cloud.language.v1.PartOfSpeech.Reciproci" - + "ty\022;\n\005tense\030\013 \001(\0162,.google.cloud.languag" - + "e.v1.PartOfSpeech.Tense\022;\n\005voice\030\014 \001(\0162," - + ".google.cloud.language.v1.PartOfSpeech.V" - + "oice\"\215\001\n\003Tag\022\013\n\007UNKNOWN\020\000\022\007\n\003ADJ\020\001\022\007\n\003AD" - + "P\020\002\022\007\n\003ADV\020\003\022\010\n\004CONJ\020\004\022\007\n\003DET\020\005\022\010\n\004NOUN\020" - + "\006\022\007\n\003NUM\020\007\022\010\n\004PRON\020\010\022\007\n\003PRT\020\t\022\t\n\005PUNCT\020\n" - + "\022\010\n\004VERB\020\013\022\005\n\001X\020\014\022\t\n\005AFFIX\020\r\"O\n\006Aspect\022\022" - + "\n\016ASPECT_UNKNOWN\020\000\022\016\n\nPERFECTIVE\020\001\022\020\n\014IM" - + "PERFECTIVE\020\002\022\017\n\013PROGRESSIVE\020\003\"\370\001\n\004Case\022\020" - + "\n\014CASE_UNKNOWN\020\000\022\016\n\nACCUSATIVE\020\001\022\r\n\tADVE" - + "RBIAL\020\002\022\021\n\rCOMPLEMENTIVE\020\003\022\n\n\006DATIVE\020\004\022\014" - + "\n\010GENITIVE\020\005\022\020\n\014INSTRUMENTAL\020\006\022\014\n\010LOCATI" - + "VE\020\007\022\016\n\nNOMINATIVE\020\010\022\013\n\007OBLIQUE\020\t\022\r\n\tPAR" - + "TITIVE\020\n\022\021\n\rPREPOSITIONAL\020\013\022\022\n\016REFLEXIVE" - + "_CASE\020\014\022\021\n\rRELATIVE_CASE\020\r\022\014\n\010VOCATIVE\020\016" - + "\"\257\001\n\004Form\022\020\n\014FORM_UNKNOWN\020\000\022\014\n\010ADNOMIAL\020" - + "\001\022\r\n\tAUXILIARY\020\002\022\022\n\016COMPLEMENTIZER\020\003\022\020\n\014" - + "FINAL_ENDING\020\004\022\n\n\006GERUND\020\005\022\n\n\006REALIS\020\006\022\014" - + "\n\010IRREALIS\020\007\022\t\n\005SHORT\020\010\022\010\n\004LONG\020\t\022\t\n\005ORD" - + "ER\020\n\022\014\n\010SPECIFIC\020\013\"E\n\006Gender\022\022\n\016GENDER_U" - + "NKNOWN\020\000\022\014\n\010FEMININE\020\001\022\r\n\tMASCULINE\020\002\022\n\n" - + "\006NEUTER\020\003\"\177\n\004Mood\022\020\n\014MOOD_UNKNOWN\020\000\022\024\n\020C" - + "ONDITIONAL_MOOD\020\001\022\016\n\nIMPERATIVE\020\002\022\016\n\nIND" - + "ICATIVE\020\003\022\021\n\rINTERROGATIVE\020\004\022\013\n\007JUSSIVE\020" - + "\005\022\017\n\013SUBJUNCTIVE\020\006\"@\n\006Number\022\022\n\016NUMBER_U" - + "NKNOWN\020\000\022\014\n\010SINGULAR\020\001\022\n\n\006PLURAL\020\002\022\010\n\004DU" - + "AL\020\003\"T\n\006Person\022\022\n\016PERSON_UNKNOWN\020\000\022\t\n\005FI" - + "RST\020\001\022\n\n\006SECOND\020\002\022\t\n\005THIRD\020\003\022\024\n\020REFLEXIV" - + "E_PERSON\020\004\"8\n\006Proper\022\022\n\016PROPER_UNKNOWN\020\000" - + "\022\n\n\006PROPER\020\001\022\016\n\nNOT_PROPER\020\002\"J\n\013Reciproc" - + "ity\022\027\n\023RECIPROCITY_UNKNOWN\020\000\022\016\n\nRECIPROC" - + "AL\020\001\022\022\n\016NON_RECIPROCAL\020\002\"s\n\005Tense\022\021\n\rTEN" - + "SE_UNKNOWN\020\000\022\025\n\021CONDITIONAL_TENSE\020\001\022\n\n\006F" - + "UTURE\020\002\022\010\n\004PAST\020\003\022\013\n\007PRESENT\020\004\022\r\n\tIMPERF" - + "ECT\020\005\022\016\n\nPLUPERFECT\020\006\"B\n\005Voice\022\021\n\rVOICE_" - + "UNKNOWN\020\000\022\n\n\006ACTIVE\020\001\022\r\n\tCAUSATIVE\020\002\022\013\n\007" - + "PASSIVE\020\003\"\225\010\n\016DependencyEdge\022\030\n\020head_tok" - + "en_index\030\001 \001(\005\022=\n\005label\030\002 \001(\0162..google.c" - + "loud.language.v1.DependencyEdge.Label\"\251\007" - + "\n\005Label\022\013\n\007UNKNOWN\020\000\022\n\n\006ABBREV\020\001\022\t\n\005ACOM" - + "P\020\002\022\t\n\005ADVCL\020\003\022\n\n\006ADVMOD\020\004\022\010\n\004AMOD\020\005\022\t\n\005" - + "APPOS\020\006\022\010\n\004ATTR\020\007\022\007\n\003AUX\020\010\022\013\n\007AUXPASS\020\t\022" - + "\006\n\002CC\020\n\022\t\n\005CCOMP\020\013\022\010\n\004CONJ\020\014\022\t\n\005CSUBJ\020\r\022" - + "\r\n\tCSUBJPASS\020\016\022\007\n\003DEP\020\017\022\007\n\003DET\020\020\022\r\n\tDISC" - + "OURSE\020\021\022\010\n\004DOBJ\020\022\022\010\n\004EXPL\020\023\022\014\n\010GOESWITH\020" - + "\024\022\010\n\004IOBJ\020\025\022\010\n\004MARK\020\026\022\007\n\003MWE\020\027\022\007\n\003MWV\020\030\022" - + "\007\n\003NEG\020\031\022\006\n\002NN\020\032\022\014\n\010NPADVMOD\020\033\022\t\n\005NSUBJ\020" - + "\034\022\r\n\tNSUBJPASS\020\035\022\007\n\003NUM\020\036\022\n\n\006NUMBER\020\037\022\005\n" - + "\001P\020 \022\r\n\tPARATAXIS\020!\022\013\n\007PARTMOD\020\"\022\t\n\005PCOM" - + "P\020#\022\010\n\004POBJ\020$\022\010\n\004POSS\020%\022\013\n\007POSTNEG\020&\022\013\n\007" - + "PRECOMP\020\'\022\013\n\007PRECONJ\020(\022\n\n\006PREDET\020)\022\010\n\004PR" - + "EF\020*\022\010\n\004PREP\020+\022\t\n\005PRONL\020,\022\007\n\003PRT\020-\022\006\n\002PS" - + "\020.\022\014\n\010QUANTMOD\020/\022\t\n\005RCMOD\0200\022\014\n\010RCMODREL\020" - + "1\022\t\n\005RDROP\0202\022\007\n\003REF\0203\022\013\n\007REMNANT\0204\022\016\n\nRE" - + "PARANDUM\0205\022\010\n\004ROOT\0206\022\010\n\004SNUM\0207\022\010\n\004SUFF\0208" - + "\022\010\n\004TMOD\0209\022\t\n\005TOPIC\020:\022\010\n\004VMOD\020;\022\014\n\010VOCAT" - + "IVE\020<\022\t\n\005XCOMP\020=\022\n\n\006SUFFIX\020>\022\t\n\005TITLE\020?\022" - + "\014\n\010ADVPHMOD\020@\022\013\n\007AUXCAUS\020A\022\t\n\005AUXVV\020B\022\t\n" - + "\005DTMOD\020C\022\013\n\007FOREIGN\020D\022\006\n\002KW\020E\022\010\n\004LIST\020F\022" - + "\010\n\004NOMC\020G\022\014\n\010NOMCSUBJ\020H\022\020\n\014NOMCSUBJPASS\020" - + "I\022\010\n\004NUMC\020J\022\007\n\003COP\020K\022\016\n\nDISLOCATED\020L\022\007\n\003" - + "ASP\020M\022\010\n\004GMOD\020N\022\010\n\004GOBJ\020O\022\n\n\006INFMOD\020P\022\007\n" - + "\003MES\020Q\022\t\n\005NCOMP\020R\"\347\001\n\rEntityMention\0220\n\004t" - + "ext\030\001 \001(\0132\".google.cloud.language.v1.Tex" - + "tSpan\022:\n\004type\030\002 \001(\0162,.google.cloud.langu" - + "age.v1.EntityMention.Type\0226\n\tsentiment\030\003" - + " \001(\0132#.google.cloud.language.v1.Sentimen" - + "t\"0\n\004Type\022\020\n\014TYPE_UNKNOWN\020\000\022\n\n\006PROPER\020\001\022" - + "\n\n\006COMMON\020\002\"1\n\010TextSpan\022\017\n\007content\030\001 \001(\t" - + "\022\024\n\014begin_offset\030\002 \001(\005\":\n\026Classification" - + "Category\022\014\n\004name\030\001 \001(\t\022\022\n\nconfidence\030\002 \001" - + "(\002\"\216\001\n\027AnalyzeSentimentRequest\0224\n\010docume" - + "nt\030\001 \001(\0132\".google.cloud.language.v1.Docu" - + "ment\022=\n\rencoding_type\030\002 \001(\0162&.google.clo" - + "ud.language.v1.EncodingType\"\244\001\n\030AnalyzeS" - + "entimentResponse\022?\n\022document_sentiment\030\001" - + " \001(\0132#.google.cloud.language.v1.Sentimen" - + "t\022\020\n\010language\030\002 \001(\t\0225\n\tsentences\030\003 \003(\0132\"" - + ".google.cloud.language.v1.Sentence\"\224\001\n\035A" - + "nalyzeEntitySentimentRequest\0224\n\010document" + + "ey\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\271\001\n\004Type\022\013\n\007" + + "UNKNOWN\020\000\022\n\n\006PERSON\020\001\022\014\n\010LOCATION\020\002\022\020\n\014O" + + "RGANIZATION\020\003\022\t\n\005EVENT\020\004\022\017\n\013WORK_OF_ART\020" + + "\005\022\021\n\rCONSUMER_GOOD\020\006\022\t\n\005OTHER\020\007\022\020\n\014PHONE" + + "_NUMBER\020\t\022\013\n\007ADDRESS\020\n\022\010\n\004DATE\020\013\022\n\n\006NUMB" + + "ER\020\014\022\t\n\005PRICE\020\r\"\313\001\n\005Token\0220\n\004text\030\001 \001(\0132" + + "\".google.cloud.language.v1.TextSpan\022>\n\016p" + + "art_of_speech\030\002 \001(\0132&.google.cloud.langu" + + "age.v1.PartOfSpeech\022A\n\017dependency_edge\030\003" + + " \001(\0132(.google.cloud.language.v1.Dependen" + + "cyEdge\022\r\n\005lemma\030\004 \001(\t\"-\n\tSentiment\022\021\n\tma" + + "gnitude\030\002 \001(\002\022\r\n\005score\030\003 \001(\002\"\243\020\n\014PartOfS" + + "peech\0227\n\003tag\030\001 \001(\0162*.google.cloud.langua" + + "ge.v1.PartOfSpeech.Tag\022=\n\006aspect\030\002 \001(\0162-" + + ".google.cloud.language.v1.PartOfSpeech.A" + + "spect\0229\n\004case\030\003 \001(\0162+.google.cloud.langu" + + "age.v1.PartOfSpeech.Case\0229\n\004form\030\004 \001(\0162+" + + ".google.cloud.language.v1.PartOfSpeech.F" + + "orm\022=\n\006gender\030\005 \001(\0162-.google.cloud.langu" + + "age.v1.PartOfSpeech.Gender\0229\n\004mood\030\006 \001(\016" + + "2+.google.cloud.language.v1.PartOfSpeech" + + ".Mood\022=\n\006number\030\007 \001(\0162-.google.cloud.lan" + + "guage.v1.PartOfSpeech.Number\022=\n\006person\030\010" + + " \001(\0162-.google.cloud.language.v1.PartOfSp" + + "eech.Person\022=\n\006proper\030\t \001(\0162-.google.clo" + + "ud.language.v1.PartOfSpeech.Proper\022G\n\013re" + + "ciprocity\030\n \001(\01622.google.cloud.language." + + "v1.PartOfSpeech.Reciprocity\022;\n\005tense\030\013 \001" + + "(\0162,.google.cloud.language.v1.PartOfSpee" + + "ch.Tense\022;\n\005voice\030\014 \001(\0162,.google.cloud.l" + + "anguage.v1.PartOfSpeech.Voice\"\215\001\n\003Tag\022\013\n" + + "\007UNKNOWN\020\000\022\007\n\003ADJ\020\001\022\007\n\003ADP\020\002\022\007\n\003ADV\020\003\022\010\n" + + "\004CONJ\020\004\022\007\n\003DET\020\005\022\010\n\004NOUN\020\006\022\007\n\003NUM\020\007\022\010\n\004P" + + "RON\020\010\022\007\n\003PRT\020\t\022\t\n\005PUNCT\020\n\022\010\n\004VERB\020\013\022\005\n\001X" + + "\020\014\022\t\n\005AFFIX\020\r\"O\n\006Aspect\022\022\n\016ASPECT_UNKNOW" + + "N\020\000\022\016\n\nPERFECTIVE\020\001\022\020\n\014IMPERFECTIVE\020\002\022\017\n" + + "\013PROGRESSIVE\020\003\"\370\001\n\004Case\022\020\n\014CASE_UNKNOWN\020" + + "\000\022\016\n\nACCUSATIVE\020\001\022\r\n\tADVERBIAL\020\002\022\021\n\rCOMP" + + "LEMENTIVE\020\003\022\n\n\006DATIVE\020\004\022\014\n\010GENITIVE\020\005\022\020\n" + + "\014INSTRUMENTAL\020\006\022\014\n\010LOCATIVE\020\007\022\016\n\nNOMINAT" + + "IVE\020\010\022\013\n\007OBLIQUE\020\t\022\r\n\tPARTITIVE\020\n\022\021\n\rPRE" + + "POSITIONAL\020\013\022\022\n\016REFLEXIVE_CASE\020\014\022\021\n\rRELA" + + "TIVE_CASE\020\r\022\014\n\010VOCATIVE\020\016\"\257\001\n\004Form\022\020\n\014FO" + + "RM_UNKNOWN\020\000\022\014\n\010ADNOMIAL\020\001\022\r\n\tAUXILIARY\020" + + "\002\022\022\n\016COMPLEMENTIZER\020\003\022\020\n\014FINAL_ENDING\020\004\022" + + "\n\n\006GERUND\020\005\022\n\n\006REALIS\020\006\022\014\n\010IRREALIS\020\007\022\t\n" + + "\005SHORT\020\010\022\010\n\004LONG\020\t\022\t\n\005ORDER\020\n\022\014\n\010SPECIFI" + + "C\020\013\"E\n\006Gender\022\022\n\016GENDER_UNKNOWN\020\000\022\014\n\010FEM" + + "ININE\020\001\022\r\n\tMASCULINE\020\002\022\n\n\006NEUTER\020\003\"\177\n\004Mo" + + "od\022\020\n\014MOOD_UNKNOWN\020\000\022\024\n\020CONDITIONAL_MOOD" + + "\020\001\022\016\n\nIMPERATIVE\020\002\022\016\n\nINDICATIVE\020\003\022\021\n\rIN" + + "TERROGATIVE\020\004\022\013\n\007JUSSIVE\020\005\022\017\n\013SUBJUNCTIV" + + "E\020\006\"@\n\006Number\022\022\n\016NUMBER_UNKNOWN\020\000\022\014\n\010SIN" + + "GULAR\020\001\022\n\n\006PLURAL\020\002\022\010\n\004DUAL\020\003\"T\n\006Person\022" + + "\022\n\016PERSON_UNKNOWN\020\000\022\t\n\005FIRST\020\001\022\n\n\006SECOND" + + "\020\002\022\t\n\005THIRD\020\003\022\024\n\020REFLEXIVE_PERSON\020\004\"8\n\006P" + + "roper\022\022\n\016PROPER_UNKNOWN\020\000\022\n\n\006PROPER\020\001\022\016\n" + + "\nNOT_PROPER\020\002\"J\n\013Reciprocity\022\027\n\023RECIPROC" + + "ITY_UNKNOWN\020\000\022\016\n\nRECIPROCAL\020\001\022\022\n\016NON_REC" + + "IPROCAL\020\002\"s\n\005Tense\022\021\n\rTENSE_UNKNOWN\020\000\022\025\n" + + "\021CONDITIONAL_TENSE\020\001\022\n\n\006FUTURE\020\002\022\010\n\004PAST" + + "\020\003\022\013\n\007PRESENT\020\004\022\r\n\tIMPERFECT\020\005\022\016\n\nPLUPER" + + "FECT\020\006\"B\n\005Voice\022\021\n\rVOICE_UNKNOWN\020\000\022\n\n\006AC" + + "TIVE\020\001\022\r\n\tCAUSATIVE\020\002\022\013\n\007PASSIVE\020\003\"\225\010\n\016D" + + "ependencyEdge\022\030\n\020head_token_index\030\001 \001(\005\022" + + "=\n\005label\030\002 \001(\0162..google.cloud.language.v" + + "1.DependencyEdge.Label\"\251\007\n\005Label\022\013\n\007UNKN" + + "OWN\020\000\022\n\n\006ABBREV\020\001\022\t\n\005ACOMP\020\002\022\t\n\005ADVCL\020\003\022" + + "\n\n\006ADVMOD\020\004\022\010\n\004AMOD\020\005\022\t\n\005APPOS\020\006\022\010\n\004ATTR" + + "\020\007\022\007\n\003AUX\020\010\022\013\n\007AUXPASS\020\t\022\006\n\002CC\020\n\022\t\n\005CCOM" + + "P\020\013\022\010\n\004CONJ\020\014\022\t\n\005CSUBJ\020\r\022\r\n\tCSUBJPASS\020\016\022" + + "\007\n\003DEP\020\017\022\007\n\003DET\020\020\022\r\n\tDISCOURSE\020\021\022\010\n\004DOBJ" + + "\020\022\022\010\n\004EXPL\020\023\022\014\n\010GOESWITH\020\024\022\010\n\004IOBJ\020\025\022\010\n\004" + + "MARK\020\026\022\007\n\003MWE\020\027\022\007\n\003MWV\020\030\022\007\n\003NEG\020\031\022\006\n\002NN\020" + + "\032\022\014\n\010NPADVMOD\020\033\022\t\n\005NSUBJ\020\034\022\r\n\tNSUBJPASS\020" + + "\035\022\007\n\003NUM\020\036\022\n\n\006NUMBER\020\037\022\005\n\001P\020 \022\r\n\tPARATAX" + + "IS\020!\022\013\n\007PARTMOD\020\"\022\t\n\005PCOMP\020#\022\010\n\004POBJ\020$\022\010" + + "\n\004POSS\020%\022\013\n\007POSTNEG\020&\022\013\n\007PRECOMP\020\'\022\013\n\007PR" + + "ECONJ\020(\022\n\n\006PREDET\020)\022\010\n\004PREF\020*\022\010\n\004PREP\020+\022" + + "\t\n\005PRONL\020,\022\007\n\003PRT\020-\022\006\n\002PS\020.\022\014\n\010QUANTMOD\020" + + "/\022\t\n\005RCMOD\0200\022\014\n\010RCMODREL\0201\022\t\n\005RDROP\0202\022\007\n" + + "\003REF\0203\022\013\n\007REMNANT\0204\022\016\n\nREPARANDUM\0205\022\010\n\004R" + + "OOT\0206\022\010\n\004SNUM\0207\022\010\n\004SUFF\0208\022\010\n\004TMOD\0209\022\t\n\005T" + + "OPIC\020:\022\010\n\004VMOD\020;\022\014\n\010VOCATIVE\020<\022\t\n\005XCOMP\020" + + "=\022\n\n\006SUFFIX\020>\022\t\n\005TITLE\020?\022\014\n\010ADVPHMOD\020@\022\013" + + "\n\007AUXCAUS\020A\022\t\n\005AUXVV\020B\022\t\n\005DTMOD\020C\022\013\n\007FOR" + + "EIGN\020D\022\006\n\002KW\020E\022\010\n\004LIST\020F\022\010\n\004NOMC\020G\022\014\n\010NO" + + "MCSUBJ\020H\022\020\n\014NOMCSUBJPASS\020I\022\010\n\004NUMC\020J\022\007\n\003" + + "COP\020K\022\016\n\nDISLOCATED\020L\022\007\n\003ASP\020M\022\010\n\004GMOD\020N" + + "\022\010\n\004GOBJ\020O\022\n\n\006INFMOD\020P\022\007\n\003MES\020Q\022\t\n\005NCOMP" + + "\020R\"\347\001\n\rEntityMention\0220\n\004text\030\001 \001(\0132\".goo" + + "gle.cloud.language.v1.TextSpan\022:\n\004type\030\002" + + " \001(\0162,.google.cloud.language.v1.EntityMe" + + "ntion.Type\0226\n\tsentiment\030\003 \001(\0132#.google.c" + + "loud.language.v1.Sentiment\"0\n\004Type\022\020\n\014TY" + + "PE_UNKNOWN\020\000\022\n\n\006PROPER\020\001\022\n\n\006COMMON\020\002\"1\n\010" + + "TextSpan\022\017\n\007content\030\001 \001(\t\022\024\n\014begin_offse" + + "t\030\002 \001(\005\":\n\026ClassificationCategory\022\014\n\004nam" + + "e\030\001 \001(\t\022\022\n\nconfidence\030\002 \001(\002\"\216\001\n\027AnalyzeS" + + "entimentRequest\0224\n\010document\030\001 \001(\0132\".goog" + + "le.cloud.language.v1.Document\022=\n\rencodin" + + "g_type\030\002 \001(\0162&.google.cloud.language.v1." + + "EncodingType\"\244\001\n\030AnalyzeSentimentRespons" + + "e\022?\n\022document_sentiment\030\001 \001(\0132#.google.c" + + "loud.language.v1.Sentiment\022\020\n\010language\030\002" + + " \001(\t\0225\n\tsentences\030\003 \003(\0132\".google.cloud.l" + + "anguage.v1.Sentence\"\224\001\n\035AnalyzeEntitySen" + + "timentRequest\0224\n\010document\030\001 \001(\0132\".google" + + ".cloud.language.v1.Document\022=\n\rencoding_" + + "type\030\002 \001(\0162&.google.cloud.language.v1.En" + + "codingType\"f\n\036AnalyzeEntitySentimentResp" + + "onse\0222\n\010entities\030\001 \003(\0132 .google.cloud.la" + + "nguage.v1.Entity\022\020\n\010language\030\002 \001(\t\"\215\001\n\026A" + + "nalyzeEntitiesRequest\0224\n\010document\030\001 \001(\0132" + + "\".google.cloud.language.v1.Document\022=\n\re" + + "ncoding_type\030\002 \001(\0162&.google.cloud.langua" + + "ge.v1.EncodingType\"_\n\027AnalyzeEntitiesRes" + + "ponse\0222\n\010entities\030\001 \003(\0132 .google.cloud.l" + + "anguage.v1.Entity\022\020\n\010language\030\002 \001(\t\"\213\001\n\024" + + "AnalyzeSyntaxRequest\0224\n\010document\030\001 \001(\0132\"" + + ".google.cloud.language.v1.Document\022=\n\ren" + + "coding_type\030\002 \001(\0162&.google.cloud.languag" + + "e.v1.EncodingType\"\221\001\n\025AnalyzeSyntaxRespo" + + "nse\0225\n\tsentences\030\001 \003(\0132\".google.cloud.la" + + "nguage.v1.Sentence\022/\n\006tokens\030\002 \003(\0132\037.goo" + + "gle.cloud.language.v1.Token\022\020\n\010language\030" + + "\003 \001(\t\"K\n\023ClassifyTextRequest\0224\n\010document" + "\030\001 \001(\0132\".google.cloud.language.v1.Docume" - + "nt\022=\n\rencoding_type\030\002 \001(\0162&.google.cloud" - + ".language.v1.EncodingType\"f\n\036AnalyzeEnti" - + "tySentimentResponse\0222\n\010entities\030\001 \003(\0132 ." - + "google.cloud.language.v1.Entity\022\020\n\010langu" - + "age\030\002 \001(\t\"\215\001\n\026AnalyzeEntitiesRequest\0224\n\010" - + "document\030\001 \001(\0132\".google.cloud.language.v" - + "1.Document\022=\n\rencoding_type\030\002 \001(\0162&.goog" - + "le.cloud.language.v1.EncodingType\"_\n\027Ana" - + "lyzeEntitiesResponse\0222\n\010entities\030\001 \003(\0132 " - + ".google.cloud.language.v1.Entity\022\020\n\010lang" - + "uage\030\002 \001(\t\"\213\001\n\024AnalyzeSyntaxRequest\0224\n\010d" - + "ocument\030\001 \001(\0132\".google.cloud.language.v1" - + ".Document\022=\n\rencoding_type\030\002 \001(\0162&.googl" - + "e.cloud.language.v1.EncodingType\"\221\001\n\025Ana" - + "lyzeSyntaxResponse\0225\n\tsentences\030\001 \003(\0132\"." - + "google.cloud.language.v1.Sentence\022/\n\006tok" - + "ens\030\002 \003(\0132\037.google.cloud.language.v1.Tok" - + "en\022\020\n\010language\030\003 \001(\t\"K\n\023ClassifyTextRequ" - + "est\0224\n\010document\030\001 \001(\0132\".google.cloud.lan" - + "guage.v1.Document\"\\\n\024ClassifyTextRespons" - + "e\022D\n\ncategories\030\001 \003(\01320.google.cloud.lan" - + "guage.v1.ClassificationCategory\"\360\002\n\023Anno" - + "tateTextRequest\0224\n\010document\030\001 \001(\0132\".goog" - + "le.cloud.language.v1.Document\022H\n\010feature" - + "s\030\002 \001(\01326.google.cloud.language.v1.Annot" - + "ateTextRequest.Features\022=\n\rencoding_type" - + "\030\003 \001(\0162&.google.cloud.language.v1.Encodi" - + "ngType\032\231\001\n\010Features\022\026\n\016extract_syntax\030\001 " - + "\001(\010\022\030\n\020extract_entities\030\002 \001(\010\022\"\n\032extract" - + "_document_sentiment\030\003 \001(\010\022 \n\030extract_ent" - + "ity_sentiment\030\004 \001(\010\022\025\n\rclassify_text\030\006 \001" - + "(\010\"\313\002\n\024AnnotateTextResponse\0225\n\tsentences" - + "\030\001 \003(\0132\".google.cloud.language.v1.Senten" - + "ce\022/\n\006tokens\030\002 \003(\0132\037.google.cloud.langua" - + "ge.v1.Token\0222\n\010entities\030\003 \003(\0132 .google.c" - + "loud.language.v1.Entity\022?\n\022document_sent" - + "iment\030\004 \001(\0132#.google.cloud.language.v1.S" - + "entiment\022\020\n\010language\030\005 \001(\t\022D\n\ncategories" - + "\030\006 \003(\01320.google.cloud.language.v1.Classi" - + "ficationCategory*8\n\014EncodingType\022\010\n\004NONE" - + "\020\000\022\010\n\004UTF8\020\001\022\t\n\005UTF16\020\002\022\t\n\005UTF32\020\0032\343\007\n\017L" - + "anguageService\022\244\001\n\020AnalyzeSentiment\0221.go" - + "ogle.cloud.language.v1.AnalyzeSentimentR" - + "equest\0322.google.cloud.language.v1.Analyz" - + "eSentimentResponse\")\202\323\344\223\002#\"\036/v1/document" - + "s:analyzeSentiment:\001*\022\240\001\n\017AnalyzeEntitie" - + "s\0220.google.cloud.language.v1.AnalyzeEnti" - + "tiesRequest\0321.google.cloud.language.v1.A" - + "nalyzeEntitiesResponse\"(\202\323\344\223\002\"\"\035/v1/docu" - + "ments:analyzeEntities:\001*\022\274\001\n\026AnalyzeEnti" - + "tySentiment\0227.google.cloud.language.v1.A" - + "nalyzeEntitySentimentRequest\0328.google.cl" - + "oud.language.v1.AnalyzeEntitySentimentRe" - + "sponse\"/\202\323\344\223\002)\"$/v1/documents:analyzeEnt" - + "itySentiment:\001*\022\230\001\n\rAnalyzeSyntax\022..goog" - + "le.cloud.language.v1.AnalyzeSyntaxReques" - + "t\032/.google.cloud.language.v1.AnalyzeSynt" - + "axResponse\"&\202\323\344\223\002 \"\033/v1/documents:analyz" - + "eSyntax:\001*\022\224\001\n\014ClassifyText\022-.google.clo" - + "ud.language.v1.ClassifyTextRequest\032..goo" - + "gle.cloud.language.v1.ClassifyTextRespon" - + "se\"%\202\323\344\223\002\037\"\032/v1/documents:classifyText:\001" - + "*\022\224\001\n\014AnnotateText\022-.google.cloud.langua" - + "ge.v1.AnnotateTextRequest\032..google.cloud" - + ".language.v1.AnnotateTextResponse\"%\202\323\344\223\002" - + "\037\"\032/v1/documents:annotateText:\001*Bx\n\034com." - + "google.cloud.language.v1B\024LanguageServic" - + "eProtoP\001Z@google.golang.org/genproto/goo" - + "gleapis/cloud/language/v1;languageb\006prot" - + "o3" + + "nt\"\\\n\024ClassifyTextResponse\022D\n\ncategories" + + "\030\001 \003(\01320.google.cloud.language.v1.Classi" + + "ficationCategory\"\360\002\n\023AnnotateTextRequest" + + "\0224\n\010document\030\001 \001(\0132\".google.cloud.langua" + + "ge.v1.Document\022H\n\010features\030\002 \001(\01326.googl" + + "e.cloud.language.v1.AnnotateTextRequest." + + "Features\022=\n\rencoding_type\030\003 \001(\0162&.google" + + ".cloud.language.v1.EncodingType\032\231\001\n\010Feat" + + "ures\022\026\n\016extract_syntax\030\001 \001(\010\022\030\n\020extract_" + + "entities\030\002 \001(\010\022\"\n\032extract_document_senti" + + "ment\030\003 \001(\010\022 \n\030extract_entity_sentiment\030\004" + + " \001(\010\022\025\n\rclassify_text\030\006 \001(\010\"\313\002\n\024Annotate" + + "TextResponse\0225\n\tsentences\030\001 \003(\0132\".google" + + ".cloud.language.v1.Sentence\022/\n\006tokens\030\002 " + + "\003(\0132\037.google.cloud.language.v1.Token\0222\n\010" + + "entities\030\003 \003(\0132 .google.cloud.language.v" + + "1.Entity\022?\n\022document_sentiment\030\004 \001(\0132#.g" + + "oogle.cloud.language.v1.Sentiment\022\020\n\010lan" + + "guage\030\005 \001(\t\022D\n\ncategories\030\006 \003(\01320.google" + + ".cloud.language.v1.ClassificationCategor" + + "y*8\n\014EncodingType\022\010\n\004NONE\020\000\022\010\n\004UTF8\020\001\022\t\n" + + "\005UTF16\020\002\022\t\n\005UTF32\020\0032\343\007\n\017LanguageService\022" + + "\244\001\n\020AnalyzeSentiment\0221.google.cloud.lang" + + "uage.v1.AnalyzeSentimentRequest\0322.google" + + ".cloud.language.v1.AnalyzeSentimentRespo" + + "nse\")\202\323\344\223\002#\"\036/v1/documents:analyzeSentim" + + "ent:\001*\022\240\001\n\017AnalyzeEntities\0220.google.clou" + + "d.language.v1.AnalyzeEntitiesRequest\0321.g" + + "oogle.cloud.language.v1.AnalyzeEntitiesR" + + "esponse\"(\202\323\344\223\002\"\"\035/v1/documents:analyzeEn" + + "tities:\001*\022\274\001\n\026AnalyzeEntitySentiment\0227.g" + + "oogle.cloud.language.v1.AnalyzeEntitySen" + + "timentRequest\0328.google.cloud.language.v1" + + ".AnalyzeEntitySentimentResponse\"/\202\323\344\223\002)\"" + + "$/v1/documents:analyzeEntitySentiment:\001*" + + "\022\230\001\n\rAnalyzeSyntax\022..google.cloud.langua" + + "ge.v1.AnalyzeSyntaxRequest\032/.google.clou" + + "d.language.v1.AnalyzeSyntaxResponse\"&\202\323\344" + + "\223\002 \"\033/v1/documents:analyzeSyntax:\001*\022\224\001\n\014" + + "ClassifyText\022-.google.cloud.language.v1." + + "ClassifyTextRequest\032..google.cloud.langu" + + "age.v1.ClassifyTextResponse\"%\202\323\344\223\002\037\"\032/v1" + + "/documents:classifyText:\001*\022\224\001\n\014AnnotateT" + + "ext\022-.google.cloud.language.v1.AnnotateT" + + "extRequest\032..google.cloud.language.v1.An" + + "notateTextResponse\"%\202\323\344\223\002\037\"\032/v1/document" + + "s:annotateText:\001*Bx\n\034com.google.cloud.la" + + "nguage.v1B\024LanguageServiceProtoP\001Z@googl" + + "e.golang.org/genproto/googleapis/cloud/l" + + "anguage/v1;languageb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/proto/google/cloud/language/v1/language_service.proto b/google-api-grpc/proto-google-cloud-language-v1/src/main/proto/google/cloud/language/v1/language_service.proto index f9893385ffcc..7a15c8bf14c4 100644 --- a/google-api-grpc/proto-google-cloud-language-v1/src/main/proto/google/cloud/language/v1/language_service.proto +++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/proto/google/cloud/language/v1/language_service.proto @@ -1,4 +1,4 @@ -// Copyright 2017 Google Inc. +// Copyright 2019 Google LLC. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -11,6 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. +// syntax = "proto3"; @@ -170,6 +171,21 @@ message Entity { // Other types OTHER = 7; + + // Phone number + PHONE_NUMBER = 9; + + // Address + ADDRESS = 10; + + // Date + DATE = 11; + + // Number + NUMBER = 12; + + // Price + PRICE = 13; } // The representative name for the entity. @@ -203,6 +219,32 @@ message Entity { Sentiment sentiment = 6; } +// Represents the text encoding that the caller uses to process the output. +// Providing an `EncodingType` is recommended because the API provides the +// beginning offsets for various outputs, such as tokens and mentions, and +// languages that natively use different text encodings may access offsets +// differently. +enum EncodingType { + // If `EncodingType` is not specified, encoding-dependent information (such as + // `begin_offset`) will be set at `-1`. + NONE = 0; + + // Encoding-dependent information (such as `begin_offset`) is calculated based + // on the UTF-8 encoding of the input. C++ and Go are examples of languages + // that use this encoding natively. + UTF8 = 1; + + // Encoding-dependent information (such as `begin_offset`) is calculated based + // on the UTF-16 encoding of the input. Java and JavaScript are examples of + // languages that use this encoding natively. + UTF16 = 2; + + // Encoding-dependent information (such as `begin_offset`) is calculated based + // on the UTF-32 encoding of the input. Python is an example of a language + // that uses this encoding natively. + UTF32 = 3; +} + // Represents the smallest syntactic building block of the text. message Token { // The token text. @@ -870,7 +912,8 @@ message TextSpan { // Represents a category returned from the text classifier. message ClassificationCategory { - // The name of the category representing the document. + // The name of the category representing the document, from the [predefined + // taxonomy](/natural-language/docs/categories). string name = 1; // The classifier's confidence of the category. Number represents how certain @@ -1041,29 +1084,3 @@ message AnnotateTextResponse { // Categories identified in the input document. repeated ClassificationCategory categories = 6; } - -// Represents the text encoding that the caller uses to process the output. -// Providing an `EncodingType` is recommended because the API provides the -// beginning offsets for various outputs, such as tokens and mentions, and -// languages that natively use different text encodings may access offsets -// differently. -enum EncodingType { - // If `EncodingType` is not specified, encoding-dependent information (such as - // `begin_offset`) will be set at `-1`. - NONE = 0; - - // Encoding-dependent information (such as `begin_offset`) is calculated based - // on the UTF-8 encoding of the input. C++ and Go are examples of languages - // that use this encoding natively. - UTF8 = 1; - - // Encoding-dependent information (such as `begin_offset`) is calculated based - // on the UTF-16 encoding of the input. Java and Javascript are examples of - // languages that use this encoding natively. - UTF16 = 2; - - // Encoding-dependent information (such as `begin_offset`) is calculated based - // on the UTF-32 encoding of the input. Python is an example of a language - // that uses this encoding natively. - UTF32 = 3; -} diff --git a/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/LanguageServiceClient.java b/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/LanguageServiceClient.java index 59686ad491a9..df590debd8a9 100644 --- a/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/LanguageServiceClient.java +++ b/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/LanguageServiceClient.java @@ -93,6 +93,7 @@ * */ @Generated("by gapic-generator") +@BetaApi public class LanguageServiceClient implements BackgroundResource { private final LanguageServiceSettings settings; private final LanguageServiceStub stub; diff --git a/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/LanguageServiceSettings.java b/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/LanguageServiceSettings.java index 2122cc0fadf9..63bb601b1580 100644 --- a/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/LanguageServiceSettings.java +++ b/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/LanguageServiceSettings.java @@ -57,6 +57,7 @@ * */ @Generated("by gapic-generator") +@BetaApi public class LanguageServiceSettings extends ClientSettings { /** Returns the object with the settings used for calls to analyzeSentiment. */ public UnaryCallSettings diff --git a/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/package-info.java b/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/package-info.java index 14349d0d96cf..410ff1248de4 100644 --- a/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/package-info.java +++ b/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/package-info.java @@ -15,7 +15,7 @@ */ /** - * A client to Google Cloud Natural Language API. + * A client to Cloud Natural Language API. * *

The interfaces provided are listed below, along with usage samples. * diff --git a/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/GrpcLanguageServiceCallableFactory.java b/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/GrpcLanguageServiceCallableFactory.java index b52d426b912a..8687a1d42764 100644 --- a/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/GrpcLanguageServiceCallableFactory.java +++ b/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/GrpcLanguageServiceCallableFactory.java @@ -36,7 +36,7 @@ // AUTO-GENERATED DOCUMENTATION AND CLASS /** - * gRPC callable factory implementation for Google Cloud Natural Language API. + * gRPC callable factory implementation for Cloud Natural Language API. * *

This class is for advanced usage. */ diff --git a/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/GrpcLanguageServiceStub.java b/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/GrpcLanguageServiceStub.java index 4da34dd16c66..a3fdfc818a9a 100644 --- a/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/GrpcLanguageServiceStub.java +++ b/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/GrpcLanguageServiceStub.java @@ -42,7 +42,7 @@ // AUTO-GENERATED DOCUMENTATION AND CLASS /** - * gRPC stub implementation for Google Cloud Natural Language API. + * gRPC stub implementation for Cloud Natural Language API. * *

This class is for advanced usage and reflects the underlying API directly. */ diff --git a/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/LanguageServiceStub.java b/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/LanguageServiceStub.java index 77dddb2fe08b..5bf82d776263 100644 --- a/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/LanguageServiceStub.java +++ b/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/LanguageServiceStub.java @@ -34,7 +34,7 @@ // AUTO-GENERATED DOCUMENTATION AND CLASS /** - * Base stub class for Google Cloud Natural Language API. + * Base stub class for Cloud Natural Language API. * *

This class is for advanced usage and reflects the underlying API directly. */ diff --git a/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/LanguageServiceStubSettings.java b/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/LanguageServiceStubSettings.java index c10ed89aab72..06b792938913 100644 --- a/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/LanguageServiceStubSettings.java +++ b/google-cloud-clients/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/LanguageServiceStubSettings.java @@ -78,10 +78,14 @@ * */ @Generated("by gapic-generator") +@BetaApi public class LanguageServiceStubSettings extends StubSettings { /** The default scopes of the service. */ private static final ImmutableList DEFAULT_SERVICE_SCOPES = - ImmutableList.builder().add("https://www.googleapis.com/auth/cloud-platform").build(); + ImmutableList.builder() + .add("https://www.googleapis.com/auth/cloud-language") + .add("https://www.googleapis.com/auth/cloud-platform") + .build(); private final UnaryCallSettings analyzeSentimentSettings; @@ -246,9 +250,9 @@ public static class Builder extends StubSettings.Builder