Adjusting version string

Author: Paultagoras

clickhouse-client/src/main/java/com/clickhouse/client/config/ClickHouseClientOption.java

@@ -436,6 +436,7 @@ public enum ClickHouseClientOption implements ClickHouseOption {
     private static final Map<String, ClickHouseClientOption> options;
 
     static final String UNKNOWN = "unknown";
+    public static final String LATEST_KNOWN_VERSION = "0.6.3";
 
     /**
      * Semantic version of the product.
@@ -480,7 +481,7 @@ public enum ClickHouseClientOption implements ClickHouseOption {
             ver = parts[3];
             PRODUCT_REVISION = ver.substring(0, ver.length() - 1);
         } else { // perhaps try harder by checking version from pom.xml?
-            PRODUCT_VERSION = "";
+            PRODUCT_VERSION = LATEST_KNOWN_VERSION;
             PRODUCT_REVISION = UNKNOWN;
         }
 
@@ -517,7 +518,7 @@ public static String buildUserAgent(String productName, String additionalPropert
         StringBuilder builder = new StringBuilder(productName).append(PRODUCT_VERSION.isEmpty() ? "" : "/" + PRODUCT_VERSION);
 
         if (!String.valueOf(PRODUCT_NAME.getDefaultValue()).equals(productName)) {//Append if someone changed the original value
-            builder.append(" ").append(PRODUCT_NAME.getDefaultValue()).append(PRODUCT_VERSION.isEmpty() ? "" : "/" + PRODUCT_VERSION);
+            builder.append(" ").append(PRODUCT_NAME.getDefaultValue()).append(LATEST_KNOWN_VERSION);
         }
         builder.append(" (").append(CLIENT_JVM_INFO);
         if (additionalProperty != null && !additionalProperty.isEmpty()) {

clickhouse-http-client/src/main/java/com/clickhouse/client/http/ClickHouseHttpConnection.java

@@ -427,6 +427,10 @@ protected final String getUserAgent() {
         }
 
         name = c.getProductName();
+        String version = c.getProductVersion();
+        if (!ClickHouseClientOption.PRODUCT_VERSION.equals(version)) {
+            name = name + "/" + c.getProductVersion();
+        }
         return ClickHouseClientOption.PRODUCT_NAME.getDefaultValue().equals(name) ? userAgent : name + " " + userAgent;
     }
 

clickhouse-http-client/src/test/java/com/clickhouse/client/http/ClickHouseHttpClientTest.java

@@ -175,7 +175,8 @@ public void testUserAgent() throws Exception {
                      .query("select http_user_agent from system.query_log where query='select ''" + uuid + "'''")
                      .executeAndWait()) {
             String result = response.firstRecord().getValue(0).asString();
-            Assert.assertTrue(result.startsWith("MyCustomClient"));
+            System.out.println(result);
+            Assert.assertTrue(result.startsWith("MyCustomClient ClickHouse-JavaClient/"));
             Assert.assertTrue(result.indexOf("Http") > 0);
         }
 
@@ -194,7 +195,7 @@ public void testUserAgent() throws Exception {
                      .query("select http_user_agent from system.query_log where query='select ''" + uuid + "'''")
                      .executeAndWait()) {
             String result = response.firstRecord().getValue(0).asString();
-            Assert.assertTrue(result.startsWith("MyCustomClient"));
+            Assert.assertTrue(result.startsWith("MyCustomClient ClickHouse-JavaClient/"));
         }
     }