diff --git a/controller/app/controllers/otp/validator/OtpRequestValidator.java b/controller/app/controllers/otp/validator/OtpRequestValidator.java index d83ac01e31..33637a5962 100644 --- a/controller/app/controllers/otp/validator/OtpRequestValidator.java +++ b/controller/app/controllers/otp/validator/OtpRequestValidator.java @@ -1,10 +1,6 @@ package controllers.otp.validator; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.sunbird.exception.ProjectCommonException; import org.sunbird.exception.ResponseCode; import org.sunbird.exception.ResponseMessage; @@ -14,6 +10,11 @@ import org.sunbird.util.StringFormatter; import org.sunbird.validator.BaseRequestValidator; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + public class OtpRequestValidator extends BaseRequestValidator { private final List allowedTemplate = diff --git a/controller/pom.xml b/controller/pom.xml index 5ae07fd0bf..07e46610f1 100644 --- a/controller/pom.xml +++ b/controller/pom.xml @@ -237,7 +237,13 @@ ch.qos.logback.contrib logback-json-classic 0.1.5 - + + + ch.qos.logback + logback-classic + + + net.logstash.logback logstash-logback-encoder diff --git a/core/platform-common/src/main/java/org/sunbird/validator/BaseRequestValidator.java b/core/platform-common/src/main/java/org/sunbird/validator/BaseRequestValidator.java index 10f384ab45..fef7e2cbf1 100644 --- a/core/platform-common/src/main/java/org/sunbird/validator/BaseRequestValidator.java +++ b/core/platform-common/src/main/java/org/sunbird/validator/BaseRequestValidator.java @@ -1,13 +1,8 @@ package org.sunbird.validator; -import java.text.MessageFormat; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - import com.typesafe.config.ConfigFactory; import org.apache.commons.collections.MapUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.sunbird.exception.ProjectCommonException; import org.sunbird.exception.ResponseCode; import org.sunbird.keys.JsonKey; @@ -15,6 +10,11 @@ import org.sunbird.util.ProjectUtil; import org.sunbird.util.StringFormatter; +import java.text.MessageFormat; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + /** * Base request validator class to house common validation methods. * diff --git a/core/platform-common/src/main/java/org/sunbird/validator/EmailValidator.java b/core/platform-common/src/main/java/org/sunbird/validator/EmailValidator.java index e90a794240..3d9d83b694 100644 --- a/core/platform-common/src/main/java/org/sunbird/validator/EmailValidator.java +++ b/core/platform-common/src/main/java/org/sunbird/validator/EmailValidator.java @@ -1,8 +1,9 @@ package org.sunbird.validator; +import org.apache.commons.lang3.StringUtils; + import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.lang.StringUtils; /** * Helper class for validating email. diff --git a/service/src/main/java/org/sunbird/actor/bulkupload/BaseBulkUploadActor.java b/service/src/main/java/org/sunbird/actor/bulkupload/BaseBulkUploadActor.java index ec95700380..67c7c688a3 100644 --- a/service/src/main/java/org/sunbird/actor/bulkupload/BaseBulkUploadActor.java +++ b/service/src/main/java/org/sunbird/actor/bulkupload/BaseBulkUploadActor.java @@ -4,16 +4,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.opencsv.CSVReader; import com.opencsv.CSVReaderBuilder; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.UnsupportedEncodingException; -import java.nio.charset.StandardCharsets; -import java.sql.Timestamp; -import java.util.*; import org.apache.commons.collections.MapUtils; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.sunbird.actor.core.BaseActor; import org.sunbird.dao.bulkupload.BulkUploadProcessDao; import org.sunbird.dao.bulkupload.BulkUploadProcessTaskDao; @@ -31,6 +24,14 @@ import org.sunbird.service.user.impl.UserServiceImpl; import org.sunbird.util.ProjectUtil; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.UnsupportedEncodingException; +import java.nio.charset.StandardCharsets; +import java.sql.Timestamp; +import java.util.*; + /** * Actor contains the common functionality for bulk upload. * diff --git a/service/src/main/java/org/sunbird/actor/notification/EmailServiceActor.java b/service/src/main/java/org/sunbird/actor/notification/EmailServiceActor.java index 6f7b1b92ae..3100b4ff87 100644 --- a/service/src/main/java/org/sunbird/actor/notification/EmailServiceActor.java +++ b/service/src/main/java/org/sunbird/actor/notification/EmailServiceActor.java @@ -1,11 +1,7 @@ package org.sunbird.actor.notification; -import java.io.StringWriter; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.sunbird.actor.core.BaseActor; @@ -19,6 +15,11 @@ import org.sunbird.service.notification.NotificationService; import org.sunbird.util.ProjectUtil; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + public class EmailServiceActor extends BaseActor { private final NotificationService notificationService = new NotificationService(); diff --git a/service/src/main/java/org/sunbird/actor/notification/SendNotificationActor.java b/service/src/main/java/org/sunbird/actor/notification/SendNotificationActor.java index 86ccd73964..9fcf9851e1 100644 --- a/service/src/main/java/org/sunbird/actor/notification/SendNotificationActor.java +++ b/service/src/main/java/org/sunbird/actor/notification/SendNotificationActor.java @@ -1,10 +1,7 @@ package org.sunbird.actor.notification; import akka.actor.ActorRef; -import java.util.*; -import javax.inject.Inject; -import javax.inject.Named; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.sunbird.actor.core.BaseActor; import org.sunbird.keys.JsonKey; import org.sunbird.operations.ActorOperations; @@ -13,6 +10,10 @@ import org.sunbird.response.Response; import org.sunbird.service.notification.NotificationService; +import javax.inject.Inject; +import javax.inject.Named; +import java.util.*; + public class SendNotificationActor extends BaseActor { private final NotificationService notificationService = new NotificationService(); diff --git a/service/src/main/java/org/sunbird/actor/user/ManagedUserActor.java b/service/src/main/java/org/sunbird/actor/user/ManagedUserActor.java index 1fe59d8276..4d07395c43 100644 --- a/service/src/main/java/org/sunbird/actor/user/ManagedUserActor.java +++ b/service/src/main/java/org/sunbird/actor/user/ManagedUserActor.java @@ -1,13 +1,8 @@ package org.sunbird.actor.user; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.StringUtils; import org.sunbird.actor.user.validator.UserCreateRequestValidator; import org.sunbird.common.ElasticSearchHelper; import org.sunbird.dto.SearchDTO; @@ -28,6 +23,12 @@ import org.sunbird.util.*; import org.sunbird.util.user.UserUtil; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + public class ManagedUserActor extends UserBaseActor { private final UserService userService = UserServiceImpl.getInstance(); diff --git a/service/src/main/java/org/sunbird/actor/user/UserOwnershipTransferActor.java b/service/src/main/java/org/sunbird/actor/user/UserOwnershipTransferActor.java index 0dc45cbf6f..5b4e414277 100644 --- a/service/src/main/java/org/sunbird/actor/user/UserOwnershipTransferActor.java +++ b/service/src/main/java/org/sunbird/actor/user/UserOwnershipTransferActor.java @@ -1,7 +1,7 @@ package org.sunbird.actor.user; import org.apache.commons.collections.MapUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.sunbird.actor.core.BaseActor; import org.sunbird.exception.ProjectCommonException; import org.sunbird.exception.ResponseCode; diff --git a/service/src/main/java/org/sunbird/dao/notification/impl/EmailTemplateDaoImpl.java b/service/src/main/java/org/sunbird/dao/notification/impl/EmailTemplateDaoImpl.java index fea78cfd6a..b87ffc152e 100644 --- a/service/src/main/java/org/sunbird/dao/notification/impl/EmailTemplateDaoImpl.java +++ b/service/src/main/java/org/sunbird/dao/notification/impl/EmailTemplateDaoImpl.java @@ -1,11 +1,7 @@ package org.sunbird.dao.notification.impl; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.sunbird.cassandra.CassandraOperation; import org.sunbird.dao.notification.EmailTemplateDao; import org.sunbird.helper.ServiceFactory; @@ -14,6 +10,11 @@ import org.sunbird.response.Response; import org.sunbird.util.ProjectUtil; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; + public class EmailTemplateDaoImpl implements EmailTemplateDao { private static EmailTemplateDao emailTemplateDao; diff --git a/service/src/main/java/org/sunbird/model/adminutil/AdminUtilRequest.java b/service/src/main/java/org/sunbird/model/adminutil/AdminUtilRequest.java index 691df6bc7d..ac1eb51e54 100644 --- a/service/src/main/java/org/sunbird/model/adminutil/AdminUtilRequest.java +++ b/service/src/main/java/org/sunbird/model/adminutil/AdminUtilRequest.java @@ -1,7 +1,8 @@ package org.sunbird.model.adminutil; -import com.fasterxml.jackson.annotation.*; -import org.apache.commons.lang.builder.ToStringBuilder; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import org.apache.commons.lang3.builder.ToStringBuilder; import java.io.Serializable; import java.util.List; diff --git a/service/src/main/java/org/sunbird/model/adminutil/AdminUtilRequestData.java b/service/src/main/java/org/sunbird/model/adminutil/AdminUtilRequestData.java index 7067373596..9dafe56ef6 100644 --- a/service/src/main/java/org/sunbird/model/adminutil/AdminUtilRequestData.java +++ b/service/src/main/java/org/sunbird/model/adminutil/AdminUtilRequestData.java @@ -1,7 +1,7 @@ package org.sunbird.model.adminutil; import com.fasterxml.jackson.annotation.JsonProperty; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import java.io.Serializable; diff --git a/service/src/main/java/org/sunbird/model/adminutil/AdminUtilRequestPayload.java b/service/src/main/java/org/sunbird/model/adminutil/AdminUtilRequestPayload.java index 485b5a652c..2c010bc4d2 100644 --- a/service/src/main/java/org/sunbird/model/adminutil/AdminUtilRequestPayload.java +++ b/service/src/main/java/org/sunbird/model/adminutil/AdminUtilRequestPayload.java @@ -2,8 +2,9 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; +import org.apache.commons.lang3.builder.ToStringBuilder; + import java.io.Serializable; -import org.apache.commons.lang.builder.ToStringBuilder; @JsonIgnoreProperties(ignoreUnknown = true) public class AdminUtilRequestPayload implements Serializable { diff --git a/service/src/main/java/org/sunbird/model/adminutil/Params.java b/service/src/main/java/org/sunbird/model/adminutil/Params.java index 93d375a6c3..3125db6a89 100644 --- a/service/src/main/java/org/sunbird/model/adminutil/Params.java +++ b/service/src/main/java/org/sunbird/model/adminutil/Params.java @@ -1,8 +1,9 @@ package org.sunbird.model.adminutil; import com.fasterxml.jackson.annotation.JsonProperty; +import org.apache.commons.lang3.builder.ToStringBuilder; + import java.io.Serializable; -import org.apache.commons.lang.builder.ToStringBuilder; public class Params implements Serializable { private static final long serialVersionUID = -8580469966189743283L; diff --git a/service/src/main/java/org/sunbird/model/formutil/FormApiUtilRequestPayload.java b/service/src/main/java/org/sunbird/model/formutil/FormApiUtilRequestPayload.java index 6ff50c8ee6..9303fd858a 100644 --- a/service/src/main/java/org/sunbird/model/formutil/FormApiUtilRequestPayload.java +++ b/service/src/main/java/org/sunbird/model/formutil/FormApiUtilRequestPayload.java @@ -2,10 +2,11 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import java.io.Serializable; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.sunbird.model.adminutil.Params; +import java.io.Serializable; + @JsonIgnoreProperties(ignoreUnknown = true) public class FormApiUtilRequestPayload implements Serializable { private static final long serialVersionUID = -2362783406031347676L; diff --git a/service/src/main/java/org/sunbird/service/notification/NotificationService.java b/service/src/main/java/org/sunbird/service/notification/NotificationService.java index 91b20d5851..2a9b6629a5 100644 --- a/service/src/main/java/org/sunbird/service/notification/NotificationService.java +++ b/service/src/main/java/org/sunbird/service/notification/NotificationService.java @@ -1,16 +1,8 @@ package org.sunbird.service.notification; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.velocity.VelocityContext; import org.sunbird.dao.notification.EmailTemplateDao; import org.sunbird.dao.notification.impl.EmailTemplateDaoImpl; @@ -28,6 +20,9 @@ import org.sunbird.service.user.impl.UserServiceImpl; import org.sunbird.util.ProjectUtil; +import java.text.MessageFormat; +import java.util.*; + public class NotificationService { private final LoggerUtil logger = new LoggerUtil(NotificationService.class); diff --git a/service/src/test/java/org/sunbird/dao/notification/EmailTemplateDaoImplTest.java b/service/src/test/java/org/sunbird/dao/notification/EmailTemplateDaoImplTest.java index 41d2288442..f2116fe917 100644 --- a/service/src/test/java/org/sunbird/dao/notification/EmailTemplateDaoImplTest.java +++ b/service/src/test/java/org/sunbird/dao/notification/EmailTemplateDaoImplTest.java @@ -1,12 +1,6 @@ package org.sunbird.dao.notification; -import static org.powermock.api.mockito.PowerMockito.when; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -24,6 +18,13 @@ import org.sunbird.response.Response; import org.sunbird.util.ProjectUtil; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.powermock.api.mockito.PowerMockito.when; + @RunWith(PowerMockRunner.class) @PrepareForTest({ CassandraOperationImpl.class,