Rename package name from org.zhdev to net.zhira

db/pom.xml

@@ -1,9 +1,12 @@
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <artifactId>parent</artifactId>
-        <groupId>org.zhdev.varioutil</groupId>
+        <groupId>net.zhira.varioutil</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 

db/src/main/java/net/zhira/varioutil/sql/AbstractProvider.java

@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.sql;
+package net.zhira.varioutil.sql;
 
 import java.sql.Connection;
 import java.sql.SQLException;

db/src/main/java/net/zhira/varioutil/sql/ConnectionProvider.java

@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.sql;
+package net.zhira.varioutil.sql;
 
 import java.sql.Connection;
 import java.sql.SQLException;

db/src/main/java/net/zhira/varioutil/sql/H2Provider.java

@@ -1,6 +1,6 @@
-package org.zhdev.varioutil.sql;
+package net.zhira.varioutil.sql;
 
-import org.zhdev.varioutil.util.SqlUtils;
+import net.zhira.varioutil.util.SqlUtils;
 
 public class H2Provider extends AbstractProvider {
     public H2Provider(String path, String username, String password) {

db/src/main/java/net/zhira/varioutil/sql/MysqlProvider.java

@@ -1,6 +1,6 @@
-package org.zhdev.varioutil.sql;
+package net.zhira.varioutil.sql;
 
-import org.zhdev.varioutil.util.SqlUtils;
+import net.zhira.varioutil.util.SqlUtils;
 
 public class MysqlProvider extends AbstractProvider {
     public MysqlProvider(String address, String dbname, String username, String password, boolean ssl) {

db/src/main/java/net/zhira/varioutil/sql/NullProvider.java

@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.sql;
+package net.zhira.varioutil.sql;
 
 import java.sql.Connection;
 

db/src/main/java/net/zhira/varioutil/sql/SqlAdapter.java

@@ -1,6 +1,6 @@
-package org.zhdev.varioutil.sql;
+package net.zhira.varioutil.sql;
 
-import org.zhdev.varioutil.util.CheckedFunction;
+import net.zhira.varioutil.util.CheckedFunction;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;

db/src/main/java/net/zhira/varioutil/sql/SqlException.java

@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.sql;
+package net.zhira.varioutil.sql;
 
 public class SqlException extends RuntimeException {
     public SqlException() {

db/src/main/java/net/zhira/varioutil/sql/SqliteProvider.java

@@ -1,6 +1,6 @@
-package org.zhdev.varioutil.sql;
+package net.zhira.varioutil.sql;
 
-import org.zhdev.varioutil.util.SqlUtils;
+import net.zhira.varioutil.util.SqlUtils;
 
 public class SqliteProvider extends AbstractProvider {
     public SqliteProvider(String path) {

db/src/main/java/net/zhira/varioutil/util/CheckedFunction.java

@@ -1,4 +1,4 @@
-package org.zhdev.varioutil.util;
+package net.zhira.varioutil.util;
 
 @FunctionalInterface
 public interface CheckedFunction<T, R, E extends Exception> {

db/src/main/java/net/zhira/varioutil/util/SqlUtils.java

@@ -1,6 +1,6 @@
-package org.zhdev.varioutil.util;
+package net.zhira.varioutil.util;
 
-import org.zhdev.varioutil.sql.SqlException;
+import net.zhira.varioutil.sql.SqlException;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -42,14 +42,14 @@ public class SqlUtils {
         try {
             Connection connection;
             if (username != null) {
-                connection = DriverManager.getConnection("jdbc:h2:./" + encodeUrlValue(path) + ";mode=MySQL;AUTO_SERVER=TRUE", username, password);
+                connection = DriverManager.getConnection("jdbc:h2:./" + path + ";mode=MySQL;AUTO_SERVER=TRUE", username, password);
             } else {
-                connection = DriverManager.getConnection("jdbc:h2:./" + encodeUrlValue(path) + ";mode=MySQL;AUTO_SERVER=TRUE", "sa", "");
+                connection = DriverManager.getConnection("jdbc:h2:./" + path + ";mode=MySQL;AUTO_SERVER=TRUE", "sa", "");
             }
             return connection;
         } catch (NoClassDefFoundError e) {
             throw new SqlException("No suitable driver");
-        } catch (SQLException | UnsupportedEncodingException e) {
+        } catch (SQLException e) {
             throw new SqlException(e);
         }
     }
@@ -68,8 +68,8 @@ public class SqlUtils {
             }
         }
         try {
-            return DriverManager.getConnection("jdbc:sqlite:" + encodeUrlValue(path.toString()));
-        } catch (SQLException | UnsupportedEncodingException e) {
+            return DriverManager.getConnection("jdbc:sqlite:" + path);
+        } catch (SQLException e) {
             throw new SqlException(e);
         }
     }