Skip to content

Commit 5da6adc

Browse files
jainadc9jainadc9
authored
Uplift eiffel-commons to 1.0.5 (#586)
* Uplift eiffel-commons to 1.0.5
1 parent 9b7dd19 commit 5da6adc

File tree

14 files changed

+29
-29
lines changed

14 files changed

+29
-29
lines changed

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<dependency>
7575
<groupId>com.github.eiffel-community</groupId>
7676
<artifactId>eiffel-commons</artifactId>
77-
<version>0.0.15-openjdk-8</version>
77+
<version>1.0.5</version>
7878
</dependency>
7979
<dependency>
8080
<groupId>org.springframework.boot</groupId>

‎src/functionaltests/java/com/ericsson/ei/restendpoints/RestEndpointsTestSteps.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import com.ericsson.ei.utils.FunctionalTestBase;
1212
import com.ericsson.ei.utils.HttpRequest;
1313
import com.ericsson.ei.utils.HttpRequest.HttpMethod;
14-
import com.ericsson.eiffelcommons.helpers.MediaType;
14+
import com.ericsson.eiffelcommons.constants.MediaType;
1515
import com.ericsson.eiffelcommons.subscriptionobject.RestPostSubscriptionObject;
1616

1717
import io.cucumber.java.en.Given;

‎src/integrationtests/java/com/ericsson/ei/integrationtests/flow/FlowStepsIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
import com.ericsson.ei.mongo.MongoDBHandler;
3333
import com.ericsson.ei.utils.HttpRequest;
3434
import com.ericsson.ei.utils.HttpRequest.HttpMethod;
35-
import com.ericsson.eiffelcommons.JenkinsManager;
36-
import com.ericsson.eiffelcommons.helpers.JenkinsXmlData;
35+
import com.ericsson.eiffelcommons.jenkins.JenkinsManager;
36+
import com.ericsson.eiffelcommons.jenkins.JenkinsXmlData;
3737
import com.ericsson.eiffelcommons.subscriptionobject.MailSubscriptionObject;
3838
import com.ericsson.eiffelcommons.subscriptionobject.RestPostSubscriptionObject;
3939
import com.ericsson.eiffelcommons.subscriptionobject.SubscriptionObject;

‎src/integrationtests/java/com/ericsson/ei/integrationtests/notification/FailedNotificationStepsIT.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
import com.ericsson.eiffelcommons.subscriptionobject.MailSubscriptionObject;
3131
import com.ericsson.eiffelcommons.subscriptionobject.RestPostSubscriptionObject;
3232
import com.ericsson.eiffelcommons.subscriptionobject.SubscriptionObject;
33-
import com.ericsson.eiffelcommons.utils.HttpRequest;
34-
import com.ericsson.eiffelcommons.utils.HttpRequest.HttpMethod;
35-
import com.ericsson.eiffelcommons.utils.ResponseEntity;
33+
import com.ericsson.eiffelcommons.http.HttpRequest;
34+
import com.ericsson.eiffelcommons.http.HttpRequest.HttpMethod;
35+
import com.ericsson.eiffelcommons.http.ResponseEntity;
3636
import com.fasterxml.jackson.databind.JsonNode;
3737
import com.fasterxml.jackson.databind.ObjectMapper;
3838

@@ -136,7 +136,7 @@ public void failedNotificationShouldExist(String searchValue, String subscriptio
136136
HttpRequest request = new HttpRequest(HttpMethod.GET);
137137
request.setBaseUrl("http://" + eiHost + ":" + port)
138138
.setEndpoint("/failed-notifications")
139-
.addParam("subscriptionNames", subscriptionName);
139+
.addParameter("subscriptionNames", subscriptionName);
140140
ResponseEntity response = request.performRequest();
141141

142142
String body = response.getBody();

‎src/main/java/com/ericsson/ei/erqueryservice/ERQueryService.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333

3434
import com.ericsson.ei.exception.HttpRequestFailedException;
3535
import com.ericsson.ei.exception.PropertyNotFoundException;
36-
import com.ericsson.eiffelcommons.utils.HttpRequest;
37-
import com.ericsson.eiffelcommons.utils.HttpRequest.HttpMethod;
38-
import com.ericsson.eiffelcommons.utils.ResponseEntity;
36+
import com.ericsson.eiffelcommons.http.HttpRequest;
37+
import com.ericsson.eiffelcommons.http.HttpRequest.HttpMethod;
38+
import com.ericsson.eiffelcommons.http.ResponseEntity;
3939

4040
import lombok.Getter;
4141

@@ -107,10 +107,10 @@ private HttpRequest prepareRequest(String eventId, SearchOption searchOption, in
107107
.setHttpMethod(HttpMethod.POST)
108108
.setBaseUrl(eventRepositoryUrl)
109109
.setEndpoint(eventId)
110-
.addParam("limit", Integer.toString(limit))
111-
.addParam("levels", Integer.toString(levels))
112-
.addParam("tree", Boolean.toString(tree))
113-
.addParam("shallow", Boolean.toString(shallowParameter))
110+
.addParameter("limit", Integer.toString(limit))
111+
.addParameter("levels", Integer.toString(levels))
112+
.addParameter("tree", Boolean.toString(tree))
113+
.addParameter("shallow", Boolean.toString(shallowParameter))
114114
.setBody(searchParameters.getAsJsonString(), ContentType.APPLICATION_JSON);
115115

116116
String uri = request.getURI().toString();

‎src/main/java/com/ericsson/ei/handlers/UpStreamEventsHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import com.ericsson.ei.exception.PropertyNotFoundException;
2727
import com.ericsson.ei.rules.RulesHandler;
2828
import com.ericsson.ei.rules.RulesObject;
29-
import com.ericsson.eiffelcommons.utils.ResponseEntity;
29+
import com.ericsson.eiffelcommons.http.ResponseEntity;
3030
import com.fasterxml.jackson.databind.JsonNode;
3131
import com.fasterxml.jackson.databind.ObjectMapper;
3232

‎src/main/java/com/ericsson/ei/subscription/SubscriptionValidator.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import com.ericsson.ei.controller.model.NotificationMessageKeyValue;
2929
import com.ericsson.ei.controller.model.Subscription;
3030
import com.ericsson.ei.exception.SubscriptionValidationException;
31-
import com.ericsson.eiffelcommons.helpers.RegExProvider;
31+
import com.ericsson.eiffelcommons.constants.RegExProvider;
3232
import com.fasterxml.jackson.databind.JsonNode;
3333
import com.fasterxml.jackson.databind.ObjectMapper;
3434
import com.github.fge.jackson.JsonLoader;
@@ -290,4 +290,4 @@ private static JsonNode objectToJson(Subscription subObject)
290290
}
291291
return jsonSubscriptionObj1;
292292
}
293-
}
293+
}

‎src/test/java/com/ericsson/ei/erqueryservice/test/ERQueryServiceTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343
import com.ericsson.ei.erqueryservice.SearchOption;
4444
import com.ericsson.ei.exception.PropertyNotFoundException;
4545
import com.ericsson.ei.utils.TestContextInitializer;
46-
import com.ericsson.eiffelcommons.utils.HttpExecutor;
47-
import com.ericsson.eiffelcommons.utils.HttpRequest;
48-
import com.ericsson.eiffelcommons.utils.HttpRequest.HttpMethod;
49-
import com.ericsson.eiffelcommons.utils.ResponseEntity;
46+
import com.ericsson.eiffelcommons.http.HttpExecutor;
47+
import com.ericsson.eiffelcommons.http.HttpRequest;
48+
import com.ericsson.eiffelcommons.http.HttpRequest.HttpMethod;
49+
import com.ericsson.eiffelcommons.http.ResponseEntity;
5050
import com.google.common.base.Charsets;
5151
import com.google.common.io.CharStreams;
5252

@@ -106,4 +106,4 @@ public String buildUri() {
106106
erQueryService.getEventRepositoryUrl().trim(), eventId, limitParam, isTree, shallow, levels) ;
107107
return uri;
108108
}
109-
}
109+
}

‎src/test/java/com/ericsson/ei/flowtests/ArrayAggregationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import com.ericsson.ei.exception.PropertyNotFoundException;
3434
import com.ericsson.ei.handlers.UpStreamEventsHandler;
3535
import com.ericsson.ei.utils.TestContextInitializer;
36-
import com.ericsson.eiffelcommons.utils.ResponseEntity;
36+
import com.ericsson.eiffelcommons.http.ResponseEntity;
3737
import com.fasterxml.jackson.databind.JsonNode;
3838
import com.fasterxml.jackson.databind.ObjectMapper;
3939
import com.fasterxml.jackson.databind.node.ObjectNode;

‎src/test/java/com/ericsson/ei/flowtests/FlowSourceChangeObject.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
import com.ericsson.ei.exception.PropertyNotFoundException;
4747
import com.ericsson.ei.handlers.UpStreamEventsHandler;
4848
import com.ericsson.ei.utils.TestContextInitializer;
49-
import com.ericsson.eiffelcommons.utils.ResponseEntity;
49+
import com.ericsson.eiffelcommons.http.ResponseEntity;
5050
import com.fasterxml.jackson.databind.JsonNode;
5151
import com.fasterxml.jackson.databind.ObjectMapper;
5252
import com.fasterxml.jackson.databind.node.ObjectNode;

‎src/test/java/com/ericsson/ei/flowtests/FlowTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
import com.ericsson.ei.exception.PropertyNotFoundException;
5151
import com.ericsson.ei.handlers.UpStreamEventsHandler;
5252
import com.ericsson.ei.utils.TestContextInitializer;
53-
import com.ericsson.eiffelcommons.utils.ResponseEntity;
53+
import com.ericsson.eiffelcommons.http.ResponseEntity;
5454
import com.fasterxml.jackson.databind.JsonNode;
5555
import com.fasterxml.jackson.databind.ObjectMapper;
5656
import com.fasterxml.jackson.databind.node.ArrayNode;

‎src/test/java/com/ericsson/ei/flowtests/SingleEventAggregationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import java.util.List;
3030
import java.util.Map;
3131

32-
import com.ericsson.eiffelcommons.utils.ResponseEntity;
32+
import com.ericsson.eiffelcommons.http.ResponseEntity;
3333
import org.apache.commons.io.FileUtils;
3434
import org.apache.http.Header;
3535
import org.json.JSONArray;

‎src/test/java/com/ericsson/ei/flowtests/TrafficGeneratedTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
import com.ericsson.ei.handlers.UpStreamEventsHandler;
6161
import com.ericsson.ei.test.utils.TestConfigs;
6262
import com.ericsson.ei.utils.TestContextInitializer;
63-
import com.ericsson.eiffelcommons.utils.ResponseEntity;
63+
import com.ericsson.eiffelcommons.http.ResponseEntity;
6464
import com.fasterxml.jackson.databind.JsonNode;
6565
import com.fasterxml.jackson.databind.ObjectMapper;
6666
import com.fasterxml.jackson.databind.node.ObjectNode;

‎src/test/java/com/ericsson/ei/handlers/test/UpStreamEventHandlerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.ericsson.ei.exception.PropertyNotFoundException;
2222
import com.ericsson.ei.handlers.UpStreamEventsHandler;
2323
import com.ericsson.ei.utils.TestContextInitializer;
24-
import com.ericsson.eiffelcommons.utils.ResponseEntity;
24+
import com.ericsson.eiffelcommons.http.ResponseEntity;
2525
import com.fasterxml.jackson.databind.JsonNode;
2626
import com.fasterxml.jackson.databind.ObjectMapper;
2727

0 commit comments

Comments
 (0)