Merge pull request #1330 from zhicwu/main

Extensible SSL context provider

CHANGELOG.md

@@ -1,4 +1,4 @@
-## 0.5.0
+## 0.4.5
 ### Breaking Changes
 * refactor data processors and response classes to ensure input stream remain intact before first read:
   - move ClickHouseSimpleRecord to com.clickhouse.data
@@ -8,6 +8,12 @@
 ### New Features
 * disable SQL rewrite for DELETE statement in ClickHouse 23.3+
 
+### Bug Fixes
+* Slow when using Apache Http Client. [#1320](https://github.com/ClickHouse/clickhouse-java/issues/1320)
+* ClickHouseResponse.getInputStream may return closed input stream.
+* ConcurrentModificationException may occure during deserialization. [#1327](https://github.com/ClickHouse/clickhouse-java/pull/1327)
+* ClickHouseSslContextProvider is not customizable. [#1329](https://github.com/ClickHouse/clickhouse-java/issues/1329)
+
 ## 0.4.4, 2023-04-17
 ### Bug Fixes
 * flatten plugin 1.4.1 generated non-sense dependencies.

clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseSslContextProvider.java

@@ -1,13 +1,15 @@
 package com.clickhouse.client;
 
 import java.util.Optional;
+import java.util.ServiceLoader;
+
 import javax.net.ssl.SSLException;
 
-import com.clickhouse.data.ClickHouseUtils;
+import com.clickhouse.data.ClickHouseChecker;
 
 /**
- * This interface defines how to build Netty SSL context based on given
- * configuration and target server.
+ * This interface defines how to build SSL context based on given configuration
+ * and target server.
  */
 public interface ClickHouseSslContextProvider {
     /**
@@ -16,7 +18,20 @@ public interface ClickHouseSslContextProvider {
      * @return non-null SSL context provider
      */
     static ClickHouseSslContextProvider getProvider() {
-        return ClickHouseUtils.getService(ClickHouseSslContextProvider.class);
+        String packageName = ClickHouseSslContextProvider.class.getName();
+        packageName = packageName.substring(0, packageName.lastIndexOf('.') + 1);
+        ClickHouseSslContextProvider defaultProvider = null;
+        for (ClickHouseSslContextProvider s : ServiceLoader.load(ClickHouseSslContextProvider.class,
+                ClickHouseSslContextProvider.class.getClassLoader())) {
+            if (s == null) {
+                // impossible
+            } else if (s.getClass().getName().startsWith(packageName)) {
+                defaultProvider = s;
+            } else {
+                return s;
+            }
+        }
+        return ClickHouseChecker.nonNull(defaultProvider, ClickHouseSslContextProvider.class.getSimpleName());
     }
 
     /**

clickhouse-client/src/test/java/com/clickhouse/client/ClickHouseSslContextProviderTest.java

@@ -0,0 +1,13 @@
+package com.clickhouse.client;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+public class ClickHouseSslContextProviderTest {
+    @Test(groups = { "unit" })
+    public void testGetProvider() {
+        Assert.assertNotNull(ClickHouseSslContextProvider.getProvider());
+        Assert.assertEquals(ClickHouseSslContextProvider.getProvider().getClass(),
+                ClickHouseSslContextProvider.getProvider().getClass());
+    }
+}