Update PR

shinfan · shinfan · commit d398c97ba21d · 2017-02-08T15:32:40.000-08:00
diff --git a/src/main/java/com/google/api/gax/grpc/InstantiatingChannelProvider.java b/src/main/java/com/google/api/gax/grpc/InstantiatingChannelProvider.java
@@ -134,16 +134,12 @@ public CredentialsProvider getCredentialsProvider() {
     return credentialsProvider;
   }
 
-  /**
-   * The address used to reach the service.
-   */
+  /** The address used to reach the service. */
   public String getServiceAddress() {
     return serviceAddress;
   }
 
-  /**
-   * The port used to reach the service.
-   */
+  /** The port used to reach the service. */
   public int getPort() {
     return port;
   }
@@ -162,7 +158,7 @@ public String serviceHeader() {
 
     String javaVersion = Runtime.class.getPackage().getImplementationVersion();
     return String.format(
-        "%s/%s gax/%s grpc/%s java/%s",
+        "%s/%s gax/%s grpc/%s gl-java/%s",
         clientName,
         clientVersion,
         getGaxVersion(),
@@ -184,7 +180,6 @@ static String getGaxVersion() {
     return gaxVersion;
   }
 
-
   public Builder toBuilder() {
     return new Builder(this);
   }
@@ -222,6 +217,7 @@ private Builder(InstantiatingChannelProvider provider) {
     /**
      * Sets the ExecutorProvider for this ChannelProvider.
      *
+     * <p>
      * This is optional; if it is not provided, needsExecutor() will return true, meaning that an
      * Executor must be provided when getChannel is called on the constructed ChannelProvider
      * instance. Note: ClientSettings will automatically provide its own Executor in this
@@ -241,74 +237,53 @@ public Builder setCredentialsProvider(CredentialsProvider credentialsProvider) {
       return this;
     }
 
-    /**
-     * The previously set CredentialsProvider.
-     */
+    /** The previously set CredentialsProvider. */
     public CredentialsProvider getCredentialsProvider() {
       return credentialsProvider;
     }
 
-    /**
-     * Sets the address used to reach the service.
-     */
+    /** Sets the address used to reach the service. */
     public Builder setServiceAddress(String serviceAddress) {
       this.serviceAddress = serviceAddress;
       return this;
     }
 
-    /**
-     * The address used to reach the service.
-     */
+    /** The address used to reach the service. */
     public String getServiceAddress() {
       return serviceAddress;
     }
 
-    /**
-     * Sets the port used to reach the service.
-     */
+    /** Sets the port used to reach the service. */
     public Builder setPort(int port) {
       this.port = port;
       return this;
     }
 
-    /**
-     * The port used to reach the service.
-     */
+    /** The port used to reach the service. */
     public int getPort() {
       return port;
     }
 
-    /**
-     * Sets the generator name and version for the GRPC custom header.
-     */
+    /** Sets the generator name and version for the GRPC custom header. */
     public Builder setClientHeader(String name, String version) {
       this.clientName = name;
       this.clientVersion = version;
       return this;
     }
 
-    /**
-     * The client name provided previously.
-     */
+    /** The client name provided previously. */
     public String getClientName() {
-      return serviceGeneratorName;
+      return clientName;
     }
 
-    /**
-     * The client version provided previously.
-     */
-    public String getGeneratorVersion() {
-      return serviceGeneratorVersion;
+    /** The client version provided previously. */
+    public String getClientVersion() {
+      return clientVersion;
     }
 
     public InstantiatingChannelProvider build() {
       return new InstantiatingChannelProvider(
-          executorProvider,
-          credentialsProvider,
-          serviceAddress,
-          port,
-          serviceGeneratorName,
-          serviceGeneratorVersion);
+          executorProvider, credentialsProvider, serviceAddress, port, clientName, clientVersion);
     }
   }
 }
diff --git a/src/test/java/com/google/api/gax/grpc/InstantiatingChannelProviderTest.java b/src/test/java/com/google/api/gax/grpc/InstantiatingChannelProviderTest.java
@@ -39,6 +39,14 @@
 @RunWith(JUnit4.class)
 public class InstantiatingChannelProviderTest {
 
+  @Test
+  public void testServiceHeader() {
+    InstantiatingChannelProvider provider = InstantiatingChannelProvider.newBuilder().build();
+    System.out.println(provider.serviceHeader());
+    String expectedHeaderPattern = "^gapic/(\\d+\\.?)+ gax/.* grpc/(\\d+\\.?)+ gl-java/.*$";
+    assertTrue(Pattern.compile(expectedHeaderPattern).matcher(provider.serviceHeader()).find());
+  }
+
   @Test
   public void test() throws Exception {
     String gaxVersion = InstantiatingChannelProvider.getGaxVersion();
diff --git a/src/test/java/com/google/api/gax/grpc/InstantiatingChannelProviderTest.java~HEAD b/src/test/java/com/google/api/gax/grpc/InstantiatingChannelProviderTest.java~HEAD
