From 3365ab28f7f58de2978a63e83a8de08e09d85c62 Mon Sep 17 00:00:00 2001 From: vijethas Date: Fri, 27 Oct 2017 10:25:32 +0530 Subject: [PATCH 1/6] Issue #SB-361 fix:Update common-util in actors --- actors/libs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actors/libs b/actors/libs index 37b52bd73..b9074974c 160000 --- a/actors/libs +++ b/actors/libs @@ -1 +1 @@ -Subproject commit 37b52bd736fb3c4fda15b23203d2468718f43325 +Subproject commit b9074974caeb325c4892383eb11ef057ee224d5e From 3eb7a7969b8c25a95400511c085ef9c52564d50f Mon Sep 17 00:00:00 2001 From: AMIT KUMAR Date: Fri, 27 Oct 2017 14:22:02 +0530 Subject: [PATCH 2/6] Issue #434 feat:cassandras api --- .../java/org/sunbird/learner/Application.java | 3 ++- .../java/org/sunbird/learner/util/Util.java | 23 ++++++++++--------- .../actors/AssessmentItemActorTest.java | 2 +- .../actors/CourseEnrollmentActorTest.java | 2 +- .../actors/CourseManagementActorTest.java | 2 +- .../learner/actors/CourseSearchActorTest.java | 2 +- .../learner/actors/LearnerStateActorTest.java | 2 +- .../actors/LearnerStateUpdateActorTest.java | 2 +- .../actors/NotesManagementActorTest.java | 2 +- .../OrganisationManagementActorTest.java | 10 ++++---- .../actors/PageManagementActorTest.java | 2 +- .../actors/UserManagementActorTest.java | 2 +- .../recommend/RecommendorActorTest.java | 2 +- .../skill/SkillmanagementActorTest.java | 2 +- .../audit/AuditLogServiceImplTest.java | 2 +- actors/src/test/resources/dbconfig.properties | 2 +- 16 files changed, 32 insertions(+), 30 deletions(-) diff --git a/actors/src/main/java/org/sunbird/learner/Application.java b/actors/src/main/java/org/sunbird/learner/Application.java index 37a897e4e..f1c2380f9 100644 --- a/actors/src/main/java/org/sunbird/learner/Application.java +++ b/actors/src/main/java/org/sunbird/learner/Application.java @@ -56,7 +56,8 @@ private static void startRemoteActorSystem() { public static void checkCassandraConnection() { - Util.checkCassandraDbConnections(); + Util.checkCassandraDbConnections(JsonKey.SUNBIRD); + Util.checkCassandraDbConnections(JsonKey.SUNBIRD_PLUGIN); SchedulerManager.schedule(); } diff --git a/actors/src/main/java/org/sunbird/learner/util/Util.java b/actors/src/main/java/org/sunbird/learner/util/Util.java index 1d448c8b2..09f15cc1d 100644 --- a/actors/src/main/java/org/sunbird/learner/util/Util.java +++ b/actors/src/main/java/org/sunbird/learner/util/Util.java @@ -179,7 +179,7 @@ public static boolean checkOrgStatusTransition(Integer currentState , Integer ne * provided environment variable , if environment variable values * are not set then connection will be established from property file. */ - public static void checkCassandraDbConnections() { + public static void checkCassandraDbConnections(String keySpace) { PropertiesCache propertiesCache = PropertiesCache.getInstance(); @@ -187,22 +187,22 @@ public static void checkCassandraDbConnections() { if (ProjectUtil.isStringNullOREmpty(cassandraMode) || cassandraMode .equalsIgnoreCase(JsonKey.EMBEDDED_MODE)) { - // configure the Embeddee mode and return true here .... + // configure the Embedded mode and return true here .... CassandraConnectionManager cassandraConnectionManager = CassandraConnectionMngrFactory .getObject(cassandraMode); - boolean result = cassandraConnectionManager.createConnection(null , null , null ,null, KEY_SPACE_NAME); + boolean result = cassandraConnectionManager.createConnection(null , null , null ,null, keySpace); if (result) { ProjectLogger .log("CONNECTION CREATED SUCCESSFULLY FOR IP:" + " : KEYSPACE :" - + KEY_SPACE_NAME, + + keySpace, LoggerEnum.INFO.name()); } else { ProjectLogger - .log("CONNECTION CREATION FAILED FOR IP: " + " : KEYSPACE :" + KEY_SPACE_NAME); + .log("CONNECTION CREATION FAILED FOR IP: " + " : KEYSPACE :" + keySpace); } } else if (cassandraMode.equalsIgnoreCase(JsonKey.STANDALONE_MODE)) { - if (readConfigFromEnv()) { + if (readConfigFromEnv(keySpace)) { ProjectLogger.log("db connection is created from System env variable."); return; } @@ -247,7 +247,7 @@ public static void checkCassandraDbConnections() { * This method will read the configuration from System variable. * @return boolean */ - public static boolean readConfigFromEnv() { + public static boolean readConfigFromEnv(String keyspace) { boolean response = false; String ips = System.getenv(JsonKey.SUNBIRD_CASSANDRA_IP); String envPort = System.getenv(JsonKey.SUNBIRD_CASSANDRA_PORT); @@ -265,11 +265,11 @@ public static boolean readConfigFromEnv() { String ip = ipList[i]; String port = portList[i]; try { - boolean result = cassandraConnectionManager.createConnection(ip, port, userName, password, KEY_SPACE_NAME); + boolean result = cassandraConnectionManager.createConnection(ip, port, userName, password, keyspace); if (result) { - ProjectLogger.log("CONNECTION CREATED SUCCESSFULLY FOR IP: " + ip + " : KEYSPACE :" + KEY_SPACE_NAME, LoggerEnum.INFO.name()); + ProjectLogger.log("CONNECTION CREATED SUCCESSFULLY FOR IP: " + ip + " : KEYSPACE :" + keyspace, LoggerEnum.INFO.name()); } else { - ProjectLogger.log("CONNECTION CREATION FAILED FOR IP: " + ip + " : KEYSPACE :" + KEY_SPACE_NAME, LoggerEnum.INFO.name()); + ProjectLogger.log("CONNECTION CREATION FAILED FOR IP: " + ip + " : KEYSPACE :" + keyspace, LoggerEnum.INFO.name()); } response = true; } catch (ProjectCommonException ex) { @@ -596,7 +596,8 @@ public static String validateRoles(List roleList){ public static void main(String[] args) { System.out.println("MAIN STARTED"); - checkCassandraDbConnections(); + checkCassandraDbConnections(JsonKey.SUNBIRD); + checkCassandraDbConnections(JsonKey.SUNBIRD_PLUGIN); System.out.println("MAIN END"); } diff --git a/actors/src/test/java/org/sunbird/learner/actors/AssessmentItemActorTest.java b/actors/src/test/java/org/sunbird/learner/actors/AssessmentItemActorTest.java index 97b95604c..970266bea 100644 --- a/actors/src/test/java/org/sunbird/learner/actors/AssessmentItemActorTest.java +++ b/actors/src/test/java/org/sunbird/learner/actors/AssessmentItemActorTest.java @@ -32,7 +32,7 @@ public class AssessmentItemActorTest { @BeforeClass public static void setUp() { system = ActorSystem.create("system"); - Util.checkCassandraDbConnections(); + Util.checkCassandraDbConnections(JsonKey.SUNBIRD); ref = TestActorRef.create(system, props, "testActor"); } diff --git a/actors/src/test/java/org/sunbird/learner/actors/CourseEnrollmentActorTest.java b/actors/src/test/java/org/sunbird/learner/actors/CourseEnrollmentActorTest.java index 571ae0732..2a7e05388 100644 --- a/actors/src/test/java/org/sunbird/learner/actors/CourseEnrollmentActorTest.java +++ b/actors/src/test/java/org/sunbird/learner/actors/CourseEnrollmentActorTest.java @@ -55,7 +55,7 @@ public class CourseEnrollmentActorTest { @BeforeClass public static void setUp() { system = ActorSystem.create("system"); - Util.checkCassandraDbConnections(); + Util.checkCassandraDbConnections(JsonKey.SUNBIRD); userCoursesdbInfo = Util.dbInfoMap.get(JsonKey.LEARNER_COURSE_DB); //PowerMockito.mockStatic(EkStepRequestUtil.class); insertBatch(); diff --git a/actors/src/test/java/org/sunbird/learner/actors/CourseManagementActorTest.java b/actors/src/test/java/org/sunbird/learner/actors/CourseManagementActorTest.java index fc2a1e942..e50128647 100644 --- a/actors/src/test/java/org/sunbird/learner/actors/CourseManagementActorTest.java +++ b/actors/src/test/java/org/sunbird/learner/actors/CourseManagementActorTest.java @@ -31,7 +31,7 @@ public class CourseManagementActorTest { //@BeforeClass public static void setUp() { system = ActorSystem.create("system"); - Util.checkCassandraDbConnections(); + Util.checkCassandraDbConnections(JsonKey.SUNBIRD); ref = TestActorRef.create(system, props, "testActor"); courseManagementActor = ref.underlyingActor(); } diff --git a/actors/src/test/java/org/sunbird/learner/actors/CourseSearchActorTest.java b/actors/src/test/java/org/sunbird/learner/actors/CourseSearchActorTest.java index 233ac2316..60765edd8 100644 --- a/actors/src/test/java/org/sunbird/learner/actors/CourseSearchActorTest.java +++ b/actors/src/test/java/org/sunbird/learner/actors/CourseSearchActorTest.java @@ -32,7 +32,7 @@ public class CourseSearchActorTest { @BeforeClass public static void setUp() { system = ActorSystem.create("system"); - Util.checkCassandraDbConnections(); + Util.checkCassandraDbConnections(JsonKey.SUNBIRD); } //@Test diff --git a/actors/src/test/java/org/sunbird/learner/actors/LearnerStateActorTest.java b/actors/src/test/java/org/sunbird/learner/actors/LearnerStateActorTest.java index 7a42fcf2a..8dccf4acb 100644 --- a/actors/src/test/java/org/sunbird/learner/actors/LearnerStateActorTest.java +++ b/actors/src/test/java/org/sunbird/learner/actors/LearnerStateActorTest.java @@ -44,7 +44,7 @@ public class LearnerStateActorTest { @BeforeClass public static void setUp() { system = ActorSystem.create("system"); - Util.checkCassandraDbConnections(); + Util.checkCassandraDbConnections(JsonKey.SUNBIRD); ref = TestActorRef.create(system, props, "testActor"); insertCourse(); insertContent(); diff --git a/actors/src/test/java/org/sunbird/learner/actors/LearnerStateUpdateActorTest.java b/actors/src/test/java/org/sunbird/learner/actors/LearnerStateUpdateActorTest.java index c76f06442..3cee83161 100644 --- a/actors/src/test/java/org/sunbird/learner/actors/LearnerStateUpdateActorTest.java +++ b/actors/src/test/java/org/sunbird/learner/actors/LearnerStateUpdateActorTest.java @@ -49,7 +49,7 @@ public class LearnerStateUpdateActorTest { @BeforeClass public static void setUp() { system = ActorSystem.create("system"); - Util.checkCassandraDbConnections(); + Util.checkCassandraDbConnections(JsonKey.SUNBIRD); insertCourse(); insertBatch(); } diff --git a/actors/src/test/java/org/sunbird/learner/actors/NotesManagementActorTest.java b/actors/src/test/java/org/sunbird/learner/actors/NotesManagementActorTest.java index cb702f0bf..6fef18a48 100644 --- a/actors/src/test/java/org/sunbird/learner/actors/NotesManagementActorTest.java +++ b/actors/src/test/java/org/sunbird/learner/actors/NotesManagementActorTest.java @@ -55,7 +55,7 @@ public class NotesManagementActorTest { public static void setUp() { system = ActorSystem.create("system"); ref = TestActorRef.create(system, props, "testActor"); - Util.checkCassandraDbConnections(); + Util.checkCassandraDbConnections(JsonKey.SUNBIRD); insertUserDataToES(); } /** diff --git a/actors/src/test/java/org/sunbird/learner/actors/OrganisationManagementActorTest.java b/actors/src/test/java/org/sunbird/learner/actors/OrganisationManagementActorTest.java index 0eaeb51d5..dfa001751 100644 --- a/actors/src/test/java/org/sunbird/learner/actors/OrganisationManagementActorTest.java +++ b/actors/src/test/java/org/sunbird/learner/actors/OrganisationManagementActorTest.java @@ -62,7 +62,7 @@ public class OrganisationManagementActorTest { public static void setUp() { Application.startLocalActorSystem(); system = ActorSystem.create("system"); - Util.checkCassandraDbConnections(); + Util.checkCassandraDbConnections(JsonKey.SUNBIRD); userManagementDB = Util.dbInfoMap.get(JsonKey.USER_DB); addressDB = Util.dbInfoMap.get(JsonKey.ADDRESS_DB); orgTypeDbInfo = Util.dbInfoMap.get(JsonKey.ORG_TYPE_DB); @@ -193,8 +193,8 @@ public void test13CreateOrgWithSourceAndExternalIdSuc(){ orgMap.put(JsonKey.ORGANISATION_NAME , "CBSE"); orgMap.put(JsonKey.DESCRIPTION, "Central Board of Secondary Education"); orgMap.put("orgCode", "CBSE"); - orgMap.put(JsonKey.PROVIDER, "pr0001"); - orgMap.put(JsonKey.EXTERNAL_ID, "ex0001"); + orgMap.put(JsonKey.PROVIDER, "pr00001"); + orgMap.put(JsonKey.EXTERNAL_ID, "ex00001"); // orgMap.put("channel", "test1"); innerMap.put(JsonKey.ORGANISATION , orgMap); @@ -223,8 +223,8 @@ public void test14CreateOrgWithSameSourceAndExternalIdExc(){ orgMap.put(JsonKey.ORGANISATION_NAME , "CBSE"); orgMap.put(JsonKey.DESCRIPTION, "Central Board of Secondary Education"); orgMap.put("orgCode", "CBSE"); - orgMap.put(JsonKey.PROVIDER, "pr0001"); - orgMap.put(JsonKey.EXTERNAL_ID, "ex0001"); + orgMap.put(JsonKey.PROVIDER, "pr00001"); + orgMap.put(JsonKey.EXTERNAL_ID, "ex00001"); orgMap.put("channel", "test"); innerMap.put(JsonKey.ORGANISATION , orgMap); diff --git a/actors/src/test/java/org/sunbird/learner/actors/PageManagementActorTest.java b/actors/src/test/java/org/sunbird/learner/actors/PageManagementActorTest.java index 396887ccc..7bb627959 100644 --- a/actors/src/test/java/org/sunbird/learner/actors/PageManagementActorTest.java +++ b/actors/src/test/java/org/sunbird/learner/actors/PageManagementActorTest.java @@ -50,7 +50,7 @@ public class PageManagementActorTest { @BeforeClass public static void setUp() { system = ActorSystem.create("system"); - Util.checkCassandraDbConnections(); + Util.checkCassandraDbConnections(JsonKey.SUNBIRD); pageMgmntDbInfo = Util.dbInfoMap.get(JsonKey.PAGE_MGMT_DB); pageSectionDbInfo = Util.dbInfoMap.get(JsonKey.PAGE_SECTION_DB); } diff --git a/actors/src/test/java/org/sunbird/learner/actors/UserManagementActorTest.java b/actors/src/test/java/org/sunbird/learner/actors/UserManagementActorTest.java index b1b0fdf9d..7581ffd92 100644 --- a/actors/src/test/java/org/sunbird/learner/actors/UserManagementActorTest.java +++ b/actors/src/test/java/org/sunbird/learner/actors/UserManagementActorTest.java @@ -74,7 +74,7 @@ public static void setUp() { Application.startLocalActorSystem(); encryption = PropertiesCache.getInstance().getProperty(JsonKey.SUNBIRD_ENCRYPTION); system = ActorSystem.create("system"); - Util.checkCassandraDbConnections(); + Util.checkCassandraDbConnections(JsonKey.SUNBIRD); userManagementDB = Util.dbInfoMap.get(JsonKey.USER_DB); addressDB = Util.dbInfoMap.get(JsonKey.ADDRESS_DB); jobDB = Util.dbInfoMap.get(JsonKey.JOB_PROFILE_DB); diff --git a/actors/src/test/java/org/sunbird/learner/actors/recommend/RecommendorActorTest.java b/actors/src/test/java/org/sunbird/learner/actors/recommend/RecommendorActorTest.java index 0212d5abf..c60972dd8 100644 --- a/actors/src/test/java/org/sunbird/learner/actors/recommend/RecommendorActorTest.java +++ b/actors/src/test/java/org/sunbird/learner/actors/recommend/RecommendorActorTest.java @@ -29,7 +29,7 @@ public class RecommendorActorTest { @BeforeClass public static void setUp() { system = ActorSystem.create("system"); - Util.checkCassandraDbConnections(); + Util.checkCassandraDbConnections(JsonKey.SUNBIRD); } @Test() diff --git a/actors/src/test/java/org/sunbird/learner/actors/skill/SkillmanagementActorTest.java b/actors/src/test/java/org/sunbird/learner/actors/skill/SkillmanagementActorTest.java index fdc4dd59d..1ec4a4f35 100644 --- a/actors/src/test/java/org/sunbird/learner/actors/skill/SkillmanagementActorTest.java +++ b/actors/src/test/java/org/sunbird/learner/actors/skill/SkillmanagementActorTest.java @@ -56,7 +56,7 @@ public static void setUp(){ system = ActorSystem.create("system"); skillsList.add("Java"); - Util.checkCassandraDbConnections(); + Util.checkCassandraDbConnections(JsonKey.SUNBIRD); insertUserDataInCassandraAndEs(); } diff --git a/actors/src/test/java/org/sunbird/learner/audit/AuditLogServiceImplTest.java b/actors/src/test/java/org/sunbird/learner/audit/AuditLogServiceImplTest.java index f780b51f9..888b4a5cb 100644 --- a/actors/src/test/java/org/sunbird/learner/audit/AuditLogServiceImplTest.java +++ b/actors/src/test/java/org/sunbird/learner/audit/AuditLogServiceImplTest.java @@ -46,7 +46,7 @@ public class AuditLogServiceImplTest { @BeforeClass public static void setUp() { system = ActorSystem.create("system"); - Util.checkCassandraDbConnections(); + Util.checkCassandraDbConnections(JsonKey.SUNBIRD); } @SuppressWarnings({"deprecation", "unchecked"}) diff --git a/actors/src/test/resources/dbconfig.properties b/actors/src/test/resources/dbconfig.properties index e99896368..b46c8d489 100644 --- a/actors/src/test/resources/dbconfig.properties +++ b/actors/src/test/resources/dbconfig.properties @@ -2,4 +2,4 @@ db.ip=127.0.0.1 db.port=9042 db.username=cassandra db.password=password -db.keyspace=sunbird +db.keyspace=sunbird,sunbirdplugin From 2d3544f85863a107a534a07c8555ef25e256a236 Mon Sep 17 00:00:00 2001 From: AMIT KUMAR Date: Fri, 27 Oct 2017 17:05:59 +0530 Subject: [PATCH 3/6] Issue #434 feat:cassandras api --- actors/src/main/resources/cassandra.cql | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/actors/src/main/resources/cassandra.cql b/actors/src/main/resources/cassandra.cql index 39eb0be97..66b63fa43 100644 --- a/actors/src/main/resources/cassandra.cql +++ b/actors/src/main/resources/cassandra.cql @@ -595,3 +595,16 @@ creation of id = one way hash of (userId##skillnametolowercase) CREATE TABLE IF NOT EXISTS sunbird.skills(id text,skills list, PRIMARY KEY (id)); ALTER TABLE sunbird.organisation ADD orgTypeId text; + + + + +//Announcement apis -27th Oct +CREATE KEYSPACE IF NOT EXISTS sunbirdplugin WITH replication = {'class':'SimpleStrategy','replication_factor':1}; +CREATE TYPE IF NOT EXISTS sunbirdplugin.attachment (id text,filename text,mimetype text); +CREATE TABLE sunbirdplugin.announcement (id text,userid text,sourceid text,details map,links list,attachments list,target text,sentcount int,priority text,expiry text,status text,createddate text,updateddate text, PRIMARY KEY (id)); +CREATE TABLE sunbirdplugin.attachment (id text,file text,filename text,mimetype text,createdby text,status text,createddate text, PRIMARY KEY (id)); +CREATE TABLE sunbirdplugin.metrics (id text,userid text,announcementid text,activity text,channel text,createddate text, PRIMARY KEY (id)); +CREATE TABLE sunbirdplugin.announcementtype (id text,rootorgid text,name text,status text,createddate text, PRIMARY KEY (id)); +CREATE TABLE sunbirdplugin.announcementauth (id text,userid text,rootorgid text,permissions map,status text,createddate text, PRIMARY KEY (id)); + From 58cdf48c3f5ca6434e9f3ebe3d43ac91a403f344 Mon Sep 17 00:00:00 2001 From: AMIT KUMAR Date: Fri, 27 Oct 2017 17:10:39 +0530 Subject: [PATCH 4/6] Issue #434 feat:cassandras api --- actors/src/main/resources/cassandra.cql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actors/src/main/resources/cassandra.cql b/actors/src/main/resources/cassandra.cql index 66b63fa43..40a3552a5 100644 --- a/actors/src/main/resources/cassandra.cql +++ b/actors/src/main/resources/cassandra.cql @@ -601,7 +601,7 @@ ALTER TABLE sunbird.organisation ADD orgTypeId text; //Announcement apis -27th Oct CREATE KEYSPACE IF NOT EXISTS sunbirdplugin WITH replication = {'class':'SimpleStrategy','replication_factor':1}; -CREATE TYPE IF NOT EXISTS sunbirdplugin.attachment (id text,filename text,mimetype text); +//CREATE TYPE IF NOT EXISTS sunbirdplugin.attachment (id text,filename text,mimetype text); CREATE TABLE sunbirdplugin.announcement (id text,userid text,sourceid text,details map,links list,attachments list,target text,sentcount int,priority text,expiry text,status text,createddate text,updateddate text, PRIMARY KEY (id)); CREATE TABLE sunbirdplugin.attachment (id text,file text,filename text,mimetype text,createdby text,status text,createddate text, PRIMARY KEY (id)); CREATE TABLE sunbirdplugin.metrics (id text,userid text,announcementid text,activity text,channel text,createddate text, PRIMARY KEY (id)); From 322e5f1b759dc9075807ad2045ffe82373f2539b Mon Sep 17 00:00:00 2001 From: AMIT KUMAR Date: Fri, 27 Oct 2017 17:55:52 +0530 Subject: [PATCH 5/6] Issue #172 feat:org Type upadate issue change --- .../org/sunbird/learner/actors/syncjobmanager/EsSyncActor.java | 1 + 1 file changed, 1 insertion(+) diff --git a/actors/src/main/java/org/sunbird/learner/actors/syncjobmanager/EsSyncActor.java b/actors/src/main/java/org/sunbird/learner/actors/syncjobmanager/EsSyncActor.java index be599f2fa..3301a502a 100644 --- a/actors/src/main/java/org/sunbird/learner/actors/syncjobmanager/EsSyncActor.java +++ b/actors/src/main/java/org/sunbird/learner/actors/syncjobmanager/EsSyncActor.java @@ -167,6 +167,7 @@ private String getType(String objectType) { private Map getOrgDetails(Entry entry) { ProjectLogger.log("fetching org data started"); Map orgMap = (Map) entry.getValue(); + orgMap.remove(JsonKey.ORG_TYPE); if (orgMap.containsKey(JsonKey.ADDRESS_ID) && !ProjectUtil.isStringNullOREmpty((String) orgMap.get(JsonKey.ADDRESS_ID))) { orgMap.put(JsonKey.ADDRESS, getDetailsById(Util.dbInfoMap.get(JsonKey.ADDRESS_DB), From 42507b83592a39d443202943ef4c59a1b9d91b11 Mon Sep 17 00:00:00 2001 From: AMIT KUMAR Date: Mon, 30 Oct 2017 17:28:01 +0530 Subject: [PATCH 6/6] Issue #172 feat:org Type upadate issue change --- .../org/sunbird/learner/util/DataCacheHandler.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/actors/src/main/java/org/sunbird/learner/util/DataCacheHandler.java b/actors/src/main/java/org/sunbird/learner/util/DataCacheHandler.java index 6e25fdb86..89ab1d180 100644 --- a/actors/src/main/java/org/sunbird/learner/util/DataCacheHandler.java +++ b/actors/src/main/java/org/sunbird/learner/util/DataCacheHandler.java @@ -10,6 +10,7 @@ import org.sunbird.common.models.response.Response; import org.sunbird.common.models.util.JsonKey; import org.sunbird.common.models.util.ProjectLogger; +import org.sunbird.common.models.util.ProjectUtil; import org.sunbird.helper.ServiceFactory; /** @@ -27,6 +28,7 @@ public class DataCacheHandler implements Runnable { private static Map roleMap = new ConcurrentHashMap<>(); private static Map orgTypeMap = new ConcurrentHashMap<>(); CassandraOperation cassandraOperation = ServiceFactory.getInstance(); + private static final String KEY_SPACE_NAME = "sunbird"; @Override public void run() { @@ -39,7 +41,7 @@ public void run() { private void orgTypeCache(Map orgTypeMap) { Response response = - cassandraOperation.getAllRecords(Util.getProperty("db.keyspace"), JsonKey.ORG_TYPE_DB); + cassandraOperation.getAllRecords(KEY_SPACE_NAME, JsonKey.ORG_TYPE_DB); List> responseList = (List>) response.get(JsonKey.RESPONSE); if (null != responseList && !responseList.isEmpty()) { @@ -51,7 +53,7 @@ private void orgTypeCache(Map orgTypeMap) { private void roleCache(Map roleMap) { Response response = - cassandraOperation.getAllRecords(Util.getProperty("db.keyspace"), JsonKey.ROLE_GROUP); + cassandraOperation.getAllRecords(KEY_SPACE_NAME, JsonKey.ROLE_GROUP); List> responseList = (List>) response.get(JsonKey.RESPONSE); if (null != responseList && !responseList.isEmpty()) { @@ -60,7 +62,7 @@ private void roleCache(Map roleMap) { } } Response response2 = - cassandraOperation.getAllRecords(Util.getProperty("db.keyspace"), JsonKey.ROLE); + cassandraOperation.getAllRecords(KEY_SPACE_NAME, JsonKey.ROLE); List> responseList2 = (List>) response2.get(JsonKey.RESPONSE); if (null != responseList2 && !responseList2.isEmpty()) { @@ -74,7 +76,7 @@ private void roleCache(Map roleMap) { private void cache(Map> map, String tableName) { try { Response response = - cassandraOperation.getAllRecords(Util.getProperty("db.keyspace"), tableName); + cassandraOperation.getAllRecords(KEY_SPACE_NAME, tableName); List> responseList = (List>) response.get(JsonKey.RESPONSE); if (null != responseList && !responseList.isEmpty()) { @@ -88,6 +90,8 @@ private void cache(Map> map, String tableName) { } } } + ProjectLogger.log("pagemap size" +map.size()); + ProjectLogger.log("pagemap keyset "+map.keySet()); } catch (Exception e) { ProjectLogger.log(e.getMessage(), e); }