Skip to content

Updated eiffel-commons library to 1.0.4 #578

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

Closed
wants to merge 2 commits into from
Closed

Updated eiffel-commons library to 1.0.4 #578

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
45a3128
Updated eiffel-commons library to 1.0.4
george1209 Apr 8, 2025
0c045b5
Merge branch 'eiffel-community:master' into eicommon
george1209 Apr 10, 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.4</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.ResponseEntity;
import com.ericsson.eiffelcommons.http.HttpRequest.HttpMethod;
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
1 change: 0 additions & 1 deletion src/main/java/com/ericsson/ei/controller/AggregatedObjectController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import com.ericsson.ei.controller.model.QueryBody;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PathVariable;
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/com/ericsson/ei/controller/RuleTestController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
package com.ericsson.ei.controller;

import javax.servlet.http.HttpServletRequest;
import com.ericsson.ei.controller.model.RuleCheckBody;
import com.ericsson.ei.controller.model.RulesCheckBody;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestMapping;
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/com/ericsson/ei/controller/SubscriptionController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public interface SubscriptionController {
@RequestMapping(value = "", method = RequestMethod.GET)
public ResponseEntity<?> getSubscriptions(
@RequestParam(required = false)
String subscriptionNames, HttpServletRequest httpRequest);
java.lang.String subscriptionNames, HttpServletRequest httpRequest);

/**
* This method creates new subscription(s) and saves in the database. The name of a subscription must be unique.
Expand All @@ -42,7 +42,7 @@ public ResponseEntity<?> getSubscriptions(
public ResponseEntity<?> createSubscription(
@Valid
@RequestBody
List<com.ericsson.ei.controller.model.Subscription> subscription, HttpServletRequest httpRequest);
List<String> string, HttpServletRequest httpRequest);

/**
* This method modifies existing subscriptions.
Expand All @@ -52,7 +52,7 @@ public ResponseEntity<?> createSubscription(
public ResponseEntity<?> updateSubscriptions(
@Valid
@RequestBody
List<com.ericsson.ei.controller.model.Subscription> subscription, HttpServletRequest httpRequest);
List<String> string, HttpServletRequest httpRequest);

/**
* This method removes subscriptions from the database. It requires a list of names by using the 'subscriptionNames' parameter
Expand All @@ -61,7 +61,7 @@ public ResponseEntity<?> updateSubscriptions(
@RequestMapping(value = "", method = RequestMethod.DELETE)
public ResponseEntity<?> deleteSubscriptions(
@RequestParam
String subscriptionNames, HttpServletRequest httpRequest);
java.lang.String subscriptionNames, HttpServletRequest httpRequest);

/**
* This method returns the subscription for the given subscription name.
Expand All @@ -70,7 +70,7 @@ public ResponseEntity<?> deleteSubscriptions(
@RequestMapping(value = "/{subscriptionName}", method = RequestMethod.GET)
public ResponseEntity<?> getSubscriptionByName(
@PathVariable
String subscriptionName, HttpServletRequest httpRequest);
java.lang.String subscriptionName, HttpServletRequest httpRequest);

/**
* This method removes the subscription from the database for the given subscription name.
Expand All @@ -79,6 +79,6 @@ public ResponseEntity<?> getSubscriptionByName(
@RequestMapping(value = "/{subscriptionName}", method = RequestMethod.DELETE)
public ResponseEntity<?> deleteSubscriptionByName(
@PathVariable
String subscriptionName, HttpServletRequest httpRequest);
java.lang.String subscriptionName, HttpServletRequest httpRequest);

}
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.ResponseEntity;
import com.ericsson.eiffelcommons.http.HttpRequest.HttpMethod;

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
3 changes: 2 additions & 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,8 @@
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
2 changes: 1 addition & 1 deletion 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
9 changes: 5 additions & 4 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,11 @@
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.HttpRequest;
import com.ericsson.eiffelcommons.http.ResponseEntity;
import com.ericsson.eiffelcommons.http.HttpRequest.HttpMethod;
import com.ericsson.eiffelcommons.http.HttpExecutor;

import com.google.common.base.Charsets;
import com.google.common.io.CharStreams;

Expand Down
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
3 changes: 2 additions & 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 org.apache.commons.io.FileUtils;
import org.apache.http.Header;
import org.json.JSONArray;
Expand Down Expand Up @@ -57,6 +57,7 @@
import com.ericsson.ei.handlers.UpStreamEventsHandler;
import com.ericsson.ei.services.ISubscriptionService;
import com.ericsson.ei.utils.TestContextInitializer;
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/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
Loading