LR-814: merge release-7.0.0 to master (#136)

Sunbird-Lern · Jul 1, 2024 · 43bd26f · 43bd26f
1 parent 374819c
commit 43bd26f
Show file tree

Hide file tree

Showing 57 changed files with 2,262 additions and 1,208 deletions.
diff --git a/all-actors/dependency-reduced-pom.xml b/all-actors/dependency-reduced-pom.xml
diff --git a/all-actors/pom.xml b/all-actors/pom.xml
@@ -12,8 +12,19 @@
     <dependency>
         <groupId>org.apache.kafka</groupId>
         <artifactId>kafka-clients</artifactId>
-        <version>0.10.0.1</version>
+        <version>3.4.0</version>
+        <exclusions>
+            <exclusion>
+                <groupId>org.xerial.snappy</groupId>
+                <artifactId>snappy-java</artifactId>
+            </exclusion>
+        </exclusions>
     </dependency>
+        <dependency>
+            <groupId>org.xerial.snappy</groupId>
+            <artifactId>snappy-java</artifactId>
+            <version>1.1.10.4</version>
+        </dependency>
     <dependency>
         <groupId>org.sunbird</groupId>
         <artifactId>sb-telemetry-utils</artifactId>
@@ -44,12 +55,19 @@
         <groupId>org.everit.json</groupId>
         <artifactId>org.everit.json.schema</artifactId>
         <version>1.5.1</version>
+        <exclusions>
+            <exclusion>
+                <groupId>org.json</groupId>
+                <artifactId>json</artifactId>
+            </exclusion>
+        </exclusions>
     </dependency>
-    <dependency>
-        <groupId>commons-collections</groupId>
-        <artifactId>commons-collections</artifactId>
-        <version>3.2</version>
-    </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20231013</version>
+            <scope>compile</scope>
+        </dependency>
     <dependency>
         <groupId>org.powermock</groupId>
         <artifactId>powermock-core</artifactId>
@@ -58,7 +76,7 @@
     <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>4.12</version>
+        <version>${junit.version}</version>
     </dependency>
     <dependency>
         <groupId>com.typesafe.akka</groupId>
@@ -99,6 +117,18 @@
                                     <exclude>org.apache.maven:lib:tests</exclude>
                                 </excludes>
                             </artifactSet>
+                            <filters>
+                                <filter>
+                                    <!-- Do not copy the signatures in the META-INF folder.
+                                    Otherwise, this might cause SecurityExceptions when using the JAR. -->
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/*.SF</exclude>
+                                        <exclude>META-INF/*.DSA</exclude>
+                                        <exclude>META-INF/*.RSA</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/all-actors/src/main/java/org/sunbird/NotificationRequestMapper.java b/all-actors/src/main/java/org/sunbird/NotificationRequestMapper.java
@@ -1,17 +1,17 @@
 package org.sunbird;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 import org.sunbird.common.exception.BaseException;
 import org.sunbird.common.message.IResponseMessage;
 import org.sunbird.common.message.ResponseCode;
 import org.sunbird.pojo.NotificationRequest;
 import org.sunbird.request.LoggerUtil;
 
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 public class NotificationRequestMapper {
 
   private static ObjectMapper mapper = new ObjectMapper();

diff --git a/all-actors/src/main/java/org/sunbird/NotificationValidator.java b/all-actors/src/main/java/org/sunbird/NotificationValidator.java
@@ -1,9 +1,5 @@
 package org.sunbird;
 
-import java.text.MessageFormat;
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.collect.Lists;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -16,6 +12,10 @@
 import org.sunbird.pojo.NotificationMode;
 import org.sunbird.pojo.NotificationRequest;
 
+import java.text.MessageFormat;
+import java.util.List;
+import java.util.Map;
+
 /** Validates send notification api request */
 public class NotificationValidator {
   private static final int MAX_NOTIFICATION_SIZE = 1000;

diff --git a/all-actors/src/main/java/org/sunbird/dao/NotificationDao.java b/all-actors/src/main/java/org/sunbird/dao/NotificationDao.java
@@ -1,8 +1,8 @@
 package org.sunbird.dao;
 
 import org.sunbird.common.exception.BaseException;
-import org.sunbird.pojo.NotificationFeed;
 import org.sunbird.common.response.Response;
+import org.sunbird.pojo.NotificationFeed;
 
 import java.util.List;
 import java.util.Map;

diff --git a/all-actors/src/main/java/org/sunbird/dao/NotificationDaoImpl.java b/all-actors/src/main/java/org/sunbird/dao/NotificationDaoImpl.java
@@ -6,10 +6,10 @@
 import org.sunbird.cassandra.CassandraOperation;
 import org.sunbird.common.Constants;
 import org.sunbird.common.exception.BaseException;
+import org.sunbird.common.response.Response;
 import org.sunbird.notification.utils.Util;
-import org.sunbird.utils.ServiceFactory;
 import org.sunbird.pojo.NotificationFeed;
-import org.sunbird.common.response.Response;
+import org.sunbird.utils.ServiceFactory;
 
 import java.util.*;
 

diff --git a/all-actors/src/main/java/org/sunbird/dao/TemplateDaoImpl.java b/all-actors/src/main/java/org/sunbird/dao/TemplateDaoImpl.java
@@ -2,14 +2,12 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import jnr.ffi.annotations.Synchronized;
 import org.sunbird.cassandra.CassandraOperation;
 import org.sunbird.common.exception.BaseException;
 import org.sunbird.common.response.Response;
 import org.sunbird.common.util.JsonKey;
 import org.sunbird.pojo.ActionTemplate;
 import org.sunbird.pojo.NotificationTemplate;
-import org.sunbird.util.DBUtil;
 import org.sunbird.utils.ServiceFactory;
 
 import java.sql.Timestamp;

diff --git a/all-actors/src/main/java/org/sunbird/notification/actor/CreateNotificationActor.java b/all-actors/src/main/java/org/sunbird/notification/actor/CreateNotificationActor.java
@@ -11,12 +11,12 @@
 import org.sunbird.common.message.IResponseMessage;
 import org.sunbird.common.message.ResponseCode;
 import org.sunbird.common.request.Request;
+import org.sunbird.common.response.Response;
 import org.sunbird.notification.handler.FeedNotificationHandler;
 import org.sunbird.notification.handler.INotificationHandler;
 import org.sunbird.notification.handler.NotificationHandlerFactory;
 import org.sunbird.pojo.NotificationV2Request;
 import org.sunbird.request.LoggerUtil;
-import org.sunbird.common.response.Response;
 import org.sunbird.telemetry.TelemetryEnvKey;
 import org.sunbird.telemetry.util.TelemetryUtil;
 

diff --git a/all-actors/src/main/java/org/sunbird/notification/actor/DeleteNotificationActor.java b/all-actors/src/main/java/org/sunbird/notification/actor/DeleteNotificationActor.java
@@ -1,8 +1,5 @@
 package org.sunbird.notification.actor;
 
-import akka.actor.AbstractActor;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.sunbird.BaseActor;
 import org.sunbird.JsonKey;
@@ -17,12 +14,10 @@
 import org.sunbird.service.NotificationService;
 import org.sunbird.service.NotificationServiceImpl;
 import org.sunbird.util.RequestHandler;
-import org.sunbird.util.Util;
 import org.sunbird.utils.PropertiesCache;
 
 import java.text.MessageFormat;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 

diff --git a/all-actors/src/main/java/org/sunbird/notification/actor/NotificationActor.java b/all-actors/src/main/java/org/sunbird/notification/actor/NotificationActor.java
@@ -1,9 +1,5 @@
 package org.sunbird.notification.actor;
 
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.sunbird.BaseActor;
@@ -17,14 +13,19 @@
 import org.sunbird.common.message.IUserResponseMessage;
 import org.sunbird.common.message.ResponseCode;
 import org.sunbird.common.request.Request;
+import org.sunbird.common.response.Response;
 import org.sunbird.notification.beans.OTPRequest;
 import org.sunbird.notification.dispatcher.NotificationRouter;
 import org.sunbird.notification.utils.NotificationConstant;
 import org.sunbird.pojo.NotificationRequest;
 import org.sunbird.request.LoggerUtil;
-import org.sunbird.common.response.Response;
 import org.sunbird.util.validator.OtpRequestValidator;
 
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 /** @author manzarul */
 @ActorConfig(
   tasks = {JsonKey.NOTIFICATION, JsonKey.VERIFY_OTP},

diff --git a/all-actors/src/main/java/org/sunbird/notification/actor/NotificationTemplateActor.java b/all-actors/src/main/java/org/sunbird/notification/actor/NotificationTemplateActor.java
@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.collections.MapUtils;
-import org.apache.commons.lang3.StringUtils;
+import org.sunbird.BaseActor;
 import org.sunbird.JsonKey;
 import org.sunbird.actor.core.ActorConfig;
 import org.sunbird.common.exception.BaseException;
@@ -13,18 +13,13 @@
 import org.sunbird.pojo.ActionTemplate;
 import org.sunbird.pojo.NotificationTemplate;
 import org.sunbird.request.LoggerUtil;
-import org.sunbird.BaseActor;
 import org.sunbird.service.TemplateService;
 import org.sunbird.service.TemplateServiceImpl;
-import org.sunbird.telemetry.TelemetryEnvKey;
-import org.sunbird.telemetry.util.TelemetryUtil;
 import org.sunbird.util.RequestHandler;
 
 import java.text.MessageFormat;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 
 @ActorConfig(
         tasks = {JsonKey.LIST_TEMPLATE, JsonKey.UPDATE_TEMPLATE,