Merge pull request #159 from aimansharief/scala-conversion-fix

Issue #SBCOSS-00 : Fix Scala Conversions and Addition of public key base path to config

Author: pallakartheekreddy

all-actors/src/main/java/org/sunbird/notification/actor/CreateNotificationActor.java

@@ -1,6 +1,7 @@
 package org.sunbird.notification.actor;
 
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.sunbird.BaseActor;
@@ -19,7 +20,7 @@
 import org.sunbird.request.LoggerUtil;
 import org.sunbird.telemetry.TelemetryEnvKey;
 import org.sunbird.telemetry.util.TelemetryUtil;
-import scala.collection.JavaConverters;
+import org.sunbird.util.Util;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -44,14 +45,11 @@ public void onReceive(Request request) throws Throwable {
         try {
             Response response = new Response();
             ObjectMapper mapper = new ObjectMapper();
-            // Convert Scala collection to Java List to avoid ClassCastException
             Object notificationsObject = request.getRequest().get(JsonKey.NOTIFICATIONS);
-            List<Map<String, Object>> notifications;
-            if (notificationsObject instanceof scala.collection.Seq) {
-                notifications = new ArrayList<>(JavaConverters.asJavaCollectionConverter((scala.collection.Seq<Map<String, Object>>) notificationsObject).asJavaCollection());
-            } else {
-                notifications = (List<Map<String, Object>>) notificationsObject;
-            }
+            List<Map<String, Object>> notifications = Util.convertToList(
+                notificationsObject, 
+                new TypeReference<List<Map<String, Object>>>() {}
+            );
 
             String deliveryMode = request.getManagerName();
             if (StringUtils.isNotBlank(deliveryMode) && "sync".equalsIgnoreCase(deliveryMode)) {

all-actors/src/main/java/org/sunbird/notification/actor/NotificationActor.java

@@ -21,6 +21,9 @@
 import org.sunbird.request.LoggerUtil;
 import org.sunbird.util.validator.OtpRequestValidator;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import org.sunbird.util.Util;
+
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.List;
@@ -54,7 +57,10 @@ public void notify(Request request) throws BaseException {
     logger.info(request.getRequest(),"Call started for notify method");
     List<NotificationRequest> notificationRequestList =
         NotificationRequestMapper.toList(
-            (List<Map<String, Object>>) request.getRequest().get(JsonKey.NOTIFICATIONS));
+            Util.convertToList(
+                request.getRequest().get(JsonKey.NOTIFICATIONS),
+                new TypeReference<List<Map<String, Object>>>() {}
+            ));
     List<String> ids = new ArrayList<String>();
     for (NotificationRequest notificationRequest : notificationRequestList) {
       if (CollectionUtils.isNotEmpty(notificationRequest.getIds())) {

all-actors/src/main/java/org/sunbird/util/Util.java

@@ -1,5 +1,6 @@
 package org.sunbird.util;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import org.apache.commons.collections.MapUtils;
 import org.sunbird.JsonKey;
 import org.sunbird.common.exception.BaseException;
@@ -41,6 +42,25 @@ public static Map<String, Object> getTemplate(NotificationV2Request notification
         return template;
     }
 
+    private static com.fasterxml.jackson.databind.ObjectMapper mapper = new com.fasterxml.jackson.databind.ObjectMapper();
+    private static com.fasterxml.jackson.databind.ObjectMapper javaMapper = new com.fasterxml.jackson.databind.ObjectMapper();
+
+    static {
+        mapper.findAndRegisterModules();
+        mapper.configure(com.fasterxml.jackson.databind.DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
+        javaMapper.configure(com.fasterxml.jackson.databind.DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
+    }
+
+    public static <T> java.util.List<T> convertToList(Object object, com.fasterxml.jackson.core.type.TypeReference<java.util.List<T>> typeReference) {
+        try {
+            JsonNode node = mapper.valueToTree(object);
+            return javaMapper.convertValue(node, typeReference);
+        } catch (Exception e) {
+            throw new org.sunbird.common.exception.BaseException(IResponseMessage.Key.INVALID_REQUESTED_DATA,
+                "Invalid data format.", ResponseCode.CLIENT_ERROR.getCode());
+        }
+    }
+
     public static Response writeDataToKafka(
             NotificationRequest notification,
             Response response,

sb-utils/src/main/resources/notification.config.properties

@@ -1,4 +1,5 @@
 notification_category_type_config=certificateUpload,member-added
 version_support_config_enable=True
 feed_limit=31
-sunbird_notification_keyspace=sunbird_notifications
+sunbird_notification_keyspace=sunbird_notifications
+accesstoken.publickey.basepath=/keys/