Skip to content

Uplift eiffel-commons to 1.0.5 #333

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
+16 −16
Merged

Uplift eiffel-commons to 1.0.5 #333

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
35cdebf
Uplift eiffel-commons to latest
jainadc9 Apr 24, 2025
99a3c00
Update pom.xml
jainadc9 Apr 29, 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 @@ -214,7 +214,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.json</groupId>
Expand Down
8 changes: 4 additions & 4 deletions src/integrationtest/java/com/ericsson/ei/frontend/CommonSteps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 \'(.*)\'$")
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/ericsson/ei/frontend/WebController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/systemtest/java/com/ericsson/ei/systemtest/artifactflow/ArtifactFlowSteps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/systemtest/java/com/ericsson/ei/systemtest/sourcechangeflow/SourceChangeFlowSteps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/systemtest/java/com/ericsson/ei/systemtest/testexecutionflow/TestExecutionFlowSteps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
14 changes: 7 additions & 7 deletions src/systemtest/java/com/ericsson/ei/systemtest/utils/StepsUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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();

Expand Down Expand Up @@ -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;
Expand Down