From 177e655ef15810d5e75b84c7179f7b5baa04f5c5 Mon Sep 17 00:00:00 2001 From: sudhirgiri2911 Date: Wed, 13 Mar 2019 12:21:09 +0530 Subject: [PATCH 1/7] Issue #SB-10876 feat: Fixed the bugs for health check --- .../java/org/sunbird/learner/actors/health/HealthActor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/actors/common/src/main/java/org/sunbird/learner/actors/health/HealthActor.java b/actors/common/src/main/java/org/sunbird/learner/actors/health/HealthActor.java index 639afcacb..f30364b63 100644 --- a/actors/common/src/main/java/org/sunbird/learner/actors/health/HealthActor.java +++ b/actors/common/src/main/java/org/sunbird/learner/actors/health/HealthActor.java @@ -87,7 +87,7 @@ private void esHealthCheck() { responseList.add(ProjectUtil.createCheckResponse(JsonKey.ACTOR_SERVICE, false, null)); try { boolean esResponse = ElasticSearchUtil.healthCheck(); - responseList.add(ProjectUtil.createCheckResponse(JsonKey.ES_SERVICE, esResponse, null)); + responseList.add(ProjectUtil.createCheckResponse(JsonKey.ES_SERVICE, !esResponse, null)); isallHealthy = esResponse; } catch (Exception e) { responseList.add(ProjectUtil.createCheckResponse(JsonKey.ES_SERVICE, true, e)); @@ -164,7 +164,7 @@ private void checkAllComponentHealth() { try { boolean response = ElasticSearchUtil.healthCheck(); responseList.add(ProjectUtil.createCheckResponse(JsonKey.ES_SERVICE, !response, null)); - isallHealthy = response; + if (!response) isallHealthy = response; } catch (Exception e) { responseList.add(ProjectUtil.createCheckResponse(JsonKey.ES_SERVICE, true, e)); isallHealthy = false; From 726fd9ef44455e26e208a72db914ee02956a78e1 Mon Sep 17 00:00:00 2001 From: manzarul Haque Date: Wed, 13 Mar 2019 16:49:48 +0530 Subject: [PATCH 2/7] Update .gitmodules changes for submodule --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 53aa0539f..6822d08bb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,11 +1,11 @@ [submodule "actors/sunbird-utils"] path = actors/sunbird-utils url = https://github.com/project-sunbird/sunbird-utils.git - branch = release-1.14-sp3 + branch = release-1.15 [submodule "actors/sunbird-open-saber-bridge"] path = actors/sunbird-open-saber-bridge url = https://github.com/project-sunbird/sunbird-open-saber-bridge.git - branch = release-1.14 + branch = release-1.15 [submodule "actors/open-saber-client"] path = actors/open-saber-client url = https://github.com/project-sunbird/open-saber-client.git From 357e52e97eedc54d3ecc3d1bb2882cc5e255cffb Mon Sep 17 00:00:00 2001 From: sudhirgiri2911 Date: Thu, 14 Mar 2019 16:48:10 +0530 Subject: [PATCH 3/7] Issue #SB-10876 feat: Comment review --- .../java/org/sunbird/learner/actors/health/HealthActor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actors/common/src/main/java/org/sunbird/learner/actors/health/HealthActor.java b/actors/common/src/main/java/org/sunbird/learner/actors/health/HealthActor.java index f30364b63..80c8b63b8 100644 --- a/actors/common/src/main/java/org/sunbird/learner/actors/health/HealthActor.java +++ b/actors/common/src/main/java/org/sunbird/learner/actors/health/HealthActor.java @@ -164,7 +164,7 @@ private void checkAllComponentHealth() { try { boolean response = ElasticSearchUtil.healthCheck(); responseList.add(ProjectUtil.createCheckResponse(JsonKey.ES_SERVICE, !response, null)); - if (!response) isallHealthy = response; + isallHealthy = isallHealthy && response; } catch (Exception e) { responseList.add(ProjectUtil.createCheckResponse(JsonKey.ES_SERVICE, true, e)); isallHealthy = false; From 58b6e4e0123b4e52abe6bfae5f3ea033d448639c Mon Sep 17 00:00:00 2001 From: Mayank Morya Date: Fri, 22 Mar 2019 12:25:11 +0530 Subject: [PATCH 4/7] added all the dulicate dial codes in a error message --- .../learner/actors/bulkupload/TextbookTocActor.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/actors/common/src/main/java/org/sunbird/learner/actors/bulkupload/TextbookTocActor.java b/actors/common/src/main/java/org/sunbird/learner/actors/bulkupload/TextbookTocActor.java index 61c73e650..033bdb7b7 100644 --- a/actors/common/src/main/java/org/sunbird/learner/actors/bulkupload/TextbookTocActor.java +++ b/actors/common/src/main/java/org/sunbird/learner/actors/bulkupload/TextbookTocActor.java @@ -590,6 +590,7 @@ private Map readAndValidateCSV(InputStream inputStream) throws I List csvRecords = csvFileParser.getRecords(); validateCSV(csvRecords); Set dialCodes = new HashSet<>(); + Set duplicateDialCodes = new HashSet<>(); Map> dialCodeIdentifierMap = new HashMap<>(); Set topics = new HashSet<>(); StringBuilder exceptionMsgs = new StringBuilder(); @@ -614,10 +615,7 @@ private Map readAndValidateCSV(InputStream inputStream) throws I dialCodeList = new ArrayList(Arrays.asList(dialCode.split(","))); for (String dCode : dialCodeList) { if (!dialCodes.add(dCode.trim())) { - throwClientErrorException( - ResponseCode.errorDduplicateDialCodeEntry, - MessageFormat.format( - ResponseCode.errorDduplicateDialCodeEntry.getErrorMessage(), dialCode)); + duplicateDialCodes.add(dCode.trim()); } } } @@ -654,6 +652,13 @@ private Map readAndValidateCSV(InputStream inputStream) throws I rows.add(map); } } + if (CollectionUtils.isNotEmpty(duplicateDialCodes)) { + throwClientErrorException( + ResponseCode.errorDduplicateDialCodeEntry, + MessageFormat.format( + ResponseCode.errorDduplicateDialCodeEntry.getErrorMessage(), + StringUtils.join(duplicateDialCodes, ","))); + } if (StringUtils.isNotBlank(exceptionMsgs.toString())) { ProjectCommonException.throwClientErrorException( ResponseCode.customClientError, exceptionMsgs.toString()); From 54c99e63f077d8bf39dcf0d4ade513e6185450ea Mon Sep 17 00:00:00 2001 From: Mayank Morya Date: Fri, 22 Mar 2019 17:26:06 +0530 Subject: [PATCH 5/7] changed dulpicate set to linked set --- .../sunbird/learner/actors/bulkupload/TextbookTocActor.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/actors/common/src/main/java/org/sunbird/learner/actors/bulkupload/TextbookTocActor.java b/actors/common/src/main/java/org/sunbird/learner/actors/bulkupload/TextbookTocActor.java index 033bdb7b7..4fd18eafa 100644 --- a/actors/common/src/main/java/org/sunbird/learner/actors/bulkupload/TextbookTocActor.java +++ b/actors/common/src/main/java/org/sunbird/learner/actors/bulkupload/TextbookTocActor.java @@ -51,6 +51,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -590,7 +591,7 @@ private Map readAndValidateCSV(InputStream inputStream) throws I List csvRecords = csvFileParser.getRecords(); validateCSV(csvRecords); Set dialCodes = new HashSet<>(); - Set duplicateDialCodes = new HashSet<>(); + Set duplicateDialCodes = new LinkedHashSet<>(); Map> dialCodeIdentifierMap = new HashMap<>(); Set topics = new HashSet<>(); StringBuilder exceptionMsgs = new StringBuilder(); From ce94b2faec6b5efcaccdd1391d003813b874b37f Mon Sep 17 00:00:00 2001 From: Mayank Morya Date: Fri, 22 Mar 2019 17:28:48 +0530 Subject: [PATCH 6/7] Update .gitmodules --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6822d08bb..53aa0539f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,11 +1,11 @@ [submodule "actors/sunbird-utils"] path = actors/sunbird-utils url = https://github.com/project-sunbird/sunbird-utils.git - branch = release-1.15 + branch = release-1.14-sp3 [submodule "actors/sunbird-open-saber-bridge"] path = actors/sunbird-open-saber-bridge url = https://github.com/project-sunbird/sunbird-open-saber-bridge.git - branch = release-1.15 + branch = release-1.14 [submodule "actors/open-saber-client"] path = actors/open-saber-client url = https://github.com/project-sunbird/open-saber-client.git From 7152693a904c71155115b6b9abe089d874ae299b Mon Sep 17 00:00:00 2001 From: Mayank Morya Date: Fri, 22 Mar 2019 17:29:48 +0530 Subject: [PATCH 7/7] Update HealthActor.java --- .../java/org/sunbird/learner/actors/health/HealthActor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/actors/common/src/main/java/org/sunbird/learner/actors/health/HealthActor.java b/actors/common/src/main/java/org/sunbird/learner/actors/health/HealthActor.java index 80c8b63b8..639afcacb 100644 --- a/actors/common/src/main/java/org/sunbird/learner/actors/health/HealthActor.java +++ b/actors/common/src/main/java/org/sunbird/learner/actors/health/HealthActor.java @@ -87,7 +87,7 @@ private void esHealthCheck() { responseList.add(ProjectUtil.createCheckResponse(JsonKey.ACTOR_SERVICE, false, null)); try { boolean esResponse = ElasticSearchUtil.healthCheck(); - responseList.add(ProjectUtil.createCheckResponse(JsonKey.ES_SERVICE, !esResponse, null)); + responseList.add(ProjectUtil.createCheckResponse(JsonKey.ES_SERVICE, esResponse, null)); isallHealthy = esResponse; } catch (Exception e) { responseList.add(ProjectUtil.createCheckResponse(JsonKey.ES_SERVICE, true, e)); @@ -164,7 +164,7 @@ private void checkAllComponentHealth() { try { boolean response = ElasticSearchUtil.healthCheck(); responseList.add(ProjectUtil.createCheckResponse(JsonKey.ES_SERVICE, !response, null)); - isallHealthy = isallHealthy && response; + isallHealthy = response; } catch (Exception e) { responseList.add(ProjectUtil.createCheckResponse(JsonKey.ES_SERVICE, true, e)); isallHealthy = false;