diff --git a/provider/indexer-ibm/pom.xml b/provider/indexer-ibm/pom.xml
index e7f3c7f9b7273f857aeeaf0fde262139a8c3e963..79bc2796bc5779b97aec789497db13f40a862b2a 100644
--- a/provider/indexer-ibm/pom.xml
+++ b/provider/indexer-ibm/pom.xml
@@ -46,10 +46,7 @@
<artifactId>os-core-lib-ibm</artifactId>
<version>0.0.12-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-amqp</artifactId>
- </dependency>
+
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
diff --git a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/IndexerIBMApplication.java b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/IndexerIBMApplication.java
index c3699d063ee500070917cc3da9ee468302da2ee4..8f2af0db3ae4beeb56b05abfa1b19500b60605a7 100644
--- a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/IndexerIBMApplication.java
+++ b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/IndexerIBMApplication.java
@@ -28,24 +28,24 @@ public class IndexerIBMApplication {
public static void main(String[] args) {
// We can't load things from Spring properties at this point
- if (System.getenv().containsKey("INSECURE_HOSTNAMES")) {
- // This must be one of the first things to run
-
- List<String> insecureHostnames = Arrays.asList(System.getenv("INSECURE_HOSTNAMES").split(":"));
-
- javax.net.ssl.HttpsURLConnection.setDefaultHostnameVerifier(
-
- new javax.net.ssl.HostnameVerifier() {
-
- public boolean verify(String hostname, javax.net.ssl.SSLSession sslSession) {
- if (insecureHostnames.contains(hostname)) {
- return true;
- }
- return false;
-
- }
- });
- }
+// if (System.getenv().containsKey("INSECURE_HOSTNAMES")) {
+// // This must be one of the first things to run
+//
+// List<String> insecureHostnames = Arrays.asList(System.getenv("INSECURE_HOSTNAMES").split(":"));
+//
+// javax.net.ssl.HttpsURLConnection.setDefaultHostnameVerifier(
+//
+// new javax.net.ssl.HostnameVerifier() {
+//
+// public boolean verify(String hostname, javax.net.ssl.SSLSession sslSession) {
+// if (insecureHostnames.contains(hostname)) {
+// return true;
+// }
+// return false;
+//
+// }
+// });
+// }
SpringApplication.run(IndexerIBMApplication.class, args);
}
}
diff --git a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/di/TenantInfoService.java b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/di/TenantInfoService.java
new file mode 100644
index 0000000000000000000000000000000000000000..1e71f8f723e8f5a9fce1880e029d6c534aea1b3e
--- /dev/null
+++ b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/di/TenantInfoService.java
@@ -0,0 +1,25 @@
+package org.opengroup.osdu.indexer.ibm.di;
+
+import javax.inject.Inject;
+
+import org.opengroup.osdu.core.common.model.http.DpsHeaders;
+import org.opengroup.osdu.core.common.model.tenant.TenantInfo;
+import org.opengroup.osdu.core.common.multitenancy.ITenantInfoService;
+import org.opengroup.osdu.core.common.provider.interfaces.ITenantFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.annotation.RequestScope;
+
+@RequestScope
+@Component
+public class TenantInfoService implements ITenantInfoService {
+ @Inject
+ private ITenantFactory tenantFactory;
+
+ @Inject
+ private DpsHeaders headers;
+
+ @Override
+ public TenantInfo getTenantInfo() {
+ return tenantFactory.getTenantInfo(headers.getPartitionId());
+ }
+}
diff --git a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/queue/MessagingConfiguration.java b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/queue/MessagingConfiguration.java
deleted file mode 100644
index 28bc099bb3663256f1e728197b61bbd94f9db1da..0000000000000000000000000000000000000000
--- a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/queue/MessagingConfiguration.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.opengroup.osdu.indexer.ibm.queue;
-
-import org.springframework.amqp.rabbit.annotation.EnableRabbit;
-import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.amqp.RabbitProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@EnableRabbit
-public class MessagingConfiguration {
-
- @Value("${ibm.rabbitmq.uri}")
- private String RABBITMQ_ADDRESS;
-
- @Bean
- public CachingConnectionFactory rabbitConnectionFactory(RabbitProperties config) throws Exception {
-
- CachingConnectionFactory connectionFactory = new CachingConnectionFactory();
- connectionFactory.getRabbitConnectionFactory().setUri(RABBITMQ_ADDRESS);
-
- return connectionFactory;
-
- }
-
-}
\ No newline at end of file
diff --git a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/queue/Subcriber.java b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/queue/Subcriber.java
deleted file mode 100644
index e010021fac9cc6c81b7972bf7166ab2241a7189a..0000000000000000000000000000000000000000
--- a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/queue/Subcriber.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.opengroup.osdu.indexer.ibm.queue;
-
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.stereotype.Component;
-
-@Component
-public class Subcriber {
-
- @RabbitListener(queues="${PUBSUB_SEARCH_TOPIC}")
- public void recievedMessage(Message message) {
- byte[] body = message.getBody();
- String msg = new String(body);
- System.out.println("Recieved Message: " + msg);
- }
-
-}
diff --git a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/security/SecurityConfig.java b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/security/SecurityConfig.java
index 2540b43ec10f3e29a3b71bd789a29975bbc00cee..89efd3526353c0b38ed70040f143cb68d37fcdc1 100644
--- a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/security/SecurityConfig.java
+++ b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/security/SecurityConfig.java
@@ -39,9 +39,10 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
"/swagger",
"/swagger-ui.html",
"/webjars/**").permitAll()
- .anyRequest().authenticated()
- .and()
- .oauth2ResourceServer().jwt();
+ .anyRequest().anonymous();
+ //.authenticated()
+ //.and()
+ //.oauth2ResourceServer().jwt();
//changed the http authentication to jwt authetication.
}
}
diff --git a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/HeadersInfoIBMImpl.java b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/HeadersInfoIBMImpl.java
index 40eb492b928c2d6fb11f138fb4c8990ac5d23769..154f2d8bc50fe87bffb288706273ad0e1797ae76 100644
--- a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/HeadersInfoIBMImpl.java
+++ b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/HeadersInfoIBMImpl.java
@@ -22,7 +22,6 @@ import javax.inject.Inject;
import org.opengroup.osdu.core.common.model.http.DpsHeaders;
import org.opengroup.osdu.core.common.search.Preconditions;
-import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
@@ -35,7 +34,7 @@ import lombok.extern.java.Log;
public class HeadersInfoIBMImpl implements IHeadersInfo {
@Inject
- @Qualifier("dpsHeaderFactorySearch")
+ //@Qualifier("dpsHeaderFactorySearch")
private DpsHeaders headersMap;
@Value("${indexer.queue.key}")
diff --git a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/RequestInfoImpl.java b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/RequestInfoImpl.java
index 9cb0b9dab3d0823c1238fae6b0f3fc72796e9797..11f89098f63a80feed8fa4a967d1d70a637e5168 100644
--- a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/RequestInfoImpl.java
+++ b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/RequestInfoImpl.java
@@ -41,7 +41,7 @@ import com.google.common.base.Strings;
public class RequestInfoImpl implements IRequestInfo {
@Inject
- @Qualifier("dpsHeaderFactorySearch")
+ //@Qualifier("dpsHeaderFactorySearch")
private DpsHeaders dpsHeaders;
@Inject
diff --git a/provider/indexer-ibm/src/main/resources/application.properties b/provider/indexer-ibm/src/main/resources/application.properties
index 8ab11daf0ac048033130024ca0aca1d3531ff3e7..09ad432c7b83b864b2d49f306245c94349db5ce9 100644
--- a/provider/indexer-ibm/src/main/resources/application.properties
+++ b/provider/indexer-ibm/src/main/resources/application.properties
@@ -1,5 +1,6 @@
-#server.servlet.contextPath=/api/indexer/v2/
+server.servlet.contextPath=/api/indexer/v2/
+LOG_PREFIX=indexer
logging.level.org.springframework.web=DEBUG
server.port=8060
JAVA_HEAP_OPTS=-Xms4096M -Xmx4096M
@@ -11,8 +12,6 @@ AUTHORIZE_API=https://entitlements-osdu-r2.osduadev-a1c3eaf78a86806e299f5f3f2075
AUTHORIZE_API_KEY=tobeupdated
LEGALTAG_API=https://os-legal-ibm-osdu-r2.osduadev-a1c3eaf78a86806e299f5f3f207556f0-0000.us-south.containers.appdomain.cloud/api/legal/v1
-PUBSUB_SEARCH_TOPIC=ic-r2-dev-osdu-queue
-
STORAGE_HOSTNAME=os-storage-ibm-osdu-r2.osduadev-a1c3eaf78a86806e299f5f3f207556f0-0000.us-south.containers.appdomain.cloud
#Default Cache Settings
@@ -42,8 +41,6 @@ spring.security.oauth2.resourceserver.jwt.jwk-set-uri=https://keycloak-osdu-r2.o
#spring.security.user.password=123
#spring.security.user.roles=service.indexer.admin
-ibm.env.prefix=ic-r2-dev
-
ibm.cloudant.url=https://5be9693e-3324-400a-aadc-59908c132be2-bluemix.cloudant.com
ibm.cloudant.apikey=0TsJrjBedUyyu4DhtpxcoL-D8vnHUsPlT5r8A-1IN4SE