DIP for channel

puneithk · puneithk · commit e81d249b7fc7 · 2016-07-11T12:52:25.000-07:00
diff --git a/speech/grpc/src/main/java/com/google/cloud/speech/grpc/demos/AsyncRecognizeClient.java b/speech/grpc/src/main/java/com/google/cloud/speech/grpc/demos/AsyncRecognizeClient.java
@@ -94,6 +94,19 @@ public void shutdown() throws InterruptedException {
     channel.shutdown().awaitTermination(5, TimeUnit.SECONDS);
   }
 
+  public static ManagedChannel createChannel(String host, int port) throws IOException {
+    GoogleCredentials creds = GoogleCredentials.getApplicationDefault();
+    creds = creds.createScoped(OAUTH2_SCOPES);
+    ManagedChannel channel =
+        NettyChannelBuilder.forAddress(host, port)
+            .negotiationType(NegotiationType.TLS)
+            .intercept(new ClientAuthInterceptor(creds, Executors.newSingleThreadExecutor()))
+            .build();
+
+    return channel;
+
+    }
+
   /** 
    * Sends a request to the speech API and returns an Operation handle.
    */
@@ -224,13 +237,7 @@ public static void main(String[] args) throws Exception {
       System.exit(1);
     }
 
-    GoogleCredentials creds = GoogleCredentials.getApplicationDefault();
-    creds = creds.createScoped(OAUTH2_SCOPES);
-    ManagedChannel channel =
-        NettyChannelBuilder.forAddress(host, port)
-            .negotiationType(NegotiationType.TLS)
-            .intercept(new ClientAuthInterceptor(creds, Executors.newSingleThreadExecutor()))
-            .build();
+    ManagedChannel channel = AsyncRecognizeClient.createChannel(host, port);
 
     AsyncRecognizeClient client =
         new AsyncRecognizeClient(channel, URI.create(audioFile), sampling);
diff --git a/speech/grpc/src/main/java/com/google/cloud/speech/grpc/demos/StreamingRecognizeClient.java b/speech/grpc/src/main/java/com/google/cloud/speech/grpc/demos/StreamingRecognizeClient.java
@@ -65,8 +65,6 @@
  */
 public class StreamingRecognizeClient {
 
-  private final String host;
-  private final int port;
   private final String file;
   private final int samplingRate;
 
@@ -82,22 +80,13 @@ public class StreamingRecognizeClient {
   /**
    * Construct client connecting to Cloud Speech server at {@code host:port}.
    */
-  public StreamingRecognizeClient(String host, int port, String file, int samplingRate)
+  public StreamingRecognizeClient(ManagedChannel channel, String file, int samplingRate)
       throws IOException {
-    this.host = host;
-    this.port = port;
     this.file = file;
     this.samplingRate = samplingRate;
+    this.channel = channel;
 
-    GoogleCredentials creds = GoogleCredentials.getApplicationDefault();
-    creds = creds.createScoped(OAUTH2_SCOPES);
-    channel =
-        NettyChannelBuilder.forAddress(host, port)
-            .negotiationType(NegotiationType.TLS)
-            .intercept(new ClientAuthInterceptor(creds, Executors.newSingleThreadExecutor()))
-            .build();
     speechClient = SpeechGrpc.newStub(channel);
-    logger.info("Created speech client for " + host + ":" + port);
   }
 
   public void shutdown() throws InterruptedException {
@@ -248,7 +237,8 @@ public static void main(String[] args) throws Exception {
       System.exit(1);
     }
 
-    StreamingRecognizeClient client = new StreamingRecognizeClient(host, port, audioFile, sampling);
+    ManagedChannel channel = AsyncRecognizeClient.createChannel(host, port);
+    StreamingRecognizeClient client = new StreamingRecognizeClient(channel, audioFile, sampling);
     try {
       client.recognize();
     } finally {
diff --git a/speech/grpc/src/main/java/com/google/cloud/speech/grpc/demos/SyncRecognizeClient.java b/speech/grpc/src/main/java/com/google/cloud/speech/grpc/demos/SyncRecognizeClient.java
@@ -66,8 +66,6 @@ public class SyncRecognizeClient {
   private static final List<String> OAUTH2_SCOPES =
       Arrays.asList("https://www.googleapis.com/auth/cloud-platform");
 
-  private final String host;
-  private final int port;
   private final URI input;
   private final int samplingRate;
 
@@ -77,22 +75,13 @@ public class SyncRecognizeClient {
   /**
    * Construct client connecting to Cloud Speech server at {@code host:port}.
    */
-  public SyncRecognizeClient(String host, int port, URI input, int samplingRate)
+  public SyncRecognizeClient(ManagedChannel channel, URI input, int samplingRate)
       throws IOException {
-    this.host = host;
-    this.port = port;
     this.input = input;
     this.samplingRate = samplingRate;
+    this.channel = channel;
 
-    GoogleCredentials creds = GoogleCredentials.getApplicationDefault();
-    creds = creds.createScoped(OAUTH2_SCOPES);
-    channel =
-        NettyChannelBuilder.forAddress(host, port)
-            .negotiationType(NegotiationType.TLS)
-            .intercept(new ClientAuthInterceptor(creds, Executors.newSingleThreadExecutor()))
-            .build();
     speechClient = SpeechGrpc.newBlockingStub(channel);
-    logger.info("Created speech client for " + host + ":" + port);
   }
 
   private RecognitionAudio createRecognitionAudio() throws IOException {
@@ -200,8 +189,9 @@ public static void main(String[] args) throws Exception {
       System.exit(1);
     }
 
+    ManagedChannel channel = AsyncRecognizeClient.createChannel(host, port);
     SyncRecognizeClient client =
-        new SyncRecognizeClient(host, port, URI.create(audioFile), sampling);
+        new SyncRecognizeClient(channel, URI.create(audioFile), sampling);
     try {
       client.recognize();
     } finally {
