committed latest changes

provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/persistence/ElasticSettingSchemaRepositoryImpl.java

@@ -15,8 +15,8 @@
 package org.opengroup.osdu.indexer.ibm.persistence;
 
 import javax.annotation.PostConstruct;
-import javax.inject.Inject;
 
+import org.opengroup.osdu.core.ibm.auth.ServiceCredentials;
 import org.opengroup.osdu.core.ibm.cloudant.IBMCloudantClientFactory;
 import org.opengroup.osdu.indexer.ibm.model.ElasticSettingSchema;
 import org.slf4j.Logger;
@@ -41,12 +41,10 @@ public class ElasticSettingSchemaRepositoryImpl implements ISchemaRepository {
 	
 	private Database db;
 	
-	@Inject
-	private IBMCloudantClientFactory cloudantFactory;
-
     @PostConstruct
     public void init(){
         try {
+        	IBMCloudantClientFactory cloudantFactory = new IBMCloudantClientFactory(new ServiceCredentials(url, apiKey));
         	db = cloudantFactory.getDatabase(dbNamePrefix, "SearchSettings");
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -55,13 +53,16 @@ public class ElasticSettingSchemaRepositoryImpl implements ISchemaRepository {
 	
 	@Override 
 	public void add(ElasticSettingSchema schema, String id) {
+
 	  ElasticSettingsDoc sd = new ElasticSettingsDoc();
+
+	  ElasticSettingsDoc sd = new ElasticSettingsDoc(); 
+
 	  sd.setId(id);
 	  sd.setSettingSchema(schema);
 	  db.save(sd);
 	}
 	 
-
     @Override
     public ElasticSettingSchema get(String id) {
     	if (db.contains(id)) {

provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/util/RequestInfoImpl.java

@@ -51,7 +51,7 @@ public class RequestInfoImpl implements IRequestInfo {
     private IServiceAccountJwtClient serviceAccountJwtClient;
 
     @Inject
-    @Qualifier("TenantInfoFactorySearch")
+    //@Qualifier("TenantInfoFactorySearch")
     private TenantInfo tenantInfo;
 
     @Value("${DEPLOYMENT_ENVIRONMENT}")

testing/indexer-test-core/src/main/java/org/opengroup/osdu/util/Config.java

@@ -3,28 +3,28 @@ package org.opengroup.osdu.util;
 public class Config {
 
 	//FIXME: remove credentials from here
-    private static final String DEFAULT_ELASTIC_HOST = "elasticsearch-instance-osdu-es6.osdu-dev-7b9b848225bcb25e9d50d2c703a0ef7e-0002.us-south.containers.appdomain.cloud";
+    private static final String DEFAULT_ELASTIC_HOST = "elasticsearch-instance-osdu-es.osduadev-a1c3eaf78a86806e299f5f3f207556f0-0000.us-south.containers.appdomain.cloud";
     //private static final String DEFAULT_ELASTIC_HOST = "localhost";
     private static final String DEFAULT_ELASTIC_USER_NAME = "elastic";
-    private static final String DEFAULT_ELASTIC_PASSWORD = "d7l9hhlqsdhd64dgz9jslvtn";
+    private static final String DEFAULT_ELASTIC_PASSWORD = "f5bljztd8jtpv76cxqqhvf46";
 
     //static final int PORT = 8080;
     static final int PORT = 443;
 
     private static final String DEFAULT_INDEXER_HOST = "localhost";
     private static final String DEFAULT_SEARCH_HOST = "localhost";
-    private static final String DEFAULT_STORAGE_HOST = "http://os-storage-brl-osdu.apps.ris.ocp.cloud9.ibm.com/api/storage/v2/";
-    private static final String DEFAULT_STORAGE_AUTH_TOKEN = "dGVzdEBpYm0uY29tOjEyMw=="; 
+    private static final String DEFAULT_STORAGE_HOST = "https://os-storage-ibm-osdu-r2.osduadev-a1c3eaf78a86806e299f5f3f207556f0-0000.us-south.containers.appdomain.cloud/api/storage/v2/";
+    private static final String DEFAULT_STORAGE_AUTH_TOKEN = "FIX ME"; 
     private static final String DEFAULT_DATA_PARTITION_ID_TENANT1 = "opendes";
     private static final String DEFAULT_DATA_PARTITION_ID_TENANT2 = "common";
     private static final String DEFAULT_SEARCH_INTEGRATION_TESTER = "";
 
     private static final String DEFAULT_TARGET_AUDIENCE = "";
 
-    private static final String DEFAULT_LEGAL_TAG = "";
+    private static final String DEFAULT_LEGAL_TAG = "common-public-usa-dataset-us";
     private static final String DEFAULT_OTHER_RELEVANT_DATA_COUNTRIES = "US";
 
-    private static final String DEFAULT_ENTITLEMENTS_DOMAIN = "";
+    private static final String DEFAULT_ENTITLEMENTS_DOMAIN = "ibm.com";
 
 
     public static String getOtherRelevantDataCountries() {
@@ -74,7 +74,7 @@ public class Config {
     public static String getStorageBaseURL() {
         return getEnvironmentVariableOrDefaultValue("STORAGE_HOST", DEFAULT_STORAGE_HOST);
     }
-    
+
     public static String getStorageBasicAuthToken() {
         return getEnvironmentVariableOrDefaultValue("STORAGE_AUTH_TOKEN", DEFAULT_STORAGE_AUTH_TOKEN);
     }

testing/indexer-test-ibm/pom.xml

@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.opengroup.osdu.indexer</groupId>
             <artifactId>indexer-test-core</artifactId>
-            <version>0.0.1</version>
+            <version>0.0.2-SNAPSHOT</version>
         </dependency>
 
         <!-- Cucumber -->

testing/indexer-test-ibm/src/test/java/org/opengroup/osdu/util/IBMHTTPClient.java

@@ -15,7 +15,7 @@ public class IBMHTTPClient extends HTTPClient {
     public synchronized String getAccessToken() {
         if(token == null) {
         	//FIXME need to get this from somewhere  
-        	token =  "Basic " + Config.getStorageBasicAuthToken();
+        	token =  "Bearer " + Config.getStorageBasicAuthToken();
         	return token;
         }
         return token;