Issue #SB-30221 fix: fixed build issue

rahu-tarento · Jun 28, 2022 · f4c9133 · f4c9133
1 parent db528da
commit f4c9133
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/assessment-api/assessment-actors/src/main/scala/org/sunbird/managers/CopyManager.scala b/assessment-api/assessment-actors/src/main/scala/org/sunbird/managers/CopyManager.scala
@@ -1,8 +1,7 @@
 package org.sunbird.managers
 
-import org.apache.commons.collections.CollectionUtils
+import org.apache.commons.collections4.CollectionUtils
 import org.apache.commons.collections4.MapUtils
-import org.apache.commons.lang.StringUtils
 import org.sunbird.common.{JsonUtils, Platform}
 import org.sunbird.common.dto.{Request, Response, ResponseHandler}
 import org.sunbird.common.exception.{ClientException, ServerException}
@@ -14,11 +13,13 @@ import org.sunbird.graph.schema.DefinitionNode
 import org.sunbird.graph.utils.{NodeUtil, ScalaJsonUtils}
 import org.sunbird.telemetry.logger.TelemetryManager
 import org.sunbird.utils.{AssessmentConstants, BranchingUtil, HierarchyConstants}
-
 import java.util
-import java.util.concurrent.{CompletionException}
+import java.util.concurrent.CompletionException
 import java.util.{Optional, UUID}
-import scala.collection.JavaConversions.{mapAsScalaMap}
+
+import org.apache.commons.lang3.StringUtils
+
+import scala.collection.JavaConversions.mapAsScalaMap
 import scala.collection.JavaConverters._
 import scala.concurrent.{ExecutionContext, Future}
 

diff --git a/assessment-api/assessment-actors/src/main/scala/org/sunbird/utils/BranchingUtil.scala b/assessment-api/assessment-actors/src/main/scala/org/sunbird/utils/BranchingUtil.scala
@@ -1,6 +1,6 @@
 package org.sunbird.utils
 
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
 import org.sunbird.common.dto.Request
 
 import java.util

diff --git a/assessment-api/assessment-actors/src/test/scala/org/sunbird/actors/CopySpec.scala b/assessment-api/assessment-actors/src/test/scala/org/sunbird/actors/CopySpec.scala
@@ -1,6 +1,6 @@
 package org.sunbird.actors
 
-import org.mortbay.util.StringUtil
+import org.apache.commons.lang3.StringUtils
 import org.sunbird.common.dto.{Request, Response, ResponseParams}
 import org.sunbird.graph.dac.model.Node
 import org.sunbird.utils.AssessmentConstants
@@ -105,7 +105,7 @@ object CopySpec {
 			{
 				put("code", "xyz")
 				put("mimeType", {
-					if (StringUtil.endsWithIgnoreCase(objectType, AssessmentConstants.QUESTIONSET_SCHEMA_NAME)) {
+					if (StringUtils.endsWithIgnoreCase(objectType, AssessmentConstants.QUESTIONSET_SCHEMA_NAME)) {
 						AssessmentConstants.QUESTIONSET_MIME_TYPE
 					} else {
 						AssessmentConstants.QUESTION_MIME_TYPE