Skip to content

Uplift eiffel-commons to 1.0.5 #586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 30, 2025
Merged

Uplift eiffel-commons to 1.0.5 #586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08f71b7
Uplift eiffel-commons to 1.0.5
jainadc9 Apr 30, 2025
17f2055
Update pom.xml with eiffel-commons 1.0.5
jainadc9 Apr 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/functionaltests/java/com/ericsson/ei/restendpoints/RestEndpointsTestSteps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/integrationtests/java/com/ericsson/ei/integrationtests/flow/FlowStepsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ...ontests/java/com/ericsson/ei/integrationtests/notification/FailedNotificationStepsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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();
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/com/ericsson/ei/erqueryservice/ERQueryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/ericsson/ei/handlers/UpStreamEventsHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/ericsson/ei/subscription/SubscriptionValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -290,4 +290,4 @@ private static JsonNode objectToJson(Subscription subObject)
}
return jsonSubscriptionObj1;
}
}
}
10 changes: 5 additions & 5 deletions src/test/java/com/ericsson/ei/erqueryservice/test/ERQueryServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -106,4 +106,4 @@ public String buildUri() {
erQueryService.getEventRepositoryUrl().trim(), eventId, limitParam, isTree, shallow, levels) ;
return uri;
}
}
}
2 changes: 1 addition & 1 deletion src/test/java/com/ericsson/ei/flowtests/ArrayAggregationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/ericsson/ei/flowtests/FlowSourceChangeObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/ericsson/ei/flowtests/FlowTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/ericsson/ei/flowtests/SingleEventAggregationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/ericsson/ei/flowtests/TrafficGeneratedTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/ericsson/ei/handlers/test/UpStreamEventHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down