Skip to content
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

fix[ENTESB-13054]: Update project dependencies #64

Merged
merged 1 commit into from
Mar 18, 2020
Merged

fix[ENTESB-13054]: Update project dependencies #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 6 additions & 21 deletions java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<log4j2.version>2.12.0</log4j2.version>
<citrus.version>2.8.0</citrus.version>
<spring.version>5.0.8.RELEASE</spring.version>
<cucumber.version>3.0.2</cucumber.version>
<camel.version>2.23.4</camel.version>
<log4j2.version>2.13.1</log4j2.version>
<citrus.version>3.0.0-M1</citrus.version>
<spring.version>5.2.4.RELEASE</spring.version>
<cucumber.version>5.4.2</cucumber.version>
<camel.version>3.1.0</camel.version>
<jackson.version>2.9.10.3</jackson.version>
<junit.version>4.12</junit.version>
<junit.version>4.13</junit.version>
<kubernetes-client.version>4.3.0</kubernetes-client.version>
<postgresql.version>9.4.1212</postgresql.version>
<testcontainers.version>1.10.7</testcontainers.version>
Expand Down Expand Up @@ -86,11 +86,6 @@
<artifactId>citrus-core</artifactId>
<version>${citrus.version}</version>
</dependency>
<dependency>
<groupId>com.consol.citrus</groupId>
<artifactId>citrus-java-dsl</artifactId>
<version>${citrus.version}</version>
</dependency>
<dependency>
<groupId>com.consol.citrus</groupId>
<artifactId>citrus-http</artifactId>
Expand All @@ -105,16 +100,6 @@
<groupId>com.consol.citrus</groupId>
<artifactId>citrus-camel</artifactId>
<version>${citrus.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Cucumber -->
Expand Down
4 changes: 2 additions & 2 deletions java/runtime/yaks-runtime-maven/src/test/java/org/citrusframework/yaks/YaksTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

package org.citrusframework.yaks;

import cucumber.api.CucumberOptions;
import cucumber.api.junit.Cucumber;
import io.cucumber.junit.Cucumber;
import io.cucumber.junit.CucumberOptions;
import org.junit.runner.RunWith;

@RunWith(Cucumber.class)
Expand Down
2 changes: 1 addition & 1 deletion java/runtime/yaks-runtime-maven/src/test/resources/cucumber.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# limitations under the License.
#

cucumber.api.java.ObjectFactory=cucumber.runtime.java.CitrusObjectFactory
cucumber.object-factory=com.consol.citrus.cucumber.backend.CitrusObjectFactory
4 changes: 2 additions & 2 deletions java/steps/yaks-camel-k/src/main/java/org/citrusframework/yaks/camelk/CamelKSteps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
import java.util.regex.Pattern;

import com.fasterxml.jackson.databind.ObjectMapper;
import cucumber.api.java.en.Given;
import cucumber.api.java.en.Then;
import io.cucumber.java.en.Given;
import io.cucumber.java.en.Then;
import io.fabric8.kubernetes.api.model.DoneablePod;
import io.fabric8.kubernetes.api.model.Pod;
import io.fabric8.kubernetes.api.model.PodList;
Expand Down
4 changes: 0 additions & 4 deletions java/steps/yaks-camel/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@
<groupId>com.consol.citrus</groupId>
<artifactId>citrus-core</artifactId>
</dependency>
<dependency>
<groupId>com.consol.citrus</groupId>
<artifactId>citrus-java-dsl</artifactId>
</dependency>
<dependency>
<groupId>com.consol.citrus</groupId>
<artifactId>citrus-camel</artifactId>
Expand Down
74 changes: 49 additions & 25 deletions java/steps/yaks-camel/src/main/java/org/citrusframework/yaks/camel/CamelSteps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,35 +21,42 @@
import java.nio.charset.StandardCharsets;

import com.consol.citrus.Citrus;
import com.consol.citrus.TestCaseRunner;
import com.consol.citrus.annotations.CitrusFramework;
import com.consol.citrus.annotations.CitrusResource;
import com.consol.citrus.camel.endpoint.CamelEndpoint;
import com.consol.citrus.camel.endpoint.CamelEndpointConfiguration;
import com.consol.citrus.dsl.runner.TestRunner;
import cucumber.api.java.en.Given;
import cucumber.api.java.en.Then;
import cucumber.api.java.en.When;
import com.consol.citrus.exceptions.CitrusRuntimeException;
import groovy.lang.Binding;
import groovy.lang.GroovyShell;
import groovy.util.DelegatingScript;
import io.cucumber.java.en.Given;
import io.cucumber.java.en.Then;
import io.cucumber.java.en.When;
import org.apache.camel.CamelContext;
import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.engine.AbstractCamelContext;
import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.model.ModelHelper;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.model.RoutesDefinition;
import org.apache.camel.spi.XMLRoutesDefinitionLoader;
import org.apache.camel.spring.SpringCamelContext;
import org.codehaus.groovy.control.CompilerConfiguration;
import org.codehaus.groovy.control.customizers.ImportCustomizer;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.GenericXmlApplicationContext;
import org.springframework.core.io.ByteArrayResource;

import static com.consol.citrus.actions.ReceiveMessageAction.Builder.receive;
import static com.consol.citrus.actions.SendMessageAction.Builder.send;
import static com.consol.citrus.camel.actions.CamelRouteActionBuilder.camel;

public class CamelSteps {

@CitrusResource
private TestRunner runner;
private TestCaseRunner runner;

@CitrusFramework
private Citrus citrus;
Expand Down Expand Up @@ -79,22 +86,39 @@ public void camelContext(String beans) {
}

@Given("^Camel route ([^\"\\s]+)\\.xml")
public void camelRouteXml(String id, String route) throws Exception {
public void camelRouteXml(String id, String routeSpec) throws Exception {
String routeXml;

if (route.startsWith("<route>")) {
routeXml = String.format("<route id=\"%s\" xmlns=\"http://camel.apache.org/schema/spring\">", id) + route.substring("<route>".length());
} else if (route.startsWith("<route")) {
routeXml = route;
if (routeSpec.startsWith("<route>")) {
routeXml = String.format("<route id=\"%s\" xmlns=\"http://camel.apache.org/schema/spring\">", id) + routeSpec.substring("<route>".length());
} else if (routeSpec.startsWith("<route")) {
routeXml = routeSpec;
} else {
routeXml = String.format("<route id=\"%s\" xmlns=\"http://camel.apache.org/schema/spring\">", id) + route + "</route>";
routeXml = String.format("<route id=\"%s\" xmlns=\"http://camel.apache.org/schema/spring\">", id) + routeSpec + "</route>";
}

RoutesDefinition routeDefinition = ModelHelper.loadRoutesDefinition(camelContext(), new ByteArrayInputStream(routeXml.getBytes(StandardCharsets.UTF_8)));

for (RouteDefinition definition : routeDefinition.getRoutes()) {
camelContext().addRouteDefinition(definition);
camelContext().startRoute(definition.getId());
final XMLRoutesDefinitionLoader loader = camelContext().adapt(ExtendedCamelContext.class).getXMLRoutesDefinitionLoader();
Object result = loader.loadRoutesDefinition(camelContext(), new ByteArrayInputStream(routeXml.getBytes(StandardCharsets.UTF_8)));
if (result instanceof RoutesDefinition) {
RoutesDefinition routeDefinition = (RoutesDefinition) result;

camelContext().addRoutes(new RouteBuilder(camelContext()) {
@Override
public void configure() throws Exception {
for (RouteDefinition route : routeDefinition.getRoutes()) {
try {
getRouteCollection().getRoutes().add(route);
log.info(String.format("Created new Camel route '%s' in context '%s'", route.getRouteId(), camelContext().getName()));
} catch (Exception e) {
throw new CitrusRuntimeException(String.format("Failed to create route definition '%s' in context '%s'", route.getRouteId(), camelContext.getName()), e);
}
}
}
});

for (RouteDefinition route : routeDefinition.getRoutes()) {
camelContext().adapt(AbstractCamelContext.class).startRoute(route.getRouteId());
}
}
}

Expand Down Expand Up @@ -122,7 +146,7 @@ public void configure() throws Exception {

@Override
protected void configureRoute(RouteDefinition route) {
route.id(id);
route.routeId(id);
}
};

Expand All @@ -131,19 +155,19 @@ protected void configureRoute(RouteDefinition route) {

@Given("^start route (.+)$")
public void startRoute(String routeId) {
runner.camel(action -> action.context(camelContext().adapt(ModelCamelContext.class))
runner.run(camel().context(camelContext().adapt(ModelCamelContext.class))
.start(routeId));
}

@Given("^stop route (.+)$")
public void stopRoute(String routeId) {
runner.camel(action -> action.context(camelContext().adapt(ModelCamelContext.class))
runner.run(camel().context(camelContext().adapt(ModelCamelContext.class))
.stop(routeId));
}

@Given("^remove route (.+)$")
public void removeRoute(String routeId) {
runner.camel(action -> action.context(camelContext().adapt(ModelCamelContext.class))
runner.run(camel().context(camelContext().adapt(ModelCamelContext.class))
.remove(routeId));
}

Expand All @@ -159,7 +183,7 @@ public void setRequestBody(String body) {

@When("^send to route ([^\"\\s]+)$")
public void sendExchange(String endpointUri) {
runner.send(action -> action.endpoint(camelEndpoint(endpointUri))
runner.run(send().endpoint(camelEndpoint(endpointUri))
.payload(requestBody));
}

Expand All @@ -170,7 +194,7 @@ public void sendExchangeMultilineBody(String endpointUri, String body) {

@When("^send to route ([^\"\\s]+) body: (.+)$")
public void sendExchangeBody(String endpointUri, String body) {
runner.send(action -> action.endpoint(camelEndpoint(endpointUri))
runner.run(send().endpoint(camelEndpoint(endpointUri))
.payload(body));
}

Expand All @@ -186,7 +210,7 @@ public void setResponseBody(String body) {

@Then("^receive from route ([^\"\\s]+)$")
public void receiveExchange(String endpointUri) {
runner.receive(action -> action.endpoint(camelEndpoint(endpointUri))
runner.run(receive().endpoint(camelEndpoint(endpointUri))
.payload(responseBody));
}

Expand All @@ -196,7 +220,7 @@ public void receiveExchangeBodyMultiline(String endpointUri, String body) {
}
@Then("^receive from route ([^\"\\s]+) body: (.+)$")
public void receiveExchangeBody(String endpointUri, String body) {
runner.receive(action -> action.endpoint(camelEndpoint(endpointUri))
runner.run(receive().endpoint(camelEndpoint(endpointUri))
.payload(body));
}

Expand Down
4 changes: 2 additions & 2 deletions java/steps/yaks-camel/src/test/java/org/citrusframework/yaks/camel/CamelFeatureTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

package org.citrusframework.yaks.camel;

import cucumber.api.CucumberOptions;
import cucumber.api.junit.Cucumber;
import io.cucumber.junit.Cucumber;
import io.cucumber.junit.CucumberOptions;
import org.junit.runner.RunWith;

/**
Expand Down
2 changes: 1 addition & 1 deletion java/steps/yaks-camel/src/test/resources/cucumber.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# limitations under the License.
#

cucumber.api.java.ObjectFactory=cucumber.runtime.java.CitrusObjectFactory
cucumber.object-factory=com.consol.citrus.cucumber.backend.CitrusObjectFactory
4 changes: 0 additions & 4 deletions java/steps/yaks-http/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@
<groupId>com.consol.citrus</groupId>
<artifactId>citrus-core</artifactId>
</dependency>
<dependency>
<groupId>com.consol.citrus</groupId>
<artifactId>citrus-java-dsl</artifactId>
</dependency>
<dependency>
<groupId>com.consol.citrus</groupId>
<artifactId>citrus-http</artifactId>
Expand Down
Loading