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.

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

CAMEL-21419: Handle Multiple Executors #1279

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.DependsOn;
import org.springframework.core.env.Environment;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;

import java.util.List;
import java.util.concurrent.Executor;

@Configuration(proxyBeanMethods = false)
Expand All @@ -38,11 +40,21 @@ public class SpringBootPlatformHttpAutoConfiguration {
CamelContext camelContext;

@Autowired
Executor executor;
List<Executor> executors;

@Bean(name = "platform-http-engine")
@ConditionalOnMissingBean(PlatformHttpEngine.class)
public PlatformHttpEngine springBootPlatformHttpEngine(Environment env) {
Executor executor;

if (executors != null && !executors.isEmpty()) {
executor = executors.stream()
.filter(e -> e instanceof ThreadPoolTaskExecutor)
.findFirst()
.orElseThrow(() -> new RuntimeException("No ThreadPoolTaskExecutor configured"));
} else {
throw new RuntimeException("No Executor configured");
}
int port = Integer.parseInt(env.getProperty("server.port", "8080"));
return new SpringBootPlatformHttpEngine(port, executor);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
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.test.context.SpringBootTest;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.test.annotation.DirtiesContext;

import java.util.List;
import java.util.concurrent.Executor;

@EnableAutoConfiguration
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
@CamelSpringBootTest
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { CamelAutoConfiguration.class,
SpringBootPlatformHttpMultipleExecutorsTest.class, SpringBootPlatformHttpMultipleExecutorsTest.TestConfiguration.class,
PlatformHttpComponentAutoConfiguration.class, SpringBootPlatformHttpAutoConfiguration.class })
@EnableScheduling
public class SpringBootPlatformHttpMultipleExecutorsTest extends PlatformHttpBase {

private static final String postRouteId = "SpringBootPlatformHttpMultipleExecutorsTest_mypost";

private static final String getRouteId = "SpringBootPlatformHttpMultipleExecutorsTest_myget";

private static final String THREAD_PREFIX = "myThread-";

// *************************************
// Config
// *************************************
@Configuration
public static class TestConfiguration {

@Bean(name = "customPoolTaskExecutor")
public Executor customPoolTaskExecutor() {
final ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
executor.setCorePoolSize(2);
executor.setMaxPoolSize(2);
executor.setQueueCapacity(500);
executor.setThreadNamePrefix(THREAD_PREFIX);
executor.initialize();
return executor;
}

@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);
}
}