Merge commit '4e4e8586b744bc371db774f2b7115647003d2965' into feature/…

…persistence_refactor

elastic/src/main/java/org/openmbee/mms/elastic/config/ElasticsearchConfig.java

@@ -1,8 +1,14 @@
 package org.openmbee.mms.elastic.config;
 
 import org.apache.http.HttpHost;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
 import org.elasticsearch.client.RestClient;
 import org.elasticsearch.client.RestClientBuilder;
+import org.elasticsearch.client.RestClientBuilder.HttpClientConfigCallback;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
@@ -18,11 +24,35 @@ public class ElasticsearchConfig {
     @Value("${elasticsearch.http}")
     private String elasticsearchHttp;
 
+    @Value("${elasticsearch.password}")
+    private String elasticsearchPassword;
+    @Value("${elasticsearch.username}")
+    private String elasticsearchUsername;
+
     @Bean(name = "clientElastic", destroyMethod = "close")
     public RestHighLevelClient restClient() {
 
+
+
         RestClientBuilder builder = RestClient.builder(new HttpHost(elasticsearchHost, elasticsearchPort, elasticsearchHttp));
         builder.setRequestConfigCallback(requestConfigBuilder -> requestConfigBuilder.setConnectTimeout(10000).setSocketTimeout(1000000));
+
+        if (elasticsearchPassword != null && elasticsearchUsername != null && !elasticsearchPassword.isEmpty() && !elasticsearchUsername.isEmpty()) {
+            final CredentialsProvider credentialsProvider =
+                new BasicCredentialsProvider();
+            credentialsProvider.setCredentials(AuthScope.ANY,
+                new UsernamePasswordCredentials(elasticsearchUsername, elasticsearchPassword));
+            builder.setHttpClientConfigCallback(new HttpClientConfigCallback() {
+            @Override
+            public HttpAsyncClientBuilder customizeHttpClient(
+                    HttpAsyncClientBuilder httpClientBuilder) {
+                return httpClientBuilder
+                    .setDefaultCredentialsProvider(credentialsProvider);
+            }
+        });
+        }
+
+
         RestHighLevelClient client = new RestHighLevelClient(builder);
         return client;
     }

elastic/src/main/resources/application.properties.example

@@ -5,4 +5,8 @@ elasticsearch.limit.result=100
 elasticsearch.limit.term=100
 elasticsearch.limit.scrollTimeout=1000
 elasticsearch.limit.get=100000
-elasticsearch.limit.index=5000
+elasticsearch.limit.index=5000
+
+#Optional Elasticsearch Basic Authentication Credentials
+elasticsearch.username=
+elasticsearch.password=

example/src/main/resources/application-test.properties

@@ -50,6 +50,8 @@ spring.main.allow-circular-references=true
 spring.mvc.pathmatch.matching-strategy=ant_path_matcher
 
 #Configuration for Elasticsearch
+# elasticsearch.username=
+# elasticsearch.password=
 elasticsearch.host=elasticsearch
 elasticsearch.port=9200
 elasticsearch.http=http

example/src/main/resources/application.properties.example

@@ -63,6 +63,10 @@ elasticsearch.limit.get=100000
 elasticsearch.limit.index=5000
 elasticsearch.limit.commit=100000
 
+#optional Elasticsearch Basic Authentication Credentials
+elasticsearch.username=
+elasticsearch.password=
+
 #Configuration for TWC
 #port is for REST interface
 #aliases are for clustered usages