DATAES-407 - Support for HighLevelRestClient via ElasticsearchRestTemplate

Original pull request: spring-projects#216

Author: donrw

pom.xml

@@ -19,7 +19,7 @@
     <properties>
         <commonscollections>3.2.1</commonscollections>
         <commonslang>2.6</commonslang>
-        <elasticsearch>6.2.2</elasticsearch>
+        <elasticsearch>6.3.0</elasticsearch>
         <log4j>2.9.1</log4j>
         <springdata.commons>2.2.0.BUILD-SNAPSHOT</springdata.commons>
         <java-module-name>spring.data.elasticsearch</java-module-name>
@@ -79,6 +79,18 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+		    <groupId>org.elasticsearch.client</groupId>
+		    <artifactId>elasticsearch-rest-high-level-client</artifactId>
+		    <version>${elasticsearch}</version>
+		    <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+		</dependency>
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>log4j-over-slf4j</artifactId>
@@ -169,7 +181,7 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <version>${lombok}</version>
-            <scope>test</scope>
+            <scope>provided</scope>
         </dependency>
 
     </dependencies>

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

@@ -0,0 +1,95 @@
+/*
+ * Copyright 2018 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 lombok.extern.slf4j.Slf4j;
+
+import java.net.URL;
+import java.util.ArrayList;
+
+import org.apache.http.HttpHost;
+import org.elasticsearch.client.RestClient;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.util.Assert;
+
+/**
+ * RestClientFactoryBean
+ * 
+ * @author Don Wellington
+ */
+@Slf4j
+public class RestClientFactoryBean implements FactoryBean<RestHighLevelClient>, InitializingBean, DisposableBean {
+
+	private RestHighLevelClient client;
+	private String hosts = "http://localhost:9200";
+	static final String COMMA = ",";
+
+	@Override
+	public void destroy() throws Exception {
+		try {
+			log.info("Closing elasticSearch  client");
+			if (client != null) {
+				client.close();
+			}
+		} catch (final Exception e) {
+			log.error("Error closing ElasticSearch client: ", e);
+		}
+	}
+
+	@Override
+	public void afterPropertiesSet() throws Exception {
+		buildClient();
+	}
+
+	@Override
+	public RestHighLevelClient getObject() throws Exception {
+		return client;
+	}
+
+	@Override
+	public Class<?> getObjectType() {
+		return RestHighLevelClient.class;
+	}
+
+	@Override
+	public boolean isSingleton() {
+		return false;
+	}
+
+	protected void buildClient() throws Exception {
+
+		Assert.hasText(hosts, "[Assertion Failed] At least one host must be set.");
+		ArrayList<HttpHost> httpHosts = new ArrayList<HttpHost>();
+		for (String host : split(hosts, COMMA)) {
+			URL hostUrl = new URL(host);
+			httpHosts.add(new HttpHost(hostUrl.getHost(), hostUrl.getPort(), hostUrl.getProtocol()));
+		}
+		client = new RestHighLevelClient(RestClient.builder(httpHosts.toArray(new HttpHost[httpHosts.size()])));
+	}
+
+	public void setHosts(String hosts) {
+		this.hosts = hosts;
+	}
+
+	public String getHosts() {
+		return this.hosts;
+	}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2018 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.
@@ -25,8 +25,8 @@
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
+ * @author Don Wellington
  */
-
 public class ElasticsearchNamespaceHandler extends NamespaceHandlerSupport {
 
 	@Override
@@ -37,5 +37,6 @@ public void init() {
 		registerBeanDefinitionParser("repositories", parser);
 		registerBeanDefinitionParser("node-client", new NodeClientBeanDefinitionParser());
 		registerBeanDefinitionParser("transport-client", new TransportClientBeanDefinitionParser());
+		registerBeanDefinitionParser("rest-client", new RestClientBeanDefinitionParser());
 	}
 }

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

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2018 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.xml.AbstractBeanDefinitionParser;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.data.elasticsearch.client.RestClientFactoryBean;
+import org.w3c.dom.Element;
+
+/**
+ * @author Don Wellington
+ */
+public class RestClientBeanDefinitionParser extends AbstractBeanDefinitionParser {
+
+	@Override
+	protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(RestClientFactoryBean.class);
+		setConfigurations(element, builder);
+		return getSourcedBeanDefinition(builder, element, parserContext);
+	}
+
+	private void setConfigurations(Element element, BeanDefinitionBuilder builder) {
+		builder.addPropertyValue("hosts", element.getAttribute("hosts"));
+	}
+
+	private AbstractBeanDefinition getSourcedBeanDefinition(BeanDefinitionBuilder builder, Element source,
+			ParserContext context) {
+		AbstractBeanDefinition definition = builder.getBeanDefinition();
+		definition.setSource(context.extractSource(source));
+		return definition;
+	}
+}