diff --git a/language/analysis/pom.xml b/language/analysis/pom.xml index da296dc6e0e..6666a601f7b 100644 --- a/language/analysis/pom.xml +++ b/language/analysis/pom.xml @@ -25,7 +25,7 @@ limitations under the License. com.google.apis google-api-services-language - v1beta1-rev11-1.22.0 + v1beta1-rev13-1.22.0 com.google.api-client diff --git a/language/analysis/src/main/java/com/google/cloud/language/samples/Analyze.java b/language/analysis/src/main/java/com/google/cloud/language/samples/Analyze.java index 104550bad22..a341f9c03ea 100644 --- a/language/analysis/src/main/java/com/google/cloud/language/samples/Analyze.java +++ b/language/analysis/src/main/java/com/google/cloud/language/samples/Analyze.java @@ -22,8 +22,8 @@ import com.google.api.client.http.HttpRequestInitializer; import com.google.api.client.json.JsonFactory; import com.google.api.client.json.jackson2.JacksonFactory; -import com.google.api.services.language.v1beta1.CloudNaturalLanguageAPI; -import com.google.api.services.language.v1beta1.CloudNaturalLanguageAPIScopes; +import com.google.api.services.language.v1beta1.CloudNaturalLanguage; +import com.google.api.services.language.v1beta1.CloudNaturalLanguageScopes; import com.google.api.services.language.v1beta1.model.AnalyzeEntitiesRequest; import com.google.api.services.language.v1beta1.model.AnalyzeEntitiesResponse; import com.google.api.services.language.v1beta1.model.AnalyzeSentimentRequest; @@ -136,12 +136,12 @@ public static void printSyntax(PrintStream out, List tokens) { /** * Connects to the Natural Language API using Application Default Credentials. */ - public static CloudNaturalLanguageAPI getLanguageService() + public static CloudNaturalLanguage getLanguageService() throws IOException, GeneralSecurityException { GoogleCredential credential = - GoogleCredential.getApplicationDefault().createScoped(CloudNaturalLanguageAPIScopes.all()); + GoogleCredential.getApplicationDefault().createScoped(CloudNaturalLanguageScopes.all()); JsonFactory jsonFactory = JacksonFactory.getDefaultInstance(); - return new CloudNaturalLanguageAPI.Builder( + return new CloudNaturalLanguage.Builder( GoogleNetHttpTransport.newTrustedTransport(), jsonFactory, new HttpRequestInitializer() { @Override @@ -153,12 +153,12 @@ public void initialize(HttpRequest request) throws IOException { .build(); } - private final CloudNaturalLanguageAPI languageApi; + private final CloudNaturalLanguage languageApi; /** * Constructs a {@link Analyze} which connects to the Cloud Natural Language API. */ - public Analyze(CloudNaturalLanguageAPI languageApi) { + public Analyze(CloudNaturalLanguage languageApi) { this.languageApi = languageApi; } @@ -170,7 +170,7 @@ public List analyzeEntities(String text) throws IOException { new AnalyzeEntitiesRequest() .setDocument(new Document().setContent(text).setType("PLAIN_TEXT")) .setEncodingType("UTF16"); - CloudNaturalLanguageAPI.Documents.AnalyzeEntities analyze = + CloudNaturalLanguage.Documents.AnalyzeEntities analyze = languageApi.documents().analyzeEntities(request); AnalyzeEntitiesResponse response = analyze.execute(); @@ -184,7 +184,7 @@ public Sentiment analyzeSentiment(String text) throws IOException { AnalyzeSentimentRequest request = new AnalyzeSentimentRequest() .setDocument(new Document().setContent(text).setType("PLAIN_TEXT")); - CloudNaturalLanguageAPI.Documents.AnalyzeSentiment analyze = + CloudNaturalLanguage.Documents.AnalyzeSentiment analyze = languageApi.documents().analyzeSentiment(request); AnalyzeSentimentResponse response = analyze.execute(); @@ -200,7 +200,7 @@ public List analyzeSyntax(String text) throws IOException { .setDocument(new Document().setContent(text).setType("PLAIN_TEXT")) .setFeatures(new Features().setExtractSyntax(true)) .setEncodingType("UTF16"); - CloudNaturalLanguageAPI.Documents.AnnotateText analyze = + CloudNaturalLanguage.Documents.AnnotateText analyze = languageApi.documents().annotateText(request); AnnotateTextResponse response = analyze.execute();