Author: thomasm
Date: Wed Jul 15 07:48:38 2020
New Revision: 1879877
URL: http://svn.apache.org/viewvc?rev=1879877&view=rev
Log:
OAK-9136 Allow elasticsearch port to be read from secrets
Modified:
jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexProviderService.java
Modified:
jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexProviderService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexProviderService.java?rev=1879877&r1=1879876&r2=1879877&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexProviderService.java
(original)
+++
jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexProviderService.java
Wed Jul 15 07:48:38 2020
@@ -108,7 +108,7 @@ public class ElasticIndexProviderService
private static final String PROP_ELASTIC_HOST =
ElasticConnection.HOST_PROP;
@Property(
- intValue = ElasticConnection.DEFAULT_PORT,
+ value = "" + ElasticConnection.DEFAULT_PORT,
label = "Elasticsearch connection port"
)
private static final String PROP_ELASTIC_PORT =
ElasticConnection.PORT_PROP;
@@ -269,8 +269,9 @@ public class ElasticIndexProviderService
(String) contextConfig.getOrDefault(PROP_ELASTIC_SCHEME,
ElasticConnection.DEFAULT_SCHEME));
final String host = System.getProperty(PROP_ELASTIC_HOST,
(String) contextConfig.getOrDefault(PROP_ELASTIC_HOST,
ElasticConnection.DEFAULT_HOST));
- final int port = Integer.getInteger(PROP_ELASTIC_PORT,
- (int) contextConfig.getOrDefault(PROP_ELASTIC_PORT,
ElasticConnection.DEFAULT_PORT));
+ final String portString = (String)
contextConfig.getOrDefault(PROP_ELASTIC_PORT,
+ "" + ElasticConnection.DEFAULT_PORT);
+ final int port = Integer.getInteger(PROP_ELASTIC_PORT,
Integer.parseInt(portString));
// optional params
final String apiKeyId = System.getProperty(PROP_ELASTIC_API_KEY_ID,
