This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 04c60529056 Fix test sb upgrade (#1035)
04c60529056 is described below
commit 04c60529056912827d0c3b6f6270c66df3e249f5
Author: Federico Mariani <34543311+cro...@users.noreply.github.com>
AuthorDate: Tue Dec 5 21:18:19 2023 +0100
Fix test sb upgrade (#1035)
* ✅ localstack replies with aws-chunked content encoding
* Upgrade reactive streams to SB 3.2
* Fix failing tests
* IT tests alignments
---
.../org/apache/camel/component/aws2/s3/BaseS3.java | 2 +-
.../camel/component/aws2/s3/S3ComponentTest.java | 1 -
.../master/springboot/EndpointUriEncodingTest.java | 4 +++-
.../integration/AbstractMongoDbITSupport.java | 5 +++--
.../integration/MongoDbFindOperationIT.java | 5 +++--
.../ReactiveStreamsServiceAutoConfiguration.java | 17 +++++++--------
core/camel-spring-boot/pom.xml | 6 ++++++
.../camel/itest/springboot/CamelAvroRpcTest.java | 8 ++++----
.../camel/itest/springboot/CamelAvroTest.java | 8 ++++----
.../springboot/CamelElasticsearchRestTest.java | 4 ++--
.../itest/springboot/CamelElasticsearchTest.java | 6 +++---
.../itest/springboot/CamelGooglePubsubTest.java | 24 +++++++++++-----------
.../itest/springboot/CamelInfinispanTest.java | 20 +++++++++---------
.../itest/springboot/CamelOpentelemetryTest.java | 20 +++++++++---------
14 files changed, 68 insertions(+), 62 deletions(-)
diff --git
a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/BaseS3.java
b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/BaseS3.java
index 1727cc5c789..768be792ef2 100644
---
a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/BaseS3.java
+++
b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/BaseS3.java
@@ -42,7 +42,7 @@ public class BaseS3 {
protected ProducerTemplate template;
@RegisterExtension
- public static AWSService service =
AWSServiceFactory.createDynamodbService();
+ public static AWSService service = AWSServiceFactory.createS3Service();
@RegisterExtension
public static SharedNameGenerator sharedNameGenerator = new
TestEntityNameGenerator();
diff --git
a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3ComponentTest.java
b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3ComponentTest.java
index dcb83a14cb7..e16329dab84 100644
---
a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3ComponentTest.java
+++
b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3ComponentTest.java
@@ -110,7 +110,6 @@ public class S3ComponentTest extends BaseS3 {
// bucket
assertNotNull(resultExchange.getIn().getHeader(AWS2S3Constants.LAST_MODIFIED));
assertEquals("application/octet-stream",
resultExchange.getIn().getHeader(AWS2S3Constants.CONTENT_TYPE));
-
assertNull(resultExchange.getIn().getHeader(AWS2S3Constants.CONTENT_ENCODING));
assertEquals(26L,
resultExchange.getIn().getHeader(AWS2S3Constants.CONTENT_LENGTH));
assertNull(resultExchange.getIn().getHeader(AWS2S3Constants.CONTENT_DISPOSITION));
assertNull(resultExchange.getIn().getHeader(AWS2S3Constants.CONTENT_MD5));
diff --git
a/components-starter/camel-master-starter/src/test/java/org/apache/camel/component/master/springboot/EndpointUriEncodingTest.java
b/components-starter/camel-master-starter/src/test/java/org/apache/camel/component/master/springboot/EndpointUriEncodingTest.java
index a5a0531597b..dfe278931aa 100644
---
a/components-starter/camel-master-starter/src/test/java/org/apache/camel/component/master/springboot/EndpointUriEncodingTest.java
+++
b/components-starter/camel-master-starter/src/test/java/org/apache/camel/component/master/springboot/EndpointUriEncodingTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.master.springboot;
import java.util.Map;
+import java.util.UUID;
import org.apache.camel.Consumer;
import org.apache.camel.Endpoint;
@@ -71,8 +72,9 @@ public class EndpointUriEncodingTest {
setupClusterService();
return new RouteBuilder() {
public void configure() {
+ final String randomMasterId = UUID.randomUUID().toString();
context.addComponent("dummy", new DummyComponent());
-
from("master:test:dummy://path?foo=hello}+world&bar=RAW(hello}+world)")
+ from("master:" + randomMasterId +
":dummy://path?foo=hello}+world&bar=RAW(hello}+world)")
.to("mock:result");
}
};
diff --git
a/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/integration/AbstractMongoDbITSupport.java
b/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/integration/AbstractMongoDbITSupport.java
index d4c3585e0ea..cfbe80f8bdd 100644
---
a/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/integration/AbstractMongoDbITSupport.java
+++
b/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/integration/AbstractMongoDbITSupport.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.mongodb.integration;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import jakarta.annotation.PostConstruct;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.ProducerTemplate;
@@ -178,8 +179,8 @@ public abstract class AbstractMongoDbITSupport {
return component;
}
- @Bean
- public void propertyLocation() {
+ @PostConstruct
+ public void setUp() {
context.getPropertiesComponent().setLocation("classpath:mongodb.test.properties");
}
}
diff --git
a/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbFindOperationIT.java
b/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbFindOperationIT.java
index 89e037d1c31..d2ad75fd7c0 100644
---
a/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbFindOperationIT.java
+++
b/components-starter/camel-mongodb-starter/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbFindOperationIT.java
@@ -26,6 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import static com.mongodb.client.model.Filters.eq;
+import jakarta.annotation.PostConstruct;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
@@ -428,8 +429,8 @@ public class MongoDbFindOperationIT {
return component;
}
- @Bean
- public void setProperties() {
+ @PostConstruct
+ public void setUp() {
context.getPropertiesComponent().setLocation("classpath:mongodb.test.properties");
}
diff --git
a/components-starter/camel-reactive-streams-starter/src/main/java/org/apache/camel/component/reactive/streams/springboot/ReactiveStreamsServiceAutoConfiguration.java
b/components-starter/camel-reactive-streams-starter/src/main/java/org/apache/camel/component/reactive/streams/springboot/ReactiveStreamsServiceAutoConfiguration.java
index c24c7a2c12f..c3c8c01f062 100644
---
a/components-starter/camel-reactive-streams-starter/src/main/java/org/apache/camel/component/reactive/streams/springboot/ReactiveStreamsServiceAutoConfiguration.java
+++
b/components-starter/camel-reactive-streams-starter/src/main/java/org/apache/camel/component/reactive/streams/springboot/ReactiveStreamsServiceAutoConfiguration.java
@@ -19,31 +19,28 @@ package
org.apache.camel.component.reactive.streams.springboot;
import org.apache.camel.CamelContext;
import org.apache.camel.component.reactive.streams.ReactiveStreamsHelper;
import
org.apache.camel.component.reactive.streams.api.CamelReactiveStreamsService;
+import
org.apache.camel.component.reactive.streams.api.CamelReactiveStreamsServiceFactory;
+import
org.apache.camel.component.reactive.streams.engine.DefaultCamelReactiveStreamsServiceFactory;
import
org.apache.camel.component.reactive.streams.engine.ReactiveStreamsEngineConfiguration;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Lazy;
@AutoConfigureAfter(ReactiveStreamsComponentAutoConfiguration.class)
@ConditionalOnBean(ReactiveStreamsComponentAutoConfiguration.class)
@EnableConfigurationProperties(ReactiveStreamsComponentConfiguration.class)
+@Configuration
public class ReactiveStreamsServiceAutoConfiguration {
- @Autowired
- private CamelContext context;
- @Autowired
- private ReactiveStreamsComponentConfiguration configuration;
@Lazy
@Bean
@ConditionalOnMissingBean
- @ConditionalOnClass(CamelContext.class)
- public CamelReactiveStreamsService
camelReactiveStreamsService(ApplicationContext ac) throws Exception {
+ public CamelReactiveStreamsService
camelReactiveStreamsService(CamelContext context,
+
ReactiveStreamsComponentConfiguration configuration) {
ReactiveStreamsEngineConfiguration engineConfiguration = new
ReactiveStreamsEngineConfiguration();
if (configuration.getReactiveStreamsEngineConfiguration() != null) {
@@ -58,7 +55,7 @@ public class ReactiveStreamsServiceAutoConfiguration {
}
}
- return ReactiveStreamsHelper.resolveReactiveStreamsService(context,
configuration.getServiceType(), engineConfiguration);
+ return new
DefaultCamelReactiveStreamsServiceFactory().newInstance(context,
engineConfiguration);
}
}
diff --git a/core/camel-spring-boot/pom.xml b/core/camel-spring-boot/pom.xml
index e5c95f8c65f..139831b828e 100644
--- a/core/camel-spring-boot/pom.xml
+++ b/core/camel-spring-boot/pom.xml
@@ -58,6 +58,12 @@
<optional>true</optional>
<version>${spring-boot-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-actuator</artifactId>
+ <scope>compile</scope> <!-- Avoid ClassNotFound
AvailabilityStateHealthIndicator -->
+ <version>${spring-boot-version}</version>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
diff --git
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelAvroRpcTest.java
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelAvroRpcTest.java
index e7c9623f7b9..6ad473693b6 100644
---
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelAvroRpcTest.java
+++
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelAvroRpcTest.java
@@ -35,10 +35,10 @@ public class CamelAvroRpcTest extends
AbstractSpringBootTestSupport {
public static ITestConfig createTestConfig() {
return new ITestConfigBuilder()
.module(inferModuleName(CamelAvroRpcTest.class))
- .dependency("org.apache.avro:avro:1.9.1")
- .dependency("org.apache.avro:avro-ipc:1.9.1")
- .dependency("org.apache.avro:avro-ipc-jetty:1.9.1")
- .dependency("org.apache.avro:avro-ipc-netty:1.9.1")
+ .dependency("org.apache.avro:avro:1.11.3")
+ .dependency("org.apache.avro:avro-ipc:1.11.3")
+ .dependency("org.apache.avro:avro-ipc-jetty:1.11.3")
+ .dependency("org.apache.avro:avro-ipc-netty:1.11.3")
.build();
}
diff --git
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelAvroTest.java
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelAvroTest.java
index 7443e976099..d5f1dd40ab6 100644
---
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelAvroTest.java
+++
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelAvroTest.java
@@ -35,10 +35,10 @@ public class CamelAvroTest extends
AbstractSpringBootTestSupport {
public static ITestConfig createTestConfig() {
return new ITestConfigBuilder()
.module(inferModuleName(CamelAvroTest.class))
- .dependency("org.apache.avro:avro:1.9.1")
- .dependency("org.apache.avro:avro-ipc:1.9.1")
- .dependency("org.apache.avro:avro-ipc-jetty:1.9.1")
- .dependency("org.apache.avro:avro-ipc-netty:1.9.1")
+ .dependency("org.apache.avro:avro:1.11.3")
+ .dependency("org.apache.avro:avro-ipc:1.11.3")
+ .dependency("org.apache.avro:avro-ipc-jetty:1.11.3")
+ .dependency("org.apache.avro:avro-ipc-netty:1.11.3")
.build();
}
diff --git
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelElasticsearchRestTest.java
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelElasticsearchRestTest.java
index 54e51bbcf4b..0644c3b8986 100644
---
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelElasticsearchRestTest.java
+++
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelElasticsearchRestTest.java
@@ -36,8 +36,8 @@ public class CamelElasticsearchRestTest extends
AbstractSpringBootTestSupport {
public static ITestConfig createTestConfig() {
return new ITestConfigBuilder()
.module(inferModuleName(CamelElasticsearchRestTest.class))
-
.dependency("org.elasticsearch.client:elasticsearch-rest-client-sniffer:7.7.0")
-
.dependency("org.elasticsearch.client:elasticsearch-rest-client:7.7.0")
+
.dependency("org.elasticsearch.client:elasticsearch-rest-client-sniffer:8.10.4")
+
.dependency("org.elasticsearch.client:elasticsearch-rest-client:8.10.4")
.build();
}
diff --git
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelElasticsearchTest.java
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelElasticsearchTest.java
index 0b595eddb29..7ebbb47a561 100644
---
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelElasticsearchTest.java
+++
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelElasticsearchTest.java
@@ -35,9 +35,9 @@ public class CamelElasticsearchTest extends
AbstractSpringBootTestSupport {
public static ITestConfig createTestConfig() {
return new ITestConfigBuilder()
.module(inferModuleName(CamelElasticsearchTest.class))
-
.dependency("org.elasticsearch.client:elasticsearch-rest-client-sniffer:8.4.1")
-
.dependency("org.elasticsearch.client:elasticsearch-rest-client:8.4.1")
- .dependency("co.elastic.clients:elasticsearch-java:8.4.1")
+
.dependency("org.elasticsearch.client:elasticsearch-rest-client-sniffer:8.10.4")
+
.dependency("org.elasticsearch.client:elasticsearch-rest-client:8.10.4")
+ .dependency("co.elastic.clients:elasticsearch-java:8.10.4")
.build();
}
diff --git
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelGooglePubsubTest.java
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelGooglePubsubTest.java
index 0cd73cb0b6d..6cd0033c14b 100644
---
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelGooglePubsubTest.java
+++
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelGooglePubsubTest.java
@@ -35,18 +35,18 @@ public class CamelGooglePubsubTest extends
AbstractSpringBootTestSupport {
public static ITestConfig createTestConfig() {
return new ITestConfigBuilder()
.module(inferModuleName(CamelGooglePubsubTest.class))
-
.dependency("com.google.http-client:google-http-client-jackson2:1.34.0")
- .dependency("com.google.http-client:google-http-client:1.34.0")
- .dependency("io.grpc:grpc-alts:1.28.1")
- .dependency("io.grpc:grpc-api:1.28.1")
- .dependency("io.grpc:grpc-auth:1.28.1")
- .dependency("io.grpc:grpc-context:1.28.1")
- .dependency("io.grpc:grpc-core:1.28.1")
- .dependency("io.grpc:grpc-grpclb:1.28.1")
- .dependency("io.grpc:grpc-netty-shaded:1.28.1")
- .dependency("io.grpc:grpc-protobuf:1.28.1")
- .dependency("io.grpc:grpc-protobuf-lite:1.28.1")
- .dependency("io.grpc:grpc-stub:1.28.1")
+
.dependency("com.google.http-client:google-http-client-jackson2:1.43.3")
+ .dependency("com.google.http-client:google-http-client:1.43.3")
+ .dependency("io.grpc:grpc-alts:1.59.1")
+ .dependency("io.grpc:grpc-api:1.59.1")
+ .dependency("io.grpc:grpc-auth:1.59.1")
+ .dependency("io.grpc:grpc-context:1.59.1")
+ .dependency("io.grpc:grpc-core:1.59.1")
+ .dependency("io.grpc:grpc-grpclb:1.59.1")
+ .dependency("io.grpc:grpc-netty-shaded:1.59.1")
+ .dependency("io.grpc:grpc-protobuf:1.59.1")
+ .dependency("io.grpc:grpc-protobuf-lite:1.59.1")
+ .dependency("io.grpc:grpc-stub:1.59.1")
.build();
}
diff --git
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelInfinispanTest.java
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelInfinispanTest.java
index 9fdffec567a..af9571c2371 100644
---
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelInfinispanTest.java
+++
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelInfinispanTest.java
@@ -35,16 +35,16 @@ public class CamelInfinispanTest extends
AbstractSpringBootTestSupport {
public static ITestConfig createTestConfig() {
return new ITestConfigBuilder()
.module(inferModuleName(CamelInfinispanTest.class))
-
.dependency("org.infinispan:infinispan-client-hotrod:12.1.3.Final")
- .dependency("org.infinispan:infinispan-commons:12.1.3.Final")
-
.dependency("org.infinispan:infinispan-component-annotations:12.1.3.Final")
- .dependency("org.infinispan:infinispan-core:12.1.3.Final")
- .dependency("org.infinispan:infinispan-query-dsl:12.1.3.Final")
-
.dependency("org.infinispan:infinispan-jboss-marshalling:12.1.3.Final")
-
.dependency("org.infinispan:infinispan-marshaller-protostuff:12.1.3.Final")
-
.dependency("org.infinispan:infinispan-remote-query-client:12.1.3.Final")
-
.dependency("org.infinispan.protostream:protostream-types:4.4.1.Final")
-
.dependency("org.infinispan.protostream:protostream:4.4.1.Final")
+
.dependency("org.infinispan:infinispan-client-hotrod:14.0.21.Final")
+ .dependency("org.infinispan:infinispan-commons:14.0.21.Final")
+
.dependency("org.infinispan:infinispan-component-annotations:14.0.21.Final")
+ .dependency("org.infinispan:infinispan-core:14.0.21.Final")
+
.dependency("org.infinispan:infinispan-query-dsl:14.0.21.Final")
+
.dependency("org.infinispan:infinispan-jboss-marshalling:14.0.21.Final")
+
.dependency("org.infinispan:infinispan-marshaller-protostuff:14.0.21.Final")
+
.dependency("org.infinispan:infinispan-remote-query-client:14.0.21.Final")
+
.dependency("org.infinispan.protostream:protostream-types:4.6.5.Final")
+
.dependency("org.infinispan.protostream:protostream:4.6.5.Final")
.disableJmx("org.infinispan:*")
.build();
}
diff --git
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelOpentelemetryTest.java
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelOpentelemetryTest.java
index 5e878bf4d61..a108f7a55f2 100644
---
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelOpentelemetryTest.java
+++
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelOpentelemetryTest.java
@@ -34,16 +34,16 @@ public class CamelOpentelemetryTest extends
AbstractSpringBootTestSupport {
public static ITestConfig createTestConfig() {
return new ITestConfigBuilder()
- .dependency("io.grpc:grpc-api:1.30.2")
- .dependency("io.grpc:grpc-context:1.30.2")
- .dependency("io.grpc:grpc-core:1.30.2")
- .dependency("io.grpc:grpc-netty-shaded:1.30.2")
- .dependency("io.grpc:grpc-protobuf-lite:1.30.2")
- .dependency("io.grpc:grpc-protobuf:1.30.2")
- .dependency("io.grpc:grpc-stub:1.30.2")
- .dependency("com.google.protobuf:protobuf-java-util:3.12.0")
- .dependency("com.google.protobuf:protobuf-java:3.12.0")
- .dependency("com.google.protobuf:protobuf-javalite:3.12.0")
+ .dependency("io.grpc:grpc-api:1.59.1")
+ .dependency("io.grpc:grpc-context:1.59.1")
+ .dependency("io.grpc:grpc-core:1.59.1")
+ .dependency("io.grpc:grpc-netty-shaded:1.59.1")
+ .dependency("io.grpc:grpc-protobuf-lite:1.59.1")
+ .dependency("io.grpc:grpc-protobuf:1.59.1")
+ .dependency("io.grpc:grpc-stub:1.59.1")
+ .dependency("com.google.protobuf:protobuf-java-util:3.23.4")
+ .dependency("com.google.protobuf:protobuf-java:3.23.4")
+ .dependency("com.google.protobuf:protobuf-javalite:3.23.4")
.module(inferModuleName(CamelOpentelemetryTest.class))
.build();
}
