Release 8.1.0

.github/workflows/build.yml

@@ -0,0 +1,74 @@
+name: Build and Deploy
+
+on:
+    push:
+      tags:
+        - '*'
+
+jobs:
+  ghcr-build-and-deploy:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+      packages: write
+
+    env:
+      REGISTRY: ghcr.io
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+
+      - name: Cache Maven packages
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Build
+        run: mvn clean install -DskipTests
+
+      - name: Package build artifact (Play dist)
+        run: mvn -f service/pom.xml play2:dist
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4.3.1
+        with:
+          name: cert-service-dist
+          path: |
+            service/target/service-*-dist.zip
+      - name: Extract image tag details
+        id: image_vars
+        run: |
+          REPO_LOWER=$(echo "${GITHUB_REPOSITORY}" | tr '[:upper:]' '[:lower:]')
+          SHORT_SHA=$(git rev-parse --short HEAD)
+          TAG_LOWER=$(echo "${GITHUB_REF_NAME}" | tr '[:upper:]' '[:lower:]')
+          IMAGE_NAME=${{ env.REGISTRY }}/${REPO_LOWER}
+          IMAGE_TAG=${TAG_LOWER}_${SHORT_SHA}_${GITHUB_RUN_NUMBER}
+          echo "IMAGE_NAME=${IMAGE_NAME}" >> $GITHUB_ENV
+          echo "IMAGE_TAG=${IMAGE_TAG}" >> $GITHUB_ENV
+      - name: Log in to GitHub Container Registry (GHCR)
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push Docker image to GHCR
+        uses: docker/build-push-action@v4
+        with:
+          context: ./service/target
+          file: ./Dockerfile
+          push: true
+          tags: ${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}

.gitignore

@@ -23,4 +23,4 @@ RUNNING_PID
 all-actors/all-actors.iml
 play-seed-wo-router.iml
 sb-actor/sb-actor.iml
-sb-utils/sb-utils.iml
+sb-utils/sb-utils.iml*.tar.gz

Dockerfile

@@ -1,7 +1,7 @@
 FROM sunbird/openjdk-java11-alpine:latest
 RUN apk update \
-    && apk add  unzip \
-    && apk add curl \
+    && apk upgrade \
+    && apk add --no-cache unzip curl \
     && adduser -u 1001 -h /home/sunbird/ -D sunbird \
     && mkdir -p /home/sunbird/ 
 ADD ./service-1.0.0-SNAPSHOT-dist.zip /home/sunbird/
@@ -10,4 +10,4 @@ RUN chown -R sunbird:sunbird /home/sunbird
 USER sunbird
 EXPOSE 9000
 WORKDIR /home/sunbird/
-CMD java -XX:+PrintFlagsFinal $JAVA_OPTIONS -cp '/home/sunbird/service-1.0.0-SNAPSHOT/lib/*' play.core.server.ProdServerStart  /home/sunbird/service-1.0.0-SNAPSHOT
+CMD java -XX:+PrintFlagsFinal $JAVA_OPTIONS -cp '/home/sunbird/service-1.0.0-SNAPSHOT/lib/*' play.core.server.ProdServerStart  /home/sunbird/service-1.0.0-SNAPSHOT

UPGRADE_README.md

@@ -0,0 +1,81 @@
+# Play Framework and Pekko Upgrade
+
+## Summary
+
+This repository has been upgraded from Play Framework 2.7.2 with Akka 2.5.22 to Play Framework 3.0.5 with Apache Pekko 1.0.3.
+
+## Version Changes
+
+### Before
+- Play Framework: 2.7.2
+- Akka: 2.5.22
+- Scala: 2.11.12
+- Java: 8 (target), 17 (runtime)
+- Jackson: 2.9.10.4
+- SLF4J: 1.6.1
+- Logback: 1.0.7
+- Netty: 4.1.44
+
+### After
+- Play Framework: 3.0.5
+- Apache Pekko: 1.0.3
+- Scala: 2.13.12
+- Java: 11 (target), 17 (runtime)
+- Jackson: 2.14.3
+- SLF4J: 2.0.9
+- Logback: 1.4.14
+- Netty: 4.1.93
+
+## Reason for Upgrade
+
+1. License Compliance: Akka changed from Apache 2.0 to Business Source License 1.1 requiring commercial licenses. Apache Pekko maintains Apache 2.0 license.
+2. Security: Play 2.7.2 and Akka 2.5.22 no longer receive security updates.
+3. Modernization: Access to latest features and performance improvements.
+
+### Play 3.0 API Updates
+- ActorStartModule: Changed from AkkaGuiceSupport to PekkoGuiceSupport
+- RequestHandler: Updated FutureConverters for Scala 2.13
+- OnRequestHandler: Removed deprecated Http.Context, using Http.Request
+- Fixed artifact names for Play 3.0 compatibility
+
+## Build
+
+Build all modules:
+```
+mvn clean install -DskipTests
+```
+
+Create distribution package:
+```
+cd service
+mvn play2:dist
+```
+
+## Build Verification
+
+All modules compile successfully:
+- certification-service
+- sb-utils
+- Cassandra Utils
+- sb-es-utils
+- all-actors
+- play-service
+
+Dependency tree verified: No Akka dependencies, only Scala 2.13.12 present.
+
+
+## Migration Impact
+
+- Business Logic: No changes to business logic or functionality
+- API Compatibility: Maintained, as Pekko is API-compatible with Akka 2.6
+- Code Changes: Primarily package name updates from akka to pekko
+- License: Now compliant with Apache 2.0 throughout the stack
+
+## Known Issues
+
+If you encounter NoClassDefFoundError for scala.collection.GenMap, verify dependency tree to ensure no Scala 2.12 artifacts are present:
+```
+mvn dependency:tree
+```
+
+Add exclusions for any scala-library or scala-reflect with version 2.12 if needed.

all-actors/pom.xml

@@ -11,24 +11,54 @@
     <version>1.0.0</version>
     <dependencies>
         <dependency>
-            <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-actor_${scala.major.version}</artifactId>
-            <version>${akka.x.version}</version>
+            <groupId>org.apache.pekko</groupId>
+            <artifactId>pekko-actor_${scala.major.version}</artifactId>
+            <version>${pekko.version}</version>
         </dependency>
         <dependency>
             <groupId>org.sunbird</groupId>
             <artifactId>sb-es-utils</artifactId>
             <version>1.0-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.scala-lang</groupId>
+                    <artifactId>scala-library</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.scala-lang</groupId>
+                    <artifactId>scala-reflect</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.sunbird</groupId>
             <artifactId>sb-utils</artifactId>
             <version>1.0.0-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.scala-lang</groupId>
+                    <artifactId>scala-library</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.scala-lang</groupId>
+                    <artifactId>scala-reflect</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.sunbird</groupId>
             <artifactId>cassandra-utils</artifactId>
             <version>1.0-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.scala-lang</groupId>
+                    <artifactId>scala-library</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.scala-lang</groupId>
+                    <artifactId>scala-reflect</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.mashape.unirest</groupId>
@@ -41,13 +71,24 @@
             <artifactId>commons-io</artifactId>
             <version>2.6</version>
         </dependency>
+        <!-- Explicitly declare Scala 2.13 -->
+        <dependency>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-library</artifactId>
+            <version>${scala.version}</version>
+        </dependency>
 
         <dependency>
-            <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-testkit_${scala.major.version}</artifactId>
-            <version>2.5.22</version>
+            <groupId>org.apache.pekko</groupId>
+            <artifactId>pekko-testkit_${scala.major.version}</artifactId>
+            <version>${pekko.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-scala_${scala.major.version}</artifactId>
+            <version>2.13.0</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

all-actors/src/main/java/org/sunbird/BaseActor.java

@@ -1,8 +1,8 @@
 package org.sunbird;
 
-import akka.actor.UntypedAbstractActor;
-import akka.event.DiagnosticLoggingAdapter;
-import akka.event.Logging;
+import org.apache.pekko.actor.UntypedAbstractActor;
+import org.apache.pekko.event.DiagnosticLoggingAdapter;
+import org.apache.pekko.event.Logging;
 import org.sunbird.message.IResponseMessage;
 import org.sunbird.message.Localizer;
 import org.sunbird.message.ResponseCode;

all-actors/src/main/java/org/sunbird/actor/CertificationActor.java

@@ -1,6 +1,6 @@
 package org.sunbird.actor;
 
-import akka.actor.ActorRef;
+import org.apache.pekko.actor.ActorRef;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import org.sunbird.BaseActor;
 import org.sunbird.BaseException;

all-actors/src/main/java/org/sunbird/service/ICertService.java

@@ -1,7 +1,7 @@
 package org.sunbird.service;
 
 
-import akka.actor.ActorRef;
+import org.apache.pekko.actor.ActorRef;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import org.sunbird.BaseException;
 import org.sunbird.request.Request;

all-actors/src/main/java/org/sunbird/serviceimpl/CertsServiceImpl.java

@@ -1,9 +1,10 @@
 package org.sunbird.serviceimpl;
 
-import akka.actor.ActorRef;
+import org.apache.pekko.actor.ActorRef;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.module.scala.DefaultScalaModule;
 import com.mashape.unirest.http.HttpResponse;
 import com.mashape.unirest.http.JsonNode;
 import org.apache.commons.collections.CollectionUtils;
@@ -27,6 +28,7 @@
 import org.sunbird.service.ICertService;
 import org.sunbird.utilities.CertificateUtil;
 import org.sunbird.utilities.ESResponseMapper;
+import scala.jdk.javaapi.CollectionConverters;
 
 import java.io.IOException;
 import java.net.URL;
@@ -48,6 +50,7 @@ public class CertsServiceImpl implements ICertService {
     static Map<String, String> headerMap = new HashMap<>();
     static {
         headerMap.put("Content-Type", "application/json");
+        requestMapper.registerModule(new DefaultScalaModule());
     }
 
     @Override
@@ -126,15 +129,26 @@ private Response processRecord(Map<String, Object> certReqAddMap, String version
         Map<String,Object>recordMap= requestMapper.convertValue(certificate,Map.class);
         return CertificateUtil.insertRecord(recordMap, certBackgroundActorRef);
     }
-    private Certificate getCertificate(Map<String, Object> certReqAddMap) {
+    private Certificate getCertificate(Map<String, Object> certReqAddMap) throws BaseException {
+        Object relatedObj = certReqAddMap.get(JsonKeys.RELATED);
+        if (relatedObj == null) {
+            throw new BaseException(IResponseMessage.INVALID_REQUESTED_DATA, MessageFormat.format(getLocalizedMessage(IResponseMessage.MISSING_MANDATORY_PARAMS,null), JsonKeys.RELATED), ResponseCode.CLIENT_ERROR.getCode());
+        }
+        Map<String, Object> relatedMap = null;
+        if (relatedObj instanceof scala.collection.Map) {
+            relatedMap = (Map<String, Object>) CollectionConverters.asJava((scala.collection.Map<?, ?>) relatedObj);
+        } else if (relatedObj instanceof Map) {
+            relatedMap = (Map<String, Object>) relatedObj;
+        }
+
         Certificate certificate = new Certificate.Builder()
                 .setId((String) certReqAddMap.get(JsonKeys.ID))
                 .setData(getData(certReqAddMap))
                 .setRevoked(false)
                 .setAccessCode((String)certReqAddMap.get(JsonKeys.ACCESS_CODE))
                 .setJsonUrl((String)certReqAddMap.get(JsonKeys.JSON_URL))
                 .setRecipient(getCompositeReciepientObject(certReqAddMap))
-                .setRelated((Map)certReqAddMap.get(JsonKeys.RELATED))
+                .setRelated(relatedMap)
                 .setReason((String)certReqAddMap.get(JsonKeys.REASON))
                 .build();
         logger.info("CertsServiceImpl:getCertificate:certificate object formed.");
@@ -149,8 +163,18 @@ private Recipient getCompositeReciepientObject(Map<String, Object> certAddReques
     return recipient;
     }
 
-    private Map<String, Object> getData(Map<String, Object> certAddRequestMap) {
-        return (Map) certAddRequestMap.get(JsonKeys.JSON_DATA);
+    private Map<String, Object> getData(Map<String, Object> certAddRequestMap) throws BaseException {
+        Object jsonDataObj = certAddRequestMap.get(JsonKeys.JSON_DATA);
+        if (jsonDataObj instanceof scala.collection.Map) {
+            return (Map<String, Object>) CollectionConverters.asJava((scala.collection.Map<?, ?>) jsonDataObj);
+        } else if (jsonDataObj instanceof Map) {
+            return (Map<String, Object>) jsonDataObj;
+        }
+        throw new BaseException(
+                IResponseMessage.INVALID_REQUESTED_DATA,
+                "Invalid type for JSON_DATA: expected Scala Map or Java Map, but got "
+                        + (jsonDataObj == null ? "null" : jsonDataObj.getClass().getName()),
+                ResponseCode.CLIENT_ERROR.getCode());
     }
 
     @Override
@@ -505,16 +529,16 @@ public Response searchV2(Request request) throws BaseException{
     private ESResponseMapper searchEsPostCall(Request request) throws BaseException {
         ESResponseMapper mappedResponse = null;
         try {
-            String requestBody = requestMapper.writeValueAsString(request.getRequest());
-            logger.info("CertsServiceImpl:search:request body found.");
+            Object requestObj = request.getRequest();
+            String requestBody = requestMapper.writeValueAsString(requestObj);
             String apiToCall = CertVars.getEsSearchUri();
             logger.info("CertsServiceImpl:search:complete url found: " + apiToCall);
             Future<HttpResponse<JsonNode>> responseFuture = CertificateUtil.makeAsyncPostCall(apiToCall, requestBody, headerMap);
             HttpResponse<JsonNode> jsonResponse = responseFuture.get();
             if (jsonResponse != null && jsonResponse.getStatus() == HttpStatus.SC_OK) {
                 String jsonArray = jsonResponse.getBody().getObject().getJSONObject(JsonKeys.HITS).toString();
                 Map<String, Object> apiResp = requestMapper.readValue(jsonArray, Map.class);
-                mappedResponse = new ObjectMapper().convertValue(apiResp, ESResponseMapper.class);
+                mappedResponse = requestMapper.convertValue(apiResp, ESResponseMapper.class);
             } else {
                 logger.error("CertsServiceImpl:searchEsPostCall: Invalid request data ");
                 throw new BaseException(IResponseMessage.INVALID_REQUESTED_DATA, jsonResponse.getBody().toString(), ResponseCode.CLIENT_ERROR.getCode());