Merge pull request #1123 from chethann-007/release-8.0.0

feat: Migrate to Play Framework 3.0.5, Apache Pekko 1.0.3, and Scala 2.13.12

Author: pallakartheekreddy

content-api/collection-csv-actors/pom.xml

@@ -28,7 +28,7 @@
         </dependency>
         <dependency>
             <groupId>org.sunbird</groupId>
-            <artifactId>graph-engine_2.12</artifactId>
+            <artifactId>graph-engine_2.13</artifactId>
             <version>1.0-SNAPSHOT</version>
             <type>jar</type>
         </dependency>
@@ -78,9 +78,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-testkit_${scala.maj.version}</artifactId>
-            <version>2.5.22</version>
+            <groupId>org.apache.pekko</groupId>
+            <artifactId>pekko-testkit_${scala.maj.version}</artifactId>
+            <version>1.0.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>

content-api/collection-csv-actors/src/main/scala/org.sunbird/collectioncsv/actors/CollectionCSVActor.scala

@@ -13,8 +13,8 @@ import org.sunbird.managers.HierarchyManager
 import org.sunbird.telemetry.logger.TelemetryManager
 
 import javax.inject.Inject
-import scala.collection.JavaConverters.mapAsJavaMapConverter
 import scala.collection.immutable.{HashMap, Map}
+import scala.jdk.CollectionConverters._
 import scala.concurrent.{ExecutionContext, Future}
 
 class CollectionCSVActor @Inject() (implicit oec: OntologyEngineContext, ss: StorageService) extends BaseActor {

content-api/collection-csv-actors/src/main/scala/org.sunbird/collectioncsv/manager/CollectionCSVManager.scala

@@ -23,13 +23,11 @@ import java.nio.charset.StandardCharsets
 import java.util
 import java.util.logging.Logger
 import scala.collection.immutable.{ListMap, Map}
-import scala.collection.convert.ImplicitConversions._
-import scala.collection.JavaConverters.{asJavaIterableConverter, mapAsScalaMapConverter}
+import scala.jdk.CollectionConverters._
 import scala.collection.mutable
 import scala.collection.mutable.ListBuffer
 import scala.concurrent.{ExecutionContext, Future}
 
-import scala.collection.JavaConverters._
 
 object CollectionCSVManager extends CollectionInputFileReader  {
 
@@ -239,7 +237,7 @@ object CollectionCSVManager extends CollectionInputFileReader  {
   }
 
   private def populateFolderInfoMap(folderInfoMap: mutable.Map[String, AnyRef], csvRecords: util.List[CSVRecord], mode: String): Unit = {
-    csvRecords.map(csvRecord => {
+    csvRecords.asScala.map(csvRecord => {
       val csvRecordFolderHierarchyMap: Map[String, String] = csvRecord.toMap.asScala.toMap.filter(colData => {
         folderHierarchyHdrColumnsList.contains(colData._1) && colData._2.nonEmpty
       })
@@ -258,11 +256,11 @@ object CollectionCSVManager extends CollectionInputFileReader  {
           if(nodeInfoMap.contains(CollectionTOCConstants.CHILDREN))
           {
             var childrenSet = nodeInfoMap(CollectionTOCConstants.CHILDREN).asInstanceOf[Seq[String]]
-            childrenSet ++= Seq(getCode(sortedFoldersDataList.get(sortedFoldersDataKey.indexOf(folderData._1)+1)))
+            childrenSet ++= Seq(getCode(sortedFoldersDataList(sortedFoldersDataKey.indexOf(folderData._1)+1)))
             nodeInfoMap(CollectionTOCConstants.CHILDREN) = childrenSet
           }
           else {
-            val childrenList = Seq(getCode(sortedFoldersDataList.get(sortedFoldersDataKey.indexOf(folderData._1)+1)))
+            val childrenList = Seq(getCode(sortedFoldersDataList(sortedFoldersDataKey.indexOf(folderData._1)+1)))
             nodeInfoMap += (CollectionTOCConstants.CHILDREN -> childrenList)
           }
           folderInfoMap(folderDataHashCode) = nodeInfoMap
@@ -304,7 +302,7 @@ object CollectionCSVManager extends CollectionInputFileReader  {
             else {
               val childrenList = {
                 if((sortedFoldersDataKey.indexOf(folderData._1)+1) != sortedFoldersDataList.size)
-                  Seq(getCode(sortedFoldersDataList.get(sortedFoldersDataKey.indexOf(folderData._1)+1)))
+                  Seq(getCode(sortedFoldersDataList(sortedFoldersDataKey.indexOf(folderData._1)+1)))
                 else Seq.empty[String]
               }
               scala.collection.mutable.Map(CollectionTOCConstants.NAME -> folderData._2, CollectionTOCConstants.CHILDREN -> childrenList, CollectionTOCConstants.LEVEL -> folderData._1)
@@ -470,9 +468,9 @@ object CollectionCSVManager extends CollectionInputFileReader  {
       if(nodeInfo(CollectionTOCConstants.DIAL_CODES) != null && nodeInfo(CollectionTOCConstants.DIAL_CODES).toString.nonEmpty)
         new util.HashMap[String, String]{put(CollectionTOCConstants.IDENTIFIER, nodeInfo(CollectionTOCConstants.IDENTIFIER).toString); put(CollectionTOCConstants.DIALCODE, nodeInfo(CollectionTOCConstants.DIAL_CODES).toString)}
       else  new util.HashMap[String, String]()
-    }).filter(record => record.nonEmpty).toList
+    }).filter(record => !record.isEmpty).toList
 
-    if(linkDIALCodeReqMap.nonEmpty) linkDIALCode(channelID, collectionID, linkDIALCodeReqMap)
+    if(!linkDIALCodeReqMap.isEmpty) linkDIALCode(channelID, collectionID, linkDIALCodeReqMap)
   }
 
 

content-api/collection-csv-actors/src/main/scala/org.sunbird/collectioncsv/util/CollectionTOCUtil.scala

@@ -7,9 +7,9 @@ import org.sunbird.graph.OntologyEngineContext
 import org.sunbird.telemetry.logger.TelemetryManager
 
 import java.util
-import scala.collection.JavaConverters._
 import java.text.MessageFormat
 import scala.collection.immutable.Map
+import scala.jdk.CollectionConverters._
 import scala.concurrent.ExecutionContext