From e18e59b1c0d5b2a8cd976768eaec012f56973b39 Mon Sep 17 00:00:00 2001
From: Michael Nguyen <michael.nguyen@parivedasolutions.com>
Date: Thu, 24 Oct 2019 10:36:12 -0500
Subject: [PATCH] indexer running not connecting to es.
---
.../service/AwsElasticSettingServiceImpl.java | 24 +++++++++++++++++++
.../service/ElasticSettingServiceImpl.java | 22 -----------------
.../src/main/resources/application.properties | 4 ++--
3 files changed, 26 insertions(+), 24 deletions(-)
create mode 100644 indexer-service-aws/src/main/java/org/opengroup/osdu/indexer/aws/service/AwsElasticSettingServiceImpl.java
delete mode 100644 indexer-service-aws/src/main/java/org/opengroup/osdu/indexer/aws/service/ElasticSettingServiceImpl.java
diff --git a/indexer-service-aws/src/main/java/org/opengroup/osdu/indexer/aws/service/AwsElasticSettingServiceImpl.java b/indexer-service-aws/src/main/java/org/opengroup/osdu/indexer/aws/service/AwsElasticSettingServiceImpl.java
new file mode 100644
index 000000000..a8e750633
--- /dev/null
+++ b/indexer-service-aws/src/main/java/org/opengroup/osdu/indexer/aws/service/AwsElasticSettingServiceImpl.java
@@ -0,0 +1,24 @@
+package org.opengroup.osdu.indexer.aws.service;
+
+import org.opengroup.osdu.is.core.model.ClusterSettings;
+import org.opengroup.osdu.is.core.service.ElasticSettingService;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Component;
+
+@Primary
+@Component
+public class AwsElasticSettingServiceImpl implements ElasticSettingService {
+
+ @Value("${aws.es.host}")
+ String host;
+
+ int port = 443;
+
+ String userNameAndPassword = "https";
+ @Override
+ public ClusterSettings getElasticClusterInformation() {
+
+ return new ClusterSettings(host, port, userNameAndPassword);
+ }
+}
\ No newline at end of file
diff --git a/indexer-service-aws/src/main/java/org/opengroup/osdu/indexer/aws/service/ElasticSettingServiceImpl.java b/indexer-service-aws/src/main/java/org/opengroup/osdu/indexer/aws/service/ElasticSettingServiceImpl.java
deleted file mode 100644
index a2a1dc7b3..000000000
--- a/indexer-service-aws/src/main/java/org/opengroup/osdu/indexer/aws/service/ElasticSettingServiceImpl.java
+++ /dev/null
@@ -1,22 +0,0 @@
-//package org.opengroup.osdu.indexer.aws.service;
-//
-//import org.opengroup.osdu.is.core.model.ClusterSettings;
-//import org.opengroup.osdu.is.core.service.ElasticSettingService;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.stereotype.Component;
-//
-//@Component
-//public class ElasticSettingServiceImpl implements ElasticSettingService {
-//
-// @Value("${aws.es.host}")
-// String host;
-//
-// int port = 8080;
-//
-// String userNameAndPassword = "testing";
-// @Override
-// public ClusterSettings getElasticClusterInformation() {
-//
-// return new ClusterSettings(host, port, userNameAndPassword);
-// }
-//}
diff --git a/indexer-service-aws/src/main/resources/application.properties b/indexer-service-aws/src/main/resources/application.properties
index 39840a0b6..7ff918931 100644
--- a/indexer-service-aws/src/main/resources/application.properties
+++ b/indexer-service-aws/src/main/resources/application.properties
@@ -18,8 +18,8 @@ spring.security.user.password=123
spring.security.user.roles=service.storage.admin
## AWS ES configuration
-aws.es.host=https://search-osdu-indexer-tester-6xsyzsnwyopgjwwnzkgejg2pe4.us-east-1.es.amazonaws.com
-aws.es.port=8080
+aws.es.host=https://search-osdu-indexer-nj62ktooaiug2mjqzguzx5utr4.us-east-1.es.amazonaws.com
+aws.es.port=443
GAE_SERVICE=indexer
--
GitLab