You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zb...@apache.org on 2021/04/30 12:18:11 UTC
[camel-quarkus] 02/12: fix compilation errors in camel-master branch
This is an automated email from the ASF dual-hosted git repository.
zbendhiba pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 5ff30f52e4562e9e5f3cf5c92946aa29d5229435
Author: Zineb Bendhiba <be...@gmail.com>
AuthorDate: Wed Apr 7 17:04:34 2021 +0200
fix compilation errors in camel-master branch
---
.../apache/camel/quarkus/core/FastCamelContext.java | 17 +++++++++++++++--
extensions-jvm/kotlin-dsl/runtime/pom.xml | 12 ++++++++++++
extensions/jsonpath/runtime/pom.xml | 4 ++++
.../json/path/it/JsonPathTransformTest.java | 9 ++++-----
pom.xml | 1 +
poms/bom/pom.xml | 20 ++++++++++++++++++++
6 files changed, 56 insertions(+), 7 deletions(-)
diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
index a0e8a93..992028d 100644
--- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
+++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
@@ -74,8 +74,8 @@ import org.apache.camel.impl.engine.DefaultTransformerRegistry;
import org.apache.camel.impl.engine.DefaultUnitOfWorkFactory;
import org.apache.camel.impl.engine.DefaultUriFactoryResolver;
import org.apache.camel.impl.engine.DefaultValidatorRegistry;
-import org.apache.camel.impl.engine.EndpointKey;
import org.apache.camel.impl.engine.PrototypeExchangeFactory;
+import org.apache.camel.impl.engine.PrototypeProcessorExchangeFactory;
import org.apache.camel.impl.engine.RouteService;
import org.apache.camel.impl.engine.TransformerKey;
import org.apache.camel.impl.engine.ValidatorKey;
@@ -139,6 +139,7 @@ import org.apache.camel.spi.ModelToXMLDumper;
import org.apache.camel.spi.NodeIdFactory;
import org.apache.camel.spi.PackageScanClassResolver;
import org.apache.camel.spi.PackageScanResourceResolver;
+import org.apache.camel.spi.ProcessorExchangeFactory;
import org.apache.camel.spi.ProcessorFactory;
import org.apache.camel.spi.PropertiesComponent;
import org.apache.camel.spi.ReactiveExecutor;
@@ -163,6 +164,7 @@ import org.apache.camel.spi.ValidatorRegistry;
import org.apache.camel.spi.XMLRoutesDefinitionLoader;
import org.apache.camel.support.CamelContextHelper;
import org.apache.camel.support.DefaultUuidGenerator;
+import org.apache.camel.support.NormalizedUri;
import org.apache.camel.support.ResolverHelper;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
@@ -474,7 +476,7 @@ public class FastCamelContext extends AbstractCamelContext implements CatalogCam
}
@Override
- protected EndpointRegistry<EndpointKey> createEndpointRegistry(Map<EndpointKey, Endpoint> endpoints) {
+ protected EndpointRegistry<NormalizedUri> createEndpointRegistry(Map<NormalizedUri, Endpoint> endpoints) {
return new DefaultEndpointRegistry(this, endpoints);
}
@@ -688,6 +690,17 @@ public class FastCamelContext extends AbstractCamelContext implements CatalogCam
}
@Override
+ protected ProcessorExchangeFactory createProcessorExchangeFactory() {
+ Optional<ProcessorExchangeFactory> result = ResolverHelper.resolveService(
+ getCamelContextReference(),
+ getBootstrapFactoryFinder(),
+ ProcessorExchangeFactory.FACTORY,
+ ProcessorExchangeFactory.class);
+
+ return result.orElseGet(PrototypeProcessorExchangeFactory::new);
+ }
+
+ @Override
public List<RouteDefinition> getRouteDefinitions() {
return model.getRouteDefinitions();
}
diff --git a/extensions-jvm/kotlin-dsl/runtime/pom.xml b/extensions-jvm/kotlin-dsl/runtime/pom.xml
index 27ae382..1449a53 100644
--- a/extensions-jvm/kotlin-dsl/runtime/pom.xml
+++ b/extensions-jvm/kotlin-dsl/runtime/pom.xml
@@ -59,6 +59,18 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-kotlin-dsl</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-script-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-scripting-jvm</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-scripting-jvm-host</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/extensions/jsonpath/runtime/pom.xml b/extensions/jsonpath/runtime/pom.xml
index ea26471..436d146 100644
--- a/extensions/jsonpath/runtime/pom.xml
+++ b/extensions/jsonpath/runtime/pom.xml
@@ -56,6 +56,10 @@
<artifactId>camel-jsonpath</artifactId>
</dependency>
<dependency>
+ <groupId>net.minidev</groupId>
+ <artifactId>json-smart</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.graalvm.nativeimage</groupId>
<artifactId>svm</artifactId>
<scope>provided</scope>
diff --git a/integration-tests/jsonpath/src/test/java/org/apache/camel/quarkus/component/json/path/it/JsonPathTransformTest.java b/integration-tests/jsonpath/src/test/java/org/apache/camel/quarkus/component/json/path/it/JsonPathTransformTest.java
index b9c1b23..2ffea10 100644
--- a/integration-tests/jsonpath/src/test/java/org/apache/camel/quarkus/component/json/path/it/JsonPathTransformTest.java
+++ b/integration-tests/jsonpath/src/test/java/org/apache/camel/quarkus/component/json/path/it/JsonPathTransformTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.quarkus.component.json.path.it;
import java.util.Arrays;
-import java.util.List;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
@@ -26,7 +25,7 @@ import org.apache.camel.quarkus.component.json.path.it.CarsRequest.Car;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertIterableEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
@QuarkusTest
class JsonPathTransformTest {
@@ -45,11 +44,11 @@ class JsonPathTransformTest {
@Test
public void getAllCarColorsShouldSucceed() {
- List<String> colors = RestAssured.given() //
+ String colors = RestAssured.given() //
.contentType(ContentType.JSON).body(carsRequest).get("/jsonpath/getAllCarColors").then().statusCode(200)
- .extract().body().jsonPath().getList(".", String.class);
+ .extract().body().asString();
- assertIterableEquals(Arrays.asList("red", "green"), colors);
+ assertEquals("[red, green]", colors);
}
}
diff --git a/pom.xml b/pom.xml
index 337470f..db770cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,6 +91,7 @@
<jersey-sun.version>1.19.4</jersey-sun.version><!-- Spark -->
<jetty.version>${jetty9-version}</jetty.version>
<jnr-ffi.version>2.1.2</jnr-ffi.version><!-- Mess in web3j transitive deps -->
+ <json-smart.version>2.4.2</json-smart.version>
<kafka.version>2.5.0</kafka.version>
<kudu.version>${kudu-version}</kudu.version><!-- keep in sync with Camel -->
<kotlin.version>1.4.31</kotlin.version><!-- keep in sync with Quarkus -->
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 8129b49..f510aa1 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -5959,6 +5959,21 @@
<version>${javassist.version}</version>
</dependency>
<dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-script-util</artifactId>
+ <version>${kotlin.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-scripting-jvm</artifactId>
+ <version>${kotlin.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-scripting-jvm-host</artifactId>
+ <version>${kotlin.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.jruby.jcodings</groupId>
<artifactId>jcodings</artifactId>
<version>${jcodings.version}</version>
@@ -6065,6 +6080,11 @@
<version>${snakeyaml.version}</version>
</dependency>
<dependency>
+ <groupId>net.minidev</groupId>
+ <artifactId>json-smart</artifactId>
+ <version>${json-smart.version}</version>
+ </dependency>
+ <dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>${xalan.version}</version>