diff --git a/language/analysis/README.md b/language/analysis/README.md index b8bc5644779..ead37507116 100644 --- a/language/analysis/README.md +++ b/language/analysis/README.md @@ -43,7 +43,8 @@ java -cp target/language-entities-1.0-jar-with-dependencies.jar \ ``` -### Usage Examples +### Usage Examples (stable) + Analyze entities ``` java -cp target/language-entities-1.0-jar-with-dependencies.jar \ @@ -68,16 +69,6 @@ java -cp target/language-entities-1.0-jar-with-dependencies.jar \ "The quick brown fox jumped over the lazy dog." ``` -Analyze sentiment with Beta Languages such as German -``` -java -cp target/language-entities-1.0-jar-with-dependencies.jar \ - com.google.cloud.language.samples.AnalyzeBeta sentiment "Ich habe eine wundervolle Zeit." "DE" -``` -Analyze entity sentiment - Beta -``` -java -cp target/language-entities-1.0-jar-with-dependencies.jar com.google.cloud.language.samples.AnalyzeBeta entities-sentiment "The quick brown fox jumped over the lazy dog." -``` - Included with the sample are `demo.sh` and `demo.bat` which show additional examples of usage. @@ -90,3 +81,25 @@ Run demo from Windows ``` demo ``` + +### Usage Examples (beta) + +Analyze sentiment beta +``` +java -cp target/language-entities-1.0-jar-with-dependencies.jar \ + com.google.cloud.language.samples.AnalyzeBeta \ + sentiment \ + "Der schnelle braune Fuchs sprang über den faulen Hund." +``` + +Analyze entity sentiment Beta +``` +java -cp target/language-entities-1.0-jar-with-dependencies.jar \ + com.google.cloud.language.samples.AnalyzeBeta entities-sentiment \ + "There's nothing better than searching for ice cream on Google." +``` + +Run beta demo from *nix or OSX +``` +demo-beta.sh +``` 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 06db78bafe6..e27f0ac37a1 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 @@ -169,7 +169,6 @@ public Analyze(LanguageServiceClient languageApi) { * Gets {@link Entity}s from the string {@code text}. */ public List analyzeEntitiesText(String text) throws IOException { - // Note: This does not work on App Engine standard. Document doc = Document.newBuilder() .setContent(text).setType(Type.PLAIN_TEXT).build(); AnalyzeEntitiesRequest request = AnalyzeEntitiesRequest.newBuilder() @@ -183,7 +182,6 @@ public List analyzeEntitiesText(String text) throws IOException { * Gets {@link Entity}s from the contents of the object at the given GCS {@code path}. */ public List analyzeEntitiesFile(String path) throws IOException { - // Note: This does not work on App Engine standard. Document doc = Document.newBuilder() .setGcsContentUri(path).setType(Type.PLAIN_TEXT).build(); AnalyzeEntitiesRequest request = AnalyzeEntitiesRequest.newBuilder() @@ -197,7 +195,6 @@ public List analyzeEntitiesFile(String path) throws IOException { * Gets {@link Sentiment} from the string {@code text}. */ public Sentiment analyzeSentimentText(String text) throws IOException { - // Note: This does not work on App Engine standard. Document doc = Document.newBuilder() .setContent(text).setType(Type.PLAIN_TEXT).build(); AnalyzeSentimentResponse response = languageApi.analyzeSentiment(doc); @@ -208,7 +205,6 @@ public Sentiment analyzeSentimentText(String text) throws IOException { * Gets {@link Sentiment} from the contents of the object at the given GCS {@code path}. */ public Sentiment analyzeSentimentFile(String path) throws IOException { - // Note: This does not work on App Engine standard. Document doc = Document.newBuilder() .setGcsContentUri(path).setType(Type.PLAIN_TEXT).build(); AnalyzeSentimentResponse response = languageApi.analyzeSentiment(doc); @@ -219,7 +215,6 @@ public Sentiment analyzeSentimentFile(String path) throws IOException { * Gets {@link Token}s from the string {@code text}. */ public List analyzeSyntaxText(String text) throws IOException { - // Note: This does not work on App Engine standard. Document doc = Document.newBuilder() .setContent(text).setType(Type.PLAIN_TEXT).build(); AnalyzeSyntaxRequest request = AnalyzeSyntaxRequest.newBuilder() @@ -233,7 +228,6 @@ public List analyzeSyntaxText(String text) throws IOException { * Gets {@link Token}s from the contents of the object at the given GCS {@code path}. */ public List analyzeSyntaxFile(String path) throws IOException { - // Note: This does not work on App Engine standard. Document doc = Document.newBuilder() .setGcsContentUri(path).setType(Type.PLAIN_TEXT).build(); AnalyzeSyntaxRequest request = AnalyzeSyntaxRequest.newBuilder() diff --git a/language/analysis/src/main/java/com/google/cloud/language/samples/AnalyzeBeta.java b/language/analysis/src/main/java/com/google/cloud/language/samples/AnalyzeBeta.java index 68fb135deb1..8d2c5096275 100644 --- a/language/analysis/src/main/java/com/google/cloud/language/samples/AnalyzeBeta.java +++ b/language/analysis/src/main/java/com/google/cloud/language/samples/AnalyzeBeta.java @@ -131,12 +131,18 @@ public static void printEntities(PrintStream out, List entities) { * Gets {@link Sentiment} from the string {@code text}. */ public Sentiment analyzeSentimentText(String text, String lang) throws IOException { - // NL autodetects the language - - // Note: This does not work on App Engine standard. - Document doc = Document.newBuilder() - .setLanguage(lang) - .setContent(text).setType(Type.PLAIN_TEXT).build(); + // NL autodetects the language + Document doc; + if (lang != null) { + doc = Document.newBuilder() + .setLanguage(lang) + .setContent(text).setType(Type.PLAIN_TEXT) + .build(); + } else { + doc = Document.newBuilder() + .setContent(text).setType(Type.PLAIN_TEXT) + .build(); + } AnalyzeSentimentResponse response = languageApi.analyzeSentiment(doc); return response.getDocumentSentiment(); } @@ -145,7 +151,6 @@ public Sentiment analyzeSentimentText(String text, String lang) throws IOExcepti * Gets {@link Entity}s from the string {@code text} with sentiment. */ public List entitySentimentText(String text) throws IOException { - // Note: This does not work on App Engine standard. Document doc = Document.newBuilder() .setContent(text).setType(Type.PLAIN_TEXT).build(); AnalyzeEntitySentimentRequest request = AnalyzeEntitySentimentRequest.newBuilder() @@ -160,7 +165,6 @@ public List entitySentimentText(String text) throws IOException { * with sentiment. */ public List entitySentimentFile(String path) throws IOException { - // Note: This does not work on App Engine standard. Document doc = Document.newBuilder() .setGcsContentUri(path).setType(Type.PLAIN_TEXT).build(); AnalyzeEntitySentimentRequest request = AnalyzeEntitySentimentRequest.newBuilder() diff --git a/language/cloud-client/README.md b/language/cloud-client/README.md index fce53f88da0..f217f04cea3 100644 --- a/language/cloud-client/README.md +++ b/language/cloud-client/README.md @@ -17,14 +17,13 @@ Install [Maven](http://maven.apache.org/). Build your project with: - mvn clean package -DskipTests - -You can then run a given `ClassName` via: - - mvn exec:java -Dexec.mainClass=com.example.language.ClassName \ - -DpropertyName=propertyValue \ - -Dexec.args="arg1 'arg 2' arg3" +```bash +mvn clean compile assembly:single +``` ### Analyze a string for sentiment (using the quickstart sample) - mvn exec:java -Dexec.mainClass=com.example.language.QuickstartSample +``` +java -cp target/language-google-cloud-samples-1.0.0-jar-with-dependencies.jar \ + com.example.language.QuickstartSample +``` diff --git a/language/cloud-client/pom.xml b/language/cloud-client/pom.xml index 930d55e8de8..4720604ab19 100644 --- a/language/cloud-client/pom.xml +++ b/language/cloud-client/pom.xml @@ -54,4 +54,22 @@ test + + + + + maven-assembly-plugin + + + + com.example.language.QuickstartSample + + + + jar-with-dependencies + + + + +