Skip to content

CAMEL-24405: Provide spring-boot-undertow-starter as the supported web server #1892

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

Draft
tdiesler wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

CAMEL-24405: Provide spring-boot-undertow-starter as the supported web server #1892

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
294 changes: 0 additions & 294 deletions CLAUDE.md
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions CLAUDE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
AGENTS.md
14 changes: 5 additions & 9 deletions components-starter/camel-platform-http-starter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,12 @@
<version>${spring-boot-version}</version>
<optional>true</optional>
</dependency>
<!-- TODO reintroduce once spring-boot-starter-undertow will be available -->
<!-- AND CHERRY PICK -->
<!-- https://github.com/apache/camel-spring-boot/commit/1bb2b737a4cc1301945a1084e5a5cbb2e4744690 -->
<!-- https://github.com/apache/camel-spring-boot/commit/16e8983051d473638701edcbb8b333022ac2eb90 -->
<!--dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-undertow</artifactId>
<version>${spring-boot-version}</version>
<dependency>
<groupId>io.undertow</groupId>
<artifactId>undertow-spring-boot-starter</artifactId>
<version>${undertow-spring-boot-version}</version>
<optional>true</optional>
</dependency-->
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
Expand Down
39 changes: 18 additions & 21 deletions ...e/camel/component/platform/http/springboot/customizer/UndertowAccessLogConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperties;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
//import org.springframework.boot.web.embedded.undertow.UndertowServletWebServerFactory;
import io.undertow.springboot.servlet.UndertowServletWebServerFactory;
import org.springframework.boot.web.server.WebServerFactoryCustomizer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;

//import io.undertow.server.handlers.accesslog.AccessLogHandler;
//import io.undertow.server.handlers.accesslog.JBossLoggingAccessLogReceiver;
import io.undertow.server.handlers.accesslog.AccessLogHandler;
import io.undertow.server.handlers.accesslog.JBossLoggingAccessLogReceiver;

/**
* Undertow specific configuration to use camel logging for HTTP access log.
Expand All @@ -46,22 +46,19 @@
})
public class UndertowAccessLogConfiguration {

// TODO reintroduce once spring-boot-starter-undertow will be available
//@Bean
//WebServerFactoryCustomizer<UndertowServletWebServerFactory> undertowServerAccessLogCustomizer(Environment env) {
// return new WebServerFactoryCustomizer<UndertowServletWebServerFactory>() {
// @Override
// public void customize(UndertowServletWebServerFactory factory) {
// factory.addDeploymentInfoCustomizers(deploymentInfo -> {
// deploymentInfo.addInitialHandlerChainWrapper(handler -> {
// JBossLoggingAccessLogReceiver jbossLogReceiver = new JBossLoggingAccessLogReceiver();
// undertow specific HTTP log message pattern
// https://github.com/undertow-io/undertow/blob/2.3.22.Final/core/src/main/java/io/undertow/server/handlers/accesslog/AccessLogHandler.java
// String pattern = env.getProperty("server.undertow.accesslog.pattern", "common");
// return new AccessLogHandler(handler, jbossLogReceiver, pattern, getClass().getClassLoader());
// });
// });
// }
// };
//}
@Bean
WebServerFactoryCustomizer<UndertowServletWebServerFactory> undertowServerAccessLogCustomizer(Environment env) {
return new WebServerFactoryCustomizer<UndertowServletWebServerFactory>() {
@Override
public void customize(UndertowServletWebServerFactory factory) {
factory.addDeploymentInfoCustomizers(deploymentInfo -> {
deploymentInfo.addInitialHandlerChainWrapper(handler -> {
JBossLoggingAccessLogReceiver jbossLogReceiver = new JBossLoggingAccessLogReceiver();
String pattern = env.getProperty("server.undertow.accesslog.pattern", "common");
return new AccessLogHandler(handler, jbossLogReceiver, pattern, getClass().getClassLoader());
});
});
}
};
}
}
2 changes: 1 addition & 1 deletion ...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ org.apache.camel.component.platform.http.springboot.PlatformHttpComponentConvert
org.apache.camel.component.platform.http.springboot.PlatformHttpComponentAutoConfiguration
org.apache.camel.component.platform.http.springboot.SpringBootPlatformHttpAutoConfiguration
org.apache.camel.component.platform.http.springboot.SpringBootPlatformWebMvcConfiguration
## TODO reintroduce once spring-boot-starter-undertow will be available
## TODO reintroduce once undertow-spring-boot-starter will be available
## AND CHERRY PICK
## https://github.com/apache/camel-spring-boot/commit/1bb2b737a4cc1301945a1084e5a5cbb2e4744690
## https://github.com/apache/camel-spring-boot/commit/16e8983051d473638701edcbb8b333022ac2eb90
Expand Down
6 changes: 6 additions & 0 deletions core/camel-spring-boot/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,12 @@
<version>${spring-boot-version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.undertow</groupId>
<artifactId>undertow-spring-boot-starter</artifactId>
<version>${undertow-spring-boot-version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
Expand Down
Loading
Loading