removed duplication and stdout

Author: chernser

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

@@ -493,21 +493,7 @@ public enum ClickHouseClientOption implements ClickHouseOption {
         }
         options = Collections.unmodifiableMap(map);
 
-        // <artifact-id> <version> (revision: <revision>)
-        String tmpVersion = "unknown";
-        try (InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream("clickhouse-client-version.properties")) {
-            Properties p = new Properties();
-            p.load(in);
-
-            String tmp = p.getProperty("version");
-            if (tmp != null && !tmp.isEmpty() && !tmp.equals("${revision}")) {
-                tmpVersion = tmp;
-            }
-        } catch (Exception e) {
-           // ignore
-        }
-
-        PRODUCT_VERSION = tmpVersion;
+        PRODUCT_VERSION = readVersionFromResource("clickhouse-client-version.properties");
         PRODUCT_REVISION = UNKNOWN;
 
         CLIENT_OS_INFO = new StringBuilder().append(getSystemConfig("os.name", "O/S")).append('/')
@@ -529,6 +515,23 @@ public enum ClickHouseClientOption implements ClickHouseOption {
         CLIENT_HOST = host == null || host.isEmpty() ? UNKNOWN : host;
     }
 
+    public static String readVersionFromResource(String resourceFilePath) {
+        // TODO: move to client-v2 when client-v1 is deprecated completely
+        String tmpVersion = "unknown";
+        try (InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream(resourceFilePath)) {
+            Properties p = new Properties();
+            p.load(in);
+
+            String tmp = p.getProperty("version");
+            if (tmp != null && !tmp.isEmpty() && !tmp.equals("${revision}")) {
+                tmpVersion = tmp;
+            }
+        } catch (Exception e) {
+            // ignore
+        }
+        return tmpVersion;
+    }
+
     /**
      * Builds user-agent based on given product name. The user-agent will be
      * something look like

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

@@ -174,7 +174,6 @@ private void testUserAgent(ClickHouseOption option, String optionValue) throws E
                          .executeAndWait()) {
                 if (response.records().iterator().hasNext()) {
                     String result = response.firstRecord().getValue(0).asString();
-                    System.out.println(result);
                     Assert.assertTrue(result.startsWith(optionValue + " ClickHouse-JavaClient/"));
                     Assert.assertTrue(result.indexOf("Http") > 0);
                     break;

client-v2/src/main/java/com/clickhouse/client/api/Client.java

@@ -2160,28 +2160,12 @@ public void updateClientName(String name) {
         this.configuration.put(ClientConfigProperties.CLIENT_NAME.getKey(), name);
     }
 
-    public static final String clientVersion = getPackageVersion();
+    public static final String clientVersion =
+            ClickHouseClientOption.readVersionFromResource("client-v2-version.properties");
     public static final String CLIENT_USER_AGENT = "clickhouse-java-v2/";
 
     private Collection<String> unmodifiableDbRolesView = Collections.emptyList();
 
-    private static String getPackageVersion() {
-        String version = "unknown";
-        try (InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream("client-v2-version.properties")) {
-            Properties p = new Properties();
-            p.load(in);
-
-            String tmp = p.getProperty("version");
-            if (tmp != null && !tmp.isEmpty() && !tmp.equals("${revision}")) {
-                version = tmp;
-            }
-        } catch (Exception e) {
-            LOG.error("Failed to load version file", e);
-        }
-
-        return version;
-    }
-
     /**
      * Returns list of DB roles that should be applied to each query.
      *

client-v2/src/main/java/com/clickhouse/client/api/internal/HttpAPIClientHelper.java

@@ -646,6 +646,7 @@ public static Map<String, String> parseUrlParameters(URL url) {
 
 
     private void correctUserAgentHeader(HttpRequest request, Map<String, Object> requestConfig) {
+        //TODO: implement cache for user-agent
         Header userAgentHeader = request.getLastHeader(HttpHeaders.USER_AGENT);
         request.removeHeaders(HttpHeaders.USER_AGENT);
 
@@ -670,10 +671,7 @@ private  String buildDefaultUserAgent() {
         StringBuilder userAgent = new StringBuilder();
         userAgent.append(Client.CLIENT_USER_AGENT);
 
-        String clientVersion = Client.class.getPackage().getImplementationVersion();
-        if (clientVersion == null) {
-            clientVersion = Client.clientVersion;
-        }
+        String clientVersion = Client.clientVersion;
 
         userAgent.append(clientVersion);
 

jdbc-v2/src/main/java/com/clickhouse/jdbc/Driver.java

@@ -2,6 +2,7 @@
 
 
 import com.clickhouse.client.api.ClientConfigProperties;
+import com.clickhouse.client.config.ClickHouseClientOption;
 import com.clickhouse.jdbc.internal.JdbcConfiguration;
 import com.clickhouse.jdbc.internal.ExceptionUtils;
 import org.slf4j.Logger;
@@ -60,20 +61,7 @@ public static String getFrameworksDetected() {
     static {
         log.debug("Initializing ClickHouse JDBC driver V2");
 
-        String tmpDriverVersion = "unknown";
-        try (InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream("jdbc-v2-version.properties")) {
-            Properties p = new Properties();
-            p.load(in);
-
-            String tmp = p.getProperty("version");
-            if (tmp != null && !tmp.isEmpty() && !tmp.equals("${revision}")) {
-                tmpDriverVersion = tmp;
-            }
-        } catch (Exception e) {
-            log.error("Failed to load version file", e);
-        }
-
-        driverVersion = tmpDriverVersion;
+        driverVersion = ClickHouseClientOption.readVersionFromResource("jdbc-v2-version.properties");
         log.info("ClickHouse JDBC driver version: {}", driverVersion);
 
         int tmpMajorVersion;