diff --git a/pom.xml b/pom.xml index 44fd4f026..565ce6398 100644 --- a/pom.xml +++ b/pom.xml @@ -214,7 +214,7 @@ com.github.eiffel-community eiffel-commons - 0.0.15-openjdk-8 + 1.0.5 org.json diff --git a/src/integrationtest/java/com/ericsson/ei/frontend/CommonSteps.java b/src/integrationtest/java/com/ericsson/ei/frontend/CommonSteps.java index 2dd5e33d1..37fe66892 100644 --- a/src/integrationtest/java/com/ericsson/ei/frontend/CommonSteps.java +++ b/src/integrationtest/java/com/ericsson/ei/frontend/CommonSteps.java @@ -29,9 +29,9 @@ import org.springframework.test.context.support.DependencyInjectionTestExecutionListener; import com.ericsson.ei.utils.AMQPCommunication; -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 cucumber.api.java.Before; import cucumber.api.java.en.Given; @@ -121,7 +121,7 @@ public void append_to_endpoint(String append) throws Throwable { @When("^param key \'(.*)\' with value \'(.*)\' is added$") public void add_param(String key, String value) throws Throwable { - httpRequest.addParam(key, value); + httpRequest.addParameter(key, value); } @When("^body is set to file \'(.*)\'$") diff --git a/src/main/java/com/ericsson/ei/frontend/WebController.java b/src/main/java/com/ericsson/ei/frontend/WebController.java index 2ed37378e..341cdfa77 100644 --- a/src/main/java/com/ericsson/ei/frontend/WebController.java +++ b/src/main/java/com/ericsson/ei/frontend/WebController.java @@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import com.ericsson.ei.frontend.utils.WebControllerUtils; -import com.ericsson.eiffelcommons.helpers.RegExProvider; +import com.ericsson.eiffelcommons.constants.RegExProvider; @Controller public class WebController { diff --git a/src/systemtest/java/com/ericsson/ei/systemtest/artifactflow/ArtifactFlowSteps.java b/src/systemtest/java/com/ericsson/ei/systemtest/artifactflow/ArtifactFlowSteps.java index ac088eeb8..a8522aa09 100644 --- a/src/systemtest/java/com/ericsson/ei/systemtest/artifactflow/ArtifactFlowSteps.java +++ b/src/systemtest/java/com/ericsson/ei/systemtest/artifactflow/ArtifactFlowSteps.java @@ -12,7 +12,7 @@ import com.ericsson.ei.systemtest.utils.Config; import com.ericsson.ei.systemtest.utils.PropertiesHandler; import com.ericsson.ei.systemtest.utils.StepsUtils; -import com.ericsson.eiffelcommons.utils.ResponseEntity; +import com.ericsson.eiffelcommons.http.ResponseEntity; import cucumber.api.java.en.Given; import cucumber.api.java.en.Then; diff --git a/src/systemtest/java/com/ericsson/ei/systemtest/sourcechangeflow/SourceChangeFlowSteps.java b/src/systemtest/java/com/ericsson/ei/systemtest/sourcechangeflow/SourceChangeFlowSteps.java index 8b091d144..099a40f22 100644 --- a/src/systemtest/java/com/ericsson/ei/systemtest/sourcechangeflow/SourceChangeFlowSteps.java +++ b/src/systemtest/java/com/ericsson/ei/systemtest/sourcechangeflow/SourceChangeFlowSteps.java @@ -3,7 +3,7 @@ import com.ericsson.ei.systemtest.utils.Config; import com.ericsson.ei.systemtest.utils.PropertiesHandler; import com.ericsson.ei.systemtest.utils.StepsUtils; -import com.ericsson.eiffelcommons.utils.ResponseEntity; +import com.ericsson.eiffelcommons.http.ResponseEntity; import cucumber.api.java.en.Given; import cucumber.api.java.en.Then; import cucumber.api.java.en.When; diff --git a/src/systemtest/java/com/ericsson/ei/systemtest/testexecutionflow/TestExecutionFlowSteps.java b/src/systemtest/java/com/ericsson/ei/systemtest/testexecutionflow/TestExecutionFlowSteps.java index 20fd2b02a..28fcfad8d 100644 --- a/src/systemtest/java/com/ericsson/ei/systemtest/testexecutionflow/TestExecutionFlowSteps.java +++ b/src/systemtest/java/com/ericsson/ei/systemtest/testexecutionflow/TestExecutionFlowSteps.java @@ -12,7 +12,7 @@ import com.ericsson.ei.systemtest.utils.Config; import com.ericsson.ei.systemtest.utils.PropertiesHandler; import com.ericsson.ei.systemtest.utils.StepsUtils; -import com.ericsson.eiffelcommons.utils.ResponseEntity; +import com.ericsson.eiffelcommons.http.ResponseEntity; import cucumber.api.java.en.Given; import cucumber.api.java.en.Then; diff --git a/src/systemtest/java/com/ericsson/ei/systemtest/utils/StepsUtils.java b/src/systemtest/java/com/ericsson/ei/systemtest/utils/StepsUtils.java index 235c6cc6d..f13e90f09 100644 --- a/src/systemtest/java/com/ericsson/ei/systemtest/utils/StepsUtils.java +++ b/src/systemtest/java/com/ericsson/ei/systemtest/utils/StepsUtils.java @@ -18,12 +18,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -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.RestPostSubscriptionObject; -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; public class StepsUtils { private static final Logger LOGGER = LoggerFactory.getLogger(StepsUtils.class); @@ -176,7 +176,7 @@ public static ResponseEntity sendSubscriptionToEiffelIntelligence(String subscri .setBaseUrl(frontendBaseUrl) .setEndpoint("/subscriptions") .addHeader("Content-Type", "application/json") - .addParam("backendurl", backendBaseUrl) + .addParameter("backendurl", backendBaseUrl) .setBody(subscription.getAsSubscriptions().toString()) .performRequest(); @@ -282,7 +282,7 @@ private static ResponseEntity deleteSubscription(String subscriptionName, String ResponseEntity response = new HttpRequest(HttpMethod.DELETE) .setBaseUrl(frontendBaseUrl) .setEndpoint("/subscriptions/" + subscriptionName) - .addParam("backendurl", backendBaseUrl) + .addParameter("backendurl", backendBaseUrl) .performRequest(); return response;