elasticsearch & spring-boot

README.md

@@ -25,8 +25,8 @@ whatsmars-redis | jedis & Spring Data Redis
 whatsmars-rpc | RPC
 whatsmars-sharding-jdbc | 分布式数据库中间件
 whatsmars-spring | Spring Framework
-whatsmars-spring-boot | Spring Boot 实战
-whatsmars-spring-boot-samples | Spring Boot Samples
+whatsmars-spring-boot | Spring Boot 1.5.x
+whatsmars-spring-boot-samples | Spring Boot 2+
 whatsmars-spring-cloud | Finchley
 whatsmars-tomcat | 模拟tomcat实现，embed tomcat
 

pom.xml

@@ -36,8 +36,6 @@
         <commons-dbcp.version>1.4</commons-dbcp.version>
         <mysql-connector-java.version>5.1.32</mysql-connector-java.version>
 
-        <spring-boot2.version>2.0.5.RELEASE</spring-boot2.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>

whatsmars-elasticsearch/pom.xml

@@ -12,27 +12,10 @@
     <artifactId>whatsmars-elasticsearch</artifactId>
 
     <properties>
-        <elasticsearch.version>5.6.13</elasticsearch.version>
+        <elasticsearch.version>5.6.12</elasticsearch.version>
     </properties>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot2.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
-        </dependency>
-
         <!-- 用于源码阅读 -->
         <dependency>
             <groupId>org.elasticsearch</groupId>
@@ -40,7 +23,6 @@
             <version>${elasticsearch.version}</version>
         </dependency>
 
-        <!-- 用于控制版本及非spring-boot环境测试 -->
         <dependency>
             <groupId>org.elasticsearch.client</groupId>
             <artifactId>transport</artifactId>
@@ -54,5 +36,4 @@
 
     </dependencies>
 
-
 </project>
\ No newline at end of file

whatsmars-spring-boot-samples/README.md

-https://github.com/spring-projects/spring-boot
\ No newline at end of file
+https://github.com/spring-projects/spring-boot
+
+其他模块的 spring-boot demo 收拢到这个模块
\ No newline at end of file

whatsmars-spring-boot-samples/pom.xml

@@ -2,41 +2,32 @@
 <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">
-    <parent>
-        <groupId>org.hongxi</groupId>
-        <artifactId>whatsmars-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
+
     <modelVersion>4.0.0</modelVersion>
 
+    <groupId>org.hongxi</groupId>
     <artifactId>whatsmars-spring-boot-samples</artifactId>
+    <version>1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
     <description>Spring Boot Samples</description>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.0.6.RELEASE</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+
     <modules>
         <module>whatsmars-boot-sample-aop</module>
         <module>whatsmars-boot-sample-session</module>
         <module>whatsmars-boot-sample-logback</module>
         <module>whatsmars-boot-sample-cache</module>
         <module>whatsmars-boot-sample-mongodb</module>
+        <module>whatsmars-boot-sample-elasticsearch</module>
     </modules>
 
-    <!--<properties>
-        <spring-boot.version>LATEST</spring-boot.version>
-    </properties>-->
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <!-- Test -->
         <dependency>
@@ -55,32 +46,24 @@
         </plugins>
     </build>
 
-    <!--<repositories>
-        <repository>
-            <id>spring-repo</id>
-            <name>Spring Repo</name>
-            <url>http://repo.spring.io/milestone/</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-repo</id>
-            <name>Spring Repo</name>
-            <url>http://repo.spring.io/milestone/</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>-->
+    <!--<repositories>-->
+        <!--<repository>-->
+            <!--<id>spring-snapshots</id>-->
+            <!--<name>Spring Snapshots</name>-->
+            <!--<url>https://repo.spring.io/snapshot</url>-->
+            <!--<snapshots>-->
+                <!--<enabled>true</enabled>-->
+            <!--</snapshots>-->
+        <!--</repository>-->
+        <!--<repository>-->
+            <!--<id>spring-milestones</id>-->
+            <!--<name>Spring Milestones</name>-->
+            <!--<url>https://repo.spring.io/milestone</url>-->
+            <!--<snapshots>-->
+                <!--<enabled>false</enabled>-->
+            <!--</snapshots>-->
+        <!--</repository>-->
+    <!--</repositories>-->
 
 
 </project>
\ No newline at end of file

whatsmars-spring-boot-samples/whatsmars-boot-sample-elasticsearch/pom.xml

+<?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">
+    <parent>
+        <artifactId>whatsmars-spring-boot-samples</artifactId>
+        <groupId>org.hongxi</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>whatsmars-boot-sample-elasticsearch</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
+        </dependency>
+    </dependencies>
+
+
+</project>
\ No newline at end of file

whatsmars-elasticsearch/src/main/java/org/hongxi/whatsmars/elasticsearch/boot/Application.java → whatsmars-spring-boot-samples/whatsmars-boot-sample-elasticsearch/src/main/java/org/hongxi/whatsmars/boot/sample/elasticsearch/Application.java

-package org.hongxi.whatsmars.elasticsearch.boot;
+package org.hongxi.whatsmars.boot.sample.elasticsearch;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
 
 /**
  * Created by shenhongxi on 2018/11/19.
@@ -12,12 +9,7 @@ import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
 @SpringBootApplication
 public class Application {
 
-    @Autowired
-    private ElasticsearchTemplate elasticsearchTemplate;
-
     public static void main(String[] args) {
-        ConfigurableApplicationContext context = SpringApplication.run(Application.class, args);
-        ElasticsearchTemplate template = context.getBean(ElasticsearchTemplate.class);
-        System.out.println(template.indexExists("whatsmars"));
+        SpringApplication.run(Application.class, args);
     }
-}
+}
\ No newline at end of file

whatsmars-spring-boot-samples/whatsmars-boot-sample-elasticsearch/src/main/java/org/hongxi/whatsmars/boot/sample/elasticsearch/SimpleController.java

+package org.hongxi.whatsmars.boot.sample.elasticsearch;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by shenhongxi on 2018/11/20.
+ */
+@RestController
+public class SimpleController {
+
+    @Autowired
+    private ElasticsearchTemplate elasticsearchTemplate;
+
+    @RequestMapping("/indexExists/{indexName}")
+    public Boolean indexExists(@PathVariable String indexName) {
+        return elasticsearchTemplate.indexExists(indexName);
+    }
+}

whatsmars-elasticsearch/src/main/resources/application.yml → whatsmars-spring-boot-samples/whatsmars-boot-sample-elasticsearch/src/main/resources/application.yml

 spring:
   data:
     elasticsearch:
-#      cluster-name: mars
       cluster-nodes: 127.0.0.1:9300
\ No newline at end of file

whatsmars-spring-boot-samples/whatsmars-boot-sample-session/pom.xml

@@ -28,6 +28,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
+            <version>1.2.44</version>
         </dependency>
     </dependencies>