Removes extraneous createService method, reduces line length in integration tests, and adds verbose comments on mock entities.

gguuss · gguuss · commit bd07872c59cb · 2016-11-30T10:00:17.000-08:00
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
@@ -57,7 +57,7 @@ public static void main(String[] args) throws IOException, GeneralSecurityExcept
     String command = args[0];
     String text = args[1];
 
-    Analyze app = new Analyze(createLanguageService());
+    Analyze app = new Analyze(LanguageServiceClient.create());
 
     if (command.equals("entities")) {
       printEntities(System.out, app.analyzeEntities(text));
@@ -140,12 +140,6 @@ public static void printSyntax(PrintStream out, List<Token> tokens) {
     }
   }
 
-  /**
-   * Connects to the Natural Language API using Application Default Credentials.
-   */
-  public static LanguageServiceClient createLanguageService() throws IOException{
-	  return LanguageServiceClient.create();
-  }
 
   private final LanguageServiceClient languageApi;
 
@@ -160,10 +154,11 @@ public Analyze(LanguageServiceClient languageApi) {
    * Gets {@link Entity}s from the string {@code text}.
    */
   public List<Entity> analyzeEntities(String text) throws IOException {
-    AnalyzeEntitiesRequest request =
-        AnalyzeEntitiesRequest.newBuilder()
-            .setDocument(Document.newBuilder().setContent(text).setType(Type.PLAIN_TEXT))
-            .setEncodingType(EncodingType.UTF16).build();
+    Document doc = Document.newBuilder()
+        .setContent(text).setType(Type.PLAIN_TEXT).build();
+    AnalyzeEntitiesRequest request = AnalyzeEntitiesRequest.newBuilder()
+        .setDocument(doc)
+        .setEncodingType(EncodingType.UTF16).build();
     AnalyzeEntitiesResponse response = languageApi.analyzeEntities(request);
     return response.getEntitiesList();
   }
@@ -172,18 +167,21 @@ public List<Entity> analyzeEntities(String text) throws IOException {
    * Gets {@link Sentiment} from the string {@code text}.
    */
   public Sentiment analyzeSentiment(String text) throws IOException {
-    AnalyzeSentimentResponse response = languageApi.analyzeSentiment(
-        Document.newBuilder().setContent(text).setType(Type.PLAIN_TEXT).build());
+    Document doc = Document.newBuilder()
+        .setContent(text).setType(Type.PLAIN_TEXT).build();
+    AnalyzeSentimentResponse response = languageApi.analyzeSentiment(doc);
     return response.getDocumentSentiment();
   }
 
   /**
    * Gets {@link Token}s from the string {@code text}.
    */
   public List<Token> analyzeSyntax(String text) throws IOException {
+    Document doc = Document.newBuilder()
+        .setContent(text).setType(Type.PLAIN_TEXT).build();
     AnalyzeSyntaxRequest request = AnalyzeSyntaxRequest.newBuilder()
-            .setDocument(Document.newBuilder().setContent(text).setType(Type.PLAIN_TEXT).build())
-            .setEncodingType(EncodingType.UTF16).build();
+        .setDocument(doc)
+        .setEncodingType(EncodingType.UTF16).build();
     AnalyzeSyntaxResponse response = languageApi.analyzeSyntax(request);
     return response.getTokensList();
   }
diff --git a/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeIT.java b/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeIT.java
@@ -18,6 +18,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import com.google.cloud.language.spi.v1.LanguageServiceClient;
 import com.google.cloud.language.v1.Entity;
 import com.google.cloud.language.v1.PartOfSpeech.Tag;
 import com.google.cloud.language.v1.Sentiment;
@@ -41,7 +42,7 @@ public class AnalyzeIT {
   private Analyze analyzeApp;
 
   @Before public void setup() throws Exception {
-    analyzeApp = new Analyze(Analyze.createLanguageService());
+    analyzeApp = new Analyze(LanguageServiceClient.create());
   }
 
   @Test public void analyzeEntities_withEntities_returnsLarryPage() throws Exception {
diff --git a/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeTest.java b/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeTest.java
@@ -69,6 +69,8 @@ public class AnalyzeTest {
     // Arrange
     ByteArrayOutputStream bout = new ByteArrayOutputStream();
     PrintStream out = new PrintStream(bout);
+
+    // Mock natural-language entities based on actual data.
     ImmutableList<Entity> entities =
         ImmutableList.of(
             Entity.newBuilder().setName("Larry Page")
@@ -88,10 +90,10 @@ public class AnalyzeTest {
                 .build(),
             Entity.newBuilder().setName("something").build());
 
-    // Act
+    // Act on sample code with mock data.
     Analyze.printEntities(out, entities);
 
-    // Assert
+    // Assert output from sample matches expected output.
     String got = bout.toString();
     assertThat(got).contains("Found 3 entities.");
     assertThat(got).contains("Larry Page");
