Skip to content

Commit

Permalink
Remove predeploy annotations for future compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
@andreapagliacci
andreapagliacci committed Jul 26, 2023
1 parent 1a15c6b commit 5336732
Showing 1 changed file with 125 additions and 127 deletions.
252 changes: 125 additions & 127 deletions .../magnolia/forge/universalcontent/app/elasticsearch/connector/ElasticSearchConnection.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import java.util.LinkedList;
import java.util.List;

import javax.annotation.PreDestroy;
import javax.inject.Inject;

import org.apache.commons.collections4.CollectionUtils;
Expand Down Expand Up @@ -41,152 +40,151 @@
@Slf4j
public class ElasticSearchConnection implements CustomConnection {

@Getter
RestClient restClient;

/** The client. */
ElasticsearchClient client;

private Sniffer sniffer;

@Getter
@Setter
ElasticSearchParameterConnection params;
@Setter
@Getter
@Inject
ElasticSearchModuleCore elasticSearchModule;
@Setter
@Getter
ElasticsearchConfiguration elasticSearchConfiguration;

/**
* Instantiates a new elastic search connection.
*/
public ElasticSearchConnection() {
if (elasticSearchModule != null) {
this.elasticSearchConfiguration = elasticSearchModule.getConfiguration();
}
if (params != null) {
connection(params);
}
@Getter
RestClient restClient;

/** The client. */
ElasticsearchClient client;

private Sniffer sniffer;

@Getter
@Setter
ElasticSearchParameterConnection params;
@Setter
@Getter
@Inject
ElasticSearchModuleCore elasticSearchModule;
@Setter
@Getter
ElasticsearchConfiguration elasticSearchConfiguration;

/**
* Instantiates a new elastic search connection.
*/
public ElasticSearchConnection() {
if (elasticSearchModule != null) {
this.elasticSearchConfiguration = elasticSearchModule.getConfiguration();
}

/**
* Connection.
*
* @param server the server
* @param port the port
*/
@Override
public void connection(ParameterConnection params) {
if (params != null) {
connection(params);
}
}

/**
* Connection.
*
* @param server the server
* @param port the port
*/
@Override
public void connection(ParameterConnection params) {
// restClient = RestClient.builder(new HttpHost(params.getServer(), Integer.valueOf(params.getPort())))
// .setDefaultHeaders(new Header[] { new BasicHeader("Content-type", "application/json"),
// new BasicHeader("X-Elastic-Product", "Elasticsearch") })
// .build();
ElasticsearchTransport transport = new RestClientTransport(restClient, new JacksonJsonpMapper());
client = new ElasticsearchClient(transport);

try {
if (elasticSearchModule != null) {
this.elasticSearchConfiguration = elasticSearchModule.getConfiguration();
ElasticsearchTransport transport = new RestClientTransport(restClient, new JacksonJsonpMapper());
client = new ElasticsearchClient(transport);

try {
if (elasticSearchModule != null) {
this.elasticSearchConfiguration = elasticSearchModule.getConfiguration();
}
if (elasticSearchConfiguration != null) {

List<HttpHost> httpHosts = new LinkedList<HttpHost>();
List<String> hosts = Arrays.asList(StringUtils.split(elasticSearchConfiguration.getHosts(), ","));
String port = elasticSearchConfiguration.getPort() == null ? "9200"
: elasticSearchConfiguration.getPort();

if (CollectionUtils.isNotEmpty(hosts)) {
for (String host : hosts) {
try {
HttpHost httpHost;
if (elasticSearchConfiguration.getHttps() != null
&& BooleanUtils.isTrue(elasticSearchConfiguration.getHttps())) {
httpHost = new HttpHost(host, Integer.parseInt(port), "https");
} else {
httpHost = new HttpHost(host, Integer.parseInt(port), "http");
}

if (httpHost != null) {
httpHosts.add(httpHost);
} else {
log.error("Cannot create http host from '{}'", host);
}
} catch (Exception e) {
log.error("Cannot create http host from '{}'", host, e);
}
if (elasticSearchConfiguration != null) {

List<HttpHost> httpHosts = new LinkedList<HttpHost>();
List<String> hosts = Arrays.asList(StringUtils.split(elasticSearchConfiguration.getHosts(), ","));
String port = elasticSearchConfiguration.getPort() == null ? "9200"
: elasticSearchConfiguration.getPort();

if (CollectionUtils.isNotEmpty(hosts)) {
for (String host : hosts) {
try {
HttpHost httpHost;
if (elasticSearchConfiguration.getHttps() != null
&& BooleanUtils.isTrue(elasticSearchConfiguration.getHttps())) {
httpHost = new HttpHost(host, Integer.parseInt(port), "https");
} else {
httpHost = new HttpHost(host, Integer.parseInt(port), "http");
}

if (httpHost != null) {
httpHosts.add(httpHost);
} else {
log.error("Cannot create http host from '{}'", host);
}
} catch (Exception e) {
log.error("Cannot create http host from '{}'", host, e);
}
}
}
}
}

if (CollectionUtils.isNotEmpty(httpHosts)) {
RestClientBuilder builder = RestClient.builder(httpHosts.toArray(new HttpHost[httpHosts.size()]))
.setRequestConfigCallback(new RestClientBuilder.RequestConfigCallback() {
if (CollectionUtils.isNotEmpty(httpHosts)) {
RestClientBuilder builder = RestClient.builder(httpHosts.toArray(new HttpHost[httpHosts.size()]))
.setRequestConfigCallback(new RestClientBuilder.RequestConfigCallback() {

@Override
public Builder customizeRequestConfig(Builder requestConfigBuilder) {
return requestConfigBuilder
.setConnectTimeout(
(int) (long) elasticSearchConfiguration.getConnectTimeout())
.setSocketTimeout(
(int) (long) elasticSearchConfiguration.getSocketTimeout());
}

@Override
public Builder customizeRequestConfig(Builder requestConfigBuilder) {
return requestConfigBuilder
.setConnectTimeout(
(int) (long) elasticSearchConfiguration.getConnectTimeout())
.setSocketTimeout(
(int) (long) elasticSearchConfiguration.getSocketTimeout());
}
});

});
restClient = builder.build();

restClient = builder.build();
restClient = RestClient.builder(httpHosts.toArray(new HttpHost[httpHosts.size()])).build();

restClient = RestClient.builder(httpHosts.toArray(new HttpHost[httpHosts.size()])).build();
if (Boolean.valueOf(elasticSearchConfiguration.getSniffer())) {
sniffer = Sniffer.builder(restClient).build();
}

if (Boolean.valueOf(elasticSearchConfiguration.getSniffer())) {
sniffer = Sniffer.builder(restClient).build();
}
log.info("Successfully loaded Elasticsearch configuration");

log.info("Successfully loaded Elasticsearch configuration");
} else {
log.error(
"No valid http host can be built for connecting to elasticsearch: please check your magnolia.properties");
}

} else {
log.error(
"No valid http host can be built for connecting to elasticsearch: please check your magnolia.properties");
}
} else {
log.error(
"No valid configuration found for connecting to elasticsearch: please check your magnolia.properties");
}

} else {
log.error(
"No valid configuration found for connecting to elasticsearch: please check your magnolia.properties");
}
} catch (Exception e) {
log.error("Exception caught building Elasticserach's client", e);
}

} catch (Exception e) {
log.error("Exception caught building Elasticserach's client", e);
}
}

public void release() {
if (sniffer != null) {
try {
sniffer.close();
} catch (Exception e) {
log.error("Exception caught closing Elasticserach's sniffer", e);
}
}

@PreDestroy
public void release() {
if (sniffer != null) {
try {
sniffer.close();
} catch (Exception e) {
log.error("Exception caught closing Elasticserach's sniffer", e);
}
}
if (restClient != null) {
try {
restClient.close();
} catch (Exception e) {
log.error("Exception caught closing Elasticserach's client", e);
}
}
if (restClient != null) {
try {
restClient.close();
} catch (Exception e) {
log.error("Exception caught closing Elasticserach's client", e);
}
}
}

@Override
public void connect() {
connection(params);
}
@Override
public void connect() {
connection(params);
}

@Override
public void setParams(ParameterConnection parameterConnection) {
this.params = (ElasticSearchParameterConnection) parameterConnection;
}
@Override
public void setParams(ParameterConnection parameterConnection) {
this.params = (ElasticSearchParameterConnection) parameterConnection;
}

}

0 comments on commit 5336732

Please sign in to comment.