Commit a3302c6b authored by Noel Alonso's avatar Noel Alonso
Browse files

Añade autorización como cabecera al transport

parent 288ee3f7

src/main/java/es/redmic/elasticsearchlib/config/ElasticsearchConfiguration.java

+6 −0
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ public class ElasticsearchConfiguration { 
	private Integer port;

	@Value("${elastic.clusterName}")

	private String clusterName;

	@Value("${elastic.user}")

	private String user;

	@Value("${elastic.password}")

	private String password;



	@Bean

	public EsClientProvider esClientProvider() {
@@ -23,6 +27,8 @@ public class ElasticsearchConfiguration { 
		elastic.setAddresses(addresses);

		elastic.setPort(port);

		elastic.setClusterName(clusterName);

		elastic.setUser(user);

		elastic.setPassword(password);

		return new EsClientProvider(elastic);

	}

}

src/main/java/es/redmic/elasticsearchlib/config/EsClientProvider.java

+9 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ package es.redmic.elasticsearchlib.config; 


import java.net.InetAddress;

import java.net.UnknownHostException;

import java.util.Base64;

import java.util.List;



import javax.annotation.PostConstruct;
@@ -24,7 +25,9 @@ public class EsClientProvider { 


	private List<String> addresses;

	private Integer port;

	private String clusterName;;

	private String clusterName;

	private String user;

	private String password;



	protected static Logger logger = LogManager.getLogger();
@@ -32,6 +35,8 @@ public class EsClientProvider { 
		this.addresses = config.getAddresses();

		this.port = config.getPort();

		this.clusterName = config.getClusterName();

		this.user = config.getUser();

		this.password = config.getPassword();

	}



	public TransportClient getClient() {
@@ -49,9 +54,12 @@ public class EsClientProvider { 
				.put("cluster.name", this.clusterName)

				.build();



		String authorization = Base64.getEncoder().encodeToString((user + ":" + password).getBytes());

		

		// @formatter:on



		client = new PreBuiltTransportClient(settings);

		client.threadPool().getThreadContext().putHeader("Authorization", "Basic " + authorization);



		for (String address : addresses) {

			try {
@@ -72,5 +80,4 @@ public class EsClientProvider { 
	private void disconnect() {

		client.close();

	}



}

src/main/java/es/redmic/elasticsearchlib/config/EsConfig.java

+21 −1
Original line number Diff line number Diff line
@@ -7,14 +7,18 @@ public class EsConfig { 
	private List<String> addresses;

	private Integer port;

	private String clusterName;

	private String user;

	private String password;



	public EsConfig() {

	}



	public EsConfig(List<String> addresses, Integer port, String clusterName) {

	public EsConfig(List<String> addresses, Integer port, String clusterName, String user, String password) {

		this.addresses = addresses;

		this.port = port;

		this.clusterName = clusterName;

		this.user = user;

		this.password = password;

	}



	public List<String> getAddresses() {
@@ -40,4 +44,20 @@ public class EsConfig { 
	public void setClusterName(String clusterName) {

		this.clusterName = clusterName;

	}



	public String getUser() {

		return user;

	}



	public void setUser(String user) {

		this.user = user;

	}



	public String getPassword() {

		return password;

	}



	public void setPassword(String password) {

		this.password = password;

	}

}