This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-spring-boot-4.8.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/camel-spring-boot-4.8.x by
this push:
new b60439dc812 Camel 21536 (#1306)
b60439dc812 is described below
commit b60439dc812a121a8e75a57e6a34ff01f48bd7d0
Author: Björn Beskow <[email protected]>
AuthorDate: Thu Dec 12 10:28:07 2024 +0100
Camel 21536 (#1306)
* Added tests to highlight the problem
* Fix CAMEL-21536 by explicitly accepting either a ThreadPoolTaskExecutor
or a SimpleAsyncTaskExecutor
---------
Co-authored-by: Bjorn Beskow <[email protected]>
---
.../SpringBootPlatformHttpAutoConfiguration.java | 5 +-
...ormHttpMultipleExecutorsVirtualThreadsTest.java | 103 +++++++++++++++++++++
.../SpringBootPlatformHttpVirtualThreadsTest.java | 71 ++++++++++++++
3 files changed, 177 insertions(+), 2 deletions(-)
diff --git
a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpAutoConfiguration.java
b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpAutoConfiguration.java
index 45ebab49c3d..041d13a6d3c 100644
---
a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpAutoConfiguration.java
+++
b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpAutoConfiguration.java
@@ -26,6 +26,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.DependsOn;
import org.springframework.core.env.Environment;
+import org.springframework.core.task.SimpleAsyncTaskExecutor;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import java.util.List;
@@ -49,9 +50,9 @@ public class SpringBootPlatformHttpAutoConfiguration {
if (executors != null && !executors.isEmpty()) {
executor = executors.stream()
- .filter(e -> e instanceof ThreadPoolTaskExecutor)
+ .filter(e -> e instanceof ThreadPoolTaskExecutor || e
instanceof SimpleAsyncTaskExecutor)
.findFirst()
- .orElseThrow(() -> new RuntimeException("No
ThreadPoolTaskExecutor configured"));
+ .orElseThrow(() -> new RuntimeException("No
ThreadPoolTaskExecutor or SimpleAsyncTaskExecutor configured"));
} else {
throw new RuntimeException("No Executor configured");
}
diff --git
a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpMultipleExecutorsVirtualThreadsTest.java
b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpMultipleExecutorsVirtualThreadsTest.java
new file mode 100644
index 00000000000..8a827f4396d
--- /dev/null
+++
b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpMultipleExecutorsVirtualThreadsTest.java
@@ -0,0 +1,103 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.platform.http.springboot;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.spring.boot.CamelAutoConfiguration;
+import org.apache.camel.test.spring.junit5.CamelSpringBootTest;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import
org.springframework.boot.autoconfigure.security.oauth2.client.servlet.OAuth2ClientAutoConfiguration;
+import
org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
+import org.springframework.boot.task.SimpleAsyncTaskExecutorBuilder;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.task.SimpleAsyncTaskExecutor;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.test.annotation.DirtiesContext;
+
+import java.util.List;
+import java.util.concurrent.Executor;
+
+@EnableAutoConfiguration(exclude = {OAuth2ClientAutoConfiguration.class,
SecurityAutoConfiguration.class})
+@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
+@CamelSpringBootTest
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
classes = { CamelAutoConfiguration.class,
+ SpringBootPlatformHttpMultipleExecutorsVirtualThreadsTest.class,
+
SpringBootPlatformHttpMultipleExecutorsVirtualThreadsTest.TestConfiguration.class,
+ PlatformHttpComponentAutoConfiguration.class,
SpringBootPlatformHttpAutoConfiguration.class },
+ properties = "spring.threads.virtual.enabled=true")
+@EnableScheduling
+public class SpringBootPlatformHttpMultipleExecutorsVirtualThreadsTest extends
PlatformHttpBase {
+
+ private static final String THREAD_PREFIX = "myThread-";
+
+ private static final String postRouteId =
"SpringBootPlatformHttpMultipleExecutorsTest_mypost";
+
+ private static final String getRouteId =
"SpringBootPlatformHttpMultipleExecutorsTest_myget";
+
+ // *************************************
+ // Config
+ // *************************************
+ @Configuration
+ public static class TestConfiguration {
+
+ @Bean
+ public SimpleAsyncTaskExecutor
simpleAsyncTaskExecutor(SimpleAsyncTaskExecutorBuilder
simpleAsyncTaskExecutorBuilder) {
+ return simpleAsyncTaskExecutorBuilder
+ .threadNamePrefix(THREAD_PREFIX)
+ .build();
+ }
+
+ @Bean
+ public RouteBuilder servletPlatformHttpRouteBuilder() {
+ return new RouteBuilder() {
+ @Override
+ public void configure() {
+
from("platform-http:/myget").id(postRouteId).setBody().constant("get");
+
from("platform-http:/mypost").id(getRouteId).transform().body(String.class, b
-> b.toUpperCase());
+
+ from("platform-http:/executor").process(exchange ->
exchange.getIn().setBody(Thread.currentThread().getName()));
+ }
+ };
+ }
+ }
+
+ @Override
+ protected String getPostRouteId() {
+ return postRouteId;
+ }
+
+ @Override
+ protected String getGetRouteId() {
+ return getRouteId;
+ }
+
+ @Autowired
+ List<Executor> executors;
+
+ @Test
+ public void checkCustomExecutorIsPickedWhenMultipleExecutorsAreDefined() {
+ Assertions.assertThat(executors).hasSizeGreaterThan(1);
+
+ Assertions.assertThat(restTemplate.postForEntity("/executor", "test",
String.class).getBody())
+ .contains(THREAD_PREFIX);
+ }
+}
diff --git
a/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpVirtualThreadsTest.java
b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpVirtualThreadsTest.java
new file mode 100644
index 00000000000..939146a4ab0
--- /dev/null
+++
b/components-starter/camel-platform-http-starter/src/test/java/org/apache/camel/component/platform/http/springboot/SpringBootPlatformHttpVirtualThreadsTest.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.platform.http.springboot;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.spring.boot.CamelAutoConfiguration;
+import org.apache.camel.test.spring.junit5.CamelSpringBootTest;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import
org.springframework.boot.autoconfigure.security.oauth2.client.servlet.OAuth2ClientAutoConfiguration;
+import
org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
+
+@EnableAutoConfiguration(exclude = {OAuth2ClientAutoConfiguration.class,
SecurityAutoConfiguration.class})
+@DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD)
+@CamelSpringBootTest
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
classes = { CamelAutoConfiguration.class,
+ SpringBootPlatformHttpVirtualThreadsTest.class,
SpringBootPlatformHttpVirtualThreadsTest.TestConfiguration.class,
+ PlatformHttpComponentAutoConfiguration.class,
SpringBootPlatformHttpAutoConfiguration.class },
+ properties = "spring.threads.virtual.enabled=true")
+public class SpringBootPlatformHttpVirtualThreadsTest extends PlatformHttpBase
{
+
+ private static final String postRouteId =
"SpringBootPlatformHttpTest_mypost";
+
+ private static final String getRouteId =
"SpringBootPlatformHttpTest_myget";
+
+ // *************************************
+ // Config
+ // *************************************
+ @Configuration
+ public static class TestConfiguration {
+
+ @Bean
+ public RouteBuilder servletPlatformHttpRouteBuilder() {
+ return new RouteBuilder() {
+ @Override
+ public void configure() {
+
from("platform-http:/myget").id(postRouteId).setBody().constant("get");
+
from("platform-http:/mypost").id(getRouteId).transform().body(String.class, b
-> b.toUpperCase());
+ }
+ };
+ }
+ }
+
+ @Override
+ protected String getPostRouteId() {
+ return postRouteId;
+ }
+
+ @Override
+ protected String getGetRouteId() {
+ return getRouteId;
+ }
+}
