From b034f316f334f69a9ba89dc5ebf9c00fe758aceb Mon Sep 17 00:00:00 2001
From: jkee <jkee@yandex-team.ru>
Date: Mon, 16 Mar 2015 19:40:36 +0300
Subject: [PATCH] METR-15511: refactor 2
---
clickhouse-jdbc.iml | 2 +-
pom.xml | 9 +++++++++
.../java/ru/yandex/metrika/clickhouse/CHDriver.java | 5 -----
.../ru/yandex/metrika/clickhouse/CHStatement.java | 13 +------------
.../metrika/clickhouse/copypaste/ByteFragment.java | 5 ++---
.../clickhouse/copypaste/CopypasteUtils.java | 12 ++++++++++++
6 files changed, 25 insertions(+), 21 deletions(-)
create mode 100644 src/main/java/ru/yandex/metrika/clickhouse/copypaste/CopypasteUtils.java
diff --git a/clickhouse-jdbc.iml b/clickhouse-jdbc.iml
index f151c7aa..b854bd52 100644
--- a/clickhouse-jdbc.iml
+++ b/clickhouse-jdbc.iml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
diff --git a/pom.xml b/pom.xml
index 101a1760..5caea755 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,15 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
diff --git a/src/main/java/ru/yandex/metrika/clickhouse/CHDriver.java b/src/main/java/ru/yandex/metrika/clickhouse/CHDriver.java
index 74c371c7..6d475d5d 100644
--- a/src/main/java/ru/yandex/metrika/clickhouse/CHDriver.java
+++ b/src/main/java/ru/yandex/metrika/clickhouse/CHDriver.java
@@ -2,7 +2,6 @@ package ru.yandex.metrika.clickhouse;
import java.sql.*;
import java.util.Properties;
-import java.util.logging.Logger;
/**
* Created by jkee on 14.03.15.
@@ -48,8 +47,4 @@ public class CHDriver implements Driver {
return false;
}
- @Override
- public Logger getParentLogger() throws SQLFeatureNotSupportedException {
- return null;
- }
}
diff --git a/src/main/java/ru/yandex/metrika/clickhouse/CHStatement.java b/src/main/java/ru/yandex/metrika/clickhouse/CHStatement.java
index dc58be44..57a5d978 100644
--- a/src/main/java/ru/yandex/metrika/clickhouse/CHStatement.java
+++ b/src/main/java/ru/yandex/metrika/clickhouse/CHStatement.java
@@ -11,7 +11,6 @@ import ru.yandex.metrika.clickhouse.copypaste.*;
import java.io.IOException;
import java.io.InputStream;
import java.net.HttpURLConnection;
-import java.nio.charset.StandardCharsets;
import java.sql.*;
/**
@@ -59,7 +58,7 @@ public class CHStatement implements Statement {
private CountingInputStream getInputStream(String sql) {
HttpPost post = new HttpPost(url);
- post.setEntity(new StringEntity(sql, StandardCharsets.UTF_8));
+ post.setEntity(new StringEntity(sql, CopypasteUtils.UTF_8));
HttpEntity entity = null;
InputStream is = null;
try {
@@ -288,16 +287,6 @@ public class CHStatement implements Statement {
return false;
}
- @Override
- public void closeOnCompletion() throws SQLException {
-
- }
-
- @Override
- public boolean isCloseOnCompletion() throws SQLException {
- return false;
- }
-
@Override
public <T> T unwrap(Class<T> iface) throws SQLException {
return null;
diff --git a/src/main/java/ru/yandex/metrika/clickhouse/copypaste/ByteFragment.java b/src/main/java/ru/yandex/metrika/clickhouse/copypaste/ByteFragment.java
index 32bcae87..5401d7fb 100644
--- a/src/main/java/ru/yandex/metrika/clickhouse/copypaste/ByteFragment.java
+++ b/src/main/java/ru/yandex/metrika/clickhouse/copypaste/ByteFragment.java
@@ -2,7 +2,6 @@ package ru.yandex.metrika.clickhouse.copypaste;
import java.io.ByteArrayInputStream;
import java.io.IOException;
-import java.nio.charset.StandardCharsets;
import java.util.Arrays;
/**
@@ -24,12 +23,12 @@ public class ByteFragment {
}
public String asString() {
- return new String(buf, start, len, StandardCharsets.UTF_8);
+ return new String(buf, start, len, CopypasteUtils.UTF_8);
}
public String asString(boolean unescape) {
if(unescape) {
- return new String(unescape(), StandardCharsets.UTF_8);
+ return new String(unescape(), CopypasteUtils.UTF_8);
} else {
return asString();
}
diff --git a/src/main/java/ru/yandex/metrika/clickhouse/copypaste/CopypasteUtils.java b/src/main/java/ru/yandex/metrika/clickhouse/copypaste/CopypasteUtils.java
new file mode 100644
index 00000000..2d6f7387
--- /dev/null
+++ b/src/main/java/ru/yandex/metrika/clickhouse/copypaste/CopypasteUtils.java
@@ -0,0 +1,12 @@
+package ru.yandex.metrika.clickhouse.copypaste;
+
+import java.nio.charset.Charset;
+
+/**
+ * Created by jkee on 16.03.15.
+ */
+public class CopypasteUtils {
+
+ public static final Charset UTF_8 = Charset.forName("UTF-8");
+
+}
--
GitLab