Skip to content

Commit 4300afc

Browse files
author
Anders Breid
authored
Improvements in handeling of rest post calls for subscriptions (#220)
* Improved the code that handles rest port requests when informing a subscriber. * EI may now handle the use of jenkins crumbs automatically * Added time limit to a loop in flow tests.
1 parent 3341c15 commit 4300afc

File tree

10 files changed

+508
-393
lines changed

10 files changed

+508
-393
lines changed

src/functionaltests/java/com/ericsson/ei/notifications/ttl/TestTTLSteps.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.springframework.util.SocketUtils;
2727

2828
import com.ericsson.ei.mongodbhandler.MongoDBHandler;
29-
import com.ericsson.ei.subscriptionhandler.InformSubscription;
29+
import com.ericsson.ei.subscriptionhandler.InformSubscriber;
3030
import com.ericsson.ei.utils.FunctionalTestBase;
3131
import com.ericsson.ei.utils.HttpRequest;
3232
import com.ericsson.ei.utils.HttpRequest.HttpMethod;
@@ -85,7 +85,7 @@ public class TestTTLSteps extends FunctionalTestBase {
8585
private MongoDBHandler mongoDBHandler;
8686

8787
@Autowired
88-
private InformSubscription informSubscription;
88+
private InformSubscriber informSubscriber;
8989

9090
@Before("@TestNotificationRetries")
9191
public void beforeScenario() {
@@ -117,7 +117,7 @@ public void create_subscription_object() throws IOException, JSONException {
117117
@When("^I want to inform subscriber$")
118118
public void inform_subscriber() throws IOException {
119119
JsonNode aggregatedObject = eventManager.getJSONFromFile(AGGREGATED_OBJECT_FILE_PATH);
120-
informSubscription.informSubscriber(aggregatedObject.toString(), subscriptionObject);
120+
informSubscriber.informSubscriber(aggregatedObject.toString(), subscriptionObject);
121121
}
122122

123123
@Then("^Verify that request has been retried")

src/main/java/com/ericsson/ei/controller/model/ParseInstanceInfoEI.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import com.ericsson.ei.erqueryservice.ERQueryService;
2020
import com.ericsson.ei.handlers.ObjectHandler;
2121
import com.ericsson.ei.rmqhandler.RmqHandler;
22-
import com.ericsson.ei.subscriptionhandler.InformSubscription;
22+
import com.ericsson.ei.subscriptionhandler.InformSubscriber;
2323
import com.ericsson.ei.subscriptionhandler.SendMail;
2424
import com.ericsson.ei.subscriptionhandler.SubscriptionHandler;
2525
import com.ericsson.ei.waitlist.WaitListStorageHandler;
@@ -99,7 +99,7 @@ public class ParseInstanceInfoEI {
9999

100100
@Getter
101101
@Autowired
102-
private InformSubscription informSubscription;
102+
private InformSubscriber informSubscriber;
103103

104104
@Getter
105105
@Autowired

0 commit comments

Comments
 (0)