DATAES-285 - upgrade to elasticsearch 5.x

Author: akonczak

.gitignore

@@ -6,9 +6,6 @@ atlassian-ide-plugin.xml
 ## ignore any target dir
 target
 
-##ignore only top level data dir - local node data files for unit tests
-/data
-
 ## Ignore project files created by Eclipse
 .settings
 .project

pom.xml

@@ -19,7 +19,7 @@
     <properties>
         <commonscollections>3.2.1</commonscollections>
         <commonslang>2.6</commonslang>
-        <elasticsearch>2.4.0</elasticsearch>
+        <elasticsearch>5.2.1</elasticsearch>
         <springdata.commons>2.0.0.BUILD-SNAPSHOT</springdata.commons>
     </properties>
 
@@ -70,6 +70,30 @@
             <version>${elasticsearch}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.elasticsearch.client</groupId>
+            <artifactId>transport</artifactId>
+            <version>${elasticsearch}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>log4j-over-slf4j</artifactId>
+            <version>1.7.22</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.6.2</version>
+        </dependency>
+
         <!-- Jackson JSON Mapper -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -96,6 +120,12 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>ch.qos.logback</groupId>
+                    <artifactId>logback-classic</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.openwebbeans.test</groupId>
@@ -120,13 +150,22 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency><!-- required by elasticsearch -->
+            <groupId>org.elasticsearch.plugin</groupId>
+            <artifactId>transport-netty4-client</artifactId>
+            <version>${elasticsearch}</version>
+            <!--<scope>test</scope>-->
+        </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <version>${lombok}</version>
             <scope>test</scope>
         </dependency>
 
+
+
     </dependencies>
 
     <build>

src/main/java/org/springframework/data/elasticsearch/annotations/CompletionField.java

@@ -32,8 +32,6 @@
 
 	String analyzer() default "simple";
 
-	boolean payloads() default false;
-
 	boolean preserveSeparators() default true;
 
 	boolean preservePositionIncrements() default true;

src/main/java/org/springframework/data/elasticsearch/annotations/Field.java

@@ -38,14 +38,16 @@
 
 	FieldType type() default FieldType.Auto;
 
-	FieldIndex index() default FieldIndex.analyzed;
+	boolean index() default true;
 
 	DateFormat format() default DateFormat.none;
 
 	String pattern() default "";
 
 	boolean store() default false;
 
+	boolean fielddata() default false;
+
 	String searchAnalyzer() default "";
 
 	String analyzer() default "";

src/main/java/org/springframework/data/elasticsearch/annotations/FieldType.java

@@ -21,5 +21,5 @@
  * @author Artur Konczak
  */
 public enum FieldType {
-	String, Integer, Long, Date, Float, Double, Boolean, Object, Auto, Nested, Ip, Attachment
+	text, Integer, Long, Date, Float, Double, Boolean, Object, Auto, Nested, Ip, Attachment, keyword
 }

src/main/java/org/springframework/data/elasticsearch/annotations/GeoPointField.java

@@ -25,8 +25,4 @@
 @Documented
 public @interface GeoPointField {
 
-        boolean geoHashPrefix() default false;
-
-        String geoHashPrecision() default "0";
-
 }

src/main/java/org/springframework/data/elasticsearch/annotations/InnerField.java

@@ -31,10 +31,12 @@
 
 	FieldType type();
 
-	FieldIndex index() default FieldIndex.analyzed;
+	boolean index() default true;
 
 	boolean store() default false;
 
+	boolean fielddata() default false;
+
 	String searchAnalyzer() default "";
 
 	String indexAnalyzer() default "";