Merge pull request #2514 from ClickHouse/fix_using_new_api

fixed j8 compatibility

Author: chernser

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

@@ -430,22 +430,22 @@ public boolean getMoreResults(int current) throws SQLException {
  return false; // false indicates that no more results (or it is an update count)
  }
 
- @Override
+// @Override
  public String enquoteLiteral(String val) throws SQLException {
  return SQLUtils.enquoteLiteral(val);
  }
 
- @Override
+// @Override
  public String enquoteIdentifier(String identifier, boolean alwaysQuote) throws SQLException {
  return SQLUtils.enquoteIdentifier(identifier, alwaysQuote);
  }
 
- @Override
+// @Override
  public boolean isSimpleIdentifier(String identifier) throws SQLException {
  return SQLUtils.isSimpleIdentifier(identifier);
  }
 
- @Override
+// @Override
  public String enquoteNCharLiteral(String val) throws SQLException {
  if (val == null) {
  throw new NullPointerException();

jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/JdbcConfiguration.java

@@ -7,10 +7,12 @@
 import com.clickhouse.jdbc.Driver;
 import com.google.common.collect.ImmutableMap;
 
+import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
+import java.nio.charset.UnsupportedCharsetException;
 import java.sql.DriverPropertyInfo;
 import java.sql.SQLException;
 import java.util.Comparator;
@@ -195,19 +197,23 @@ private Map<String, String> parseUrl(String url) throws SQLException {
  }
  if (uri.getQuery() != null && !uri.getQuery().trim().isEmpty()) {
  for (String pair : uri.getRawQuery().split("&")) {
- String[] p = pair.split("=", 2);
- if (p.length != 2 || p[0] == null || p[1] == null) {
- throw new SQLException("Invalid query parameter '" + pair + "'");
+ try {
+ String[] p = pair.split("=", 2);
+ if (p.length != 2 || p[0] == null || p[1] == null) {
+ throw new SQLException("Invalid query parameter '" + pair + "'");
+ }
+ String key = URLDecoder.decode(p[0], StandardCharsets.UTF_8.name());
+ if (key == null || key.trim().isEmpty() || !PATTERN_HTTP_TOKEN.matcher(key).matches()) {
+ throw new SQLException("Invalid query parameter key in pair'" + pair + "'");
+ }
+ String value = URLDecoder.decode(p[1], StandardCharsets.UTF_8.name());
+ if (value == null || value.trim().isEmpty() || "=".equals(value)) {
+ throw new SQLException("Invalid query parameter value in pair '" + pair + "'");
+ }
+ properties.put(key.trim(), value);
+ } catch (UnsupportedEncodingException e) {
+ throw new SQLException("Internal error'", e);
  }
- String key = URLDecoder.decode(p[0], StandardCharsets.UTF_8);
- if (key == null || key.trim().isEmpty() || !PATTERN_HTTP_TOKEN.matcher(key).matches()) {
- throw new SQLException("Invalid query parameter key in pair'" + pair + "'");
- }
- String value = URLDecoder.decode(p[1], StandardCharsets.UTF_8);
- if (value == null || value.trim().isEmpty() || "=".equals(value)) {
- throw new SQLException("Invalid query parameter value in pair '" + pair + "'");
- }
- properties.put(key.trim(), value);
  }
  }
  return properties;