optimise

javahongxi · Jan 12, 2019 · ef27968 · ef27968
1 parent e69db39
commit ef27968
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 30 deletions.
diff --git a/pom.xml b/pom.xml
@@ -51,13 +51,10 @@
         <jackson.version>2.9.5</jackson.version>
         <commons-lang.version>2.6</commons-lang.version>
         <commons-collections.version>3.2.2</commons-collections.version>
-        <commons-codec.version>1.11</commons-codec.version>
         <commons-fileupload.version>1.3.3</commons-fileupload.version>
-        <commons-lang3.version>3.7</commons-lang3.version>
         <commons-beanutils.version>1.9.3</commons-beanutils.version>
         <commons-logging.version>1.2</commons-logging.version>
         <commons-dbcp.version>1.4</commons-dbcp.version>
-        <commons-pool2.version>2.6.0</commons-pool2.version>
         <fastjson.version>1.2.44</fastjson.version>
         <swagger2.version>2.5.0</swagger2.version>
         <netty.version>4.1.30.Final</netty.version>
@@ -124,11 +121,6 @@
                 <artifactId>commons-collections</artifactId>
                 <version>${commons-collections.version}</version>
             </dependency>
-            <dependency>
-                <groupId>commons-codec</groupId>
-                <artifactId>commons-codec</artifactId>
-                <version>${commons-codec.version}</version>
-            </dependency>
             <dependency>
                 <groupId>commons-fileupload</groupId>
                 <artifactId>commons-fileupload</artifactId>
@@ -139,11 +131,6 @@
                 <artifactId>commons-beanutils</artifactId>
                 <version>${commons-beanutils.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-lang3</artifactId>
-                <version>${commons-lang3.version}</version>
-            </dependency>
             <dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
@@ -154,11 +141,6 @@
                 <artifactId>commons-dbcp</artifactId>
                 <version>${commons-dbcp.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-pool2</artifactId>
-                <version>${commons-pool2.version}</version>
-            </dependency>
 
             <dependency>
                 <groupId>com.alibaba</groupId>

diff --git a/whatsmars-elasticsearch/pom.xml b/whatsmars-elasticsearch/pom.xml
@@ -15,22 +15,16 @@
     <name>${project.artifactId}</name>
     <description>Elasticsearch demo</description>
 
-    <properties>
-        <elasticsearch.version>5.6.12</elasticsearch.version>
-    </properties>
-
     <dependencies>
         <!-- 用于源码阅读 -->
         <dependency>
             <groupId>org.elasticsearch</groupId>
             <artifactId>elasticsearch</artifactId>
-            <version>${elasticsearch.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.elasticsearch.client</groupId>
             <artifactId>transport</artifactId>
-            <version>${elasticsearch.version}</version>
         </dependency>
     </dependencies>
 

diff --git a/...ars-elasticsearch/src/main/java/org/hongxi/whatsmars/elasticsearch/ElasticsearchDemo.java b/...ars-elasticsearch/src/main/java/org/hongxi/whatsmars/elasticsearch/ElasticsearchDemo.java
@@ -3,7 +3,7 @@
 import org.elasticsearch.action.index.IndexResponse;
 import org.elasticsearch.client.transport.TransportClient;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.transport.InetSocketTransportAddress;
+import org.elasticsearch.common.transport.TransportAddress;
 import org.elasticsearch.transport.client.PreBuiltTransportClient;
 
 import java.net.InetAddress;
@@ -19,7 +19,7 @@ public static void main(String[] args) throws Exception {
         // on startup
         //此步骤添加IP，至少一个，如果设置了"client.transport.sniff"= true 一个就够了，因为添加了自动嗅探配置
         TransportClient client = new PreBuiltTransportClient(Settings.EMPTY)
-                .addTransportAddress(new InetSocketTransportAddress(InetAddress.getByName("127.0.0.1"), 9300));
+                .addTransportAddress(new TransportAddress(InetAddress.getByName("127.0.0.1"), 9300));
 
         Map<String, Object> json = new HashMap<>();
         json.put("user","hongxi");

diff --git a/whatsmars-elasticsearch/src/test/java/org/hongxi/whatsmars/elasticsearch/CreateIndex.java b/whatsmars-elasticsearch/src/test/java/org/hongxi/whatsmars/elasticsearch/CreateIndex.java
@@ -3,7 +3,7 @@
 import org.elasticsearch.action.index.IndexResponse;
 import org.elasticsearch.client.transport.TransportClient;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.transport.InetSocketTransportAddress;
+import org.elasticsearch.common.transport.TransportAddress;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.transport.client.PreBuiltTransportClient;
@@ -24,7 +24,7 @@ public class CreateIndex {
     @Before
     public void getClient() throws Exception{
         client = new PreBuiltTransportClient(Settings.EMPTY)
-                .addTransportAddress(new InetSocketTransportAddress(InetAddress.getByName("127.0.0.1"), 9300));
+                .addTransportAddress(new TransportAddress(InetAddress.getByName("127.0.0.1"), 9300));
     }
 
     /**

diff --git a/whatsmars-elasticsearch/src/test/java/org/hongxi/whatsmars/elasticsearch/GetAPI.java b/whatsmars-elasticsearch/src/test/java/org/hongxi/whatsmars/elasticsearch/GetAPI.java
@@ -3,7 +3,7 @@
 import org.elasticsearch.action.get.GetResponse;
 import org.elasticsearch.client.transport.TransportClient;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.transport.InetSocketTransportAddress;
+import org.elasticsearch.common.transport.TransportAddress;
 import org.elasticsearch.transport.client.PreBuiltTransportClient;
 import org.junit.Before;
 import org.junit.Test;
@@ -20,7 +20,7 @@ public class GetAPI {
     @Before
     public void getClient() throws Exception{
         client = new PreBuiltTransportClient(Settings.EMPTY)
-                .addTransportAddress(new InetSocketTransportAddress(InetAddress.getByName("127.0.0.1"), 9300));
+                .addTransportAddress(new TransportAddress(InetAddress.getByName("127.0.0.1"), 9300));
     }
 
     @Test