From 4e0d8e978ddbc9b73a9be63c4b70845033fce093 Mon Sep 17 00:00:00 2001
From: KrishnasagarVutukuru <KrishnasagarVutukuru@9.85.136.254>
Date: Thu, 20 Feb 2020 11:46:35 -0600
Subject: [PATCH] Made changes using core-lib-ibm version- 0.0.9.
---
provider/indexer-ibm/pom.xml | 2 +-
.../indexer/ibm/di/TenantFactoryImpl.java | 13 +++---
.../ElasticSettingSchemaRepositoryImpl.java | 44 +++++++++++--------
3 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/provider/indexer-ibm/pom.xml b/provider/indexer-ibm/pom.xml
index 72a4dd272..f0a2b0187 100644
--- a/provider/indexer-ibm/pom.xml
+++ b/provider/indexer-ibm/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-lib-ibm</artifactId>
- <version>0.1.2</version>
+ <version>0.0.9-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/di/TenantFactoryImpl.java b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/di/TenantFactoryImpl.java
index 2e828556c..55d199f40 100644
--- a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/di/TenantFactoryImpl.java
+++ b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/di/TenantFactoryImpl.java
@@ -15,7 +15,6 @@
package org.opengroup.osdu.indexer.ibm.di;
import java.io.IOException;
-import java.net.MalformedURLException;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
@@ -26,7 +25,7 @@ import javax.annotation.PostConstruct;
import org.opengroup.osdu.core.common.model.core.ICache;
import org.opengroup.osdu.core.common.model.core.ITenantFactory;
import org.opengroup.osdu.core.common.model.core.TenantInfo;
-import org.opengroup.osdu.core.ibm.cloudant.IBMCloudantClientFactory;
+import org.opengroup.osdu.core.ibm.cloudant.ICloudantFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,16 +41,13 @@ public class TenantFactoryImpl implements ITenantFactory {
private static final Logger logger = LoggerFactory.getLogger(TenantFactoryImpl.class);
@Autowired
- private IBMCloudantClientFactory cloudantFactory;
+ private ICloudantFactory cloudantFactory;
private Database db;
+ public static final String DB_NAME = "TenantInfo";
@PostConstruct
public void init(){
- try {
- db = cloudantFactory.getClient().database(TenantInfoDoc.DB_NAME, true);
- } catch (MalformedURLException e) {
- e.printStackTrace();
- }
+ db = cloudantFactory.getDatabase(DB_NAME);
}
@@ -110,5 +106,6 @@ public class TenantFactoryImpl implements ITenantFactory {
ti.setServiceAccount(doc.getServiceprincipalAppId());
this.tenants.put(tenantName, ti) ;
});
+
}
}
diff --git a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/persistence/ElasticSettingSchemaRepositoryImpl.java b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/persistence/ElasticSettingSchemaRepositoryImpl.java
index bc199c27e..0566cd4e4 100644
--- a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/persistence/ElasticSettingSchemaRepositoryImpl.java
+++ b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/persistence/ElasticSettingSchemaRepositoryImpl.java
@@ -15,15 +15,16 @@
package org.opengroup.osdu.indexer.ibm.persistence;
import javax.annotation.PostConstruct;
+import javax.inject.Inject;
-import org.opengroup.osdu.core.ibm.cloudant.IBMCloudantClientFactory;
+
+import org.opengroup.osdu.core.ibm.cloudant.ICloudantFactory;
import org.opengroup.osdu.indexer.ibm.model.ElasticSettingSchema;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Repository;
-import com.cloudant.client.api.CloudantClient;
import com.cloudant.client.api.Database;
@@ -40,31 +41,37 @@ public class ElasticSettingSchemaRepositoryImpl implements ISchemaRepository {
private String dbNamePrefix;
private Database db;
+
+ @Inject
+ private ICloudantFactory cloudantFactory;
@PostConstruct
public void init(){
try {
- IBMCloudantClientFactory iccFactory = new IBMCloudantClientFactory(url, apiKey);
- CloudantClient cloudant = iccFactory.getClient();
- System.out.println("dbNamePrefix: " + dbNamePrefix);
- if (dbNamePrefix.charAt(dbNamePrefix.length() - 1) == '-') {
- dbNamePrefix = dbNamePrefix.substring(0, dbNamePrefix.length()-1);
- }
- String dbFullName = dbNamePrefix.toLowerCase() + "-" + ElasticSettingsDoc.DB_NAME.toLowerCase();
- System.out.println("dbFullName: " + dbFullName);
- db = cloudant.database(dbFullName, true);
+ db = cloudantFactory.getDatabase("SearchSettings");
+ //ICloudantFactory iccFactory = new ICloudantFactory(url, apiKey);
+ /*
+ * CloudantClient cloudant = iccFactory.getClient();
+ * System.out.println("dbNamePrefix: " + dbNamePrefix); if
+ * (dbNamePrefix.charAt(dbNamePrefix.length() - 1) == '-') { dbNamePrefix =
+ * dbNamePrefix.substring(0, dbNamePrefix.length()-1); } String dbFullName =
+ * dbNamePrefix.toLowerCase() + "-" + ElasticSettingsDoc.DB_NAME.toLowerCase();
+ * System.out.println("dbFullName: " + dbFullName); db =
+ * cloudant.database(dbFullName, true);
+ */
} catch (Exception e) {
e.printStackTrace();
}
}
- @Override
- public void add(ElasticSettingSchema schema, String id) {
- ElasticSettingsDoc sd = new ElasticSettingsDoc();
- sd.setId(id);
- sd.setSettingSchema(schema);
- db.save(sd);
- }
+ @Override
+ public void add(ElasticSettingSchema schema, String id) {
+ ElasticSettingsDoc sd = new ElasticSettingsDoc(); sd.setId(id);
+ sd.setSettingSchema(schema);
+ db.save(sd);
+
+ }
+
@Override
public ElasticSettingSchema get(String id) {
@@ -84,4 +91,5 @@ public class ElasticSettingSchemaRepositoryImpl implements ISchemaRepository {
}
+
}
--
GitLab