Uplift eiffel-commons to 1.0.5 (#586)

jainadc9 · web-flow · commit 5da6adc2af47 · 2025-04-30T13:34:31.000+05:30
* Uplift eiffel-commons to 1.0.5
diff --git a/pom.xml b/pom.xml
@@ -74,7 +74,7 @@
         <dependency>
             <groupId>com.github.eiffel-community</groupId>
             <artifactId>eiffel-commons</artifactId>
-            <version>0.0.15-openjdk-8</version>
+            <version>1.0.5</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/src/functionaltests/java/com/ericsson/ei/restendpoints/RestEndpointsTestSteps.java b/src/functionaltests/java/com/ericsson/ei/restendpoints/RestEndpointsTestSteps.java
@@ -11,7 +11,7 @@
 import com.ericsson.ei.utils.FunctionalTestBase;
 import com.ericsson.ei.utils.HttpRequest;
 import com.ericsson.ei.utils.HttpRequest.HttpMethod;
-import com.ericsson.eiffelcommons.helpers.MediaType;
+import com.ericsson.eiffelcommons.constants.MediaType;
 import com.ericsson.eiffelcommons.subscriptionobject.RestPostSubscriptionObject;
 
 import io.cucumber.java.en.Given;
diff --git a/src/integrationtests/java/com/ericsson/ei/integrationtests/flow/FlowStepsIT.java b/src/integrationtests/java/com/ericsson/ei/integrationtests/flow/FlowStepsIT.java
@@ -32,8 +32,8 @@
 import com.ericsson.ei.mongo.MongoDBHandler;
 import com.ericsson.ei.utils.HttpRequest;
 import com.ericsson.ei.utils.HttpRequest.HttpMethod;
-import com.ericsson.eiffelcommons.JenkinsManager;
-import com.ericsson.eiffelcommons.helpers.JenkinsXmlData;
+import com.ericsson.eiffelcommons.jenkins.JenkinsManager;
+import com.ericsson.eiffelcommons.jenkins.JenkinsXmlData;
 import com.ericsson.eiffelcommons.subscriptionobject.MailSubscriptionObject;
 import com.ericsson.eiffelcommons.subscriptionobject.RestPostSubscriptionObject;
 import com.ericsson.eiffelcommons.subscriptionobject.SubscriptionObject;
diff --git a/src/integrationtests/java/com/ericsson/ei/integrationtests/notification/FailedNotificationStepsIT.java b/src/integrationtests/java/com/ericsson/ei/integrationtests/notification/FailedNotificationStepsIT.java
@@ -30,9 +30,9 @@
 import com.ericsson.eiffelcommons.subscriptionobject.MailSubscriptionObject;
 import com.ericsson.eiffelcommons.subscriptionobject.RestPostSubscriptionObject;
 import com.ericsson.eiffelcommons.subscriptionobject.SubscriptionObject;
-import com.ericsson.eiffelcommons.utils.HttpRequest;
-import com.ericsson.eiffelcommons.utils.HttpRequest.HttpMethod;
-import com.ericsson.eiffelcommons.utils.ResponseEntity;
+import com.ericsson.eiffelcommons.http.HttpRequest;
+import com.ericsson.eiffelcommons.http.HttpRequest.HttpMethod;
+import com.ericsson.eiffelcommons.http.ResponseEntity;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -136,7 +136,7 @@ public void failedNotificationShouldExist(String searchValue, String subscriptio
         HttpRequest request = new HttpRequest(HttpMethod.GET);
         request.setBaseUrl("http://" + eiHost + ":" + port)
                .setEndpoint("/failed-notifications")
-               .addParam("subscriptionNames", subscriptionName);
+               .addParameter("subscriptionNames", subscriptionName);
         ResponseEntity response = request.performRequest();
 
         String body = response.getBody();
diff --git a/src/main/java/com/ericsson/ei/erqueryservice/ERQueryService.java b/src/main/java/com/ericsson/ei/erqueryservice/ERQueryService.java
@@ -33,9 +33,9 @@
 
 import com.ericsson.ei.exception.HttpRequestFailedException;
 import com.ericsson.ei.exception.PropertyNotFoundException;
-import com.ericsson.eiffelcommons.utils.HttpRequest;
-import com.ericsson.eiffelcommons.utils.HttpRequest.HttpMethod;
-import com.ericsson.eiffelcommons.utils.ResponseEntity;
+import com.ericsson.eiffelcommons.http.HttpRequest;
+import com.ericsson.eiffelcommons.http.HttpRequest.HttpMethod;
+import com.ericsson.eiffelcommons.http.ResponseEntity;
 
 import lombok.Getter;
 
@@ -107,10 +107,10 @@ private HttpRequest prepareRequest(String eventId, SearchOption searchOption, in
                .setHttpMethod(HttpMethod.POST)
                .setBaseUrl(eventRepositoryUrl)
                .setEndpoint(eventId)
-               .addParam("limit", Integer.toString(limit))
-               .addParam("levels", Integer.toString(levels))
-               .addParam("tree", Boolean.toString(tree))
-               .addParam("shallow", Boolean.toString(shallowParameter))
+               .addParameter("limit", Integer.toString(limit))
+               .addParameter("levels", Integer.toString(levels))
+               .addParameter("tree", Boolean.toString(tree))
+               .addParameter("shallow", Boolean.toString(shallowParameter))
                .setBody(searchParameters.getAsJsonString(), ContentType.APPLICATION_JSON);
 
         String uri = request.getURI().toString();
diff --git a/src/main/java/com/ericsson/ei/handlers/UpStreamEventsHandler.java b/src/main/java/com/ericsson/ei/handlers/UpStreamEventsHandler.java
@@ -26,7 +26,7 @@
 import com.ericsson.ei.exception.PropertyNotFoundException;
 import com.ericsson.ei.rules.RulesHandler;
 import com.ericsson.ei.rules.RulesObject;
-import com.ericsson.eiffelcommons.utils.ResponseEntity;
+import com.ericsson.eiffelcommons.http.ResponseEntity;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
diff --git a/src/main/java/com/ericsson/ei/subscription/SubscriptionValidator.java b/src/main/java/com/ericsson/ei/subscription/SubscriptionValidator.java
@@ -28,7 +28,7 @@
 import com.ericsson.ei.controller.model.NotificationMessageKeyValue;
 import com.ericsson.ei.controller.model.Subscription;
 import com.ericsson.ei.exception.SubscriptionValidationException;
-import com.ericsson.eiffelcommons.helpers.RegExProvider;
+import com.ericsson.eiffelcommons.constants.RegExProvider;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.fge.jackson.JsonLoader;
@@ -290,4 +290,4 @@ private static JsonNode objectToJson(Subscription subObject)
         }
         return jsonSubscriptionObj1;
     }
-}
+}
diff --git a/src/test/java/com/ericsson/ei/erqueryservice/test/ERQueryServiceTest.java b/src/test/java/com/ericsson/ei/erqueryservice/test/ERQueryServiceTest.java
@@ -43,10 +43,10 @@
 import com.ericsson.ei.erqueryservice.SearchOption;
 import com.ericsson.ei.exception.PropertyNotFoundException;
 import com.ericsson.ei.utils.TestContextInitializer;
-import com.ericsson.eiffelcommons.utils.HttpExecutor;
-import com.ericsson.eiffelcommons.utils.HttpRequest;
-import com.ericsson.eiffelcommons.utils.HttpRequest.HttpMethod;
-import com.ericsson.eiffelcommons.utils.ResponseEntity;
+import com.ericsson.eiffelcommons.http.HttpExecutor;
+import com.ericsson.eiffelcommons.http.HttpRequest;
+import com.ericsson.eiffelcommons.http.HttpRequest.HttpMethod;
+import com.ericsson.eiffelcommons.http.ResponseEntity;
 import com.google.common.base.Charsets;
 import com.google.common.io.CharStreams;
 
@@ -106,4 +106,4 @@ public String buildUri() {
                 erQueryService.getEventRepositoryUrl().trim(), eventId, limitParam, isTree, shallow, levels) ;
         return uri;
     }
-}
+}
diff --git a/src/test/java/com/ericsson/ei/flowtests/ArrayAggregationTest.java b/src/test/java/com/ericsson/ei/flowtests/ArrayAggregationTest.java
@@ -33,7 +33,7 @@
 import com.ericsson.ei.exception.PropertyNotFoundException;
 import com.ericsson.ei.handlers.UpStreamEventsHandler;
 import com.ericsson.ei.utils.TestContextInitializer;
-import com.ericsson.eiffelcommons.utils.ResponseEntity;
+import com.ericsson.eiffelcommons.http.ResponseEntity;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
diff --git a/src/test/java/com/ericsson/ei/flowtests/FlowSourceChangeObject.java b/src/test/java/com/ericsson/ei/flowtests/FlowSourceChangeObject.java
@@ -46,7 +46,7 @@
 import com.ericsson.ei.exception.PropertyNotFoundException;
 import com.ericsson.ei.handlers.UpStreamEventsHandler;
 import com.ericsson.ei.utils.TestContextInitializer;
-import com.ericsson.eiffelcommons.utils.ResponseEntity;
+import com.ericsson.eiffelcommons.http.ResponseEntity;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
diff --git a/src/test/java/com/ericsson/ei/flowtests/FlowTest.java b/src/test/java/com/ericsson/ei/flowtests/FlowTest.java
@@ -50,7 +50,7 @@
 import com.ericsson.ei.exception.PropertyNotFoundException;
 import com.ericsson.ei.handlers.UpStreamEventsHandler;
 import com.ericsson.ei.utils.TestContextInitializer;
-import com.ericsson.eiffelcommons.utils.ResponseEntity;
+import com.ericsson.eiffelcommons.http.ResponseEntity;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
diff --git a/src/test/java/com/ericsson/ei/flowtests/SingleEventAggregationTest.java b/src/test/java/com/ericsson/ei/flowtests/SingleEventAggregationTest.java
@@ -29,7 +29,7 @@
 import java.util.List;
 import java.util.Map;
 
-import com.ericsson.eiffelcommons.utils.ResponseEntity;
+import com.ericsson.eiffelcommons.http.ResponseEntity;
 import org.apache.commons.io.FileUtils;
 import org.apache.http.Header;
 import org.json.JSONArray;
diff --git a/src/test/java/com/ericsson/ei/flowtests/TrafficGeneratedTest.java b/src/test/java/com/ericsson/ei/flowtests/TrafficGeneratedTest.java
@@ -60,7 +60,7 @@
 import com.ericsson.ei.handlers.UpStreamEventsHandler;
 import com.ericsson.ei.test.utils.TestConfigs;
 import com.ericsson.ei.utils.TestContextInitializer;
-import com.ericsson.eiffelcommons.utils.ResponseEntity;
+import com.ericsson.eiffelcommons.http.ResponseEntity;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
diff --git a/src/test/java/com/ericsson/ei/handlers/test/UpStreamEventHandlerTest.java b/src/test/java/com/ericsson/ei/handlers/test/UpStreamEventHandlerTest.java
@@ -21,7 +21,7 @@
 import com.ericsson.ei.exception.PropertyNotFoundException;
 import com.ericsson.ei.handlers.UpStreamEventsHandler;
 import com.ericsson.ei.utils.TestContextInitializer;
-import com.ericsson.eiffelcommons.utils.ResponseEntity;
+import com.ericsson.eiffelcommons.http.ResponseEntity;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`import com.ericsson.ei.controller.model.NotificationMessageKeyValue;`
`29`	`29`	`import com.ericsson.ei.controller.model.Subscription;`
`30`	`30`	`import com.ericsson.ei.exception.SubscriptionValidationException;`
`31`		`-import com.ericsson.eiffelcommons.helpers.RegExProvider;`
	`31`	`+import com.ericsson.eiffelcommons.constants.RegExProvider;`
`32`	`32`	`import com.fasterxml.jackson.databind.JsonNode;`
`33`	`33`	`import com.fasterxml.jackson.databind.ObjectMapper;`
`34`	`34`	`import com.github.fge.jackson.JsonLoader;`
`@@ -290,4 +290,4 @@ private static JsonNode objectToJson(Subscription subObject)`
`290`	`290`	`}`
`291`	`291`	`return jsonSubscriptionObj1;`
`292`	`292`	`}`
`293`		`-}`
	`293`	`+}`