From 804045682cbfee0be5382a702ab1d86d1976aa1d Mon Sep 17 00:00:00 2001
From: zyyang <zyyang@taosdata.com>
Date: Thu, 17 Sep 2020 14:06:39 +0800
Subject: [PATCH] solve conflict

---
 src/connector/jdbc/pom.xml                                 | 5 -----
 .../jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java   | 7 +++----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/connector/jdbc/pom.xml b/src/connector/jdbc/pom.xml
index 841b0d3c74..36e2fa426b 100755
--- a/src/connector/jdbc/pom.xml
+++ b/src/connector/jdbc/pom.xml
@@ -49,11 +49,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java
index c356df8bf7..bc649a31e1 100755
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java
@@ -15,8 +15,6 @@
 package com.taosdata.jdbc;
 
 
-import org.apache.commons.lang3.StringUtils;
-
 import java.io.*;
 
 import java.sql.*;
@@ -246,7 +244,7 @@ public class TSDBDriver implements java.sql.Driver {
     }
 
     public boolean acceptsURL(String url) throws SQLException {
-        return StringUtils.isNotBlank(url) && url.startsWith(URL_PREFIX);
+        return (url != null && url.length() > 0 && url.trim().length() > 0) && url.toLowerCase().startsWith(URL_PREFIX);
     }
 
     public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws SQLException {
@@ -293,7 +291,8 @@ public class TSDBDriver implements java.sql.Driver {
             return null;
         }
 
-        if (!StringUtils.startsWithIgnoreCase(url, URL_PREFIX) && !StringUtils.startsWithIgnoreCase(url, URL_PREFIX1)) {
+        String lowerUrl = url.toLowerCase();
+        if (!lowerUrl.startsWith(URL_PREFIX) && !lowerUrl.startsWith(URL_PREFIX1)) {
             return null;
         }
 
-- 
GitLab