DATAES-527 - Release version 2.1.19 (Ingalls SR19).

This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener).

# Fixed URLs

## Fixed Success
These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended.

* [ ] http://www.apache.org/licenses/ with 1 occurrences migrated to:
  https://www.apache.org/licenses/ ([https](https://www.apache.org/licenses/) result 200).
* [ ] http://www.apache.org/licenses/LICENSE-2.0 with 223 occurrences migrated to:
  https://www.apache.org/licenses/LICENSE-2.0 ([https](https://www.apache.org/licenses/LICENSE-2.0) result 200).

Original Pull Request: #262

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,9 +1,12 @@
+<!--
+
 Thank you for proposing a pull request. This template will guide you through the essential steps necessary for a pull request.
 Make sure that:
 
+-->
+
 - [ ] You have read the [Spring Data contribution guidelines](https://github.com/spring-projects/spring-data-build/blob/master/CONTRIBUTING.adoc).
 - [ ] There is a ticket in the bug tracker for the project in our [JIRA](https://jira.spring.io/browse/DATAES).
 - [ ] You use the code formatters provided [here](https://github.com/spring-projects/spring-data-build/tree/master/etc/ide) and have them applied to your changes. Don’t submit any formatting related changes.
 - [ ] You submit test cases (unit or integration tests) that back your changes.
 - [ ] You added yourself as author in the headers of the classes you touched. Amend the date range in the Apache license header if needed. For new types, add the license header (copy from another file and set the current year only).
-- [ ] You provide your full name and an email address registered with your GitHub account. If you’re a first-time submitter, make sure you have completed the [Contributor’s License Agreement form](https://support.springsource.com/spring_committer_signup).

.gitignore

@@ -1,21 +1,21 @@
-atlassian-ide-plugin.xml
-
-## Ignore svn files
-.svn
-
-## 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
-.classpath
-
-## Ignore project files created by IntelliJ IDEA
-*.iml
-*.ipr
-*.iws
-.idea
+atlassian-ide-plugin.xml
+
+## Ignore svn files
+.svn
+
+## 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
+.classpath
+
+## Ignore project files created by IntelliJ IDEA
+*.iml
+*.ipr
+*.iws
+.idea

README.md

@@ -245,7 +245,7 @@ Here are some ways for you to get involved in the community:
 * Github is for social coding: if you want to write code, we encourage contributions through pull requests from [forks of this repository](http://help.github.com/forking/). If you want to contribute code this way, please reference a JIRA ticket as well covering the specific issue you are addressing.
 * Watch for upcoming articles on Spring by [subscribing](http://www.springsource.org/node/feed) to springframework.org
 
-Before we accept a non-trivial patch or pull request we will need you to sign the [contributor's agreement](https://support.springsource.com/spring_committer_signup).  Signing the contributor's agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do.  Active contributors might be asked to join the core team, and given the ability to merge pull requests.
+Before we accept a non-trivial patch or pull request we will need you to [sign the Contributor License Agreement](https://cla.pivotal.io/sign/spring). Signing the contributor’s agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do. If you forget to do so, you'll be reminded when you submit a pull request. Active contributors might be asked to join the core team, and given the ability to merge pull requests.
 
 
 Code formatting for [Eclipse and Intellij](https://github.com/spring-projects/spring-data-build/tree/master/etc/ide)

pom.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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">
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.springframework.data</groupId>
     <artifactId>spring-data-elasticsearch</artifactId>
-    <version>2.1.0.BUILD-SNAPSHOT</version>
+    <version>2.1.19.RELEASE</version>
 
     <parent>
         <groupId>org.springframework.data.build</groupId>
         <artifactId>spring-data-parent</artifactId>
-        <version>1.9.0.BUILD-SNAPSHOT</version>
+        <version>1.9.19.RELEASE</version>
         <relativePath>../spring-data-build/parent/pom.xml</relativePath>
     </parent>
 
@@ -24,7 +24,7 @@
         <commonscollections>3.2.1</commonscollections>
         <commonslang>2.6</commonslang>
         <elasticsearch>2.4.0</elasticsearch>
-        <springdata.commons>1.13.0.BUILD-SNAPSHOT</springdata.commons>
+        <springdata.commons>1.13.19.RELEASE</springdata.commons>
 
     </properties>
 
@@ -79,14 +79,12 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>${jackson}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson}</version>
         </dependency>
-        
+
         <!-- CDI -->
         <dependency>
             <groupId>javax.enterprise</groupId>
@@ -176,8 +174,8 @@
 
     <repositories>
         <repository>
-            <id>spring-libs-snapshot</id>
-            <url>https://repo.spring.io/libs-snapshot</url>
+            <id>spring-libs-release</id>
+            <url>https://repo.spring.io/libs-release</url>
         </repository>
     </repositories>
 
@@ -197,7 +195,7 @@
 
     <ciManagement>
         <system>Bamboo</system>
-        <url>http://build.springsource.org/browse/SPRINGDATAES</url>
+        <url>https://build.springsource.org/browse/SPRINGDATAES</url>
     </ciManagement>
 
     <issueManagement>

src/main/asciidoc/index.adoc

@@ -6,7 +6,7 @@ BioMed Central Development Team
 :toc-placement!:
 :spring-data-commons-docs: ../../../../spring-data-commons/src/main/asciidoc
 
-(C) 2013-2015 The original author(s).
+(C) 2013-2019 The original author(s).
 
 NOTE: Copies of this document may be made for your own use and for distribution to others, provided that you do not charge any fee for such copies and further provided that each copy contains this Copyright Notice, whether distributed in print or electronically.
 

src/main/java/org/springframework/data/elasticsearch/ElasticsearchException.java

@@ -1,51 +1,51 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch;
-
-import java.util.Map;
-
-/**
- * ElasticsearchException
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-public class ElasticsearchException extends RuntimeException {
-
-	private Map<String, String> failedDocuments;
-
-	public ElasticsearchException(String message) {
-		super(message);
-	}
-
-	public ElasticsearchException(String message, Throwable cause) {
-		super(message, cause);
-	}
-
-	public ElasticsearchException(String message, Throwable cause, Map<String, String> failedDocuments) {
-		super(message, cause);
-		this.failedDocuments = failedDocuments;
-	}
-
-	public ElasticsearchException(String message, Map<String, String> failedDocuments) {
-		super(message);
-		this.failedDocuments = failedDocuments;
-	}
-
-	public Map<String, String> getFailedDocuments() {
-		return failedDocuments;
-	}
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch;
+
+import java.util.Map;
+
+/**
+ * ElasticsearchException
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+public class ElasticsearchException extends RuntimeException {
+
+	private Map<String, String> failedDocuments;
+
+	public ElasticsearchException(String message) {
+		super(message);
+	}
+
+	public ElasticsearchException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+	public ElasticsearchException(String message, Throwable cause, Map<String, String> failedDocuments) {
+		super(message, cause);
+		this.failedDocuments = failedDocuments;
+	}
+
+	public ElasticsearchException(String message, Map<String, String> failedDocuments) {
+		super(message);
+		this.failedDocuments = failedDocuments;
+	}
+
+	public Map<String, String> getFailedDocuments() {
+		return failedDocuments;
+	}
+}

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

@@ -1,11 +1,11 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

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

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

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

@@ -1,51 +1,51 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.annotations;
-
-import java.lang.annotation.*;
-
-import org.springframework.data.annotation.Persistent;
-
-/**
- * Document
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Mason Chan
- */
-
-@Persistent
-@Inherited
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE})
-public @interface Document {
-
-	String indexName();
-
-	String type() default "";
-
-	boolean useServerConfiguration() default false;
-
-	short shards() default 5;
-
-	short replicas() default 1;
-
-	String refreshInterval() default "1s";
-
-	String indexStoreType() default "fs";
-
-	boolean createIndex() default true;
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.annotations;
+
+import java.lang.annotation.*;
+
+import org.springframework.data.annotation.Persistent;
+
+/**
+ * Document
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Mason Chan
+ */
+
+@Persistent
+@Inherited
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE})
+public @interface Document {
+
+	String indexName();
+
+	String type() default "";
+
+	boolean useServerConfiguration() default false;
+
+	short shards() default 5;
+
+	short replicas() default 1;
+
+	String refreshInterval() default "1s";
+
+	String indexStoreType() default "fs";
+
+	boolean createIndex() default true;
+}

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

@@ -1,56 +1,56 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Artur Konczak
- * @author Jonathan Yan
- * @author Jakub Vavrik
- * @author Kevin Leturc
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-@Documented
-@Inherited
-public @interface Field {
-
-	FieldType type() default FieldType.Auto;
-
-	FieldIndex index() default FieldIndex.analyzed;
-
-	DateFormat format() default DateFormat.none;
-
-	String pattern() default "";
-
-	boolean store() default false;
-
-	String searchAnalyzer() default "";
-
-	String analyzer() default "";
-
-	String[] ignoreFields() default {};
-
-	boolean includeInParent() default false;
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.annotations;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Artur Konczak
+ * @author Jonathan Yan
+ * @author Jakub Vavrik
+ * @author Kevin Leturc
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+@Documented
+@Inherited
+public @interface Field {
+
+	FieldType type() default FieldType.Auto;
+
+	FieldIndex index() default FieldIndex.analyzed;
+
+	DateFormat format() default DateFormat.none;
+
+	String pattern() default "";
+
+	boolean store() default false;
+
+	String searchAnalyzer() default "";
+
+	String analyzer() default "";
+
+	String[] ignoreFields() default {};
+
+	boolean includeInParent() default false;
+}

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

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

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

@@ -1,11 +1,11 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

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

@@ -1,11 +1,11 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

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

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

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

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

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

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

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

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

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

@@ -1,45 +1,45 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.annotations;
-
-import java.lang.annotation.*;
-
-/**
- * Query
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@Documented
-public @interface Query {
-
-	/**
-	 * Elasticsearch query to be used when executing query. May contain placeholders eg. ?0
-	 *
-	 * @return
-	 */
-	String value() default "";
-
-	/**
-	 * Named Query Named looked up by repository.
-	 *
-	 * @return
-	 */
-	String name() default "";
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.annotations;
+
+import java.lang.annotation.*;
+
+/**
+ * Query
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+@Documented
+public @interface Query {
+
+	/**
+	 * Elasticsearch query to be used when executing query. May contain placeholders eg. ?0
+	 *
+	 * @return
+	 */
+	String value() default "";
+
+	/**
+	 * Named Query Named looked up by repository.
+	 *
+	 * @return
+	 */
+	String name() default "";
+}

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

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/client/NodeClientFactoryBean.java

@@ -1,127 +1,127 @@
-/*
- * Copyright 2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.client;
-
-import static org.elasticsearch.node.NodeBuilder.*;
-
-import java.io.InputStream;
-import org.apache.commons.lang.StringUtils;
-import org.elasticsearch.client.Client;
-import org.elasticsearch.client.node.NodeClient;
-import org.elasticsearch.common.settings.Settings;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.InitializingBean;
-
-/**
- * NodeClientFactoryBean
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-
-public class NodeClientFactoryBean implements FactoryBean<NodeClient>, InitializingBean, DisposableBean {
-
-	private static final Logger logger = LoggerFactory.getLogger(NodeClientFactoryBean.class);
-	private boolean local;
-	private boolean enableHttp;
-	private String clusterName;
-	private NodeClient nodeClient;
-	private String pathData;
-	private String pathHome;
-	private String pathConfiguration;
-
-	NodeClientFactoryBean() {
-	}
-
-	public NodeClientFactoryBean(boolean local) {
-		this.local = local;
-	}
-
-	@Override
-	public NodeClient getObject() throws Exception {
-		return nodeClient;
-	}
-
-	@Override
-	public Class<? extends Client> getObjectType() {
-		return NodeClient.class;
-	}
-
-	@Override
-	public boolean isSingleton() {
-		return true;
-	}
-
-	@Override
-	public void afterPropertiesSet() throws Exception {
-		nodeClient = (NodeClient) nodeBuilder().settings(Settings.builder().put(loadConfig())
-				.put("http.enabled", String.valueOf(this.enableHttp))
-				.put("path.home", this.pathHome)
-				.put("path.data", this.pathData))
-				.clusterName(this.clusterName).local(this.local).node()
-				.client();
-	}
-
-	private Settings loadConfig() {
-		if (StringUtils.isNotBlank(pathConfiguration)) {
-			InputStream stream = getClass().getClassLoader().getResourceAsStream(pathConfiguration);
-			if (stream != null) {
-				return Settings.builder().loadFromStream(pathConfiguration, getClass().getClassLoader().getResourceAsStream(pathConfiguration)).build();
-			}
-			logger.error(String.format("Unable to read node configuration from file [%s]", pathConfiguration));
-		}
-		return Settings.builder().build();
-	}
-
-	public void setLocal(boolean local) {
-		this.local = local;
-	}
-
-	public void setEnableHttp(boolean enableHttp) {
-		this.enableHttp = enableHttp;
-	}
-
-	public void setClusterName(String clusterName) {
-		this.clusterName = clusterName;
-	}
-
-	public void setPathData(String pathData) {
-		this.pathData = pathData;
-	}
-
-	public void setPathHome(String pathHome) {
-		this.pathHome = pathHome;
-	}
-
-	public void setPathConfiguration(String configuration) {
-		this.pathConfiguration = configuration;
-	}
-
-	@Override
-	public void destroy() throws Exception {
-		try {
-			logger.info("Closing elasticSearch  client");
-			if (nodeClient != null) {
-				nodeClient.close();
-			}
-		} catch (final Exception e) {
-			logger.error("Error closing ElasticSearch client: ", e);
-		}
-	}
-}
+/*
+ * Copyright 2015-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client;
+
+import static org.elasticsearch.node.NodeBuilder.*;
+
+import java.io.InputStream;
+import org.apache.commons.lang.StringUtils;
+import org.elasticsearch.client.Client;
+import org.elasticsearch.client.node.NodeClient;
+import org.elasticsearch.common.settings.Settings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.InitializingBean;
+
+/**
+ * NodeClientFactoryBean
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+
+public class NodeClientFactoryBean implements FactoryBean<NodeClient>, InitializingBean, DisposableBean {
+
+	private static final Logger logger = LoggerFactory.getLogger(NodeClientFactoryBean.class);
+	private boolean local;
+	private boolean enableHttp;
+	private String clusterName;
+	private NodeClient nodeClient;
+	private String pathData;
+	private String pathHome;
+	private String pathConfiguration;
+
+	NodeClientFactoryBean() {
+	}
+
+	public NodeClientFactoryBean(boolean local) {
+		this.local = local;
+	}
+
+	@Override
+	public NodeClient getObject() throws Exception {
+		return nodeClient;
+	}
+
+	@Override
+	public Class<? extends Client> getObjectType() {
+		return NodeClient.class;
+	}
+
+	@Override
+	public boolean isSingleton() {
+		return true;
+	}
+
+	@Override
+	public void afterPropertiesSet() throws Exception {
+		nodeClient = (NodeClient) nodeBuilder().settings(Settings.builder().put(loadConfig())
+				.put("http.enabled", String.valueOf(this.enableHttp))
+				.put("path.home", this.pathHome)
+				.put("path.data", this.pathData))
+				.clusterName(this.clusterName).local(this.local).node()
+				.client();
+	}
+
+	private Settings loadConfig() {
+		if (StringUtils.isNotBlank(pathConfiguration)) {
+			InputStream stream = getClass().getClassLoader().getResourceAsStream(pathConfiguration);
+			if (stream != null) {
+				return Settings.builder().loadFromStream(pathConfiguration, getClass().getClassLoader().getResourceAsStream(pathConfiguration)).build();
+			}
+			logger.error(String.format("Unable to read node configuration from file [%s]", pathConfiguration));
+		}
+		return Settings.builder().build();
+	}
+
+	public void setLocal(boolean local) {
+		this.local = local;
+	}
+
+	public void setEnableHttp(boolean enableHttp) {
+		this.enableHttp = enableHttp;
+	}
+
+	public void setClusterName(String clusterName) {
+		this.clusterName = clusterName;
+	}
+
+	public void setPathData(String pathData) {
+		this.pathData = pathData;
+	}
+
+	public void setPathHome(String pathHome) {
+		this.pathHome = pathHome;
+	}
+
+	public void setPathConfiguration(String configuration) {
+		this.pathConfiguration = configuration;
+	}
+
+	@Override
+	public void destroy() throws Exception {
+		try {
+			logger.info("Closing elasticSearch  client");
+			if (nodeClient != null) {
+				nodeClient.close();
+			}
+		} catch (final Exception e) {
+			logger.error("Error closing ElasticSearch client: ", e);
+		}
+	}
+}

src/main/java/org/springframework/data/elasticsearch/client/TransportClientFactoryBean.java

@@ -1,154 +1,154 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.client;
-
-import static org.apache.commons.lang.StringUtils.*;
-
-import java.net.InetAddress;
-import java.util.Properties;
-
-import org.elasticsearch.client.transport.TransportClient;
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.transport.InetSocketTransportAddress;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.util.Assert;
-
-/**
- * TransportClientFactoryBean
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Jakub Vavrik
- * @author Piotr Betkier
- */
-
-public class TransportClientFactoryBean implements FactoryBean<TransportClient>, InitializingBean, DisposableBean {
-
-	private static final Logger logger = LoggerFactory.getLogger(TransportClientFactoryBean.class);
-	private String clusterNodes = "127.0.0.1:9300";
-	private String clusterName = "elasticsearch";
-	private Boolean clientTransportSniff = true;
-	private Boolean clientIgnoreClusterName = Boolean.FALSE;
-	private String clientPingTimeout = "5s";
-	private String clientNodesSamplerInterval = "5s";
-	private TransportClient client;
-	private Properties properties;
-	static final String COLON = ":";
-	static final String COMMA = ",";
-
-	@Override
-	public void destroy() throws Exception {
-		try {
-			logger.info("Closing elasticSearch  client");
-			if (client != null) {
-				client.close();
-			}
-		} catch (final Exception e) {
-			logger.error("Error closing ElasticSearch client: ", e);
-		}
-	}
-
-	@Override
-	public TransportClient getObject() throws Exception {
-		return client;
-	}
-
-	@Override
-	public Class<TransportClient> getObjectType() {
-		return TransportClient.class;
-	}
-
-	@Override
-	public boolean isSingleton() {
-		return false;
-	}
-
-	@Override
-	public void afterPropertiesSet() throws Exception {
-		buildClient();
-	}
-
-	protected void buildClient() throws Exception {
-		client = TransportClient.builder().settings(settings()).build();
-		Assert.hasText(clusterNodes, "[Assertion failed] clusterNodes settings missing.");
-		for (String clusterNode : split(clusterNodes, COMMA)) {
-			String hostName = substringBeforeLast(clusterNode, COLON);
-			String port = substringAfterLast(clusterNode, COLON);
-			Assert.hasText(hostName, "[Assertion failed] missing host name in 'clusterNodes'");
-			Assert.hasText(port, "[Assertion failed] missing port in 'clusterNodes'");
-			logger.info("adding transport node : " + clusterNode);
-			client.addTransportAddress(new InetSocketTransportAddress(InetAddress.getByName(hostName), Integer.valueOf(port)));
-		}
-		client.connectedNodes();
-	}
-
-	private Settings settings() {
-		if (properties != null) {
-			return Settings.builder().put(properties).build();
-		}
-		return Settings.builder()
-				.put("cluster.name", clusterName)
-				.put("client.transport.sniff", clientTransportSniff)
-				.put("client.transport.ignore_cluster_name", clientIgnoreClusterName)
-				.put("client.transport.ping_timeout", clientPingTimeout)
-				.put("client.transport.nodes_sampler_interval", clientNodesSamplerInterval)
-				.build();
-	}
-
-	public void setClusterNodes(String clusterNodes) {
-		this.clusterNodes = clusterNodes;
-	}
-
-	public void setClusterName(String clusterName) {
-		this.clusterName = clusterName;
-	}
-
-	public void setClientTransportSniff(Boolean clientTransportSniff) {
-		this.clientTransportSniff = clientTransportSniff;
-	}
-
-	public String getClientNodesSamplerInterval() {
-		return clientNodesSamplerInterval;
-	}
-
-	public void setClientNodesSamplerInterval(String clientNodesSamplerInterval) {
-		this.clientNodesSamplerInterval = clientNodesSamplerInterval;
-	}
-
-	public String getClientPingTimeout() {
-		return clientPingTimeout;
-	}
-
-	public void setClientPingTimeout(String clientPingTimeout) {
-		this.clientPingTimeout = clientPingTimeout;
-	}
-
-	public Boolean getClientIgnoreClusterName() {
-		return clientIgnoreClusterName;
-	}
-
-	public void setClientIgnoreClusterName(Boolean clientIgnoreClusterName) {
-		this.clientIgnoreClusterName = clientIgnoreClusterName;
-	}
-
-	public void setProperties(Properties properties) {
-		this.properties = properties;
-	}
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client;
+
+import static org.apache.commons.lang.StringUtils.*;
+
+import java.net.InetAddress;
+import java.util.Properties;
+
+import org.elasticsearch.client.transport.TransportClient;
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.transport.InetSocketTransportAddress;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.util.Assert;
+
+/**
+ * TransportClientFactoryBean
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Jakub Vavrik
+ * @author Piotr Betkier
+ */
+
+public class TransportClientFactoryBean implements FactoryBean<TransportClient>, InitializingBean, DisposableBean {
+
+	private static final Logger logger = LoggerFactory.getLogger(TransportClientFactoryBean.class);
+	private String clusterNodes = "127.0.0.1:9300";
+	private String clusterName = "elasticsearch";
+	private Boolean clientTransportSniff = true;
+	private Boolean clientIgnoreClusterName = Boolean.FALSE;
+	private String clientPingTimeout = "5s";
+	private String clientNodesSamplerInterval = "5s";
+	private TransportClient client;
+	private Properties properties;
+	static final String COLON = ":";
+	static final String COMMA = ",";
+
+	@Override
+	public void destroy() throws Exception {
+		try {
+			logger.info("Closing elasticSearch  client");
+			if (client != null) {
+				client.close();
+			}
+		} catch (final Exception e) {
+			logger.error("Error closing ElasticSearch client: ", e);
+		}
+	}
+
+	@Override
+	public TransportClient getObject() throws Exception {
+		return client;
+	}
+
+	@Override
+	public Class<TransportClient> getObjectType() {
+		return TransportClient.class;
+	}
+
+	@Override
+	public boolean isSingleton() {
+		return false;
+	}
+
+	@Override
+	public void afterPropertiesSet() throws Exception {
+		buildClient();
+	}
+
+	protected void buildClient() throws Exception {
+		client = TransportClient.builder().settings(settings()).build();
+		Assert.hasText(clusterNodes, "[Assertion failed] clusterNodes settings missing.");
+		for (String clusterNode : split(clusterNodes, COMMA)) {
+			String hostName = substringBeforeLast(clusterNode, COLON);
+			String port = substringAfterLast(clusterNode, COLON);
+			Assert.hasText(hostName, "[Assertion failed] missing host name in 'clusterNodes'");
+			Assert.hasText(port, "[Assertion failed] missing port in 'clusterNodes'");
+			logger.info("adding transport node : " + clusterNode);
+			client.addTransportAddress(new InetSocketTransportAddress(InetAddress.getByName(hostName), Integer.valueOf(port)));
+		}
+		client.connectedNodes();
+	}
+
+	private Settings settings() {
+		if (properties != null) {
+			return Settings.builder().put(properties).build();
+		}
+		return Settings.builder()
+				.put("cluster.name", clusterName)
+				.put("client.transport.sniff", clientTransportSniff)
+				.put("client.transport.ignore_cluster_name", clientIgnoreClusterName)
+				.put("client.transport.ping_timeout", clientPingTimeout)
+				.put("client.transport.nodes_sampler_interval", clientNodesSamplerInterval)
+				.build();
+	}
+
+	public void setClusterNodes(String clusterNodes) {
+		this.clusterNodes = clusterNodes;
+	}
+
+	public void setClusterName(String clusterName) {
+		this.clusterName = clusterName;
+	}
+
+	public void setClientTransportSniff(Boolean clientTransportSniff) {
+		this.clientTransportSniff = clientTransportSniff;
+	}
+
+	public String getClientNodesSamplerInterval() {
+		return clientNodesSamplerInterval;
+	}
+
+	public void setClientNodesSamplerInterval(String clientNodesSamplerInterval) {
+		this.clientNodesSamplerInterval = clientNodesSamplerInterval;
+	}
+
+	public String getClientPingTimeout() {
+		return clientPingTimeout;
+	}
+
+	public void setClientPingTimeout(String clientPingTimeout) {
+		this.clientPingTimeout = clientPingTimeout;
+	}
+
+	public Boolean getClientIgnoreClusterName() {
+		return clientIgnoreClusterName;
+	}
+
+	public void setClientIgnoreClusterName(Boolean clientIgnoreClusterName) {
+		this.clientIgnoreClusterName = clientIgnoreClusterName;
+	}
+
+	public void setProperties(Properties properties) {
+		this.properties = properties;
+	}
+}

src/main/java/org/springframework/data/elasticsearch/config/ElasticsearchNamespaceHandler.java

@@ -1,41 +1,41 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.config;
-
-import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
-import org.springframework.data.elasticsearch.repository.config.ElasticsearchRepositoryConfigExtension;
-import org.springframework.data.repository.config.RepositoryBeanDefinitionParser;
-import org.springframework.data.repository.config.RepositoryConfigurationExtension;
-
-/**
- * ElasticsearchNamespaceHandler
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-
-public class ElasticsearchNamespaceHandler extends NamespaceHandlerSupport {
-
-	@Override
-	public void init() {
-		RepositoryConfigurationExtension extension = new ElasticsearchRepositoryConfigExtension();
-		RepositoryBeanDefinitionParser parser = new RepositoryBeanDefinitionParser(extension);
-
-		registerBeanDefinitionParser("repositories", parser);
-		registerBeanDefinitionParser("node-client", new NodeClientBeanDefinitionParser());
-		registerBeanDefinitionParser("transport-client", new TransportClientBeanDefinitionParser());
-	}
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.config;
+
+import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
+import org.springframework.data.elasticsearch.repository.config.ElasticsearchRepositoryConfigExtension;
+import org.springframework.data.repository.config.RepositoryBeanDefinitionParser;
+import org.springframework.data.repository.config.RepositoryConfigurationExtension;
+
+/**
+ * ElasticsearchNamespaceHandler
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+
+public class ElasticsearchNamespaceHandler extends NamespaceHandlerSupport {
+
+	@Override
+	public void init() {
+		RepositoryConfigurationExtension extension = new ElasticsearchRepositoryConfigExtension();
+		RepositoryBeanDefinitionParser parser = new RepositoryBeanDefinitionParser(extension);
+
+		registerBeanDefinitionParser("repositories", parser);
+		registerBeanDefinitionParser("node-client", new NodeClientBeanDefinitionParser());
+		registerBeanDefinitionParser("transport-client", new TransportClientBeanDefinitionParser());
+	}
+}

src/main/java/org/springframework/data/elasticsearch/config/NodeClientBeanDefinitionParser.java

@@ -1,57 +1,57 @@
-/*
- * Copyright 2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.data.elasticsearch.config;
-
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.data.elasticsearch.client.NodeClientFactoryBean;
-import org.w3c.dom.Element;
-
-/**
- * NodeClientBeanDefinitionParser
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-
-public class NodeClientBeanDefinitionParser extends AbstractBeanDefinitionParser {
-
-	@Override
-	protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(NodeClientFactoryBean.class);
-		setLocalSettings(element, builder);
-		return getSourcedBeanDefinition(builder, element, parserContext);
-	}
-
-	private void setLocalSettings(Element element, BeanDefinitionBuilder builder) {
-		builder.addPropertyValue("local", Boolean.valueOf(element.getAttribute("local")));
-		builder.addPropertyValue("clusterName", element.getAttribute("cluster-name"));
-		builder.addPropertyValue("enableHttp", Boolean.valueOf(element.getAttribute("http-enabled")));
-		builder.addPropertyValue("pathData", element.getAttribute("path-data"));
-		builder.addPropertyValue("pathHome", element.getAttribute("path-home"));
-		builder.addPropertyValue("pathConfiguration", element.getAttribute("path-configuration"));
-	}
-
-	private AbstractBeanDefinition getSourcedBeanDefinition(BeanDefinitionBuilder builder, Element source,
-															ParserContext context) {
-		AbstractBeanDefinition definition = builder.getBeanDefinition();
-		definition.setSource(context.extractSource(source));
-		return definition;
-	}
-}
+/*
+ * Copyright 2015-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.data.elasticsearch.config;
+
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.data.elasticsearch.client.NodeClientFactoryBean;
+import org.w3c.dom.Element;
+
+/**
+ * NodeClientBeanDefinitionParser
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+
+public class NodeClientBeanDefinitionParser extends AbstractBeanDefinitionParser {
+
+	@Override
+	protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(NodeClientFactoryBean.class);
+		setLocalSettings(element, builder);
+		return getSourcedBeanDefinition(builder, element, parserContext);
+	}
+
+	private void setLocalSettings(Element element, BeanDefinitionBuilder builder) {
+		builder.addPropertyValue("local", Boolean.valueOf(element.getAttribute("local")));
+		builder.addPropertyValue("clusterName", element.getAttribute("cluster-name"));
+		builder.addPropertyValue("enableHttp", Boolean.valueOf(element.getAttribute("http-enabled")));
+		builder.addPropertyValue("pathData", element.getAttribute("path-data"));
+		builder.addPropertyValue("pathHome", element.getAttribute("path-home"));
+		builder.addPropertyValue("pathConfiguration", element.getAttribute("path-configuration"));
+	}
+
+	private AbstractBeanDefinition getSourcedBeanDefinition(BeanDefinitionBuilder builder, Element source,
+															ParserContext context) {
+		AbstractBeanDefinition definition = builder.getBeanDefinition();
+		definition.setSource(context.extractSource(source));
+		return definition;
+	}
+}

src/main/java/org/springframework/data/elasticsearch/config/TransportClientBeanDefinitionParser.java

@@ -1,56 +1,56 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.config;
-
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.data.elasticsearch.client.TransportClientFactoryBean;
-import org.w3c.dom.Element;
-
-/**
- * TransportClientBeanDefinitionParser
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-
-public class TransportClientBeanDefinitionParser extends AbstractBeanDefinitionParser {
-
-	@Override
-	protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(TransportClientFactoryBean.class);
-		setConfigurations(element, builder);
-		return getSourcedBeanDefinition(builder, element, parserContext);
-	}
-
-	private void setConfigurations(Element element, BeanDefinitionBuilder builder) {
-		builder.addPropertyValue("clusterNodes", element.getAttribute("cluster-nodes"));
-		builder.addPropertyValue("clusterName", element.getAttribute("cluster-name"));
-		builder.addPropertyValue("clientTransportSniff", Boolean.valueOf(element.getAttribute("client-transport-sniff")));
-		builder.addPropertyValue("clientIgnoreClusterName", Boolean.valueOf(element.getAttribute("client-transport-ignore-cluster-name")));
-		builder.addPropertyValue("clientPingTimeout", element.getAttribute("client-transport-ping-timeout"));
-		builder.addPropertyValue("clientNodesSamplerInterval", element.getAttribute("client-transport-nodes-sampler-interval"));
-	}
-
-	private AbstractBeanDefinition getSourcedBeanDefinition(BeanDefinitionBuilder builder, Element source,
-															ParserContext context) {
-		AbstractBeanDefinition definition = builder.getBeanDefinition();
-		definition.setSource(context.extractSource(source));
-		return definition;
-	}
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.config;
+
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.data.elasticsearch.client.TransportClientFactoryBean;
+import org.w3c.dom.Element;
+
+/**
+ * TransportClientBeanDefinitionParser
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+
+public class TransportClientBeanDefinitionParser extends AbstractBeanDefinitionParser {
+
+	@Override
+	protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(TransportClientFactoryBean.class);
+		setConfigurations(element, builder);
+		return getSourcedBeanDefinition(builder, element, parserContext);
+	}
+
+	private void setConfigurations(Element element, BeanDefinitionBuilder builder) {
+		builder.addPropertyValue("clusterNodes", element.getAttribute("cluster-nodes"));
+		builder.addPropertyValue("clusterName", element.getAttribute("cluster-name"));
+		builder.addPropertyValue("clientTransportSniff", Boolean.valueOf(element.getAttribute("client-transport-sniff")));
+		builder.addPropertyValue("clientIgnoreClusterName", Boolean.valueOf(element.getAttribute("client-transport-ignore-cluster-name")));
+		builder.addPropertyValue("clientPingTimeout", element.getAttribute("client-transport-ping-timeout"));
+		builder.addPropertyValue("clientNodesSamplerInterval", element.getAttribute("client-transport-nodes-sampler-interval"));
+	}
+
+	private AbstractBeanDefinition getSourcedBeanDefinition(BeanDefinitionBuilder builder, Element source,
+															ParserContext context) {
+		AbstractBeanDefinition definition = builder.getBeanDefinition();
+		definition.setSource(context.extractSource(source));
+		return definition;
+	}
+}

src/main/java/org/springframework/data/elasticsearch/core/AbstractResultMapper.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/core/CriteriaFilterProcessor.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/core/CriteriaQueryProcessor.java

@@ -1,210 +1,210 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core;
-
-import static org.elasticsearch.index.query.QueryBuilders.*;
-import static org.springframework.data.elasticsearch.core.query.Criteria.*;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-
-import org.apache.lucene.queryparser.flexible.core.util.StringUtils;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.BoostableQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryStringQueryBuilder;
-import org.springframework.data.elasticsearch.core.query.Criteria;
-import org.springframework.util.Assert;
-
-/**
- * CriteriaQueryProcessor
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Franck Marchand
- * @author Artur Konczak
- */
-class CriteriaQueryProcessor {
-
-
-	QueryBuilder createQueryFromCriteria(Criteria criteria) {
-		if (criteria == null)
-			return null;
-
-		List<QueryBuilder> shouldQueryBuilderList = new LinkedList<QueryBuilder>();
-		List<QueryBuilder> mustNotQueryBuilderList = new LinkedList<QueryBuilder>();
-		List<QueryBuilder> mustQueryBuilderList = new LinkedList<QueryBuilder>();
-
-		ListIterator<Criteria> chainIterator = criteria.getCriteriaChain().listIterator();
-
-		QueryBuilder firstQuery = null;
-		boolean negateFirstQuery = false;
-
-		while (chainIterator.hasNext()) {
-			Criteria chainedCriteria = chainIterator.next();
-			QueryBuilder queryFragmentForCriteria = createQueryFragmentForCriteria(chainedCriteria);
-			if (queryFragmentForCriteria != null) {
-				if (firstQuery == null) {
-					firstQuery = queryFragmentForCriteria;
-					negateFirstQuery = chainedCriteria.isNegating();
-					continue;
-				}
-				if (chainedCriteria.isOr()) {
-					shouldQueryBuilderList.add(queryFragmentForCriteria);
-				} else if (chainedCriteria.isNegating()) {
-					mustNotQueryBuilderList.add(queryFragmentForCriteria);
-				} else {
-					mustQueryBuilderList.add(queryFragmentForCriteria);
-				}
-			}
-		}
-
-		if (firstQuery != null) {
-			if (!shouldQueryBuilderList.isEmpty() && mustNotQueryBuilderList.isEmpty() && mustQueryBuilderList.isEmpty()) {
-				shouldQueryBuilderList.add(0, firstQuery);
-			} else {
-				if (negateFirstQuery) {
-					mustNotQueryBuilderList.add(0, firstQuery);
-				} else {
-					mustQueryBuilderList.add(0, firstQuery);
-				}
-			}
-		}
-
-		BoolQueryBuilder query = null;
-
-		if (!shouldQueryBuilderList.isEmpty() || !mustNotQueryBuilderList.isEmpty() || !mustQueryBuilderList.isEmpty()) {
-
-			query = boolQuery();
-
-			for (QueryBuilder qb : shouldQueryBuilderList) {
-				query.should(qb);
-			}
-			for (QueryBuilder qb : mustNotQueryBuilderList) {
-				query.mustNot(qb);
-			}
-			for (QueryBuilder qb : mustQueryBuilderList) {
-				query.must(qb);
-			}
-		}
-
-		return query;
-	}
-
-
-	private QueryBuilder createQueryFragmentForCriteria(Criteria chainedCriteria) {
-		if (chainedCriteria.getQueryCriteriaEntries().isEmpty())
-			return null;
-
-		Iterator<Criteria.CriteriaEntry> it = chainedCriteria.getQueryCriteriaEntries().iterator();
-		boolean singeEntryCriteria = (chainedCriteria.getQueryCriteriaEntries().size() == 1);
-
-		String fieldName = chainedCriteria.getField().getName();
-		Assert.notNull(fieldName, "Unknown field");
-		QueryBuilder query = null;
-
-		if (singeEntryCriteria) {
-			Criteria.CriteriaEntry entry = it.next();
-			query = processCriteriaEntry(entry, fieldName);
-		} else {
-			query = boolQuery();
-			while (it.hasNext()) {
-				Criteria.CriteriaEntry entry = it.next();
-				((BoolQueryBuilder) query).must(processCriteriaEntry(entry, fieldName));
-			}
-		}
-
-		addBoost(query, chainedCriteria.getBoost());
-		return query;
-	}
-
-
-	private QueryBuilder processCriteriaEntry(Criteria.CriteriaEntry entry,/* OperationKey key, Object value,*/ String fieldName) {
-		Object value = entry.getValue();
-		if (value == null) {
-			return null;
-		}
-		OperationKey key = entry.getKey();
-		QueryBuilder query = null;
-
-		String searchText = StringUtils.toString(value);
-
-		Iterable<Object> collection = null;
-
-		switch (key) {
-			case EQUALS:
-				query = queryStringQuery(searchText).field(fieldName).defaultOperator(QueryStringQueryBuilder.Operator.AND);
-				break;
-			case CONTAINS:
-				query = queryStringQuery("*" + searchText + "*").field(fieldName).analyzeWildcard(true);
-				break;
-			case STARTS_WITH:
-				query = queryStringQuery(searchText + "*").field(fieldName).analyzeWildcard(true);
-				break;
-			case ENDS_WITH:
-				query = queryStringQuery("*" + searchText).field(fieldName).analyzeWildcard(true);
-				break;
-			case EXPRESSION:
-				query = queryStringQuery(searchText).field(fieldName);
-				break;
-			case LESS_EQUAL:
-				query = rangeQuery(fieldName).lte(value);
-				break;
-			case GREATER_EQUAL:
-				query = rangeQuery(fieldName).gte(value);
-				break;
-			case BETWEEN:
-				Object[] ranges = (Object[]) value;
-				query = rangeQuery(fieldName).from(ranges[0]).to(ranges[1]);
-				break;
-			case LESS:
-				query = rangeQuery(fieldName).lt(value);
-				break;
-			case GREATER:
-				query = rangeQuery(fieldName).gt(value);
-				break;
-			case FUZZY:
-				query = fuzzyQuery(fieldName, searchText);
-				break;
-			case IN:
-				query = boolQuery();
-				collection = (Iterable<Object>) value;
-				for (Object item : collection) {
-					((BoolQueryBuilder) query).should(queryStringQuery(item.toString()).field(fieldName));
-				}
-				break;
-			case NOT_IN:
-				query = boolQuery();
-				collection = (Iterable<Object>) value;
-				for (Object item : collection) {
-					((BoolQueryBuilder) query).mustNot(queryStringQuery(item.toString()).field(fieldName));
-				}
-				break;
-		}
-		return query;
-	}
-
-	private void addBoost(QueryBuilder query, float boost) {
-		if (Float.isNaN(boost)) {
-			return;
-		}
-		if (query instanceof BoostableQueryBuilder) {
-			((BoostableQueryBuilder) query).boost(boost);
-		}
-	}
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core;
+
+import static org.elasticsearch.index.query.QueryBuilders.*;
+import static org.springframework.data.elasticsearch.core.query.Criteria.*;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+
+import org.apache.lucene.queryparser.flexible.core.util.StringUtils;
+import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.BoostableQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilder;
+import org.elasticsearch.index.query.QueryStringQueryBuilder;
+import org.springframework.data.elasticsearch.core.query.Criteria;
+import org.springframework.util.Assert;
+
+/**
+ * CriteriaQueryProcessor
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Franck Marchand
+ * @author Artur Konczak
+ */
+class CriteriaQueryProcessor {
+
+
+	QueryBuilder createQueryFromCriteria(Criteria criteria) {
+		if (criteria == null)
+			return null;
+
+		List<QueryBuilder> shouldQueryBuilderList = new LinkedList<QueryBuilder>();
+		List<QueryBuilder> mustNotQueryBuilderList = new LinkedList<QueryBuilder>();
+		List<QueryBuilder> mustQueryBuilderList = new LinkedList<QueryBuilder>();
+
+		ListIterator<Criteria> chainIterator = criteria.getCriteriaChain().listIterator();
+
+		QueryBuilder firstQuery = null;
+		boolean negateFirstQuery = false;
+
+		while (chainIterator.hasNext()) {
+			Criteria chainedCriteria = chainIterator.next();
+			QueryBuilder queryFragmentForCriteria = createQueryFragmentForCriteria(chainedCriteria);
+			if (queryFragmentForCriteria != null) {
+				if (firstQuery == null) {
+					firstQuery = queryFragmentForCriteria;
+					negateFirstQuery = chainedCriteria.isNegating();
+					continue;
+				}
+				if (chainedCriteria.isOr()) {
+					shouldQueryBuilderList.add(queryFragmentForCriteria);
+				} else if (chainedCriteria.isNegating()) {
+					mustNotQueryBuilderList.add(queryFragmentForCriteria);
+				} else {
+					mustQueryBuilderList.add(queryFragmentForCriteria);
+				}
+			}
+		}
+
+		if (firstQuery != null) {
+			if (!shouldQueryBuilderList.isEmpty() && mustNotQueryBuilderList.isEmpty() && mustQueryBuilderList.isEmpty()) {
+				shouldQueryBuilderList.add(0, firstQuery);
+			} else {
+				if (negateFirstQuery) {
+					mustNotQueryBuilderList.add(0, firstQuery);
+				} else {
+					mustQueryBuilderList.add(0, firstQuery);
+				}
+			}
+		}
+
+		BoolQueryBuilder query = null;
+
+		if (!shouldQueryBuilderList.isEmpty() || !mustNotQueryBuilderList.isEmpty() || !mustQueryBuilderList.isEmpty()) {
+
+			query = boolQuery();
+
+			for (QueryBuilder qb : shouldQueryBuilderList) {
+				query.should(qb);
+			}
+			for (QueryBuilder qb : mustNotQueryBuilderList) {
+				query.mustNot(qb);
+			}
+			for (QueryBuilder qb : mustQueryBuilderList) {
+				query.must(qb);
+			}
+		}
+
+		return query;
+	}
+
+
+	private QueryBuilder createQueryFragmentForCriteria(Criteria chainedCriteria) {
+		if (chainedCriteria.getQueryCriteriaEntries().isEmpty())
+			return null;
+
+		Iterator<Criteria.CriteriaEntry> it = chainedCriteria.getQueryCriteriaEntries().iterator();
+		boolean singeEntryCriteria = (chainedCriteria.getQueryCriteriaEntries().size() == 1);
+
+		String fieldName = chainedCriteria.getField().getName();
+		Assert.notNull(fieldName, "Unknown field");
+		QueryBuilder query = null;
+
+		if (singeEntryCriteria) {
+			Criteria.CriteriaEntry entry = it.next();
+			query = processCriteriaEntry(entry, fieldName);
+		} else {
+			query = boolQuery();
+			while (it.hasNext()) {
+				Criteria.CriteriaEntry entry = it.next();
+				((BoolQueryBuilder) query).must(processCriteriaEntry(entry, fieldName));
+			}
+		}
+
+		addBoost(query, chainedCriteria.getBoost());
+		return query;
+	}
+
+
+	private QueryBuilder processCriteriaEntry(Criteria.CriteriaEntry entry,/* OperationKey key, Object value,*/ String fieldName) {
+		Object value = entry.getValue();
+		if (value == null) {
+			return null;
+		}
+		OperationKey key = entry.getKey();
+		QueryBuilder query = null;
+
+		String searchText = StringUtils.toString(value);
+
+		Iterable<Object> collection = null;
+
+		switch (key) {
+			case EQUALS:
+				query = queryStringQuery(searchText).field(fieldName).defaultOperator(QueryStringQueryBuilder.Operator.AND);
+				break;
+			case CONTAINS:
+				query = queryStringQuery("*" + searchText + "*").field(fieldName).analyzeWildcard(true);
+				break;
+			case STARTS_WITH:
+				query = queryStringQuery(searchText + "*").field(fieldName).analyzeWildcard(true);
+				break;
+			case ENDS_WITH:
+				query = queryStringQuery("*" + searchText).field(fieldName).analyzeWildcard(true);
+				break;
+			case EXPRESSION:
+				query = queryStringQuery(searchText).field(fieldName);
+				break;
+			case LESS_EQUAL:
+				query = rangeQuery(fieldName).lte(value);
+				break;
+			case GREATER_EQUAL:
+				query = rangeQuery(fieldName).gte(value);
+				break;
+			case BETWEEN:
+				Object[] ranges = (Object[]) value;
+				query = rangeQuery(fieldName).from(ranges[0]).to(ranges[1]);
+				break;
+			case LESS:
+				query = rangeQuery(fieldName).lt(value);
+				break;
+			case GREATER:
+				query = rangeQuery(fieldName).gt(value);
+				break;
+			case FUZZY:
+				query = fuzzyQuery(fieldName, searchText);
+				break;
+			case IN:
+				query = boolQuery();
+				collection = (Iterable<Object>) value;
+				for (Object item : collection) {
+					((BoolQueryBuilder) query).should(queryStringQuery(item.toString()).field(fieldName));
+				}
+				break;
+			case NOT_IN:
+				query = boolQuery();
+				collection = (Iterable<Object>) value;
+				for (Object item : collection) {
+					((BoolQueryBuilder) query).mustNot(queryStringQuery(item.toString()).field(fieldName));
+				}
+				break;
+		}
+		return query;
+	}
+
+	private void addBoost(QueryBuilder query, float boost) {
+		if (Float.isNaN(boost)) {
+			return;
+		}
+		if (query instanceof BoostableQueryBuilder) {
+			((BoostableQueryBuilder) query).boost(boost);
+		}
+	}
+}

src/main/java/org/springframework/data/elasticsearch/core/DefaultEntityMapper.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/core/DefaultResultMapper.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/core/EntityMapper.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/core/FacetedPage.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/core/FacetedPageImpl.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/core/GetResultMapper.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/core/MappingBuilder.java

@@ -1,361 +1,361 @@
-/*
- * Copyright 2014-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core;
-
-import static org.apache.commons.lang.StringUtils.*;
-import static org.elasticsearch.common.xcontent.XContentFactory.*;
-import static org.springframework.util.StringUtils.*;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.math.NumberUtils;
-import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.springframework.core.GenericCollectionTypeResolver;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.data.annotation.Transient;
-import org.springframework.data.elasticsearch.annotations.*;
-import org.springframework.data.elasticsearch.annotations.Field;
-import org.springframework.data.elasticsearch.core.completion.Completion;
-import org.springframework.data.elasticsearch.core.geo.GeoPoint;
-import org.springframework.data.mapping.model.SimpleTypeHolder;
-import org.springframework.data.util.ClassTypeInformation;
-import org.springframework.data.util.TypeInformation;
-
-/**
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Artur Konczak
- * @author Kevin Leturc
- * @author Alexander Volz
- * @author Dennis Maaß
- * @author Pavel Luhin
- */
-
-class MappingBuilder {
-
-	public static final String FIELD_STORE = "store";
-	public static final String FIELD_TYPE = "type";
-	public static final String FIELD_INDEX = "index";
-	public static final String FIELD_FORMAT = "format";
-	public static final String FIELD_SEARCH_ANALYZER = "search_analyzer";
-	public static final String FIELD_INDEX_ANALYZER = "analyzer";
-	public static final String FIELD_PROPERTIES = "properties";
-	public static final String FIELD_PARENT = "_parent";
-
-	public static final String COMPLETION_PAYLOADS = "payloads";
-	public static final String COMPLETION_PRESERVE_SEPARATORS = "preserve_separators";
-	public static final String COMPLETION_PRESERVE_POSITION_INCREMENTS = "preserve_position_increments";
-	public static final String COMPLETION_MAX_INPUT_LENGTH = "max_input_length";
-
-	public static final String INDEX_VALUE_NOT_ANALYZED = "not_analyzed";
-	public static final String TYPE_VALUE_STRING = "string";
-	public static final String TYPE_VALUE_GEO_POINT = "geo_point";
-	public static final String TYPE_VALUE_COMPLETION = "completion";
-	public static final String TYPE_VALUE_GEO_HASH_PREFIX = "geohash_prefix";
-	public static final String TYPE_VALUE_GEO_HASH_PRECISION = "geohash_precision";
-
-	private static SimpleTypeHolder SIMPLE_TYPE_HOLDER = new SimpleTypeHolder();
-
-	static XContentBuilder buildMapping(Class clazz, String indexType, String idFieldName, String parentType) throws IOException {
-
-		XContentBuilder mapping = jsonBuilder().startObject().startObject(indexType);
-		// Parent
-		if (hasText(parentType)) {
-			mapping.startObject(FIELD_PARENT).field(FIELD_TYPE, parentType).endObject();
-		}
-
-		// Properties
-		XContentBuilder xContentBuilder = mapping.startObject(FIELD_PROPERTIES);
-
-		mapEntity(xContentBuilder, clazz, true, idFieldName, EMPTY, false, FieldType.Auto, null);
-
-		return xContentBuilder.endObject().endObject().endObject();
-	}
-
-	private static void mapEntity(XContentBuilder xContentBuilder, Class clazz, boolean isRootObject, String idFieldName,
-								  String nestedObjectFieldName, boolean nestedOrObjectField, FieldType fieldType, Field fieldAnnotation) throws IOException {
-
-		java.lang.reflect.Field[] fields = retrieveFields(clazz);
-
-		if (!isRootObject && (isAnyPropertyAnnotatedAsField(fields) || nestedOrObjectField)) {
-			String type = FieldType.Object.toString().toLowerCase();
-			if (nestedOrObjectField) {
-				type = fieldType.toString().toLowerCase();
-			}
-			XContentBuilder t = xContentBuilder.startObject(nestedObjectFieldName).field(FIELD_TYPE, type);
-
-			if (nestedOrObjectField && FieldType.Nested == fieldType && fieldAnnotation.includeInParent()) {
-				t.field("include_in_parent", fieldAnnotation.includeInParent());
-			}
-			t.startObject(FIELD_PROPERTIES);
-		}
-
-		for (java.lang.reflect.Field field : fields) {
-
-			if (field.isAnnotationPresent(Transient.class) || isInIgnoreFields(field, fieldAnnotation)) {
-				continue;
-			}
-
-			if (field.isAnnotationPresent(Mapping.class)) {
-				String mappingPath = field.getAnnotation(Mapping.class).mappingPath();
-				if (isNotBlank(mappingPath)) {
-					ClassPathResource mappings = new ClassPathResource(mappingPath);
-					if (mappings.exists()) {
-						xContentBuilder.rawField(field.getName(), mappings.getInputStream());
-						continue;
-					}
-				}
-			}
-
-			boolean isGeoPointField = isGeoPointField(field);
-			boolean isCompletionField = isCompletionField(field);
-
-			Field singleField = field.getAnnotation(Field.class);
-			if (!isGeoPointField && !isCompletionField && isEntity(field) && isAnnotated(field)) {
-				if (singleField == null) {
-					continue;
-				}
-				boolean nestedOrObject = isNestedOrObjectField(field);
-				mapEntity(xContentBuilder, getFieldType(field), false, EMPTY, field.getName(), nestedOrObject, singleField.type(), field.getAnnotation(Field.class));
-				if (nestedOrObject) {
-					continue;
-				}
-			}
-
-			MultiField multiField = field.getAnnotation(MultiField.class);
-
-			if (isGeoPointField) {
-				applyGeoPointFieldMapping(xContentBuilder, field);
-			}
-
-			if (isCompletionField) {
-				CompletionField completionField = field.getAnnotation(CompletionField.class);
-				applyCompletionFieldMapping(xContentBuilder, field, completionField);
-			}
-
-			if (isRootObject && singleField != null && isIdField(field, idFieldName)) {
-				applyDefaultIdFieldMapping(xContentBuilder, field);
-			} else if (multiField != null) {
-				addMultiFieldMapping(xContentBuilder, field, multiField, isNestedOrObjectField(field));
-			} else if (singleField != null) {
-				addSingleFieldMapping(xContentBuilder, field, singleField, isNestedOrObjectField(field));
-			}
-		}
-
-		if (!isRootObject && isAnyPropertyAnnotatedAsField(fields) || nestedOrObjectField) {
-			xContentBuilder.endObject().endObject();
-		}
-	}
-
-	private static java.lang.reflect.Field[] retrieveFields(Class clazz) {
-		// Create list of fields.
-		List<java.lang.reflect.Field> fields = new ArrayList<java.lang.reflect.Field>();
-
-		// Keep backing up the inheritance hierarchy.
-		Class targetClass = clazz;
-		do {
-			fields.addAll(Arrays.asList(targetClass.getDeclaredFields()));
-			targetClass = targetClass.getSuperclass();
-		}
-		while (targetClass != null && targetClass != Object.class);
-
-		return fields.toArray(new java.lang.reflect.Field[fields.size()]);
-	}
-
-	private static boolean isAnnotated(java.lang.reflect.Field field) {
-		return field.getAnnotation(Field.class) != null ||
-				field.getAnnotation(MultiField.class) != null ||
-				field.getAnnotation(GeoPointField.class) != null ||
-				field.getAnnotation(CompletionField.class) != null;
-	}
-
-	private static void applyGeoPointFieldMapping(XContentBuilder xContentBuilder, java.lang.reflect.Field field) throws IOException {
-		xContentBuilder.startObject(field.getName());
-		xContentBuilder.field(FIELD_TYPE, TYPE_VALUE_GEO_POINT);
-
-		GeoPointField annotation = field.getAnnotation(GeoPointField.class);
-		if (annotation != null) {
-			if (annotation.geoHashPrefix()) {
-				xContentBuilder.field(TYPE_VALUE_GEO_HASH_PREFIX, true);
-				if (StringUtils.isNotEmpty(annotation.geoHashPrecision())) {
-					if (NumberUtils.isNumber(annotation.geoHashPrecision())) {
-						xContentBuilder.field(TYPE_VALUE_GEO_HASH_PRECISION, Integer.parseInt(annotation.geoHashPrecision()));
-					} else {
-						xContentBuilder.field(TYPE_VALUE_GEO_HASH_PRECISION, annotation.geoHashPrecision());
-					}
-				}
-			}
-		}
-
-		xContentBuilder.endObject();
-	}
-
-	private static void applyCompletionFieldMapping(XContentBuilder xContentBuilder, java.lang.reflect.Field field, CompletionField annotation) throws IOException {
-		xContentBuilder.startObject(field.getName());
-		xContentBuilder.field(FIELD_TYPE, TYPE_VALUE_COMPLETION);
-		if (annotation != null) {
-			xContentBuilder.field(COMPLETION_MAX_INPUT_LENGTH, annotation.maxInputLength());
-			xContentBuilder.field(COMPLETION_PAYLOADS, annotation.payloads());
-			xContentBuilder.field(COMPLETION_PRESERVE_POSITION_INCREMENTS, annotation.preservePositionIncrements());
-			xContentBuilder.field(COMPLETION_PRESERVE_SEPARATORS, annotation.preserveSeparators());
-			if (isNotBlank(annotation.searchAnalyzer())) {
-				xContentBuilder.field(FIELD_SEARCH_ANALYZER, annotation.searchAnalyzer());
-			}
-			if (isNotBlank(annotation.analyzer())) {
-				xContentBuilder.field(FIELD_INDEX_ANALYZER, annotation.analyzer());
-			}
-		}
-		xContentBuilder.endObject();
-	}
-
-	private static void applyDefaultIdFieldMapping(XContentBuilder xContentBuilder, java.lang.reflect.Field field)
-			throws IOException {
-		xContentBuilder.startObject(field.getName())
-				.field(FIELD_TYPE, TYPE_VALUE_STRING)
-				.field(FIELD_INDEX, INDEX_VALUE_NOT_ANALYZED);
-		xContentBuilder.endObject();
-	}
-
-	/**
-	 * Apply mapping for a single @Field annotation
-	 *
-	 * @throws IOException
-	 */
-	private static void addSingleFieldMapping(XContentBuilder xContentBuilder, java.lang.reflect.Field field,
-											  Field fieldAnnotation, boolean nestedOrObjectField) throws IOException {
-		xContentBuilder.startObject(field.getName());
-		if(!nestedOrObjectField) {
-			xContentBuilder.field(FIELD_STORE, fieldAnnotation.store());
-		}
-		if (FieldType.Auto != fieldAnnotation.type()) {
-			xContentBuilder.field(FIELD_TYPE, fieldAnnotation.type().name().toLowerCase());
-			if (FieldType.Date == fieldAnnotation.type() && DateFormat.none != fieldAnnotation.format()) {
-				xContentBuilder.field(FIELD_FORMAT, DateFormat.custom == fieldAnnotation.format()
-						? fieldAnnotation.pattern() : fieldAnnotation.format());
-			}
-		}
-		if (FieldIndex.not_analyzed == fieldAnnotation.index() || FieldIndex.no == fieldAnnotation.index()) {
-			xContentBuilder.field(FIELD_INDEX, fieldAnnotation.index().name().toLowerCase());
-		}
-		if (isNotBlank(fieldAnnotation.searchAnalyzer())) {
-			xContentBuilder.field(FIELD_SEARCH_ANALYZER, fieldAnnotation.searchAnalyzer());
-		}
-		if (isNotBlank(fieldAnnotation.analyzer())) {
-			xContentBuilder.field(FIELD_INDEX_ANALYZER, fieldAnnotation.analyzer());
-		}
-		xContentBuilder.endObject();
-	}
-
-	/**
-	 * Apply mapping for a single nested @Field annotation
-	 *
-	 * @throws IOException
-	 */
-	private static void addNestedFieldMapping(XContentBuilder builder, java.lang.reflect.Field field,
-											  InnerField annotation) throws IOException {
-		builder.startObject(annotation.suffix());
-		//builder.field(FIELD_STORE, annotation.store());
-		if (FieldType.Auto != annotation.type()) {
-			builder.field(FIELD_TYPE, annotation.type().name().toLowerCase());
-		}
-		if (FieldIndex.not_analyzed == annotation.index()) {
-			builder.field(FIELD_INDEX, annotation.index().name().toLowerCase());
-		}
-		if (isNotBlank(annotation.searchAnalyzer())) {
-			builder.field(FIELD_SEARCH_ANALYZER, annotation.searchAnalyzer());
-		}
-		if (isNotBlank(annotation.indexAnalyzer())) {
-			builder.field(FIELD_INDEX_ANALYZER, annotation.indexAnalyzer());
-		}
-		builder.endObject();
-	}
-
-	/**
-	 * Multi field mappings for string type fields, support for sorts and facets
-	 *
-	 * @throws IOException
-	 */
-	private static void addMultiFieldMapping(XContentBuilder builder, java.lang.reflect.Field field,
-											 MultiField annotation, boolean nestedOrObjectField) throws IOException {
-		builder.startObject(field.getName());
-		builder.field(FIELD_TYPE, "multi_field");
-		builder.startObject("fields");
-		//add standard field
-		addSingleFieldMapping(builder, field, annotation.mainField(),nestedOrObjectField);
-		for (InnerField innerField : annotation.otherFields()) {
-			addNestedFieldMapping(builder, field, innerField);
-		}
-		builder.endObject();
-		builder.endObject();
-	}
-
-	protected static boolean isEntity(java.lang.reflect.Field field) {
-		TypeInformation typeInformation = ClassTypeInformation.from(field.getType());
-		Class<?> clazz = getFieldType(field);
-		boolean isComplexType = !SIMPLE_TYPE_HOLDER.isSimpleType(clazz);
-		return isComplexType && !Map.class.isAssignableFrom(typeInformation.getType());
-	}
-
-	protected static Class<?> getFieldType(java.lang.reflect.Field field) {
-		Class<?> clazz = field.getType();
-		TypeInformation typeInformation = ClassTypeInformation.from(clazz);
-		if (typeInformation.isCollectionLike()) {
-			clazz = GenericCollectionTypeResolver.getCollectionFieldType(field) != null ? GenericCollectionTypeResolver.getCollectionFieldType(field) : typeInformation.getComponentType().getType();
-		}
-		return clazz;
-	}
-
-	private static boolean isAnyPropertyAnnotatedAsField(java.lang.reflect.Field[] fields) {
-		if (fields != null) {
-			for (java.lang.reflect.Field field : fields) {
-				if (field.isAnnotationPresent(Field.class)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	private static boolean isIdField(java.lang.reflect.Field field, String idFieldName) {
-		return idFieldName.equals(field.getName());
-	}
-
-	private static boolean isInIgnoreFields(java.lang.reflect.Field field, Field parentFieldAnnotation) {
-		if (null != parentFieldAnnotation) {
-			String[] ignoreFields = parentFieldAnnotation.ignoreFields();
-			return Arrays.asList(ignoreFields).contains(field.getName());
-		}
-		return false;
-	}
-
-	private static boolean isNestedOrObjectField(java.lang.reflect.Field field) {
-		Field fieldAnnotation = field.getAnnotation(Field.class);
-		return fieldAnnotation != null && (FieldType.Nested == fieldAnnotation.type() || FieldType.Object == fieldAnnotation.type());
-	}
-
-	private static boolean isGeoPointField(java.lang.reflect.Field field) {
-		return field.getType() == GeoPoint.class || field.getAnnotation(GeoPointField.class) != null;
-	}
-
-	private static boolean isCompletionField(java.lang.reflect.Field field) {
-		return field.getType() == Completion.class;
-	}
-}
+/*
+ * Copyright 2014-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core;
+
+import static org.apache.commons.lang.StringUtils.*;
+import static org.elasticsearch.common.xcontent.XContentFactory.*;
+import static org.springframework.util.StringUtils.*;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.NumberUtils;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.data.annotation.Transient;
+import org.springframework.data.elasticsearch.annotations.*;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.core.completion.Completion;
+import org.springframework.data.elasticsearch.core.geo.GeoPoint;
+import org.springframework.data.mapping.model.SimpleTypeHolder;
+import org.springframework.data.util.ClassTypeInformation;
+import org.springframework.data.util.TypeInformation;
+
+/**
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Artur Konczak
+ * @author Kevin Leturc
+ * @author Alexander Volz
+ * @author Dennis Maaß
+ * @author Pavel Luhin
+ * @author Oliver Gierke
+ */
+
+class MappingBuilder {
+
+	public static final String FIELD_STORE = "store";
+	public static final String FIELD_TYPE = "type";
+	public static final String FIELD_INDEX = "index";
+	public static final String FIELD_FORMAT = "format";
+	public static final String FIELD_SEARCH_ANALYZER = "search_analyzer";
+	public static final String FIELD_INDEX_ANALYZER = "analyzer";
+	public static final String FIELD_PROPERTIES = "properties";
+	public static final String FIELD_PARENT = "_parent";
+
+	public static final String COMPLETION_PAYLOADS = "payloads";
+	public static final String COMPLETION_PRESERVE_SEPARATORS = "preserve_separators";
+	public static final String COMPLETION_PRESERVE_POSITION_INCREMENTS = "preserve_position_increments";
+	public static final String COMPLETION_MAX_INPUT_LENGTH = "max_input_length";
+
+	public static final String INDEX_VALUE_NOT_ANALYZED = "not_analyzed";
+	public static final String TYPE_VALUE_STRING = "string";
+	public static final String TYPE_VALUE_GEO_POINT = "geo_point";
+	public static final String TYPE_VALUE_COMPLETION = "completion";
+	public static final String TYPE_VALUE_GEO_HASH_PREFIX = "geohash_prefix";
+	public static final String TYPE_VALUE_GEO_HASH_PRECISION = "geohash_precision";
+
+	private static SimpleTypeHolder SIMPLE_TYPE_HOLDER = new SimpleTypeHolder();
+
+	static XContentBuilder buildMapping(Class clazz, String indexType, String idFieldName, String parentType) throws IOException {
+
+		XContentBuilder mapping = jsonBuilder().startObject().startObject(indexType);
+		// Parent
+		if (hasText(parentType)) {
+			mapping.startObject(FIELD_PARENT).field(FIELD_TYPE, parentType).endObject();
+		}
+
+		// Properties
+		XContentBuilder xContentBuilder = mapping.startObject(FIELD_PROPERTIES);
+
+		mapEntity(xContentBuilder, clazz, true, idFieldName, EMPTY, false, FieldType.Auto, null);
+
+		return xContentBuilder.endObject().endObject().endObject();
+	}
+
+	private static void mapEntity(XContentBuilder xContentBuilder, Class clazz, boolean isRootObject, String idFieldName,
+								  String nestedObjectFieldName, boolean nestedOrObjectField, FieldType fieldType, Field fieldAnnotation) throws IOException {
+
+		java.lang.reflect.Field[] fields = retrieveFields(clazz);
+
+		if (!isRootObject && (isAnyPropertyAnnotatedAsField(fields) || nestedOrObjectField)) {
+			String type = FieldType.Object.toString().toLowerCase();
+			if (nestedOrObjectField) {
+				type = fieldType.toString().toLowerCase();
+			}
+			XContentBuilder t = xContentBuilder.startObject(nestedObjectFieldName).field(FIELD_TYPE, type);
+
+			if (nestedOrObjectField && FieldType.Nested == fieldType && fieldAnnotation.includeInParent()) {
+				t.field("include_in_parent", fieldAnnotation.includeInParent());
+			}
+			t.startObject(FIELD_PROPERTIES);
+		}
+
+		for (java.lang.reflect.Field field : fields) {
+
+			if (field.isAnnotationPresent(Transient.class) || isInIgnoreFields(field, fieldAnnotation)) {
+				continue;
+			}
+
+			if (field.isAnnotationPresent(Mapping.class)) {
+				String mappingPath = field.getAnnotation(Mapping.class).mappingPath();
+				if (isNotBlank(mappingPath)) {
+					ClassPathResource mappings = new ClassPathResource(mappingPath);
+					if (mappings.exists()) {
+						xContentBuilder.rawField(field.getName(), mappings.getInputStream());
+						continue;
+					}
+				}
+			}
+
+			boolean isGeoPointField = isGeoPointField(field);
+			boolean isCompletionField = isCompletionField(field);
+
+			Field singleField = field.getAnnotation(Field.class);
+			if (!isGeoPointField && !isCompletionField && isEntity(field) && isAnnotated(field)) {
+				if (singleField == null) {
+					continue;
+				}
+				boolean nestedOrObject = isNestedOrObjectField(field);
+				mapEntity(xContentBuilder, getFieldType(field), false, EMPTY, field.getName(), nestedOrObject, singleField.type(), field.getAnnotation(Field.class));
+				if (nestedOrObject) {
+					continue;
+				}
+			}
+
+			MultiField multiField = field.getAnnotation(MultiField.class);
+
+			if (isGeoPointField) {
+				applyGeoPointFieldMapping(xContentBuilder, field);
+			}
+
+			if (isCompletionField) {
+				CompletionField completionField = field.getAnnotation(CompletionField.class);
+				applyCompletionFieldMapping(xContentBuilder, field, completionField);
+			}
+
+			if (isRootObject && singleField != null && isIdField(field, idFieldName)) {
+				applyDefaultIdFieldMapping(xContentBuilder, field);
+			} else if (multiField != null) {
+				addMultiFieldMapping(xContentBuilder, field, multiField, isNestedOrObjectField(field));
+			} else if (singleField != null) {
+				addSingleFieldMapping(xContentBuilder, field, singleField, isNestedOrObjectField(field));
+			}
+		}
+
+		if (!isRootObject && isAnyPropertyAnnotatedAsField(fields) || nestedOrObjectField) {
+			xContentBuilder.endObject().endObject();
+		}
+	}
+
+	private static java.lang.reflect.Field[] retrieveFields(Class clazz) {
+		// Create list of fields.
+		List<java.lang.reflect.Field> fields = new ArrayList<java.lang.reflect.Field>();
+
+		// Keep backing up the inheritance hierarchy.
+		Class targetClass = clazz;
+		do {
+			fields.addAll(Arrays.asList(targetClass.getDeclaredFields()));
+			targetClass = targetClass.getSuperclass();
+		}
+		while (targetClass != null && targetClass != Object.class);
+
+		return fields.toArray(new java.lang.reflect.Field[fields.size()]);
+	}
+
+	private static boolean isAnnotated(java.lang.reflect.Field field) {
+		return field.getAnnotation(Field.class) != null ||
+				field.getAnnotation(MultiField.class) != null ||
+				field.getAnnotation(GeoPointField.class) != null ||
+				field.getAnnotation(CompletionField.class) != null;
+	}
+
+	private static void applyGeoPointFieldMapping(XContentBuilder xContentBuilder, java.lang.reflect.Field field) throws IOException {
+		xContentBuilder.startObject(field.getName());
+		xContentBuilder.field(FIELD_TYPE, TYPE_VALUE_GEO_POINT);
+
+		GeoPointField annotation = field.getAnnotation(GeoPointField.class);
+		if (annotation != null) {
+			if (annotation.geoHashPrefix()) {
+				xContentBuilder.field(TYPE_VALUE_GEO_HASH_PREFIX, true);
+				if (StringUtils.isNotEmpty(annotation.geoHashPrecision())) {
+					if (NumberUtils.isNumber(annotation.geoHashPrecision())) {
+						xContentBuilder.field(TYPE_VALUE_GEO_HASH_PRECISION, Integer.parseInt(annotation.geoHashPrecision()));
+					} else {
+						xContentBuilder.field(TYPE_VALUE_GEO_HASH_PRECISION, annotation.geoHashPrecision());
+					}
+				}
+			}
+		}
+
+		xContentBuilder.endObject();
+	}
+
+	private static void applyCompletionFieldMapping(XContentBuilder xContentBuilder, java.lang.reflect.Field field, CompletionField annotation) throws IOException {
+		xContentBuilder.startObject(field.getName());
+		xContentBuilder.field(FIELD_TYPE, TYPE_VALUE_COMPLETION);
+		if (annotation != null) {
+			xContentBuilder.field(COMPLETION_MAX_INPUT_LENGTH, annotation.maxInputLength());
+			xContentBuilder.field(COMPLETION_PAYLOADS, annotation.payloads());
+			xContentBuilder.field(COMPLETION_PRESERVE_POSITION_INCREMENTS, annotation.preservePositionIncrements());
+			xContentBuilder.field(COMPLETION_PRESERVE_SEPARATORS, annotation.preserveSeparators());
+			if (isNotBlank(annotation.searchAnalyzer())) {
+				xContentBuilder.field(FIELD_SEARCH_ANALYZER, annotation.searchAnalyzer());
+			}
+			if (isNotBlank(annotation.analyzer())) {
+				xContentBuilder.field(FIELD_INDEX_ANALYZER, annotation.analyzer());
+			}
+		}
+		xContentBuilder.endObject();
+	}
+
+	private static void applyDefaultIdFieldMapping(XContentBuilder xContentBuilder, java.lang.reflect.Field field)
+			throws IOException {
+		xContentBuilder.startObject(field.getName())
+				.field(FIELD_TYPE, TYPE_VALUE_STRING)
+				.field(FIELD_INDEX, INDEX_VALUE_NOT_ANALYZED);
+		xContentBuilder.endObject();
+	}
+
+	/**
+	 * Apply mapping for a single @Field annotation
+	 *
+	 * @throws IOException
+	 */
+	private static void addSingleFieldMapping(XContentBuilder xContentBuilder, java.lang.reflect.Field field,
+											  Field fieldAnnotation, boolean nestedOrObjectField) throws IOException {
+		xContentBuilder.startObject(field.getName());
+		if(!nestedOrObjectField) {
+			xContentBuilder.field(FIELD_STORE, fieldAnnotation.store());
+		}
+		if (FieldType.Auto != fieldAnnotation.type()) {
+			xContentBuilder.field(FIELD_TYPE, fieldAnnotation.type().name().toLowerCase());
+			if (FieldType.Date == fieldAnnotation.type() && DateFormat.none != fieldAnnotation.format()) {
+				xContentBuilder.field(FIELD_FORMAT, DateFormat.custom == fieldAnnotation.format()
+						? fieldAnnotation.pattern() : fieldAnnotation.format());
+			}
+		}
+		if (FieldIndex.not_analyzed == fieldAnnotation.index() || FieldIndex.no == fieldAnnotation.index()) {
+			xContentBuilder.field(FIELD_INDEX, fieldAnnotation.index().name().toLowerCase());
+		}
+		if (isNotBlank(fieldAnnotation.searchAnalyzer())) {
+			xContentBuilder.field(FIELD_SEARCH_ANALYZER, fieldAnnotation.searchAnalyzer());
+		}
+		if (isNotBlank(fieldAnnotation.analyzer())) {
+			xContentBuilder.field(FIELD_INDEX_ANALYZER, fieldAnnotation.analyzer());
+		}
+		xContentBuilder.endObject();
+	}
+
+	/**
+	 * Apply mapping for a single nested @Field annotation
+	 *
+	 * @throws IOException
+	 */
+	private static void addNestedFieldMapping(XContentBuilder builder, java.lang.reflect.Field field,
+											  InnerField annotation) throws IOException {
+		builder.startObject(annotation.suffix());
+		//builder.field(FIELD_STORE, annotation.store());
+		if (FieldType.Auto != annotation.type()) {
+			builder.field(FIELD_TYPE, annotation.type().name().toLowerCase());
+		}
+		if (FieldIndex.not_analyzed == annotation.index()) {
+			builder.field(FIELD_INDEX, annotation.index().name().toLowerCase());
+		}
+		if (isNotBlank(annotation.searchAnalyzer())) {
+			builder.field(FIELD_SEARCH_ANALYZER, annotation.searchAnalyzer());
+		}
+		if (isNotBlank(annotation.indexAnalyzer())) {
+			builder.field(FIELD_INDEX_ANALYZER, annotation.indexAnalyzer());
+		}
+		builder.endObject();
+	}
+
+	/**
+	 * Multi field mappings for string type fields, support for sorts and facets
+	 *
+	 * @throws IOException
+	 */
+	private static void addMultiFieldMapping(XContentBuilder builder, java.lang.reflect.Field field,
+											 MultiField annotation, boolean nestedOrObjectField) throws IOException {
+		builder.startObject(field.getName());
+		builder.field(FIELD_TYPE, "multi_field");
+		builder.startObject("fields");
+		//add standard field
+		addSingleFieldMapping(builder, field, annotation.mainField(),nestedOrObjectField);
+		for (InnerField innerField : annotation.otherFields()) {
+			addNestedFieldMapping(builder, field, innerField);
+		}
+		builder.endObject();
+		builder.endObject();
+	}
+
+	protected static boolean isEntity(java.lang.reflect.Field field) {
+		
+		TypeInformation<?> typeInformation = ClassTypeInformation.from(field.getType());
+		Class<?> clazz = getFieldType(field);
+		boolean isComplexType = !SIMPLE_TYPE_HOLDER.isSimpleType(clazz);
+		return isComplexType && !typeInformation.isMap();
+	}
+
+	protected static Class<?> getFieldType(java.lang.reflect.Field field) {
+		
+		return ClassTypeInformation.from(field.getDeclaringClass()) //
+				.getProperty(field.getName()) //
+				.getActualType() //
+				.getType();
+	}
+
+	private static boolean isAnyPropertyAnnotatedAsField(java.lang.reflect.Field[] fields) {
+		if (fields != null) {
+			for (java.lang.reflect.Field field : fields) {
+				if (field.isAnnotationPresent(Field.class)) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	private static boolean isIdField(java.lang.reflect.Field field, String idFieldName) {
+		return idFieldName.equals(field.getName());
+	}
+
+	private static boolean isInIgnoreFields(java.lang.reflect.Field field, Field parentFieldAnnotation) {
+		if (null != parentFieldAnnotation) {
+			String[] ignoreFields = parentFieldAnnotation.ignoreFields();
+			return Arrays.asList(ignoreFields).contains(field.getName());
+		}
+		return false;
+	}
+
+	private static boolean isNestedOrObjectField(java.lang.reflect.Field field) {
+		Field fieldAnnotation = field.getAnnotation(Field.class);
+		return fieldAnnotation != null && (FieldType.Nested == fieldAnnotation.type() || FieldType.Object == fieldAnnotation.type());
+	}
+
+	private static boolean isGeoPointField(java.lang.reflect.Field field) {
+		return field.getType() == GeoPoint.class || field.getAnnotation(GeoPointField.class) != null;
+	}
+
+	private static boolean isCompletionField(java.lang.reflect.Field field) {
+		return field.getType() == Completion.class;
+	}
+}

src/main/java/org/springframework/data/elasticsearch/core/MultiGetResultMapper.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/core/ResultsExtractor.java

@@ -1,24 +1,24 @@
-/*
- * Copyright 2013-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.data.elasticsearch.core;
-
-import org.elasticsearch.action.search.SearchResponse;
-
-public interface ResultsExtractor<T> {
-
-	T extract(SearchResponse response);
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.data.elasticsearch.core;
+
+import org.elasticsearch.action.search.SearchResponse;
+
+public interface ResultsExtractor<T> {
+
+	T extract(SearchResponse response);
+}

src/main/java/org/springframework/data/elasticsearch/core/ResultsMapper.java

@@ -1,29 +1,29 @@
-/*
- * Copyright 2013-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core;
-
-/**
- * ResultsMapper
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Artur Konczak
- */
-
-public interface ResultsMapper extends SearchResultMapper, GetResultMapper, MultiGetResultMapper {
-
-	EntityMapper getEntityMapper();
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core;
+
+/**
+ * ResultsMapper
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Artur Konczak
+ */
+
+public interface ResultsMapper extends SearchResultMapper, GetResultMapper, MultiGetResultMapper {
+
+	EntityMapper getEntityMapper();
+}

src/main/java/org/springframework/data/elasticsearch/core/SearchResultMapper.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/core/convert/DateTimeConverters.java

@@ -1,77 +1,77 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core.convert;
-
-import java.util.Date;
-
-import org.joda.time.DateTimeZone;
-import org.joda.time.LocalDateTime;
-import org.joda.time.ReadableInstant;
-import org.joda.time.format.DateTimeFormatter;
-import org.joda.time.format.ISODateTimeFormat;
-import org.springframework.core.convert.converter.Converter;
-
-/**
- * DateTimeConverters
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-
-public final class DateTimeConverters {
-
-	private static DateTimeFormatter formatter = ISODateTimeFormat.dateTime().withZone(DateTimeZone.UTC);
-
-	public enum JodaDateTimeConverter implements Converter<ReadableInstant, String> {
-		INSTANCE;
-
-		@Override
-		public String convert(ReadableInstant source) {
-			if (source == null) {
-				return null;
-			}
-			return formatter.print(source);
-		}
-
-	}
-
-	public enum JodaLocalDateTimeConverter implements Converter<LocalDateTime, String> {
-		INSTANCE;
-
-		@Override
-		public String convert(LocalDateTime source) {
-			if (source == null) {
-				return null;
-			}
-			return formatter.print(source.toDateTime(DateTimeZone.UTC));
-		}
-
-	}
-
-	public enum JavaDateConverter implements Converter<Date, String> {
-		INSTANCE;
-
-		@Override
-		public String convert(Date source) {
-			if (source == null) {
-				return null;
-			}
-
-			return formatter.print(source.getTime());
-		}
-
-	}
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core.convert;
+
+import java.util.Date;
+
+import org.joda.time.DateTimeZone;
+import org.joda.time.LocalDateTime;
+import org.joda.time.ReadableInstant;
+import org.joda.time.format.DateTimeFormatter;
+import org.joda.time.format.ISODateTimeFormat;
+import org.springframework.core.convert.converter.Converter;
+
+/**
+ * DateTimeConverters
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+
+public final class DateTimeConverters {
+
+	private static DateTimeFormatter formatter = ISODateTimeFormat.dateTime().withZone(DateTimeZone.UTC);
+
+	public enum JodaDateTimeConverter implements Converter<ReadableInstant, String> {
+		INSTANCE;
+
+		@Override
+		public String convert(ReadableInstant source) {
+			if (source == null) {
+				return null;
+			}
+			return formatter.print(source);
+		}
+
+	}
+
+	public enum JodaLocalDateTimeConverter implements Converter<LocalDateTime, String> {
+		INSTANCE;
+
+		@Override
+		public String convert(LocalDateTime source) {
+			if (source == null) {
+				return null;
+			}
+			return formatter.print(source.toDateTime(DateTimeZone.UTC));
+		}
+
+	}
+
+	public enum JavaDateConverter implements Converter<Date, String> {
+		INSTANCE;
+
+		@Override
+		public String convert(Date source) {
+			if (source == null) {
+				return null;
+			}
+
+			return formatter.print(source.getTime());
+		}
+
+	}
+}

src/main/java/org/springframework/data/elasticsearch/core/convert/ElasticsearchConverter.java

@@ -1,45 +1,45 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core.convert;
-
-import org.springframework.core.convert.ConversionService;
-import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
-import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
-import org.springframework.data.mapping.context.MappingContext;
-
-/**
- * ElasticsearchConverter
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-
-public interface ElasticsearchConverter {
-
-	/**
-	 * Returns the underlying {@link org.springframework.data.mapping.context.MappingContext} used by the converter.
-	 *
-	 * @return never {@literal null}
-	 */
-	MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> getMappingContext();
-
-	/**
-	 * Returns the underlying {@link org.springframework.core.convert.ConversionService} used by the converter.
-	 *
-	 * @return never {@literal null}.
-	 */
-	ConversionService getConversionService();
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core.convert;
+
+import org.springframework.core.convert.ConversionService;
+import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
+import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
+import org.springframework.data.mapping.context.MappingContext;
+
+/**
+ * ElasticsearchConverter
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+
+public interface ElasticsearchConverter {
+
+	/**
+	 * Returns the underlying {@link org.springframework.data.mapping.context.MappingContext} used by the converter.
+	 *
+	 * @return never {@literal null}
+	 */
+	MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> getMappingContext();
+
+	/**
+	 * Returns the underlying {@link org.springframework.core.convert.ConversionService} used by the converter.
+	 *
+	 * @return never {@literal null}.
+	 */
+	ConversionService getConversionService();
+}

src/main/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverter.java

@@ -1,68 +1,70 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core.convert;
-
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.core.convert.support.DefaultConversionService;
-import org.springframework.core.convert.support.GenericConversionService;
-import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
-import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
-import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.util.Assert;
-
-/**
- * MappingElasticsearchConverter
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-
-public class MappingElasticsearchConverter implements ElasticsearchConverter, ApplicationContextAware {
-
-	private final MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext;
-	private final GenericConversionService conversionService;
-
-	@SuppressWarnings("unused")
-	private ApplicationContext applicationContext;
-
-	public MappingElasticsearchConverter(
-			MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext) {
-		Assert.notNull(mappingContext);
-		this.mappingContext = mappingContext;
-		this.conversionService = new DefaultConversionService();
-	}
-
-	@Override
-	public MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> getMappingContext() {
-		return mappingContext;
-	}
-
-	@Override
-	public ConversionService getConversionService() {
-		return this.conversionService;
-	}
-
-	@Override
-	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-		this.applicationContext = applicationContext;
-		if (mappingContext instanceof ApplicationContextAware) {
-			((ApplicationContextAware) mappingContext).setApplicationContext(applicationContext);
-		}
-	}
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core.convert;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.core.convert.ConversionService;
+import org.springframework.core.convert.support.DefaultConversionService;
+import org.springframework.core.convert.support.GenericConversionService;
+import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
+import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.util.Assert;
+
+/**
+ * MappingElasticsearchConverter
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Mark Paluch
+ */
+public class MappingElasticsearchConverter implements ElasticsearchConverter, ApplicationContextAware {
+
+	private final MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext;
+	private final GenericConversionService conversionService;
+
+	@SuppressWarnings("unused")
+	private ApplicationContext applicationContext;
+
+	public MappingElasticsearchConverter(
+			MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext) {
+		
+		Assert.notNull(mappingContext, "MappingContext must not be null!");
+		
+		this.mappingContext = mappingContext;
+		this.conversionService = new DefaultConversionService();
+	}
+
+	@Override
+	public MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> getMappingContext() {
+		return mappingContext;
+	}
+
+	@Override
+	public ConversionService getConversionService() {
+		return this.conversionService;
+	}
+
+	@Override
+	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+		this.applicationContext = applicationContext;
+		if (mappingContext instanceof ApplicationContextAware) {
+			((ApplicationContextAware) mappingContext).setApplicationContext(applicationContext);
+		}
+	}
+}

src/main/java/org/springframework/data/elasticsearch/core/facet/AbstractFacetRequest.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -47,4 +47,4 @@ public abstract class AbstractFacetRequest implements FacetRequest {
 	public boolean applyQueryFilter() {
 		return applyQueryFilter;
 	}
-}
+}

src/main/java/org/springframework/data/elasticsearch/core/facet/AbstractFacetResult.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/core/facet/FacetRequest.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/core/facet/FacetResult.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/core/facet/FacetType.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/core/facet/request/HistogramFacetRequest.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -70,4 +70,4 @@ public class HistogramFacetRequest extends AbstractFacetRequest {
 
 		return dateHistogramBuilder;
 	}
-}
+}

src/main/java/org/springframework/data/elasticsearch/core/facet/request/HistogramFacetRequestBuilder.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -55,4 +55,4 @@ public class HistogramFacetRequestBuilder {
 		result.setApplyQueryFilter(true);
 		return this;
 	}
-}
+}

src/main/java/org/springframework/data/elasticsearch/core/facet/request/NativeFacetRequest.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/core/facet/request/RangeFacetRequest.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/core/facet/request/RangeFacetRequestBuilder.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -82,4 +82,4 @@ public class RangeFacetRequestBuilder {
 	public FacetRequest build() {
 		return result;
 	}
-}
+}

src/main/java/org/springframework/data/elasticsearch/core/facet/request/StatisticalFacetRequest.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -50,4 +50,4 @@ public class StatisticalFacetRequest extends AbstractFacetRequest {
 		Assert.isTrue(StringUtils.isNotBlank(field) && fields == null, "Please select field or fields on which to build the facets !!!");
 		return AggregationBuilders.extendedStats(getName()).field(field);
 	}
-}
+}

src/main/java/org/springframework/data/elasticsearch/core/facet/request/StatisticalFacetRequestBuilder.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -49,4 +49,4 @@ public class StatisticalFacetRequestBuilder {
 	public FacetRequest build() {
 		return result;
 	}
-}
+}

src/main/java/org/springframework/data/elasticsearch/core/facet/request/TermFacetOrder.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/core/facet/request/TermFacetRequest.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -104,4 +104,4 @@ public class TermFacetRequest extends AbstractFacetRequest {
 
 		return termsBuilder;
 	}
-}
+}

src/main/java/org/springframework/data/elasticsearch/core/facet/request/TermFacetRequestBuilder.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -85,4 +85,4 @@ public class TermFacetRequestBuilder {
 	public FacetRequest build() {
 		return result;
 	}
-}
+}

src/main/java/org/springframework/data/elasticsearch/core/facet/result/HistogramResult.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/core/facet/result/IntervalUnit.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/core/facet/result/Range.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/core/facet/result/RangeResult.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/core/facet/result/StatisticalResult.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/core/facet/result/Term.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/core/facet/result/TermResult.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/core/geo/GeoBox.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/core/geo/GeoPoint.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/core/mapping/ElasticsearchPersistentEntity.java

@@ -1,52 +1,52 @@
-/*
- * Copyright 2013-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core.mapping;
-
-import org.springframework.data.mapping.PersistentEntity;
-
-/**
- * ElasticsearchPersistentEntity
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-
-public interface ElasticsearchPersistentEntity<T> extends PersistentEntity<T, ElasticsearchPersistentProperty> {
-
-	String getIndexName();
-
-	String getIndexType();
-
-	short getShards();
-
-	short getReplicas();
-
-	boolean isUseServerConfiguration();
-
-	String getRefreshInterval();
-
-	String getIndexStoreType();
-
-	ElasticsearchPersistentProperty getVersionProperty();
-
-	String getParentType();
-
-	ElasticsearchPersistentProperty getParentIdProperty();
-
-	String settingPath();
-
-	boolean isCreateIndexAndMapping();
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core.mapping;
+
+import org.springframework.data.mapping.PersistentEntity;
+
+/**
+ * ElasticsearchPersistentEntity
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+
+public interface ElasticsearchPersistentEntity<T> extends PersistentEntity<T, ElasticsearchPersistentProperty> {
+
+	String getIndexName();
+
+	String getIndexType();
+
+	short getShards();
+
+	short getReplicas();
+
+	boolean isUseServerConfiguration();
+
+	String getRefreshInterval();
+
+	String getIndexStoreType();
+
+	ElasticsearchPersistentProperty getVersionProperty();
+
+	String getParentType();
+
+	ElasticsearchPersistentProperty getParentIdProperty();
+
+	String settingPath();
+
+	boolean isCreateIndexAndMapping();
+}

src/main/java/org/springframework/data/elasticsearch/core/mapping/ElasticsearchPersistentProperty.java

@@ -1,40 +1,40 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core.mapping;
-
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.data.mapping.PersistentProperty;
-
-/**
- * ElasticsearchPersistentProperty
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-
-public interface ElasticsearchPersistentProperty extends PersistentProperty<ElasticsearchPersistentProperty> {
-
-	String getFieldName();
-
-	public enum PropertyToFieldNameConverter implements Converter<ElasticsearchPersistentProperty, String> {
-
-		INSTANCE;
-
-		public String convert(ElasticsearchPersistentProperty source) {
-			return source.getFieldName();
-		}
-	}
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core.mapping;
+
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.data.mapping.PersistentProperty;
+
+/**
+ * ElasticsearchPersistentProperty
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+
+public interface ElasticsearchPersistentProperty extends PersistentProperty<ElasticsearchPersistentProperty> {
+
+	String getFieldName();
+
+	public enum PropertyToFieldNameConverter implements Converter<ElasticsearchPersistentProperty, String> {
+
+		INSTANCE;
+
+		public String convert(ElasticsearchPersistentProperty source) {
+			return source.getFieldName();
+		}
+	}
+}

src/main/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchMappingContext.java

@@ -1,60 +1,60 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core.mapping;
-
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.Field;
-
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.data.mapping.context.AbstractMappingContext;
-import org.springframework.data.mapping.model.SimpleTypeHolder;
-import org.springframework.data.util.TypeInformation;
-
-/**
- * SimpleElasticsearchMappingContext
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-
-public class SimpleElasticsearchMappingContext extends
-		AbstractMappingContext<SimpleElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> implements ApplicationContextAware {
-
-	private ApplicationContext context;
-
-	@Override
-	protected <T> SimpleElasticsearchPersistentEntity<?> createPersistentEntity(TypeInformation<T> typeInformation) {
-		final SimpleElasticsearchPersistentEntity<T> persistentEntity =
-				new SimpleElasticsearchPersistentEntity<T>(typeInformation);
-		if (context != null) {
-			persistentEntity.setApplicationContext(context);
-		}
-		return persistentEntity;
-	}
-
-	@Override
-	protected ElasticsearchPersistentProperty createPersistentProperty(Field field, PropertyDescriptor descriptor,
-																	   SimpleElasticsearchPersistentEntity<?> owner, SimpleTypeHolder simpleTypeHolder) {
-		return new SimpleElasticsearchPersistentProperty(field, descriptor, owner, simpleTypeHolder);
-	}
-
-	@Override
-	public void setApplicationContext(ApplicationContext context) throws BeansException {
-		this.context = context;
-	}
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core.mapping;
+
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Field;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.data.mapping.context.AbstractMappingContext;
+import org.springframework.data.mapping.model.SimpleTypeHolder;
+import org.springframework.data.util.TypeInformation;
+
+/**
+ * SimpleElasticsearchMappingContext
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+
+public class SimpleElasticsearchMappingContext extends
+		AbstractMappingContext<SimpleElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> implements ApplicationContextAware {
+
+	private ApplicationContext context;
+
+	@Override
+	protected <T> SimpleElasticsearchPersistentEntity<?> createPersistentEntity(TypeInformation<T> typeInformation) {
+		final SimpleElasticsearchPersistentEntity<T> persistentEntity =
+				new SimpleElasticsearchPersistentEntity<T>(typeInformation);
+		if (context != null) {
+			persistentEntity.setApplicationContext(context);
+		}
+		return persistentEntity;
+	}
+
+	@Override
+	protected ElasticsearchPersistentProperty createPersistentProperty(Field field, PropertyDescriptor descriptor,
+																	   SimpleElasticsearchPersistentEntity<?> owner, SimpleTypeHolder simpleTypeHolder) {
+		return new SimpleElasticsearchPersistentProperty(field, descriptor, owner, simpleTypeHolder);
+	}
+
+	@Override
+	public void setApplicationContext(ApplicationContext context) throws BeansException {
+		this.context = context;
+	}
+}

src/main/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentEntity.java

@@ -1,170 +1,170 @@
-/*
- * Copyright 2013-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core.mapping;
-
-import static org.springframework.util.StringUtils.*;
-
-import java.util.Locale;
-
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.context.expression.BeanFactoryAccessor;
-import org.springframework.context.expression.BeanFactoryResolver;
-import org.springframework.data.elasticsearch.annotations.Document;
-import org.springframework.data.elasticsearch.annotations.Parent;
-import org.springframework.data.elasticsearch.annotations.Setting;
-import org.springframework.data.mapping.model.BasicPersistentEntity;
-import org.springframework.data.util.TypeInformation;
-import org.springframework.expression.Expression;
-import org.springframework.expression.ParserContext;
-import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.expression.spel.support.StandardEvaluationContext;
-import org.springframework.util.Assert;
-
-/**
- * Elasticsearch specific {@link org.springframework.data.mapping.PersistentEntity} implementation holding
- *
- * @param <T>
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-public class SimpleElasticsearchPersistentEntity<T> extends BasicPersistentEntity<T, ElasticsearchPersistentProperty>
-		implements ElasticsearchPersistentEntity<T>, ApplicationContextAware {
-
-	private final StandardEvaluationContext context;
-	private final SpelExpressionParser parser;
-
-	private String indexName;
-	private String indexType;
-	private boolean useServerConfiguration;
-	private short shards;
-	private short replicas;
-	private String refreshInterval;
-	private String indexStoreType;
-	private String parentType;
-	private ElasticsearchPersistentProperty parentIdProperty;
-	private String settingPath;
-	private boolean createIndexAndMapping;
-
-	public SimpleElasticsearchPersistentEntity(TypeInformation<T> typeInformation) {
-		super(typeInformation);
-		this.context = new StandardEvaluationContext();
-		this.parser = new SpelExpressionParser();
-
-		Class<T> clazz = typeInformation.getType();
-		if (clazz.isAnnotationPresent(Document.class)) {
-			Document document = clazz.getAnnotation(Document.class);
-			Assert.hasText(document.indexName(),
-					" Unknown indexName. Make sure the indexName is defined. e.g @Document(indexName=\"foo\")");
-			this.indexName = document.indexName();
-			this.indexType = hasText(document.type()) ? document.type() : clazz.getSimpleName().toLowerCase(Locale.ENGLISH);
-			this.useServerConfiguration = document.useServerConfiguration();
-			this.shards = document.shards();
-			this.replicas = document.replicas();
-			this.refreshInterval = document.refreshInterval();
-			this.indexStoreType = document.indexStoreType();
-			this.createIndexAndMapping = document.createIndex();
-		}
-		if (clazz.isAnnotationPresent(Setting.class)) {
-			this.settingPath = typeInformation.getType().getAnnotation(Setting.class).settingPath();
-		}
-	}
-
-	@Override
-	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-		context.addPropertyAccessor(new BeanFactoryAccessor());
-		context.setBeanResolver(new BeanFactoryResolver(applicationContext));
-		context.setRootObject(applicationContext);
-	}
-
-	@Override
-	public String getIndexName() {
-		Expression expression = parser.parseExpression(indexName, ParserContext.TEMPLATE_EXPRESSION);
-		return expression.getValue(context, String.class);
-	}
-
-	@Override
-	public String getIndexType() {
-		Expression expression = parser.parseExpression(indexType, ParserContext.TEMPLATE_EXPRESSION);
-		return expression.getValue(context, String.class);
-	}
-
-	@Override
-	public String getIndexStoreType() {
-		return indexStoreType;
-	}
-
-	@Override
-	public short getShards() {
-		return shards;
-	}
-
-	@Override
-	public short getReplicas() {
-		return replicas;
-	}
-
-	@Override
-	public boolean isUseServerConfiguration() {
-		return useServerConfiguration;
-	}
-
-	@Override
-	public String getRefreshInterval() {
-		return refreshInterval;
-	}
-
-	@Override
-	public String getParentType() {
-		return parentType;
-	}
-
-	@Override
-	public ElasticsearchPersistentProperty getParentIdProperty() {
-		return parentIdProperty;
-	}
-
-	@Override
-	public String settingPath() {
-		return settingPath;
-	}
-
-	@Override
-	public boolean isCreateIndexAndMapping() {
-		return createIndexAndMapping;
-	}
-
-	@Override
-	public void addPersistentProperty(ElasticsearchPersistentProperty property) {
-		super.addPersistentProperty(property);
-
-		if (property.getField() != null) {
-			Parent parent = property.getField().getAnnotation(Parent.class);
-			if (parent != null) {
-				Assert.isNull(this.parentIdProperty, "Only one field can hold a @Parent annotation");
-				Assert.isNull(this.parentType, "Only one field can hold a @Parent annotation");
-				Assert.isTrue(property.getType() == String.class, "Parent ID property should be String");
-				this.parentIdProperty = property;
-				this.parentType = parent.type();
-			}
-		}
-
-		if (property.isVersionProperty()) {
-			Assert.isTrue(property.getType() == Long.class, "Version property should be Long");
-		}
-	}
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core.mapping;
+
+import static org.springframework.util.StringUtils.*;
+
+import java.util.Locale;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.expression.BeanFactoryAccessor;
+import org.springframework.context.expression.BeanFactoryResolver;
+import org.springframework.data.elasticsearch.annotations.Document;
+import org.springframework.data.elasticsearch.annotations.Parent;
+import org.springframework.data.elasticsearch.annotations.Setting;
+import org.springframework.data.mapping.model.BasicPersistentEntity;
+import org.springframework.data.util.TypeInformation;
+import org.springframework.expression.Expression;
+import org.springframework.expression.ParserContext;
+import org.springframework.expression.spel.standard.SpelExpressionParser;
+import org.springframework.expression.spel.support.StandardEvaluationContext;
+import org.springframework.util.Assert;
+
+/**
+ * Elasticsearch specific {@link org.springframework.data.mapping.PersistentEntity} implementation holding
+ *
+ * @param <T>
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+public class SimpleElasticsearchPersistentEntity<T> extends BasicPersistentEntity<T, ElasticsearchPersistentProperty>
+		implements ElasticsearchPersistentEntity<T>, ApplicationContextAware {
+
+	private final StandardEvaluationContext context;
+	private final SpelExpressionParser parser;
+
+	private String indexName;
+	private String indexType;
+	private boolean useServerConfiguration;
+	private short shards;
+	private short replicas;
+	private String refreshInterval;
+	private String indexStoreType;
+	private String parentType;
+	private ElasticsearchPersistentProperty parentIdProperty;
+	private String settingPath;
+	private boolean createIndexAndMapping;
+
+	public SimpleElasticsearchPersistentEntity(TypeInformation<T> typeInformation) {
+		super(typeInformation);
+		this.context = new StandardEvaluationContext();
+		this.parser = new SpelExpressionParser();
+
+		Class<T> clazz = typeInformation.getType();
+		if (clazz.isAnnotationPresent(Document.class)) {
+			Document document = clazz.getAnnotation(Document.class);
+			Assert.hasText(document.indexName(),
+					" Unknown indexName. Make sure the indexName is defined. e.g @Document(indexName=\"foo\")");
+			this.indexName = document.indexName();
+			this.indexType = hasText(document.type()) ? document.type() : clazz.getSimpleName().toLowerCase(Locale.ENGLISH);
+			this.useServerConfiguration = document.useServerConfiguration();
+			this.shards = document.shards();
+			this.replicas = document.replicas();
+			this.refreshInterval = document.refreshInterval();
+			this.indexStoreType = document.indexStoreType();
+			this.createIndexAndMapping = document.createIndex();
+		}
+		if (clazz.isAnnotationPresent(Setting.class)) {
+			this.settingPath = typeInformation.getType().getAnnotation(Setting.class).settingPath();
+		}
+	}
+
+	@Override
+	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+		context.addPropertyAccessor(new BeanFactoryAccessor());
+		context.setBeanResolver(new BeanFactoryResolver(applicationContext));
+		context.setRootObject(applicationContext);
+	}
+
+	@Override
+	public String getIndexName() {
+		Expression expression = parser.parseExpression(indexName, ParserContext.TEMPLATE_EXPRESSION);
+		return expression.getValue(context, String.class);
+	}
+
+	@Override
+	public String getIndexType() {
+		Expression expression = parser.parseExpression(indexType, ParserContext.TEMPLATE_EXPRESSION);
+		return expression.getValue(context, String.class);
+	}
+
+	@Override
+	public String getIndexStoreType() {
+		return indexStoreType;
+	}
+
+	@Override
+	public short getShards() {
+		return shards;
+	}
+
+	@Override
+	public short getReplicas() {
+		return replicas;
+	}
+
+	@Override
+	public boolean isUseServerConfiguration() {
+		return useServerConfiguration;
+	}
+
+	@Override
+	public String getRefreshInterval() {
+		return refreshInterval;
+	}
+
+	@Override
+	public String getParentType() {
+		return parentType;
+	}
+
+	@Override
+	public ElasticsearchPersistentProperty getParentIdProperty() {
+		return parentIdProperty;
+	}
+
+	@Override
+	public String settingPath() {
+		return settingPath;
+	}
+
+	@Override
+	public boolean isCreateIndexAndMapping() {
+		return createIndexAndMapping;
+	}
+
+	@Override
+	public void addPersistentProperty(ElasticsearchPersistentProperty property) {
+		super.addPersistentProperty(property);
+
+		if (property.getField() != null) {
+			Parent parent = property.getField().getAnnotation(Parent.class);
+			if (parent != null) {
+				Assert.isNull(this.parentIdProperty, "Only one field can hold a @Parent annotation");
+				Assert.isNull(this.parentType, "Only one field can hold a @Parent annotation");
+				Assert.isTrue(property.getType() == String.class, "Parent ID property should be String");
+				this.parentIdProperty = property;
+				this.parentType = parent.type();
+			}
+		}
+
+		if (property.isVersionProperty()) {
+			Assert.isTrue(property.getType() == Long.class, "Version property should be Long");
+		}
+	}
+}

src/main/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentProperty.java

@@ -1,65 +1,65 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core.mapping;
-
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.Field;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.springframework.data.mapping.Association;
-import org.springframework.data.mapping.PersistentEntity;
-import org.springframework.data.mapping.model.AnnotationBasedPersistentProperty;
-import org.springframework.data.mapping.model.SimpleTypeHolder;
-
-/**
- * Elasticsearch specific {@link org.springframework.data.mapping.PersistentProperty} implementation processing
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-public class SimpleElasticsearchPersistentProperty extends
-		AnnotationBasedPersistentProperty<ElasticsearchPersistentProperty> implements ElasticsearchPersistentProperty {
-
-	private static final Set<Class<?>> SUPPORTED_ID_TYPES = new HashSet<Class<?>>();
-	private static final Set<String> SUPPORTED_ID_PROPERTY_NAMES = new HashSet<String>();
-
-	static {
-		SUPPORTED_ID_TYPES.add(String.class);
-		SUPPORTED_ID_PROPERTY_NAMES.add("id");
-		SUPPORTED_ID_PROPERTY_NAMES.add("documentId");
-	}
-
-	public SimpleElasticsearchPersistentProperty(Field field, PropertyDescriptor propertyDescriptor,
-												 PersistentEntity<?, ElasticsearchPersistentProperty> owner, SimpleTypeHolder simpleTypeHolder) {
-		super(field, propertyDescriptor, owner, simpleTypeHolder);
-	}
-
-	@Override
-	public String getFieldName() {
-		return field.getName();
-	}
-
-	@Override
-	public boolean isIdProperty() {
-		return super.isIdProperty() || (field != null ? SUPPORTED_ID_PROPERTY_NAMES.contains(getFieldName()) : false);
-	}
-
-	@Override
-	protected Association<ElasticsearchPersistentProperty> createAssociation() {
-		return null;
-	}
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core.mapping;
+
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Field;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.springframework.data.mapping.Association;
+import org.springframework.data.mapping.PersistentEntity;
+import org.springframework.data.mapping.model.AnnotationBasedPersistentProperty;
+import org.springframework.data.mapping.model.SimpleTypeHolder;
+
+/**
+ * Elasticsearch specific {@link org.springframework.data.mapping.PersistentProperty} implementation processing
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+public class SimpleElasticsearchPersistentProperty extends
+		AnnotationBasedPersistentProperty<ElasticsearchPersistentProperty> implements ElasticsearchPersistentProperty {
+
+	private static final Set<Class<?>> SUPPORTED_ID_TYPES = new HashSet<Class<?>>();
+	private static final Set<String> SUPPORTED_ID_PROPERTY_NAMES = new HashSet<String>();
+
+	static {
+		SUPPORTED_ID_TYPES.add(String.class);
+		SUPPORTED_ID_PROPERTY_NAMES.add("id");
+		SUPPORTED_ID_PROPERTY_NAMES.add("documentId");
+	}
+
+	public SimpleElasticsearchPersistentProperty(Field field, PropertyDescriptor propertyDescriptor,
+												 PersistentEntity<?, ElasticsearchPersistentProperty> owner, SimpleTypeHolder simpleTypeHolder) {
+		super(field, propertyDescriptor, owner, simpleTypeHolder);
+	}
+
+	@Override
+	public String getFieldName() {
+		return field.getName();
+	}
+
+	@Override
+	public boolean isIdProperty() {
+		return super.isIdProperty() || (field != null ? SUPPORTED_ID_PROPERTY_NAMES.contains(getFieldName()) : false);
+	}
+
+	@Override
+	protected Association<ElasticsearchPersistentProperty> createAssociation() {
+		return null;
+	}
+}

src/main/java/org/springframework/data/elasticsearch/core/query/AbstractQuery.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -29,6 +29,7 @@ import org.springframework.util.Assert;
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
+ * @author Mark Paluch
  */
 abstract class AbstractQuery implements Query {
 
@@ -55,7 +56,9 @@ abstract class AbstractQuery implements Query {
 
 	@Override
 	public final <T extends Query> T setPageable(Pageable pageable) {
-		Assert.notNull(pageable);
+		
+		Assert.notNull(pageable, "Pageable must not be null!");
+		
 		this.pageable = pageable;
 		return (T) this.addSort(pageable.getSort());
 	}

src/main/java/org/springframework/data/elasticsearch/core/query/AliasBuilder.java

@@ -1,81 +1,81 @@
-/*
- * Copyright 2013-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core.query;
-
-import java.util.Map;
-
-import org.elasticsearch.index.query.QueryBuilder;
-
-/**
- * @author Mohsin Husen
- */
-public class AliasBuilder {
-
-	private String indexName;
-	private String aliasName;
-	private QueryBuilder filterBuilder;
-	private Map<String, Object> filter;
-	private String searchRouting;
-	private String indexRouting;
-	private String routing;
-
-	public AliasBuilder withIndexName(String indexName) {
-		this.indexName = indexName;
-		return this;
-	}
-
-	public AliasBuilder withAliasName(String aliasName) {
-		this.aliasName = aliasName;
-		return this;
-	}
-
-	public AliasBuilder withFilterBuilder(QueryBuilder filterBuilder) {
-		this.filterBuilder = filterBuilder;
-		return this;
-	}
-
-	public AliasBuilder withFilter(Map<String, Object> filter) {
-		this.filter = filter;
-		return this;
-	}
-
-	public AliasBuilder withSearchRouting(String searchRouting) {
-		this.searchRouting = searchRouting;
-		return this;
-	}
-
-	public AliasBuilder withIndexRouting(String indexRouting) {
-		this.indexRouting = indexRouting;
-		return this;
-	}
-
-	public AliasBuilder withRouting(String routing) {
-		this.routing = routing;
-		return this;
-	}
-
-	public AliasQuery build() {
-		AliasQuery aliasQuery = new AliasQuery();
-		aliasQuery.setIndexName(indexName);
-		aliasQuery.setAliasName(aliasName);
-		aliasQuery.setFilterBuilder(filterBuilder);
-		aliasQuery.setFilter(filter);
-		aliasQuery.setSearchRouting(searchRouting);
-		aliasQuery.setIndexRouting(indexRouting);
-		aliasQuery.setRouting(routing);
-		return aliasQuery;
-	}
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core.query;
+
+import java.util.Map;
+
+import org.elasticsearch.index.query.QueryBuilder;
+
+/**
+ * @author Mohsin Husen
+ */
+public class AliasBuilder {
+
+	private String indexName;
+	private String aliasName;
+	private QueryBuilder filterBuilder;
+	private Map<String, Object> filter;
+	private String searchRouting;
+	private String indexRouting;
+	private String routing;
+
+	public AliasBuilder withIndexName(String indexName) {
+		this.indexName = indexName;
+		return this;
+	}
+
+	public AliasBuilder withAliasName(String aliasName) {
+		this.aliasName = aliasName;
+		return this;
+	}
+
+	public AliasBuilder withFilterBuilder(QueryBuilder filterBuilder) {
+		this.filterBuilder = filterBuilder;
+		return this;
+	}
+
+	public AliasBuilder withFilter(Map<String, Object> filter) {
+		this.filter = filter;
+		return this;
+	}
+
+	public AliasBuilder withSearchRouting(String searchRouting) {
+		this.searchRouting = searchRouting;
+		return this;
+	}
+
+	public AliasBuilder withIndexRouting(String indexRouting) {
+		this.indexRouting = indexRouting;
+		return this;
+	}
+
+	public AliasBuilder withRouting(String routing) {
+		this.routing = routing;
+		return this;
+	}
+
+	public AliasQuery build() {
+		AliasQuery aliasQuery = new AliasQuery();
+		aliasQuery.setIndexName(indexName);
+		aliasQuery.setAliasName(aliasName);
+		aliasQuery.setFilterBuilder(filterBuilder);
+		aliasQuery.setFilter(filter);
+		aliasQuery.setSearchRouting(searchRouting);
+		aliasQuery.setIndexRouting(indexRouting);
+		aliasQuery.setRouting(routing);
+		return aliasQuery;
+	}
+}

src/main/java/org/springframework/data/elasticsearch/core/query/AliasQuery.java

@@ -1,92 +1,92 @@
-/*
- * Copyright 2013-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core.query;
-
-import java.util.Map;
-
-import org.elasticsearch.index.query.QueryBuilder;
-
-/**
- * AliasQuery is useful for creating new alias or deleting existing ones
- *
- * @author Mohsin Husen
- */
-public class AliasQuery {
-
-	private String indexName;
-	private String aliasName;
-	private QueryBuilder filterBuilder;
-	private Map<String, Object> filter;
-	private String searchRouting;
-	private String indexRouting;
-	private String routing;
-
-	public String getIndexName() {
-		return indexName;
-	}
-
-	public void setIndexName(String indexName) {
-		this.indexName = indexName;
-	}
-
-	public String getAliasName() {
-		return aliasName;
-	}
-
-	public void setAliasName(String aliasName) {
-		this.aliasName = aliasName;
-	}
-
-	public QueryBuilder getFilterBuilder() {
-		return filterBuilder;
-	}
-
-	public void setFilterBuilder(QueryBuilder filterBuilder) {
-		this.filterBuilder = filterBuilder;
-	}
-
-	public Map<String, Object> getFilter() {
-		return filter;
-	}
-
-	public void setFilter(Map<String, Object> filter) {
-		this.filter = filter;
-	}
-
-	public String getSearchRouting() {
-		return searchRouting;
-	}
-
-	public void setSearchRouting(String searchRouting) {
-		this.searchRouting = searchRouting;
-	}
-
-	public String getIndexRouting() {
-		return indexRouting;
-	}
-
-	public void setIndexRouting(String indexRouting) {
-		this.indexRouting = indexRouting;
-	}
-
-	public String getRouting() {
-		return routing;
-	}
-
-	public void setRouting(String routing) {
-		this.routing = routing;
-	}
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core.query;
+
+import java.util.Map;
+
+import org.elasticsearch.index.query.QueryBuilder;
+
+/**
+ * AliasQuery is useful for creating new alias or deleting existing ones
+ *
+ * @author Mohsin Husen
+ */
+public class AliasQuery {
+
+	private String indexName;
+	private String aliasName;
+	private QueryBuilder filterBuilder;
+	private Map<String, Object> filter;
+	private String searchRouting;
+	private String indexRouting;
+	private String routing;
+
+	public String getIndexName() {
+		return indexName;
+	}
+
+	public void setIndexName(String indexName) {
+		this.indexName = indexName;
+	}
+
+	public String getAliasName() {
+		return aliasName;
+	}
+
+	public void setAliasName(String aliasName) {
+		this.aliasName = aliasName;
+	}
+
+	public QueryBuilder getFilterBuilder() {
+		return filterBuilder;
+	}
+
+	public void setFilterBuilder(QueryBuilder filterBuilder) {
+		this.filterBuilder = filterBuilder;
+	}
+
+	public Map<String, Object> getFilter() {
+		return filter;
+	}
+
+	public void setFilter(Map<String, Object> filter) {
+		this.filter = filter;
+	}
+
+	public String getSearchRouting() {
+		return searchRouting;
+	}
+
+	public void setSearchRouting(String searchRouting) {
+		this.searchRouting = searchRouting;
+	}
+
+	public String getIndexRouting() {
+		return indexRouting;
+	}
+
+	public void setIndexRouting(String indexRouting) {
+		this.indexRouting = indexRouting;
+	}
+
+	public String getRouting() {
+		return routing;
+	}
+
+	public void setRouting(String routing) {
+		this.routing = routing;
+	}
+}

src/main/java/org/springframework/data/elasticsearch/core/query/CriteriaQuery.java

@@ -1,80 +1,80 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core.query;
-
-import org.springframework.data.domain.Pageable;
-import org.springframework.util.Assert;
-
-/**
- * CriteriaQuery
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-public class CriteriaQuery extends AbstractQuery {
-
-	private Criteria criteria;
-
-	private CriteriaQuery() {
-	}
-
-	public CriteriaQuery(Criteria criteria) {
-		this(criteria, null);
-	}
-
-	public CriteriaQuery(Criteria criteria, Pageable pageable) {
-		this.criteria = criteria;
-		this.pageable = pageable;
-		if (pageable != null) {
-			this.addSort(pageable.getSort());
-		}
-	}
-
-	public static final Query fromQuery(CriteriaQuery source) {
-		return fromQuery(source, new CriteriaQuery());
-	}
-
-	public static <T extends CriteriaQuery> T fromQuery(CriteriaQuery source, T destination) {
-		if (source == null || destination == null) {
-			return null;
-		}
-
-		if (source.getCriteria() != null) {
-			destination.addCriteria(source.getCriteria());
-		}
-
-		if (source.getSort() != null) {
-			destination.addSort(source.getSort());
-		}
-
-		return destination;
-	}
-
-	@SuppressWarnings("unchecked")
-	public final <T extends CriteriaQuery> T addCriteria(Criteria criteria) {
-		Assert.notNull(criteria, "Cannot add null criteria.");
-		if (this.criteria == null) {
-			this.criteria = criteria;
-		} else {
-			this.criteria.and(criteria);
-		}
-		return (T) this;
-	}
-
-	public Criteria getCriteria() {
-		return this.criteria;
-	}
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core.query;
+
+import org.springframework.data.domain.Pageable;
+import org.springframework.util.Assert;
+
+/**
+ * CriteriaQuery
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+public class CriteriaQuery extends AbstractQuery {
+
+	private Criteria criteria;
+
+	private CriteriaQuery() {
+	}
+
+	public CriteriaQuery(Criteria criteria) {
+		this(criteria, null);
+	}
+
+	public CriteriaQuery(Criteria criteria, Pageable pageable) {
+		this.criteria = criteria;
+		this.pageable = pageable;
+		if (pageable != null) {
+			this.addSort(pageable.getSort());
+		}
+	}
+
+	public static final Query fromQuery(CriteriaQuery source) {
+		return fromQuery(source, new CriteriaQuery());
+	}
+
+	public static <T extends CriteriaQuery> T fromQuery(CriteriaQuery source, T destination) {
+		if (source == null || destination == null) {
+			return null;
+		}
+
+		if (source.getCriteria() != null) {
+			destination.addCriteria(source.getCriteria());
+		}
+
+		if (source.getSort() != null) {
+			destination.addSort(source.getSort());
+		}
+
+		return destination;
+	}
+
+	@SuppressWarnings("unchecked")
+	public final <T extends CriteriaQuery> T addCriteria(Criteria criteria) {
+		Assert.notNull(criteria, "Cannot add null criteria.");
+		if (this.criteria == null) {
+			this.criteria = criteria;
+		} else {
+			this.criteria.and(criteria);
+		}
+		return (T) this;
+	}
+
+	public Criteria getCriteria() {
+		return this.criteria;
+	}
+}

src/main/java/org/springframework/data/elasticsearch/core/query/DeleteQuery.java

@@ -1,73 +1,73 @@
-/*
- * Copyright 2013-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core.query;
-
-import org.elasticsearch.index.query.QueryBuilder;
-
-/**
- * DeleteQuery
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-public class DeleteQuery {
-
-	private QueryBuilder query;
-	private String index;
-	private String type;
-	private Integer pageSize;
-	private Long scrollTimeInMillis;
-
-	public QueryBuilder getQuery() {
-		return query;
-	}
-
-	public void setQuery(QueryBuilder query) {
-		this.query = query;
-	}
-
-	public String getIndex() {
-		return index;
-	}
-
-	public void setIndex(String index) {
-		this.index = index;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public Integer getPageSize() {
-		return pageSize;
-	}
-
-	public void setPageSize(Integer pageSize) {
-		this.pageSize = pageSize;
-	}
-
-	public Long getScrollTimeInMillis() {
-		return scrollTimeInMillis;
-	}
-
-	public void setScrollTimeInMillis(Long scrollTimeInMillis) {
-		this.scrollTimeInMillis = scrollTimeInMillis;
-	}
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core.query;
+
+import org.elasticsearch.index.query.QueryBuilder;
+
+/**
+ * DeleteQuery
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+public class DeleteQuery {
+
+	private QueryBuilder query;
+	private String index;
+	private String type;
+	private Integer pageSize;
+	private Long scrollTimeInMillis;
+
+	public QueryBuilder getQuery() {
+		return query;
+	}
+
+	public void setQuery(QueryBuilder query) {
+		this.query = query;
+	}
+
+	public String getIndex() {
+		return index;
+	}
+
+	public void setIndex(String index) {
+		this.index = index;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public Integer getPageSize() {
+		return pageSize;
+	}
+
+	public void setPageSize(Integer pageSize) {
+		this.pageSize = pageSize;
+	}
+
+	public Long getScrollTimeInMillis() {
+		return scrollTimeInMillis;
+	}
+
+	public void setScrollTimeInMillis(Long scrollTimeInMillis) {
+		this.scrollTimeInMillis = scrollTimeInMillis;
+	}
+}

src/main/java/org/springframework/data/elasticsearch/core/query/FetchSourceFilter.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/core/query/FetchSourceFilterBuilder.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/core/query/Field.java

@@ -1,32 +1,32 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core.query;
-
-/**
- * Defines a Field that can be used within a Criteria.
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-public interface Field {
-
-	/**
-	 * Get the name of the field used in schema.xml of elasticsearch server
-	 *
-	 * @return
-	 */
-	String getName();
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core.query;
+
+/**
+ * Defines a Field that can be used within a Criteria.
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+public interface Field {
+
+	/**
+	 * Get the name of the field used in schema.xml of elasticsearch server
+	 *
+	 * @return
+	 */
+	String getName();
+}

src/main/java/org/springframework/data/elasticsearch/core/query/GetQuery.java

@@ -1,35 +1,35 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core.query;
-
-/**
- * GetQuery
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-public class GetQuery {
-
-	private String id;
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core.query;
+
+/**
+ * GetQuery
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+public class GetQuery {
+
+	private String id;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+}

src/main/java/org/springframework/data/elasticsearch/core/query/IndexBoost.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/core/query/IndexQuery.java

@@ -1,90 +1,90 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core.query;
-
-/**
- * IndexQuery
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-
-public class IndexQuery {
-
-	private String id;
-	private Object object;
-	private Long version;
-	private String indexName;
-	private String type;
-	private String source;
-	private String parentId;
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public Object getObject() {
-		return object;
-	}
-
-	public void setObject(Object object) {
-		this.object = object;
-	}
-
-	public Long getVersion() {
-		return version;
-	}
-
-	public void setVersion(Long version) {
-		this.version = version;
-	}
-
-	public String getIndexName() {
-		return indexName;
-	}
-
-	public void setIndexName(String indexName) {
-		this.indexName = indexName;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public String getSource() {
-		return source;
-	}
-
-	public void setSource(String source) {
-		this.source = source;
-	}
-
-	public String getParentId() {
-		return parentId;
-	}
-
-	public void setParentId(String parentId) {
-		this.parentId = parentId;
-	}
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core.query;
+
+/**
+ * IndexQuery
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+
+public class IndexQuery {
+
+	private String id;
+	private Object object;
+	private Long version;
+	private String indexName;
+	private String type;
+	private String source;
+	private String parentId;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public Object getObject() {
+		return object;
+	}
+
+	public void setObject(Object object) {
+		this.object = object;
+	}
+
+	public Long getVersion() {
+		return version;
+	}
+
+	public void setVersion(Long version) {
+		this.version = version;
+	}
+
+	public String getIndexName() {
+		return indexName;
+	}
+
+	public void setIndexName(String indexName) {
+		this.indexName = indexName;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getSource() {
+		return source;
+	}
+
+	public void setSource(String source) {
+		this.source = source;
+	}
+
+	public String getParentId() {
+		return parentId;
+	}
+
+	public void setParentId(String parentId) {
+		this.parentId = parentId;
+	}
+}

src/main/java/org/springframework/data/elasticsearch/core/query/IndexQueryBuilder.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/core/query/MoreLikeThisQuery.java

@@ -1,188 +1,188 @@
-/*
- * Copyright 2013-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core.query;
-
-import static java.util.Collections.addAll;
-import static org.springframework.data.elasticsearch.core.query.AbstractQuery.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.data.domain.Pageable;
-
-/**
- * MoreLikeThisQuery
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-
-public class MoreLikeThisQuery {
-
-	private String id;
-	private String indexName;
-	private String type;
-	private List<String> searchIndices = new ArrayList<String>();
-	private List<String> searchTypes = new ArrayList<String>();
-	private List<String> fields = new ArrayList<String>();
-	private String routing;
-	private Float percentTermsToMatch;
-	private Integer minTermFreq;
-	private Integer maxQueryTerms;
-	private List<String> stopWords = new ArrayList<String>();
-	private Integer minDocFreq;
-	private Integer maxDocFreq;
-	private Integer minWordLen;
-	private Integer maxWordLen;
-	private Float boostTerms;
-	private Pageable pageable = DEFAULT_PAGE;
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getIndexName() {
-		return indexName;
-	}
-
-	public void setIndexName(String indexName) {
-		this.indexName = indexName;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public List<String> getSearchIndices() {
-		return searchIndices;
-	}
-
-	public void addSearchIndices(String... searchIndices) {
-		addAll(this.searchIndices, searchIndices);
-	}
-
-	public List<String> getSearchTypes() {
-		return searchTypes;
-	}
-
-	public void addSearchTypes(String... searchTypes) {
-		addAll(this.searchTypes, searchTypes);
-	}
-
-	public List<String> getFields() {
-		return fields;
-	}
-
-	public void addFields(String... fields) {
-		addAll(this.fields, fields);
-	}
-
-	public String getRouting() {
-		return routing;
-	}
-
-	public void setRouting(String routing) {
-		this.routing = routing;
-	}
-
-	public Float getPercentTermsToMatch() {
-		return percentTermsToMatch;
-	}
-
-	public void setPercentTermsToMatch(Float percentTermsToMatch) {
-		this.percentTermsToMatch = percentTermsToMatch;
-	}
-
-	public Integer getMinTermFreq() {
-		return minTermFreq;
-	}
-
-	public void setMinTermFreq(Integer minTermFreq) {
-		this.minTermFreq = minTermFreq;
-	}
-
-	public Integer getMaxQueryTerms() {
-		return maxQueryTerms;
-	}
-
-	public void setMaxQueryTerms(Integer maxQueryTerms) {
-		this.maxQueryTerms = maxQueryTerms;
-	}
-
-	public List<String> getStopWords() {
-		return stopWords;
-	}
-
-	public void addStopWords(String... stopWords) {
-		addAll(this.stopWords, stopWords);
-	}
-
-	public Integer getMinDocFreq() {
-		return minDocFreq;
-	}
-
-	public void setMinDocFreq(Integer minDocFreq) {
-		this.minDocFreq = minDocFreq;
-	}
-
-	public Integer getMaxDocFreq() {
-		return maxDocFreq;
-	}
-
-	public void setMaxDocFreq(Integer maxDocFreq) {
-		this.maxDocFreq = maxDocFreq;
-	}
-
-	public Integer getMinWordLen() {
-		return minWordLen;
-	}
-
-	public void setMinWordLen(Integer minWordLen) {
-		this.minWordLen = minWordLen;
-	}
-
-	public Integer getMaxWordLen() {
-		return maxWordLen;
-	}
-
-	public void setMaxWordLen(Integer maxWordLen) {
-		this.maxWordLen = maxWordLen;
-	}
-
-	public Float getBoostTerms() {
-		return boostTerms;
-	}
-
-	public void setBoostTerms(Float boostTerms) {
-		this.boostTerms = boostTerms;
-	}
-
-	public Pageable getPageable() {
-		return pageable;
-	}
-
-	public void setPageable(Pageable pageable) {
-		this.pageable = pageable;
-	}
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core.query;
+
+import static java.util.Collections.addAll;
+import static org.springframework.data.elasticsearch.core.query.AbstractQuery.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.data.domain.Pageable;
+
+/**
+ * MoreLikeThisQuery
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+
+public class MoreLikeThisQuery {
+
+	private String id;
+	private String indexName;
+	private String type;
+	private List<String> searchIndices = new ArrayList<String>();
+	private List<String> searchTypes = new ArrayList<String>();
+	private List<String> fields = new ArrayList<String>();
+	private String routing;
+	private Float percentTermsToMatch;
+	private Integer minTermFreq;
+	private Integer maxQueryTerms;
+	private List<String> stopWords = new ArrayList<String>();
+	private Integer minDocFreq;
+	private Integer maxDocFreq;
+	private Integer minWordLen;
+	private Integer maxWordLen;
+	private Float boostTerms;
+	private Pageable pageable = DEFAULT_PAGE;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getIndexName() {
+		return indexName;
+	}
+
+	public void setIndexName(String indexName) {
+		this.indexName = indexName;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public List<String> getSearchIndices() {
+		return searchIndices;
+	}
+
+	public void addSearchIndices(String... searchIndices) {
+		addAll(this.searchIndices, searchIndices);
+	}
+
+	public List<String> getSearchTypes() {
+		return searchTypes;
+	}
+
+	public void addSearchTypes(String... searchTypes) {
+		addAll(this.searchTypes, searchTypes);
+	}
+
+	public List<String> getFields() {
+		return fields;
+	}
+
+	public void addFields(String... fields) {
+		addAll(this.fields, fields);
+	}
+
+	public String getRouting() {
+		return routing;
+	}
+
+	public void setRouting(String routing) {
+		this.routing = routing;
+	}
+
+	public Float getPercentTermsToMatch() {
+		return percentTermsToMatch;
+	}
+
+	public void setPercentTermsToMatch(Float percentTermsToMatch) {
+		this.percentTermsToMatch = percentTermsToMatch;
+	}
+
+	public Integer getMinTermFreq() {
+		return minTermFreq;
+	}
+
+	public void setMinTermFreq(Integer minTermFreq) {
+		this.minTermFreq = minTermFreq;
+	}
+
+	public Integer getMaxQueryTerms() {
+		return maxQueryTerms;
+	}
+
+	public void setMaxQueryTerms(Integer maxQueryTerms) {
+		this.maxQueryTerms = maxQueryTerms;
+	}
+
+	public List<String> getStopWords() {
+		return stopWords;
+	}
+
+	public void addStopWords(String... stopWords) {
+		addAll(this.stopWords, stopWords);
+	}
+
+	public Integer getMinDocFreq() {
+		return minDocFreq;
+	}
+
+	public void setMinDocFreq(Integer minDocFreq) {
+		this.minDocFreq = minDocFreq;
+	}
+
+	public Integer getMaxDocFreq() {
+		return maxDocFreq;
+	}
+
+	public void setMaxDocFreq(Integer maxDocFreq) {
+		this.maxDocFreq = maxDocFreq;
+	}
+
+	public Integer getMinWordLen() {
+		return minWordLen;
+	}
+
+	public void setMinWordLen(Integer minWordLen) {
+		this.minWordLen = minWordLen;
+	}
+
+	public Integer getMaxWordLen() {
+		return maxWordLen;
+	}
+
+	public void setMaxWordLen(Integer maxWordLen) {
+		this.maxWordLen = maxWordLen;
+	}
+
+	public Float getBoostTerms() {
+		return boostTerms;
+	}
+
+	public void setBoostTerms(Float boostTerms) {
+		this.boostTerms = boostTerms;
+	}
+
+	public Pageable getPageable() {
+		return pageable;
+	}
+
+	public void setPageable(Pageable pageable) {
+		this.pageable = pageable;
+	}
+}

src/main/java/org/springframework/data/elasticsearch/core/query/NativeSearchQuery.java

@@ -1,140 +1,140 @@
-/*
- * Copyright 2013-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core.query;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
-import org.elasticsearch.search.highlight.HighlightBuilder;
-import org.elasticsearch.search.sort.SortBuilder;
-import org.springframework.data.elasticsearch.core.facet.FacetRequest;
-
-import java.util.Arrays;
-
-/**
- * NativeSearchQuery
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Artur Konczak
- */
-public class NativeSearchQuery extends AbstractQuery implements SearchQuery {
-
-	private QueryBuilder query;
-	private QueryBuilder filter;
-	private List<SortBuilder> sorts;
-    private final List<ScriptField> scriptFields = new ArrayList<ScriptField>();
-	private List<FacetRequest> facets;
-	private List<AbstractAggregationBuilder> aggregations;
-	private HighlightBuilder.Field[] highlightFields;
-	private List<IndexBoost> indicesBoost;
-
-
-	public NativeSearchQuery(QueryBuilder query) {
-		this.query = query;
-	}
-
-	public NativeSearchQuery(QueryBuilder query, QueryBuilder filter) {
-		this.query = query;
-		this.filter = filter;
-	}
-
-	public NativeSearchQuery(QueryBuilder query, QueryBuilder filter, List<SortBuilder> sorts) {
-		this.query = query;
-		this.filter = filter;
-		this.sorts = sorts;
-	}
-
-	public NativeSearchQuery(QueryBuilder query, QueryBuilder filter, List<SortBuilder> sorts, HighlightBuilder.Field[] highlightFields) {
-		this.query = query;
-		this.filter = filter;
-		this.sorts = sorts;
-		this.highlightFields = highlightFields;
-	}
-
-	public QueryBuilder getQuery() {
-		return query;
-	}
-
-	public QueryBuilder getFilter() {
-		return filter;
-	}
-
-	public List<SortBuilder> getElasticsearchSorts() {
-		return sorts;
-	}
-
-	@Override
-	public HighlightBuilder.Field[] getHighlightFields() {
-		return highlightFields;
-	}
-
-    @Override
-    public List<ScriptField> getScriptFields() { return scriptFields; }
-
-    public void setScriptFields(List<ScriptField> scriptFields) {
-        this.scriptFields.addAll(scriptFields);
-    }
-
-    public void addScriptField(ScriptField... scriptField) {
-        scriptFields.addAll(Arrays.asList(scriptField));
-    }
-
-	public void addFacet(FacetRequest facetRequest) {
-		if (facets == null) {
-			facets = new ArrayList<FacetRequest>();
-		}
-		facets.add(facetRequest);
-	}
-
-	public void setFacets(List<FacetRequest> facets) {
-		this.facets = facets;
-	}
-
-	@Override
-	public List<FacetRequest> getFacets() {
-		return facets;
-	}
-
-	@Override
-	public List<AbstractAggregationBuilder> getAggregations() {
-		return aggregations;
-	}
-
-
-	public void addAggregation(AbstractAggregationBuilder aggregationBuilder) {
-		if (aggregations == null) {
-			aggregations = new ArrayList<AbstractAggregationBuilder>();
-		}
-		aggregations.add(aggregationBuilder);
-	}
-
-	public void setAggregations(List<AbstractAggregationBuilder> aggregations) {
-		this.aggregations = aggregations;
-	}
-
-	@Override
-	public List<IndexBoost> getIndicesBoost() {
-		return indicesBoost;
-	}
-
-	public void setIndicesBoost(List<IndexBoost> indicesBoost) {
-		this.indicesBoost = indicesBoost;
-	}
-
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core.query;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.elasticsearch.index.query.QueryBuilder;
+import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
+import org.elasticsearch.search.highlight.HighlightBuilder;
+import org.elasticsearch.search.sort.SortBuilder;
+import org.springframework.data.elasticsearch.core.facet.FacetRequest;
+
+import java.util.Arrays;
+
+/**
+ * NativeSearchQuery
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Artur Konczak
+ */
+public class NativeSearchQuery extends AbstractQuery implements SearchQuery {
+
+	private QueryBuilder query;
+	private QueryBuilder filter;
+	private List<SortBuilder> sorts;
+    private final List<ScriptField> scriptFields = new ArrayList<ScriptField>();
+	private List<FacetRequest> facets;
+	private List<AbstractAggregationBuilder> aggregations;
+	private HighlightBuilder.Field[] highlightFields;
+	private List<IndexBoost> indicesBoost;
+
+
+	public NativeSearchQuery(QueryBuilder query) {
+		this.query = query;
+	}
+
+	public NativeSearchQuery(QueryBuilder query, QueryBuilder filter) {
+		this.query = query;
+		this.filter = filter;
+	}
+
+	public NativeSearchQuery(QueryBuilder query, QueryBuilder filter, List<SortBuilder> sorts) {
+		this.query = query;
+		this.filter = filter;
+		this.sorts = sorts;
+	}
+
+	public NativeSearchQuery(QueryBuilder query, QueryBuilder filter, List<SortBuilder> sorts, HighlightBuilder.Field[] highlightFields) {
+		this.query = query;
+		this.filter = filter;
+		this.sorts = sorts;
+		this.highlightFields = highlightFields;
+	}
+
+	public QueryBuilder getQuery() {
+		return query;
+	}
+
+	public QueryBuilder getFilter() {
+		return filter;
+	}
+
+	public List<SortBuilder> getElasticsearchSorts() {
+		return sorts;
+	}
+
+	@Override
+	public HighlightBuilder.Field[] getHighlightFields() {
+		return highlightFields;
+	}
+
+    @Override
+    public List<ScriptField> getScriptFields() { return scriptFields; }
+
+    public void setScriptFields(List<ScriptField> scriptFields) {
+        this.scriptFields.addAll(scriptFields);
+    }
+
+    public void addScriptField(ScriptField... scriptField) {
+        scriptFields.addAll(Arrays.asList(scriptField));
+    }
+
+	public void addFacet(FacetRequest facetRequest) {
+		if (facets == null) {
+			facets = new ArrayList<FacetRequest>();
+		}
+		facets.add(facetRequest);
+	}
+
+	public void setFacets(List<FacetRequest> facets) {
+		this.facets = facets;
+	}
+
+	@Override
+	public List<FacetRequest> getFacets() {
+		return facets;
+	}
+
+	@Override
+	public List<AbstractAggregationBuilder> getAggregations() {
+		return aggregations;
+	}
+
+
+	public void addAggregation(AbstractAggregationBuilder aggregationBuilder) {
+		if (aggregations == null) {
+			aggregations = new ArrayList<AbstractAggregationBuilder>();
+		}
+		aggregations.add(aggregationBuilder);
+	}
+
+	public void setAggregations(List<AbstractAggregationBuilder> aggregations) {
+		this.aggregations = aggregations;
+	}
+
+	@Override
+	public List<IndexBoost> getIndicesBoost() {
+		return indicesBoost;
+	}
+
+	public void setIndicesBoost(List<IndexBoost> indicesBoost) {
+		this.indicesBoost = indicesBoost;
+	}
+
+}

src/main/java/org/springframework/data/elasticsearch/core/query/NativeSearchQueryBuilder.java

@@ -1,199 +1,199 @@
-/*
- * Copyright 2013-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core.query;
-
-import static org.springframework.util.CollectionUtils.isEmpty;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.elasticsearch.action.search.SearchType;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
-import org.elasticsearch.search.highlight.HighlightBuilder;
-import org.elasticsearch.search.sort.SortBuilder;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.elasticsearch.core.facet.FacetRequest;
-
-/**
- * NativeSearchQuery
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Artur Konczak
- */
-
-public class NativeSearchQueryBuilder {
-
-	private QueryBuilder queryBuilder;
-	private QueryBuilder filterBuilder;
-    private List<ScriptField> scriptFields = new ArrayList<ScriptField>();
-	private List<SortBuilder> sortBuilders = new ArrayList<SortBuilder>();
-	private List<FacetRequest> facetRequests = new ArrayList<FacetRequest>();
-	private List<AbstractAggregationBuilder> aggregationBuilders = new ArrayList<AbstractAggregationBuilder>();
-	private HighlightBuilder.Field[] highlightFields;
-	private Pageable pageable;
-	private String[] indices;
-	private String[] types;
-	private String[] fields;
-	private SourceFilter sourceFilter;
-	private List<IndexBoost> indicesBoost;
-	private float minScore;
-	private Collection<String> ids;
-	private String route;
-	private SearchType searchType;
-
-	public NativeSearchQueryBuilder withQuery(QueryBuilder queryBuilder) {
-		this.queryBuilder = queryBuilder;
-		return this;
-	}
-
-	public NativeSearchQueryBuilder withFilter(QueryBuilder filterBuilder) {
-		this.filterBuilder = filterBuilder;
-		return this;
-	}
-
-	public NativeSearchQueryBuilder withSort(SortBuilder sortBuilder) {
-		this.sortBuilders.add(sortBuilder);
-		return this;
-	}
-
-    public NativeSearchQueryBuilder withScriptField(ScriptField scriptField) {
-        this.scriptFields.add(scriptField);
-        return this;
-    }
-
-	public NativeSearchQueryBuilder addAggregation(AbstractAggregationBuilder aggregationBuilder) {
-		this.aggregationBuilders.add(aggregationBuilder);
-		return this;
-	}
-
-	public NativeSearchQueryBuilder withFacet(FacetRequest facetRequest) {
-		facetRequests.add(facetRequest);
-		return this;
-	}
-
-	public NativeSearchQueryBuilder withHighlightFields(HighlightBuilder.Field... highlightFields) {
-		this.highlightFields = highlightFields;
-		return this;
-	}
-
-	public NativeSearchQueryBuilder withIndicesBoost(List<IndexBoost> indicesBoost) {
-		this.indicesBoost = indicesBoost;
-		return this;
-	}
-
-	public NativeSearchQueryBuilder withPageable(Pageable pageable) {
-		this.pageable = pageable;
-		return this;
-	}
-
-	public NativeSearchQueryBuilder withIndices(String... indices) {
-		this.indices = indices;
-		return this;
-	}
-
-	public NativeSearchQueryBuilder withTypes(String... types) {
-		this.types = types;
-		return this;
-	}
-
-	public NativeSearchQueryBuilder withFields(String... fields) {
-		this.fields = fields;
-		return this;
-	}
-
-	public NativeSearchQueryBuilder withSourceFilter(SourceFilter sourceFilter) {
-				this.sourceFilter = sourceFilter;
-				return this;
-	}
-
-	public NativeSearchQueryBuilder withMinScore(float minScore) {
-		this.minScore = minScore;
-		return this;
-	}
-
-	public NativeSearchQueryBuilder withIds(Collection<String> ids) {
-		this.ids = ids;
-		return this;
-	}
-
-	public NativeSearchQueryBuilder withRoute(String route) {
-		this.route = route;
-		return this;
-	}
-
-	public NativeSearchQueryBuilder withSearchType(SearchType searchType) {
-		this.searchType = searchType;
-		return this;
-	}
-
-	public NativeSearchQuery build() {
-		NativeSearchQuery nativeSearchQuery = new NativeSearchQuery(queryBuilder, filterBuilder, sortBuilders, highlightFields);
-		if (pageable != null) {
-			nativeSearchQuery.setPageable(pageable);
-		}
-
-		if (indices != null) {
-			nativeSearchQuery.addIndices(indices);
-		}
-
-		if (types != null) {
-			nativeSearchQuery.addTypes(types);
-		}
-
-		if (fields != null) {
-			nativeSearchQuery.addFields(fields);
-		}
-
-		if (sourceFilter != null) {
-			nativeSearchQuery.addSourceFilter(sourceFilter);
-		}
-		
-		if(indicesBoost != null) {
-		    nativeSearchQuery.setIndicesBoost(indicesBoost);
-		}
-		
-        if (!isEmpty(scriptFields)) {
-            nativeSearchQuery.setScriptFields(scriptFields);
-        }
-
-		if (!isEmpty(facetRequests)) {
-			nativeSearchQuery.setFacets(facetRequests);
-		}
-
-		if (!isEmpty(aggregationBuilders)) {
-			nativeSearchQuery.setAggregations(aggregationBuilders);
-		}
-
-		if (minScore > 0) {
-			nativeSearchQuery.setMinScore(minScore);
-		}
-
-		if (ids != null) {
-			nativeSearchQuery.setIds(ids);
-		}
-
-		if (route != null) {
-			nativeSearchQuery.setRoute(route);
-		}
-
-		if (searchType != null) {
-			nativeSearchQuery.setSearchType(searchType);
-		}
-
-		return nativeSearchQuery;
-	}
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core.query;
+
+import static org.springframework.util.CollectionUtils.isEmpty;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import org.elasticsearch.action.search.SearchType;
+import org.elasticsearch.index.query.QueryBuilder;
+import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
+import org.elasticsearch.search.highlight.HighlightBuilder;
+import org.elasticsearch.search.sort.SortBuilder;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.elasticsearch.core.facet.FacetRequest;
+
+/**
+ * NativeSearchQuery
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Artur Konczak
+ */
+
+public class NativeSearchQueryBuilder {
+
+	private QueryBuilder queryBuilder;
+	private QueryBuilder filterBuilder;
+    private List<ScriptField> scriptFields = new ArrayList<ScriptField>();
+	private List<SortBuilder> sortBuilders = new ArrayList<SortBuilder>();
+	private List<FacetRequest> facetRequests = new ArrayList<FacetRequest>();
+	private List<AbstractAggregationBuilder> aggregationBuilders = new ArrayList<AbstractAggregationBuilder>();
+	private HighlightBuilder.Field[] highlightFields;
+	private Pageable pageable;
+	private String[] indices;
+	private String[] types;
+	private String[] fields;
+	private SourceFilter sourceFilter;
+	private List<IndexBoost> indicesBoost;
+	private float minScore;
+	private Collection<String> ids;
+	private String route;
+	private SearchType searchType;
+
+	public NativeSearchQueryBuilder withQuery(QueryBuilder queryBuilder) {
+		this.queryBuilder = queryBuilder;
+		return this;
+	}
+
+	public NativeSearchQueryBuilder withFilter(QueryBuilder filterBuilder) {
+		this.filterBuilder = filterBuilder;
+		return this;
+	}
+
+	public NativeSearchQueryBuilder withSort(SortBuilder sortBuilder) {
+		this.sortBuilders.add(sortBuilder);
+		return this;
+	}
+
+    public NativeSearchQueryBuilder withScriptField(ScriptField scriptField) {
+        this.scriptFields.add(scriptField);
+        return this;
+    }
+
+	public NativeSearchQueryBuilder addAggregation(AbstractAggregationBuilder aggregationBuilder) {
+		this.aggregationBuilders.add(aggregationBuilder);
+		return this;
+	}
+
+	public NativeSearchQueryBuilder withFacet(FacetRequest facetRequest) {
+		facetRequests.add(facetRequest);
+		return this;
+	}
+
+	public NativeSearchQueryBuilder withHighlightFields(HighlightBuilder.Field... highlightFields) {
+		this.highlightFields = highlightFields;
+		return this;
+	}
+
+	public NativeSearchQueryBuilder withIndicesBoost(List<IndexBoost> indicesBoost) {
+		this.indicesBoost = indicesBoost;
+		return this;
+	}
+
+	public NativeSearchQueryBuilder withPageable(Pageable pageable) {
+		this.pageable = pageable;
+		return this;
+	}
+
+	public NativeSearchQueryBuilder withIndices(String... indices) {
+		this.indices = indices;
+		return this;
+	}
+
+	public NativeSearchQueryBuilder withTypes(String... types) {
+		this.types = types;
+		return this;
+	}
+
+	public NativeSearchQueryBuilder withFields(String... fields) {
+		this.fields = fields;
+		return this;
+	}
+
+	public NativeSearchQueryBuilder withSourceFilter(SourceFilter sourceFilter) {
+				this.sourceFilter = sourceFilter;
+				return this;
+	}
+
+	public NativeSearchQueryBuilder withMinScore(float minScore) {
+		this.minScore = minScore;
+		return this;
+	}
+
+	public NativeSearchQueryBuilder withIds(Collection<String> ids) {
+		this.ids = ids;
+		return this;
+	}
+
+	public NativeSearchQueryBuilder withRoute(String route) {
+		this.route = route;
+		return this;
+	}
+
+	public NativeSearchQueryBuilder withSearchType(SearchType searchType) {
+		this.searchType = searchType;
+		return this;
+	}
+
+	public NativeSearchQuery build() {
+		NativeSearchQuery nativeSearchQuery = new NativeSearchQuery(queryBuilder, filterBuilder, sortBuilders, highlightFields);
+		if (pageable != null) {
+			nativeSearchQuery.setPageable(pageable);
+		}
+
+		if (indices != null) {
+			nativeSearchQuery.addIndices(indices);
+		}
+
+		if (types != null) {
+			nativeSearchQuery.addTypes(types);
+		}
+
+		if (fields != null) {
+			nativeSearchQuery.addFields(fields);
+		}
+
+		if (sourceFilter != null) {
+			nativeSearchQuery.addSourceFilter(sourceFilter);
+		}
+		
+		if(indicesBoost != null) {
+		    nativeSearchQuery.setIndicesBoost(indicesBoost);
+		}
+		
+        if (!isEmpty(scriptFields)) {
+            nativeSearchQuery.setScriptFields(scriptFields);
+        }
+
+		if (!isEmpty(facetRequests)) {
+			nativeSearchQuery.setFacets(facetRequests);
+		}
+
+		if (!isEmpty(aggregationBuilders)) {
+			nativeSearchQuery.setAggregations(aggregationBuilders);
+		}
+
+		if (minScore > 0) {
+			nativeSearchQuery.setMinScore(minScore);
+		}
+
+		if (ids != null) {
+			nativeSearchQuery.setIds(ids);
+		}
+
+		if (route != null) {
+			nativeSearchQuery.setRoute(route);
+		}
+
+		if (searchType != null) {
+			nativeSearchQuery.setSearchType(searchType);
+		}
+
+		return nativeSearchQuery;
+	}
+}

src/main/java/org/springframework/data/elasticsearch/core/query/Query.java

@@ -1,157 +1,157 @@
-/*
- * Copyright 2013-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core.query;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.elasticsearch.action.search.SearchType;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-
-/**
- * Query
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-public interface Query {
-
-	public static final int DEFAULT_PAGE_SIZE = 10;
-	public static final Pageable DEFAULT_PAGE = new PageRequest(0, DEFAULT_PAGE_SIZE);
-
-	/**
-	 * restrict result to entries on given page. Corresponds to the 'start' and 'rows' parameter in elasticsearch
-	 *
-	 * @param pageable
-	 * @return
-	 */
-	<T extends Query> T setPageable(Pageable pageable);
-
-	/**
-	 * Get filter queries if defined
-	 *
-	 * @return
-	 */
-	// List<FilterQuery> getFilterQueries();
-
-	/**
-	 * Get page settings if defined
-	 *
-	 * @return
-	 */
-	Pageable getPageable();
-
-	/**
-	 * Add {@link org.springframework.data.domain.Sort} to query
-	 *
-	 * @param sort
-	 * @return
-	 */
-	<T extends Query> T addSort(Sort sort);
-
-	/**
-	 * @return null if not set
-	 */
-	Sort getSort();
-
-	/**
-	 * Get Indices to be searched
-	 *
-	 * @return
-	 */
-	List<String> getIndices();
-
-	/**
-	 * Add Indices to be added as part of search request
-	 *
-	 * @param indices
-	 */
-	void addIndices(String... indices);
-
-	/**
-	 * Add types to be searched
-	 *
-	 * @param types
-	 */
-	void addTypes(String... types);
-
-	/**
-	 * Get types to be searched
-	 *
-	 * @return
-	 */
-	List<String> getTypes();
-
-	/**
-	 * Add fields to be added as part of search request
-	 *
-	 * @param fields
-	 */
-	void addFields(String... fields);
-
-	/**
-	 * Get fields to be returned as part of search request
-	 *
-	 * @return
-	 */
-	List<String> getFields();
-
-	/**
-	 * Add source filter to be added as part of search request
-	 *
-	 * @param sourceFilter
-	 */
-	void addSourceFilter(SourceFilter sourceFilter);
-
-	/**
-	 * Get SourceFilter to be returned to get include and exclude source
-	 * fields as part of search request.
-	 *
-	 * @return SourceFilter
-	 */
-	SourceFilter getSourceFilter();
-
-	/**
-	 * Get minimum score
-	 *
-	 * @return
-	 */
-	float getMinScore();
-
-	/**
-	 * Get Ids
-	 *
-	 * @return
-	 */
-	Collection<String> getIds();
-
-	/**
-	 * Get route
-	 *
-	 * @return
-	 */
-	String getRoute();
-
-
-	/**
-	 * Type of search
-	 *
-	 * @return
-	 */
-	SearchType getSearchType();
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core.query;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.elasticsearch.action.search.SearchType;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+
+/**
+ * Query
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+public interface Query {
+
+	public static final int DEFAULT_PAGE_SIZE = 10;
+	public static final Pageable DEFAULT_PAGE = new PageRequest(0, DEFAULT_PAGE_SIZE);
+
+	/**
+	 * restrict result to entries on given page. Corresponds to the 'start' and 'rows' parameter in elasticsearch
+	 *
+	 * @param pageable
+	 * @return
+	 */
+	<T extends Query> T setPageable(Pageable pageable);
+
+	/**
+	 * Get filter queries if defined
+	 *
+	 * @return
+	 */
+	// List<FilterQuery> getFilterQueries();
+
+	/**
+	 * Get page settings if defined
+	 *
+	 * @return
+	 */
+	Pageable getPageable();
+
+	/**
+	 * Add {@link org.springframework.data.domain.Sort} to query
+	 *
+	 * @param sort
+	 * @return
+	 */
+	<T extends Query> T addSort(Sort sort);
+
+	/**
+	 * @return null if not set
+	 */
+	Sort getSort();
+
+	/**
+	 * Get Indices to be searched
+	 *
+	 * @return
+	 */
+	List<String> getIndices();
+
+	/**
+	 * Add Indices to be added as part of search request
+	 *
+	 * @param indices
+	 */
+	void addIndices(String... indices);
+
+	/**
+	 * Add types to be searched
+	 *
+	 * @param types
+	 */
+	void addTypes(String... types);
+
+	/**
+	 * Get types to be searched
+	 *
+	 * @return
+	 */
+	List<String> getTypes();
+
+	/**
+	 * Add fields to be added as part of search request
+	 *
+	 * @param fields
+	 */
+	void addFields(String... fields);
+
+	/**
+	 * Get fields to be returned as part of search request
+	 *
+	 * @return
+	 */
+	List<String> getFields();
+
+	/**
+	 * Add source filter to be added as part of search request
+	 *
+	 * @param sourceFilter
+	 */
+	void addSourceFilter(SourceFilter sourceFilter);
+
+	/**
+	 * Get SourceFilter to be returned to get include and exclude source
+	 * fields as part of search request.
+	 *
+	 * @return SourceFilter
+	 */
+	SourceFilter getSourceFilter();
+
+	/**
+	 * Get minimum score
+	 *
+	 * @return
+	 */
+	float getMinScore();
+
+	/**
+	 * Get Ids
+	 *
+	 * @return
+	 */
+	Collection<String> getIds();
+
+	/**
+	 * Get route
+	 *
+	 * @return
+	 */
+	String getRoute();
+
+
+	/**
+	 * Type of search
+	 *
+	 * @return
+	 */
+	SearchType getSearchType();
+}

src/main/java/org/springframework/data/elasticsearch/core/query/SearchQuery.java

@@ -1,52 +1,52 @@
-/*
- * Copyright 2013-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core.query;
-
-import java.util.List;
-
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
-import org.elasticsearch.search.highlight.HighlightBuilder;
-import org.elasticsearch.search.sort.SortBuilder;
-import org.springframework.data.elasticsearch.core.facet.FacetRequest;
-
-/**
- * NativeSearchQuery
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Artur Konczak
- */
-public interface SearchQuery extends Query {
-
-	QueryBuilder getQuery();
-
-	QueryBuilder getFilter();
-
-	List<SortBuilder> getElasticsearchSorts();
-
-	@Deprecated
-	List<FacetRequest> getFacets();
-
-	List<AbstractAggregationBuilder> getAggregations();
-
-	HighlightBuilder.Field[] getHighlightFields();
-
-	List<IndexBoost> getIndicesBoost();
-
-    List<ScriptField> getScriptFields();
-
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core.query;
+
+import java.util.List;
+
+import org.elasticsearch.index.query.QueryBuilder;
+import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
+import org.elasticsearch.search.highlight.HighlightBuilder;
+import org.elasticsearch.search.sort.SortBuilder;
+import org.springframework.data.elasticsearch.core.facet.FacetRequest;
+
+/**
+ * NativeSearchQuery
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Artur Konczak
+ */
+public interface SearchQuery extends Query {
+
+	QueryBuilder getQuery();
+
+	QueryBuilder getFilter();
+
+	List<SortBuilder> getElasticsearchSorts();
+
+	@Deprecated
+	List<FacetRequest> getFacets();
+
+	List<AbstractAggregationBuilder> getAggregations();
+
+	HighlightBuilder.Field[] getHighlightFields();
+
+	List<IndexBoost> getIndicesBoost();
+
+    List<ScriptField> getScriptFields();
+
+}

src/main/java/org/springframework/data/elasticsearch/core/query/SimpleField.java

@@ -1,41 +1,41 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core.query;
-
-/**
- * The most trivial implementation of a Field
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-public class SimpleField implements Field {
-
-	private final String name;
-
-	public SimpleField(String name) {
-		this.name = name;
-	}
-
-	@Override
-	public String getName() {
-		return this.name;
-	}
-
-	@Override
-	public String toString() {
-		return this.name;
-	}
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core.query;
+
+/**
+ * The most trivial implementation of a Field
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+public class SimpleField implements Field {
+
+	private final String name;
+
+	public SimpleField(String name) {
+		this.name = name;
+	}
+
+	@Override
+	public String getName() {
+		return this.name;
+	}
+
+	@Override
+	public String toString() {
+		return this.name;
+	}
+}

src/main/java/org/springframework/data/elasticsearch/core/query/SourceFilter.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/core/query/StringQuery.java

@@ -1,49 +1,49 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core.query;
-
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-
-/**
- * StringQuery
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-public class StringQuery extends AbstractQuery {
-
-	private String source;
-
-	public StringQuery(String source) {
-		this.source = source;
-	}
-
-	public StringQuery(String source, Pageable pageable) {
-		this.source = source;
-		this.pageable = pageable;
-	}
-
-	public StringQuery(String source, Pageable pageable, Sort sort) {
-		this.pageable = pageable;
-		this.sort = sort;
-		this.source = source;
-	}
-
-	public String getSource() {
-		return source;
-	}
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core.query;
+
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+
+/**
+ * StringQuery
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+public class StringQuery extends AbstractQuery {
+
+	private String source;
+
+	public StringQuery(String source) {
+		this.source = source;
+	}
+
+	public StringQuery(String source, Pageable pageable) {
+		this.source = source;
+		this.pageable = pageable;
+	}
+
+	public StringQuery(String source, Pageable pageable, Sort sort) {
+		this.pageable = pageable;
+		this.sort = sort;
+		this.source = source;
+	}
+
+	public String getSource() {
+		return source;
+	}
+}

src/main/java/org/springframework/data/elasticsearch/core/query/UpdateQuery.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/core/query/UpdateQueryBuilder.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/elasticsearch/repository/ElasticsearchCrudRepository.java

@@ -1,33 +1,33 @@
-/*
- * Copyright 2013-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.repository;
-
-import java.io.Serializable;
-
-import org.springframework.data.repository.NoRepositoryBean;
-import org.springframework.data.repository.PagingAndSortingRepository;
-
-/**
- * @param <T>
- * @param <ID>
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Oliver Gierke
- */
-@NoRepositoryBean
-public interface ElasticsearchCrudRepository<T, ID extends Serializable> extends PagingAndSortingRepository<T, ID> {
-
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.repository;
+
+import java.io.Serializable;
+
+import org.springframework.data.repository.NoRepositoryBean;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+/**
+ * @param <T>
+ * @param <ID>
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Oliver Gierke
+ */
+@NoRepositoryBean
+public interface ElasticsearchCrudRepository<T, ID extends Serializable> extends PagingAndSortingRepository<T, ID> {
+
+}

src/main/java/org/springframework/data/elasticsearch/repository/ElasticsearchRepository.java

@@ -1,48 +1,48 @@
-/*
- * Copyright 2013-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.repository;
-
-import java.io.Serializable;
-
-import org.elasticsearch.index.query.QueryBuilder;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.elasticsearch.core.query.SearchQuery;
-import org.springframework.data.repository.NoRepositoryBean;
-
-/**
- * @param <T>
- * @param <ID>
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-@NoRepositoryBean
-public interface ElasticsearchRepository<T, ID extends Serializable> extends ElasticsearchCrudRepository<T, ID> {
-
-	<S extends T> S index(S entity);
-
-	Iterable<T> search(QueryBuilder query);
-
-	Page<T> search(QueryBuilder query, Pageable pageable);
-
-	Page<T> search(SearchQuery searchQuery);
-
-	Page<T> searchSimilar(T entity, String[] fields, Pageable pageable);
-
-	void refresh();
-
-	Class<T> getEntityClass();
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.repository;
+
+import java.io.Serializable;
+
+import org.elasticsearch.index.query.QueryBuilder;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.elasticsearch.core.query.SearchQuery;
+import org.springframework.data.repository.NoRepositoryBean;
+
+/**
+ * @param <T>
+ * @param <ID>
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+@NoRepositoryBean
+public interface ElasticsearchRepository<T, ID extends Serializable> extends ElasticsearchCrudRepository<T, ID> {
+
+	<S extends T> S index(S entity);
+
+	Iterable<T> search(QueryBuilder query);
+
+	Page<T> search(QueryBuilder query, Pageable pageable);
+
+	Page<T> search(SearchQuery searchQuery);
+
+	Page<T> searchSimilar(T entity, String[] fields, Pageable pageable);
+
+	void refresh();
+
+	Class<T> getEntityClass();
+}

src/main/java/org/springframework/data/elasticsearch/repository/cdi/ElasticsearchRepositoryBean.java

@@ -1,71 +1,71 @@
-/*
- * Copyright 2013-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.repository.cdi;
-
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import java.lang.annotation.Annotation;
-import java.util.Set;
-
-import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
-import org.springframework.data.elasticsearch.repository.support.ElasticsearchRepositoryFactory;
-import org.springframework.data.repository.cdi.CdiRepositoryBean;
-import org.springframework.data.repository.config.CustomRepositoryImplementationDetector;
-import org.springframework.util.Assert;
-
-/**
- * Uses CdiRepositoryBean to create ElasticsearchRepository instances.
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Mark Paluch
- */
-public class ElasticsearchRepositoryBean<T> extends CdiRepositoryBean<T> {
-
-	private final Bean<ElasticsearchOperations> elasticsearchOperationsBean;
-
-	/**
-	 * Creates a new {@link ElasticsearchRepositoryBean}.
-	 *
-	 * @param operations must not be {@literal null}.
-	 * @param qualifiers must not be {@literal null}.
-	 * @param repositoryType must not be {@literal null}.
-	 * @param beanManager must not be {@literal null}.
-	 * @param detector detector for the custom {@link org.springframework.data.repository.Repository} implementations
-	 * {@link CustomRepositoryImplementationDetector}, can be {@literal null}.
-	 */
-	public ElasticsearchRepositoryBean(Bean<ElasticsearchOperations> operations, Set<Annotation> qualifiers,
-									   Class<T> repositoryType, BeanManager beanManager, CustomRepositoryImplementationDetector detector) {
-		super(qualifiers, repositoryType, beanManager, detector);
-
-		Assert.notNull(operations, "Cannot create repository with 'null' for ElasticsearchOperations.");
-		this.elasticsearchOperationsBean = operations;
-	}
-
-	@Override
-	protected T create(CreationalContext<T> creationalContext, Class<T> repositoryType, Object customImplementation) {
-		ElasticsearchOperations elasticsearchOperations = getDependencyInstance(elasticsearchOperationsBean,
-				ElasticsearchOperations.class);
-		return new ElasticsearchRepositoryFactory(elasticsearchOperations).getRepository(repositoryType,
-				customImplementation);
-	}
-
-	@Override
-	public Class<? extends Annotation> getScope() {
-		return elasticsearchOperationsBean.getScope();
-	}
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.repository.cdi;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import java.lang.annotation.Annotation;
+import java.util.Set;
+
+import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
+import org.springframework.data.elasticsearch.repository.support.ElasticsearchRepositoryFactory;
+import org.springframework.data.repository.cdi.CdiRepositoryBean;
+import org.springframework.data.repository.config.CustomRepositoryImplementationDetector;
+import org.springframework.util.Assert;
+
+/**
+ * Uses CdiRepositoryBean to create ElasticsearchRepository instances.
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Mark Paluch
+ */
+public class ElasticsearchRepositoryBean<T> extends CdiRepositoryBean<T> {
+
+	private final Bean<ElasticsearchOperations> elasticsearchOperationsBean;
+
+	/**
+	 * Creates a new {@link ElasticsearchRepositoryBean}.
+	 *
+	 * @param operations must not be {@literal null}.
+	 * @param qualifiers must not be {@literal null}.
+	 * @param repositoryType must not be {@literal null}.
+	 * @param beanManager must not be {@literal null}.
+	 * @param detector detector for the custom {@link org.springframework.data.repository.Repository} implementations
+	 * {@link CustomRepositoryImplementationDetector}, can be {@literal null}.
+	 */
+	public ElasticsearchRepositoryBean(Bean<ElasticsearchOperations> operations, Set<Annotation> qualifiers,
+									   Class<T> repositoryType, BeanManager beanManager, CustomRepositoryImplementationDetector detector) {
+		super(qualifiers, repositoryType, beanManager, detector);
+
+		Assert.notNull(operations, "Cannot create repository with 'null' for ElasticsearchOperations.");
+		this.elasticsearchOperationsBean = operations;
+	}
+
+	@Override
+	protected T create(CreationalContext<T> creationalContext, Class<T> repositoryType, Object customImplementation) {
+		ElasticsearchOperations elasticsearchOperations = getDependencyInstance(elasticsearchOperationsBean,
+				ElasticsearchOperations.class);
+		return new ElasticsearchRepositoryFactory(elasticsearchOperations).getRepository(repositoryType,
+				customImplementation);
+	}
+
+	@Override
+	public Class<? extends Annotation> getScope() {
+		return elasticsearchOperationsBean.getScope();
+	}
+}

src/main/java/org/springframework/data/elasticsearch/repository/cdi/ElasticsearchRepositoryExtension.java

@@ -1,82 +1,82 @@
-/*
- * Copyright 2013-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.repository.cdi;
-
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.UnsatisfiedResolutionException;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.ProcessBean;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
-import org.springframework.data.repository.cdi.CdiRepositoryBean;
-import org.springframework.data.repository.cdi.CdiRepositoryExtensionSupport;
-
-/**
- * CDI extension to export Elasticsearch repositories.
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Oliver Gierke
- * @author Mark Paluch
- */
-public class ElasticsearchRepositoryExtension extends CdiRepositoryExtensionSupport {
-
-	private final Map<Set<Annotation>, Bean<ElasticsearchOperations>> elasticsearchOperationsMap = new HashMap<Set<Annotation>, Bean<ElasticsearchOperations>>();
-
-	@SuppressWarnings("unchecked")
-	<T> void processBean(@Observes ProcessBean<T> processBean) {
-		Bean<T> bean = processBean.getBean();
-		for (Type type : bean.getTypes()) {
-			if (type instanceof Class<?> && ElasticsearchOperations.class.isAssignableFrom((Class<?>) type)) {
-				elasticsearchOperationsMap.put(bean.getQualifiers(), ((Bean<ElasticsearchOperations>) bean));
-			}
-		}
-	}
-
-	void afterBeanDiscovery(@Observes AfterBeanDiscovery afterBeanDiscovery, BeanManager beanManager) {
-		for (Entry<Class<?>, Set<Annotation>> entry : getRepositoryTypes()) {
-
-			Class<?> repositoryType = entry.getKey();
-			Set<Annotation> qualifiers = entry.getValue();
-
-			CdiRepositoryBean<?> repositoryBean = createRepositoryBean(repositoryType, qualifiers, beanManager);
-			afterBeanDiscovery.addBean(repositoryBean);
-			registerBean(repositoryBean);
-		}
-	}
-
-	private <T> CdiRepositoryBean<T> createRepositoryBean(Class<T> repositoryType, Set<Annotation> qualifiers,
-														  BeanManager beanManager) {
-
-		Bean<ElasticsearchOperations> elasticsearchOperationsBean = this.elasticsearchOperationsMap.get(qualifiers);
-
-		if (elasticsearchOperationsBean == null) {
-			throw new UnsatisfiedResolutionException(String.format("Unable to resolve a bean for '%s' with qualifiers %s.",
-					ElasticsearchOperations.class.getName(), qualifiers));
-		}
-
-		return new ElasticsearchRepositoryBean<T>(elasticsearchOperationsBean, qualifiers, repositoryType, beanManager,
-				getCustomImplementationDetector());
-	}
-}
+/*
+ * Copyright 2013-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.repository.cdi;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.UnsatisfiedResolutionException;
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.ProcessBean;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
+import org.springframework.data.repository.cdi.CdiRepositoryBean;
+import org.springframework.data.repository.cdi.CdiRepositoryExtensionSupport;
+
+/**
+ * CDI extension to export Elasticsearch repositories.
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Oliver Gierke
+ * @author Mark Paluch
+ */
+public class ElasticsearchRepositoryExtension extends CdiRepositoryExtensionSupport {
+
+	private final Map<Set<Annotation>, Bean<ElasticsearchOperations>> elasticsearchOperationsMap = new HashMap<Set<Annotation>, Bean<ElasticsearchOperations>>();
+
+	@SuppressWarnings("unchecked")
+	<T> void processBean(@Observes ProcessBean<T> processBean) {
+		Bean<T> bean = processBean.getBean();
+		for (Type type : bean.getTypes()) {
+			if (type instanceof Class<?> && ElasticsearchOperations.class.isAssignableFrom((Class<?>) type)) {
+				elasticsearchOperationsMap.put(bean.getQualifiers(), ((Bean<ElasticsearchOperations>) bean));
+			}
+		}
+	}
+
+	void afterBeanDiscovery(@Observes AfterBeanDiscovery afterBeanDiscovery, BeanManager beanManager) {
+		for (Entry<Class<?>, Set<Annotation>> entry : getRepositoryTypes()) {
+
+			Class<?> repositoryType = entry.getKey();
+			Set<Annotation> qualifiers = entry.getValue();
+
+			CdiRepositoryBean<?> repositoryBean = createRepositoryBean(repositoryType, qualifiers, beanManager);
+			afterBeanDiscovery.addBean(repositoryBean);
+			registerBean(repositoryBean);
+		}
+	}
+
+	private <T> CdiRepositoryBean<T> createRepositoryBean(Class<T> repositoryType, Set<Annotation> qualifiers,
+														  BeanManager beanManager) {
+
+		Bean<ElasticsearchOperations> elasticsearchOperationsBean = this.elasticsearchOperationsMap.get(qualifiers);
+
+		if (elasticsearchOperationsBean == null) {
+			throw new UnsatisfiedResolutionException(String.format("Unable to resolve a bean for '%s' with qualifiers %s.",
+					ElasticsearchOperations.class.getName(), qualifiers));
+		}
+
+		return new ElasticsearchRepositoryBean<T>(elasticsearchOperationsBean, qualifiers, repositoryType, beanManager,
+				getCustomImplementationDetector());
+	}
+}

src/main/java/org/springframework/data/elasticsearch/repository/config/ElasticsearchRepositoriesRegistrar.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,