From 7fda403b95b47b5b1eab7aac3a0715b6f76ef660 Mon Sep 17 00:00:00 2001
From: Hari-stackroute <40484996+Hari-stackroute@users.noreply.github.com>
Date: Wed, 8 Dec 2021 12:59:17 +0530
Subject: [PATCH] SB-21780 Change all logs to follow the standard log format -
User Org-learner (#1003)
* SB-21780 Change all logs to follow the standard log format - User Org-learner
---
.../main/java/org/sunbird/keys/JsonKey.java | 1 +
.../java/org/sunbird/logging/LoggerUtil.java | 22 ++++-
.../validator/TelemetryObjectValidatorV3.java | 8 ++
.../resources/externalresource.properties | 2 +-
.../org/sunbird/logging/LoggerUtilTest.java | 71 ++++++++++++++
pom.xml | 1 -
.../LocationBulkUploadBackGroundJobActor.java | 9 +-
.../OrgBulkUploadBackgroundJobActor.java | 38 ++++----
.../UserBulkUploadBackgroundJobActor.java | 43 ++++++---
.../sunbird/actor/user/UserUpdateActor.java | 1 -
.../UserExternalIdManagementActorTest.java | 5 +-
.../user/UserManagementActorTestBase.java | 6 +-
...serSelfDeclarationManagementActorTest.java | 1 -
.../organisation/OrgServiceImplTest.java | 3 +-
.../user/impl/SSOUserServiceImplTest.java | 1 -
.../org/sunbird/util/UserUtilityTest.java | 15 ++-
.../test/java/org/sunbird/util/UtilTest.java | 17 ++--
.../user/UserExternalIdentityAdapterTest.java | 92 +++++++++----------
18 files changed, 218 insertions(+), 118 deletions(-)
create mode 100644 core/platform-common/src/test/java/org/sunbird/logging/LoggerUtilTest.java
diff --git a/core/platform-common/src/main/java/org/sunbird/keys/JsonKey.java b/core/platform-common/src/main/java/org/sunbird/keys/JsonKey.java
index 7c3cb7720..a6be47ed8 100644
--- a/core/platform-common/src/main/java/org/sunbird/keys/JsonKey.java
+++ b/core/platform-common/src/main/java/org/sunbird/keys/JsonKey.java
@@ -605,6 +605,7 @@ public final class JsonKey {
public static final String CONTACT_DETAILS_UPDATE_VERIFICATION_SUBJECT =
"OTP to edit Diksha Profile";
public static final String X_Source = "x-source";
+ public static final String DEBUG = "DEBUG";
private JsonKey() {}
}
diff --git a/core/platform-common/src/main/java/org/sunbird/logging/LoggerUtil.java b/core/platform-common/src/main/java/org/sunbird/logging/LoggerUtil.java
index 26b1966e2..180a3a1c1 100644
--- a/core/platform-common/src/main/java/org/sunbird/logging/LoggerUtil.java
+++ b/core/platform-common/src/main/java/org/sunbird/logging/LoggerUtil.java
@@ -11,8 +11,12 @@ import org.sunbird.exception.ResponseCode;
import org.sunbird.keys.JsonKey;
import org.sunbird.request.Request;
import org.sunbird.request.RequestContext;
+import org.sunbird.telemetry.collector.TelemetryAssemblerFactory;
+import org.sunbird.telemetry.collector.TelemetryDataAssembler;
import org.sunbird.telemetry.util.TelemetryEvents;
import org.sunbird.telemetry.util.TelemetryWriter;
+import org.sunbird.telemetry.validator.TelemetryObjectValidator;
+import org.sunbird.telemetry.validator.TelemetryObjectValidatorV3;
public class LoggerUtil {
@@ -81,7 +85,23 @@ public class LoggerUtil {
public void debug(RequestContext requestContext, String message) {
if (isDebugEnabled(requestContext)) {
- logger.info(Markers.appendEntries(requestContext.getContextMap()), message);
+ TelemetryDataAssembler telemetryDataAssembler = TelemetryAssemblerFactory.get();
+ TelemetryObjectValidator telemetryObjectValidator = TelemetryObjectValidatorV3.getInstance();
+ Map<String, Object> context =
+ (Map<String, Object>) requestContext.getTelemetryContext().get(JsonKey.CONTEXT);
+ Map<String, Object> params = new HashMap<>();
+ Map<String, Object> telemetryInfo = new HashMap<>();
+ telemetryInfo.put(JsonKey.CONTEXT, context);
+ telemetryInfo.put(JsonKey.PARAMS, params);
+ params.put(JsonKey.LOG_TYPE, JsonKey.API_ACCESS);
+ params.put(JsonKey.LOG_LEVEL, JsonKey.DEBUG);
+ params.put(JsonKey.MESSAGE, message);
+ String telemetry = telemetryDataAssembler.log(context, params);
+ if (StringUtils.isNotBlank(telemetry) && telemetryObjectValidator.validateLog(telemetry)) {
+ logger.debug(Markers.appendEntries(requestContext.getContextMap()), telemetry);
+ } else {
+ logger.debug(Markers.appendEntries(requestContext.getContextMap()), message);
+ }
} else {
logger.debug(message);
}
diff --git a/core/platform-common/src/main/java/org/sunbird/telemetry/validator/TelemetryObjectValidatorV3.java b/core/platform-common/src/main/java/org/sunbird/telemetry/validator/TelemetryObjectValidatorV3.java
index a41ca1139..75b2bc9b7 100644
--- a/core/platform-common/src/main/java/org/sunbird/telemetry/validator/TelemetryObjectValidatorV3.java
+++ b/core/platform-common/src/main/java/org/sunbird/telemetry/validator/TelemetryObjectValidatorV3.java
@@ -14,9 +14,17 @@ import org.sunbird.telemetry.util.TelemetryEvents;
/** @author arvind */
public class TelemetryObjectValidatorV3 implements TelemetryObjectValidator {
private static final LoggerUtil logger = new LoggerUtil(TelemetryObjectValidatorV3.class);
+ private static TelemetryObjectValidator telemetryObjectValidator = null;
private final ObjectMapper mapper = new ObjectMapper();
+ public static TelemetryObjectValidator getInstance() {
+ if (telemetryObjectValidator == null) {
+ telemetryObjectValidator = new TelemetryObjectValidatorV3();
+ }
+ return telemetryObjectValidator;
+ }
+
@Override
public boolean validateAudit(String jsonString) {
diff --git a/core/platform-common/src/main/resources/externalresource.properties b/core/platform-common/src/main/resources/externalresource.properties
index 0c5199b12..8ff056c33 100644
--- a/core/platform-common/src/main/resources/externalresource.properties
+++ b/core/platform-common/src/main/resources/externalresource.properties
@@ -36,7 +36,7 @@ sunbird_otp_allowed_attempt=2
#Telemetry producer related info
telemetry_pdata_id=local.sunbird.learning.service
telemetry_pdata_pid=learning-service
-telemetry_pdata_ver=4.4.0
+telemetry_pdata_ver=4.5.0
#elastic search top n result count for telemetry
searchTopN=5
ekstep.channel.update.api.url=/channel/v3/update
diff --git a/core/platform-common/src/test/java/org/sunbird/logging/LoggerUtilTest.java b/core/platform-common/src/test/java/org/sunbird/logging/LoggerUtilTest.java
new file mode 100644
index 000000000..58e7c47bb
--- /dev/null
+++ b/core/platform-common/src/test/java/org/sunbird/logging/LoggerUtilTest.java
@@ -0,0 +1,71 @@
+package org.sunbird.logging;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+import org.sunbird.request.RequestContext;
+import org.sunbird.telemetry.collector.TelemetryAssemblerFactory;
+import org.sunbird.telemetry.collector.TelemetryDataAssembler;
+import org.sunbird.telemetry.validator.TelemetryObjectValidator;
+import org.sunbird.telemetry.validator.TelemetryObjectValidatorV3;
+
+@RunWith(PowerMockRunner.class)
+@PowerMockIgnore({
+ "javax.management.*",
+ "javax.net.ssl.*",
+ "javax.security.*",
+ "jdk.internal.reflect.*",
+ "javax.crypto.*"
+})
+@PrepareForTest({
+ TelemetryAssemblerFactory.class,
+ TelemetryDataAssembler.class,
+ TelemetryObjectValidatorV3.class
+})
+public class LoggerUtilTest {
+ private static LoggerUtil loggerUtil;
+ private static TelemetryDataAssembler telemetryDataAssembler;
+ private static TelemetryObjectValidator telemetryObjectValidator;
+ private static TelemetryObjectValidatorV3 telemetryObjectValidatorV3;
+
+ @Before
+ public void setup() throws Exception {
+ loggerUtil = Mockito.mock(LoggerUtil.class);
+ Mockito.mock(TelemetryAssemblerFactory.class);
+ PowerMockito.mockStatic(TelemetryAssemblerFactory.class);
+ telemetryDataAssembler = Mockito.mock(TelemetryDataAssembler.class);
+ telemetryObjectValidator = Mockito.mock(TelemetryObjectValidator.class);
+ telemetryObjectValidatorV3 = Mockito.mock(TelemetryObjectValidatorV3.class);
+ PowerMockito.mockStatic(TelemetryObjectValidatorV3.class);
+ // PowerMockito.whenNew(LoggerUtil.class).withAnyArguments().thenReturn(loggerUtil);
+ PowerMockito.when(TelemetryAssemblerFactory.get()).thenReturn(telemetryDataAssembler);
+ PowerMockito.when(TelemetryObjectValidatorV3.getInstance())
+ .thenReturn(telemetryObjectValidator);
+ }
+
+ @Test
+ public void debug() {
+ loggerUtil = new LoggerUtil(this.getClass());
+ RequestContext requestContext =
+ new RequestContext(
+ "someUid",
+ "someDid",
+ "someSid",
+ "someAppId",
+ "someAppVer",
+ "someReqId",
+ "someSource",
+ "true",
+ "operation");
+ PowerMockito.when(telemetryDataAssembler.log(Mockito.any(), Mockito.anyMap()))
+ .thenReturn("telemetry string");
+ PowerMockito.when(telemetryObjectValidator.validateLog(Mockito.anyString())).thenReturn(true);
+ loggerUtil.debug(requestContext, "debug message");
+ Mockito.verify(telemetryDataAssembler, Mockito.times(1)).log(Mockito.any(), Mockito.anyMap());
+ }
+}
diff --git a/pom.xml b/pom.xml
index 4963bc46c..0f4ba987c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,6 @@
<argLine>
@{argLine} --illegal-access=permit
</argLine>
- <forkCount>0</forkCount>
<properties>
<property>
<name>parallel</name>
diff --git a/service/src/main/java/org/sunbird/actor/bulkupload/LocationBulkUploadBackGroundJobActor.java b/service/src/main/java/org/sunbird/actor/bulkupload/LocationBulkUploadBackGroundJobActor.java
index fd5196cf7..43e51749c 100644
--- a/service/src/main/java/org/sunbird/actor/bulkupload/LocationBulkUploadBackGroundJobActor.java
+++ b/service/src/main/java/org/sunbird/actor/bulkupload/LocationBulkUploadBackGroundJobActor.java
@@ -1,8 +1,6 @@
package org.sunbird.actor.bulkupload;
import akka.actor.ActorRef;
-import akka.pattern.Patterns;
-import akka.util.Timeout;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.IOException;
@@ -10,10 +8,8 @@ import java.sql.Timestamp;
import java.text.MessageFormat;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.TimeUnit;
import javax.inject.Inject;
import javax.inject.Named;
-
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.sunbird.exception.ProjectCommonException;
@@ -31,9 +27,6 @@ import org.sunbird.service.location.LocationServiceImpl;
import org.sunbird.telemetry.dto.TelemetryEnvKey;
import org.sunbird.util.ProjectUtil;
import org.sunbird.util.Util;
-import scala.concurrent.Await;
-import scala.concurrent.Future;
-import scala.concurrent.duration.Duration;
public class LocationBulkUploadBackGroundJobActor extends BaseBulkUploadBackgroundJobActor {
@@ -217,7 +210,7 @@ public class LocationBulkUploadBackGroundJobActor extends BaseBulkUploadBackgrou
}
private String upsertLocation(
- ActorRef actorRef, Map<String, Object> locationMap, String operation, RequestContext context) {
+ ActorRef actorRef, Map<String, Object> locationMap, String operation, RequestContext context) {
String locId = null;
Request request = new Request();
diff --git a/service/src/main/java/org/sunbird/actor/bulkupload/OrgBulkUploadBackgroundJobActor.java b/service/src/main/java/org/sunbird/actor/bulkupload/OrgBulkUploadBackgroundJobActor.java
index ab69d8a77..f6286d654 100644
--- a/service/src/main/java/org/sunbird/actor/bulkupload/OrgBulkUploadBackgroundJobActor.java
+++ b/service/src/main/java/org/sunbird/actor/bulkupload/OrgBulkUploadBackgroundJobActor.java
@@ -1,8 +1,6 @@
package org.sunbird.actor.bulkupload;
import akka.actor.ActorRef;
-import akka.pattern.Patterns;
-import akka.util.Timeout;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -12,13 +10,10 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.TimeUnit;
import javax.inject.Inject;
import javax.inject.Named;
-
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
-import org.sunbird.exception.ProjectCommonException;
import org.sunbird.exception.ResponseCode;
import org.sunbird.keys.JsonKey;
import org.sunbird.model.bulkupload.BulkUploadProcess;
@@ -26,7 +21,6 @@ import org.sunbird.model.bulkupload.BulkUploadProcessTask;
import org.sunbird.model.location.Location;
import org.sunbird.model.organisation.OrgTypeEnum;
import org.sunbird.model.organisation.Organisation;
-import org.sunbird.operations.LocationActorOperation;
import org.sunbird.operations.OrganisationActorOperation;
import org.sunbird.request.Request;
import org.sunbird.request.RequestContext;
@@ -37,9 +31,6 @@ import org.sunbird.service.systemsettings.SystemSettingsService;
import org.sunbird.telemetry.dto.TelemetryEnvKey;
import org.sunbird.util.ProjectUtil;
import org.sunbird.util.Util;
-import scala.concurrent.Await;
-import scala.concurrent.Future;
-import scala.concurrent.duration.Duration;
public class OrgBulkUploadBackgroundJobActor extends BaseBulkUploadBackgroundJobActor {
@@ -90,16 +81,14 @@ public class OrgBulkUploadBackgroundJobActor extends BaseBulkUploadBackgroundJob
}
private void processOrg(
- BulkUploadProcessTask task,
- Map<String, Location> locationCache,
- RequestContext context) {
+ BulkUploadProcessTask task, Map<String, Location> locationCache, RequestContext context) {
logger.info(context, "OrgBulkUploadBackgroundJobActor: processOrg called");
String data = task.getData();
ObjectMapper mapper = new ObjectMapper();
try {
Map<String, Object> orgMap = mapper.readValue(data, Map.class);
Object mandatoryColumnsObject =
- systemSettingsService.getSystemSettingByFieldAndKey(
+ systemSettingsService.getSystemSettingByFieldAndKey(
"orgProfileConfig",
"csv.mandatoryColumns",
new TypeReference<String[]>() {},
@@ -135,8 +124,7 @@ public class OrgBulkUploadBackgroundJobActor extends BaseBulkUploadBackgroundJob
} else {
callUpdateOrg(organisation, task, locationCodes, context);
}
- setLocationInformation(
- task, locationCache, locationCodes, context);
+ setLocationInformation(task, locationCache, locationCodes, context);
} catch (Exception e) {
logger.error(
context,
@@ -159,7 +147,8 @@ public class OrgBulkUploadBackgroundJobActor extends BaseBulkUploadBackgroundJob
if (locationCache.containsKey(locationCode)) {
locationNames.add(locationCache.get(locationCode).getName());
} else {
- List<Location> locationList = locationService.locationSearch(JsonKey.CODE, locationCode, context);
+ List<Location> locationList =
+ locationService.locationSearch(JsonKey.CODE, locationCode, context);
if (CollectionUtils.isNotEmpty(locationList)) {
Location location = locationList.get(0);
locationNames.add(location.getName());
@@ -205,7 +194,12 @@ public class OrgBulkUploadBackgroundJobActor extends BaseBulkUploadBackgroundJob
String orgId;
row.put(JsonKey.ORG_TYPE, OrgTypeEnum.getTypeByValue(org.getOrganisationType()));
try {
- orgId = upsertOrg(organisationManagementActor, row, OrganisationActorOperation.CREATE_ORG.getValue(), context);
+ orgId =
+ upsertOrg(
+ organisationManagementActor,
+ row,
+ OrganisationActorOperation.CREATE_ORG.getValue(),
+ context);
} catch (Exception ex) {
logger.error(
context,
@@ -243,7 +237,11 @@ public class OrgBulkUploadBackgroundJobActor extends BaseBulkUploadBackgroundJob
row.put(JsonKey.ORG_TYPE, OrgTypeEnum.getTypeByValue(org.getOrganisationType()));
try {
row.put(JsonKey.ORGANISATION_ID, org.getId());
- upsertOrg(organisationManagementActor, row, OrganisationActorOperation.UPDATE_ORG.getValue(), context);
+ upsertOrg(
+ organisationManagementActor,
+ row,
+ OrganisationActorOperation.UPDATE_ORG.getValue(),
+ context);
} catch (Exception ex) {
logger.error(
context,
@@ -266,7 +264,7 @@ public class OrgBulkUploadBackgroundJobActor extends BaseBulkUploadBackgroundJob
}
private String upsertOrg(
- ActorRef actorRef, Map<String, Object> orgMap, String operation, RequestContext context) {
+ ActorRef actorRef, Map<String, Object> orgMap, String operation, RequestContext context) {
String orgId = null;
Request request = new Request();
@@ -278,7 +276,7 @@ public class OrgBulkUploadBackgroundJobActor extends BaseBulkUploadBackgroundJob
if (obj instanceof Response) {
Response response = (Response) obj;
- if(response.get(JsonKey.ORGANISATION_ID) != null) {
+ if (response.get(JsonKey.ORGANISATION_ID) != null) {
orgId = (String) response.get(JsonKey.ORGANISATION_ID);
}
}
diff --git a/service/src/main/java/org/sunbird/actor/bulkupload/UserBulkUploadBackgroundJobActor.java b/service/src/main/java/org/sunbird/actor/bulkupload/UserBulkUploadBackgroundJobActor.java
index 3ce78b788..bea9812fd 100644
--- a/service/src/main/java/org/sunbird/actor/bulkupload/UserBulkUploadBackgroundJobActor.java
+++ b/service/src/main/java/org/sunbird/actor/bulkupload/UserBulkUploadBackgroundJobActor.java
@@ -110,7 +110,7 @@ public class UserBulkUploadBackgroundJobActor extends BaseBulkUploadBackgroundJo
ObjectMapper mapper = new ObjectMapper();
Map<String, Object> userMap = mapper.readValue(data, Map.class);
String[] mandatoryColumnsObject =
- systemSettingsService.getSystemSettingByFieldAndKey(
+ systemSettingsService.getSystemSettingByFieldAndKey(
"userProfileConfig",
"csv.mandatoryColumns",
new TypeReference<String[]>() {},
@@ -221,9 +221,21 @@ public class UserBulkUploadBackgroundJobActor extends BaseBulkUploadBackgroundJo
Map<String, Object> newUserReqMap = SerializationUtils.clone(new HashMap<>(userMap));
newUserReqMap.put(JsonKey.ORG_NAME, orgName);
- callUpdateUser(userUpdateActor, ActorOperations.UPDATE_USER.getValue(), JsonKey.UPDATE,newUserReqMap, task, context);
+ callUpdateUser(
+ userUpdateActor,
+ ActorOperations.UPDATE_USER.getValue(),
+ JsonKey.UPDATE,
+ newUserReqMap,
+ task,
+ context);
if (userMap.containsKey(JsonKey.ROLES)) {
- callUpdateUser(userRoleActor, ActorOperations.ASSIGN_ROLES.getValue(), ActorOperations.ASSIGN_ROLES.getValue(),userMap, task, context);
+ callUpdateUser(
+ userRoleActor,
+ ActorOperations.ASSIGN_ROLES.getValue(),
+ ActorOperations.ASSIGN_ROLES.getValue(),
+ userMap,
+ task,
+ context);
}
}
} catch (Exception e) {
@@ -239,7 +251,8 @@ public class UserBulkUploadBackgroundJobActor extends BaseBulkUploadBackgroundJo
logger.info(context, "UserBulkUploadBackgroundJobActor: callCreateUser called");
String userId;
try {
- userId = upsertUser(ssoUserCreateActor, user, ActorOperations.CREATE_USER.getValue(), context);
+ userId =
+ upsertUser(ssoUserCreateActor, user, ActorOperations.CREATE_USER.getValue(), context);
} catch (Exception ex) {
logger.error(
context,
@@ -268,21 +281,27 @@ public class UserBulkUploadBackgroundJobActor extends BaseBulkUploadBackgroundJo
}
@SuppressWarnings("unchecked")
- private void callUpdateUser(ActorRef actorRef, String operation, String taskAction,
- Map<String, Object> user, BulkUploadProcessTask task, RequestContext context)
+ private void callUpdateUser(
+ ActorRef actorRef,
+ String operation,
+ String taskAction,
+ Map<String, Object> user,
+ BulkUploadProcessTask task,
+ RequestContext context)
throws JsonProcessingException {
- logger.info(context, "UserBulkUploadBackgroundJobActor: "+operation+" called");
+ logger.info(context, "UserBulkUploadBackgroundJobActor: " + operation + " called");
try {
upsertUser(actorRef, user, operation, context);
} catch (Exception ex) {
logger.error(
context,
- "UserBulkUploadBackgroundJobActor:"+operation+": Exception occurred with error message = "
+ "UserBulkUploadBackgroundJobActor:"
+ + operation
+ + ": Exception occurred with error message = "
+ ex.getMessage(),
ex);
user.put(JsonKey.ERROR_MSG, ex.getMessage());
- setTaskStatus(
- task, ProjectUtil.BulkProcessStatus.FAILED, ex.getMessage(), user, taskAction);
+ setTaskStatus(task, ProjectUtil.BulkProcessStatus.FAILED, ex.getMessage(), user, taskAction);
}
if (task.getStatus() != ProjectUtil.BulkProcessStatus.FAILED.getValue()) {
ObjectMapper mapper = new ObjectMapper();
@@ -314,7 +333,7 @@ public class UserBulkUploadBackgroundJobActor extends BaseBulkUploadBackgroundJo
}
private String upsertUser(
- ActorRef actorRef, Map<String, Object> userMap, String operation, RequestContext context) {
+ ActorRef actorRef, Map<String, Object> userMap, String operation, RequestContext context) {
String userId = null;
Request request = new Request();
@@ -329,7 +348,7 @@ public class UserBulkUploadBackgroundJobActor extends BaseBulkUploadBackgroundJo
if (obj instanceof Response) {
Response response = (Response) obj;
- if(response.get(JsonKey.USER_ID) != null) {
+ if (response.get(JsonKey.USER_ID) != null) {
userId = (String) response.get(JsonKey.USER_ID);
}
}
diff --git a/service/src/main/java/org/sunbird/actor/user/UserUpdateActor.java b/service/src/main/java/org/sunbird/actor/user/UserUpdateActor.java
index b38a6efc6..8105cb6f9 100644
--- a/service/src/main/java/org/sunbird/actor/user/UserUpdateActor.java
+++ b/service/src/main/java/org/sunbird/actor/user/UserUpdateActor.java
@@ -24,7 +24,6 @@ import org.sunbird.exception.ProjectCommonException;
import org.sunbird.exception.ResponseCode;
import org.sunbird.keys.JsonKey;
import org.sunbird.model.location.Location;
-import org.sunbird.model.organisation.Organisation;
import org.sunbird.model.user.User;
import org.sunbird.model.user.UserDeclareEntity;
import org.sunbird.model.user.UserOrg;
diff --git a/service/src/test/java/org/sunbird/actor/user/UserExternalIdManagementActorTest.java b/service/src/test/java/org/sunbird/actor/user/UserExternalIdManagementActorTest.java
index df9643b28..816da27b4 100644
--- a/service/src/test/java/org/sunbird/actor/user/UserExternalIdManagementActorTest.java
+++ b/service/src/test/java/org/sunbird/actor/user/UserExternalIdManagementActorTest.java
@@ -28,12 +28,11 @@ import org.sunbird.dao.notification.impl.EmailTemplateDaoImpl;
import org.sunbird.exception.ResponseCode;
import org.sunbird.helper.ServiceFactory;
import org.sunbird.keys.JsonKey;
-import org.sunbird.util.DataCacheHandler;
-import org.sunbird.util.UserUtility;
-import org.sunbird.util.Util;
import org.sunbird.request.Request;
import org.sunbird.request.RequestContext;
import org.sunbird.response.Response;
+import org.sunbird.util.DataCacheHandler;
+import org.sunbird.util.UserUtility;
import org.sunbird.util.user.UserActorOperations;
@RunWith(PowerMockRunner.class)
diff --git a/service/src/test/java/org/sunbird/actor/user/UserManagementActorTestBase.java b/service/src/test/java/org/sunbird/actor/user/UserManagementActorTestBase.java
index f2a42a5a5..67b93e545 100644
--- a/service/src/test/java/org/sunbird/actor/user/UserManagementActorTestBase.java
+++ b/service/src/test/java/org/sunbird/actor/user/UserManagementActorTestBase.java
@@ -2,7 +2,8 @@ package org.sunbird.actor.user;
import static akka.testkit.JavaTestKit.duration;
import static org.mockito.ArgumentMatchers.eq;
-import static org.powermock.api.mockito.PowerMockito.*;
+import static org.powermock.api.mockito.PowerMockito.mock;
+import static org.powermock.api.mockito.PowerMockito.when;
import akka.actor.ActorRef;
import akka.actor.ActorSelection;
@@ -206,8 +207,7 @@ public abstract class UserManagementActorTestBase {
organisation.setChannel("anyChannel");
organisation.setRootOrgId("rootOrgId");
organisation.setTenant(true);
- when(orgService.getOrgObjById(Mockito.anyString(), Mockito.any()))
- .thenReturn(organisation);
+ when(orgService.getOrgObjById(Mockito.anyString(), Mockito.any())).thenReturn(organisation);
Map<String, Object> user = new HashMap<>();
user.put(JsonKey.IS_DELETED, false);
user.put(JsonKey.ROOT_ORG_ID, "custodianRootOrgId");
diff --git a/service/src/test/java/org/sunbird/actor/user/UserSelfDeclarationManagementActorTest.java b/service/src/test/java/org/sunbird/actor/user/UserSelfDeclarationManagementActorTest.java
index ccd2dffeb..aa61fd3af 100644
--- a/service/src/test/java/org/sunbird/actor/user/UserSelfDeclarationManagementActorTest.java
+++ b/service/src/test/java/org/sunbird/actor/user/UserSelfDeclarationManagementActorTest.java
@@ -42,7 +42,6 @@ import org.sunbird.request.RequestContext;
import org.sunbird.response.Response;
import org.sunbird.util.DataCacheHandler;
import org.sunbird.util.UserUtility;
-import org.sunbird.util.Util;
import org.sunbird.util.user.UserActorOperations;
import org.sunbird.util.user.UserUtil;
import scala.concurrent.Promise;
diff --git a/service/src/test/java/org/sunbird/service/organisation/OrgServiceImplTest.java b/service/src/test/java/org/sunbird/service/organisation/OrgServiceImplTest.java
index b0873fc8c..e3e488040 100644
--- a/service/src/test/java/org/sunbird/service/organisation/OrgServiceImplTest.java
+++ b/service/src/test/java/org/sunbird/service/organisation/OrgServiceImplTest.java
@@ -71,7 +71,7 @@ public class OrgServiceImplTest {
cassandraOperation.getRecordById(
Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.any()))
.thenReturn(getRecordsByProperty(false))
- .thenReturn(getRecordsByProperty(false));
+ .thenReturn(getRecordsByProperty(false));
PowerMockito.when(
cassandraOperation.getRecordsByPrimaryKeys(
@@ -229,5 +229,4 @@ public class OrgServiceImplTest {
Boolean bool = orgService.updateChannel(map, new RequestContext());
Assert.assertNotNull(bool);
}
-
}
diff --git a/service/src/test/java/org/sunbird/service/user/impl/SSOUserServiceImplTest.java b/service/src/test/java/org/sunbird/service/user/impl/SSOUserServiceImplTest.java
index f98c23f7c..34fe60d55 100644
--- a/service/src/test/java/org/sunbird/service/user/impl/SSOUserServiceImplTest.java
+++ b/service/src/test/java/org/sunbird/service/user/impl/SSOUserServiceImplTest.java
@@ -3,7 +3,6 @@ package org.sunbird.service.user.impl;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.when;
import static org.powermock.api.mockito.PowerMockito.mock;
-import static org.powermock.api.mockito.PowerMockito.mockStatic;
import java.util.HashMap;
import java.util.Map;
diff --git a/service/src/test/java/org/sunbird/util/UserUtilityTest.java b/service/src/test/java/org/sunbird/util/UserUtilityTest.java
index 820ea075b..f2bc2be40 100644
--- a/service/src/test/java/org/sunbird/util/UserUtilityTest.java
+++ b/service/src/test/java/org/sunbird/util/UserUtilityTest.java
@@ -1,10 +1,10 @@
package org.sunbird.util;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
import java.util.HashMap;
import java.util.Map;
-
import org.junit.Test;
import org.junit.runner.RunWith;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
@@ -13,11 +13,11 @@ import org.sunbird.keys.JsonKey;
@RunWith(PowerMockRunner.class)
@PowerMockIgnore({
- "javax.management.*",
- "javax.net.ssl.*",
- "javax.security.*",
- "jdk.internal.reflect.*",
- "javax.crypto.*"
+ "javax.management.*",
+ "javax.net.ssl.*",
+ "javax.security.*",
+ "jdk.internal.reflect.*",
+ "javax.crypto.*"
})
public class UserUtilityTest {
@@ -137,5 +137,4 @@ public class UserUtilityTest {
assertEquals(email, response.get(JsonKey.EMAIL));
assertEquals(userName, response.get(JsonKey.USER_NAME));
}
-
}
diff --git a/service/src/test/java/org/sunbird/util/UtilTest.java b/service/src/test/java/org/sunbird/util/UtilTest.java
index ee4b827fe..e3d430216 100644
--- a/service/src/test/java/org/sunbird/util/UtilTest.java
+++ b/service/src/test/java/org/sunbird/util/UtilTest.java
@@ -7,7 +7,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -24,10 +23,7 @@ import org.sunbird.request.Request;
import org.sunbird.response.Response;
@RunWith(PowerMockRunner.class)
-@PrepareForTest({
- ServiceFactory.class,
- CassandraOperation.class
-})
+@PrepareForTest({ServiceFactory.class, CassandraOperation.class})
@PowerMockIgnore({
"javax.management.*",
"javax.net.ssl.*",
@@ -44,8 +40,9 @@ public class UtilTest {
cassandraOperation = mock(CassandraOperation.class);
when(ServiceFactory.getInstance()).thenReturn(cassandraOperation);
}
+
@Test
- public void initializeContextTest(){
+ public void initializeContextTest() {
List<Map<String, Object>> userList = new ArrayList<>();
Map<String, Object> user = new HashMap<>();
@@ -57,12 +54,12 @@ public class UtilTest {
when(cassandraOperation.getRecordById(
Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.any()))
- .thenReturn(response);
+ .thenReturn(response);
Request req = new Request();
- req.getContext().put( JsonKey.ACTOR_TYPE, JsonKey.USER);
- req.getContext().put(JsonKey.REQUESTED_BY,"user1");
- Util.initializeContext(req,null);
+ req.getContext().put(JsonKey.ACTOR_TYPE, JsonKey.USER);
+ req.getContext().put(JsonKey.REQUESTED_BY, "user1");
+ Util.initializeContext(req, null);
}
@Test
diff --git a/service/src/test/java/org/sunbird/util/user/UserExternalIdentityAdapterTest.java b/service/src/test/java/org/sunbird/util/user/UserExternalIdentityAdapterTest.java
index da01ea6bc..67a6b0fb2 100644
--- a/service/src/test/java/org/sunbird/util/user/UserExternalIdentityAdapterTest.java
+++ b/service/src/test/java/org/sunbird/util/user/UserExternalIdentityAdapterTest.java
@@ -10,53 +10,53 @@ import org.sunbird.keys.JsonKey;
import org.sunbird.model.user.UserDeclareEntity;
public class UserExternalIdentityAdapterTest {
- private ObjectMapper mapper = new ObjectMapper();
+ private ObjectMapper mapper = new ObjectMapper();
- @Test
- public void testConvertSelfDeclareFieldsToExternalIds() {
- Map<String, Object> selfDeclaredFields = getSelfDeclareFields();
- List<Map<String, String>> externalIds =
- UserExternalIdentityAdapter.convertSelfDeclareFieldsToExternalIds(selfDeclaredFields);
- String declaredEmail = "";
- String declaredPhone = "";
- for (Map<String, String> extIdMap : externalIds) {
- if (JsonKey.DECLARED_EMAIL.equals((String) extIdMap.get(JsonKey.ORIGINAL_ID_TYPE))) {
- declaredEmail = (String) extIdMap.get(JsonKey.ORIGINAL_EXTERNAL_ID);
- }
- if (JsonKey.DECLARED_PHONE.equals((String) extIdMap.get(JsonKey.ORIGINAL_ID_TYPE))) {
- declaredPhone = (String) extIdMap.get(JsonKey.ORIGINAL_EXTERNAL_ID);
- }
- }
-
- Assert.assertEquals("abc@tenant.com", declaredEmail);
- Assert.assertEquals("999999999", declaredPhone);
+ @Test
+ public void testConvertSelfDeclareFieldsToExternalIds() {
+ Map<String, Object> selfDeclaredFields = getSelfDeclareFields();
+ List<Map<String, String>> externalIds =
+ UserExternalIdentityAdapter.convertSelfDeclareFieldsToExternalIds(selfDeclaredFields);
+ String declaredEmail = "";
+ String declaredPhone = "";
+ for (Map<String, String> extIdMap : externalIds) {
+ if (JsonKey.DECLARED_EMAIL.equals((String) extIdMap.get(JsonKey.ORIGINAL_ID_TYPE))) {
+ declaredEmail = (String) extIdMap.get(JsonKey.ORIGINAL_EXTERNAL_ID);
+ }
+ if (JsonKey.DECLARED_PHONE.equals((String) extIdMap.get(JsonKey.ORIGINAL_ID_TYPE))) {
+ declaredPhone = (String) extIdMap.get(JsonKey.ORIGINAL_EXTERNAL_ID);
+ }
}
- @Test
- public void testConvertExternalFieldsToSelfDeclareFields() {
- Map<String, Object> declaredFeilds = getSelfDeclareFields();
- List<Map<String, String>> externalIds =
- UserExternalIdentityAdapter.convertSelfDeclareFieldsToExternalIds(declaredFeilds);
- Map<String, Object> resultDeclaredFields =
- UserExternalIdentityAdapter.convertExternalFieldsToSelfDeclareFields(externalIds);
- Assert.assertEquals(
- declaredFeilds.get(JsonKey.USER_ID), resultDeclaredFields.get(JsonKey.USER_ID));
- Assert.assertEquals(
- ((Map<String, Object>) declaredFeilds.get(JsonKey.USER_INFO)).get(JsonKey.DECLARED_EMAIL),
- ((Map<String, Object>) resultDeclaredFields.get(JsonKey.USER_INFO))
- .get(JsonKey.DECLARED_EMAIL));
- }
+ Assert.assertEquals("abc@tenant.com", declaredEmail);
+ Assert.assertEquals("999999999", declaredPhone);
+ }
- private Map<String, Object> getSelfDeclareFields() {
- UserDeclareEntity userDeclareEntity = new UserDeclareEntity();
- userDeclareEntity.setUserId("userid");
- userDeclareEntity.setOrgId("org");
- userDeclareEntity.setPersona(JsonKey.TEACHER_PERSONA);
- Map<String, Object> userInfo = new HashMap<>();
- userInfo.put(JsonKey.DECLARED_EMAIL, "abc@tenant.com");
- userInfo.put(JsonKey.DECLARED_PHONE, "999999999");
- userDeclareEntity.setUserInfo(userInfo);
- Map<String, Object> selfDeclaredMap = mapper.convertValue(userDeclareEntity, Map.class);
- return selfDeclaredMap;
- }
-}
\ No newline at end of file
+ @Test
+ public void testConvertExternalFieldsToSelfDeclareFields() {
+ Map<String, Object> declaredFeilds = getSelfDeclareFields();
+ List<Map<String, String>> externalIds =
+ UserExternalIdentityAdapter.convertSelfDeclareFieldsToExternalIds(declaredFeilds);
+ Map<String, Object> resultDeclaredFields =
+ UserExternalIdentityAdapter.convertExternalFieldsToSelfDeclareFields(externalIds);
+ Assert.assertEquals(
+ declaredFeilds.get(JsonKey.USER_ID), resultDeclaredFields.get(JsonKey.USER_ID));
+ Assert.assertEquals(
+ ((Map<String, Object>) declaredFeilds.get(JsonKey.USER_INFO)).get(JsonKey.DECLARED_EMAIL),
+ ((Map<String, Object>) resultDeclaredFields.get(JsonKey.USER_INFO))
+ .get(JsonKey.DECLARED_EMAIL));
+ }
+
+ private Map<String, Object> getSelfDeclareFields() {
+ UserDeclareEntity userDeclareEntity = new UserDeclareEntity();
+ userDeclareEntity.setUserId("userid");
+ userDeclareEntity.setOrgId("org");
+ userDeclareEntity.setPersona(JsonKey.TEACHER_PERSONA);
+ Map<String, Object> userInfo = new HashMap<>();
+ userInfo.put(JsonKey.DECLARED_EMAIL, "abc@tenant.com");
+ userInfo.put(JsonKey.DECLARED_PHONE, "999999999");
+ userDeclareEntity.setUserInfo(userInfo);
+ Map<String, Object> selfDeclaredMap = mapper.convertValue(userDeclareEntity, Map.class);
+ return selfDeclaredMap;
+ }
+}
--
GitLab