EI Frontend clogged when old subscriptions are not removed. (#517)

Author: Gangisetty-Alekhya

pom.xml

@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.ericsson</groupId>
     <artifactId>eiffel-intelligence</artifactId>
-    <version>3.2.3</version>
+    <version>3.2.4</version>
     <packaging>war</packaging>
 
     <parent>

src/main/java/com/ericsson/ei/notifications/HttpRequestSender.java

@@ -19,8 +19,12 @@
 import com.ericsson.ei.exception.AuthenticationException;
 import com.fasterxml.jackson.databind.JsonNode;
 
+import java.time.Duration;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.http.*;
 import org.springframework.stereotype.Component;
@@ -38,8 +42,10 @@ public class HttpRequestSender {
 
     private RestOperations rest;
 
-    public HttpRequestSender(RestTemplateBuilder builder) {
-        rest = builder.build();
+    @Autowired
+    public HttpRequestSender(RestTemplateBuilder builder, @Value("${notification.httpRequest.timeout:5000}") Duration timeOut) {
+        timeOut = timeOut == null ? Duration.ofMillis(5000) : timeOut;
+        rest = builder.setReadTimeout(timeOut).setConnectTimeout(timeOut).build();
     }
 
     /**

src/main/resources/application.properties

@@ -46,6 +46,7 @@ waitlist.resend.fixed.rate: 15000
 failed.notifications.collection.name: failed_notifications
 failed.notifications.collection.ttl: 600
 notification.retry: 3
+notification.httpRequest.timeout: 5000
 
 email.sender: noreply@domain.com
 email.subject: Email Subscription Notification

wiki/configuration.md

@@ -156,10 +156,13 @@ Eiffel Intelligence how long a failed notification will be stored in the
 database before deletion. With **notification.retry** property, it
 is possible to configure the number of attempts Eiffel Intelligence will
 retry to make a REST POST notification when a subscription is triggered.
+The **notification.httpRequest.timeout** property value will be used to set the
+response timeout for the Rest Post notifications when a subscription is triggered.
 
 * failed.notifications.collection.name
 * failed.notifications.collection.ttl
 * notification.retry
+* notification.httpRequest.timeout
 
 ### Configure Search in Event Repository