Skip to content

Commit adb7402

Browse files
committed
🚚 Move JerseyConfig logic into proxy autoconfiguration code.
1 parent 12e320c commit adb7402

2 files changed

Lines changed: 10 additions & 23 deletions

File tree

β€Žspring/fluentforms-jersey-spring-boot-autoconfigure/src/main/java/com/_4point/aem/fluentforms/spring/AemProxyJerseyAutoConfiguration.javaβ€Ž

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package com._4point.aem.fluentforms.spring;
22

33
import java.util.List;
4+
import java.util.Map;
45

6+
import org.glassfish.jersey.servlet.ServletProperties;
57
import org.springframework.beans.factory.annotation.Autowired;
68
import org.springframework.boot.autoconfigure.AutoConfiguration;
79
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -52,6 +54,14 @@ public class AemProxyJerseyAutoConfiguration {
5254
public ResourceConfigCustomizer afProxyConfigurer(AemConfiguration aemConfig, AemProxyConfiguration aemProxyConfig, @Autowired(required = false) SslBundles sslBundles, TaskExecutor aemProxyTaskExecutor) {
5355
return config->config.register(new AemProxyJerseyEndpoint(aemConfig, aemProxyConfig, sslBundles, aemProxyTaskExecutor))
5456
.register(new AemProxyJerseyAfSubmission())
57+
.addProperties(Map.of(
58+
// Turn off Wadl generation (this was interfering with some CORS functionality
59+
"jersey.config.server.wadl.disableWadl", true,
60+
// Set properties to allow Jersey to coexist with Spring MVC
61+
"jersey.config.server.response.setStatusOverSendError", true,
62+
// See https://docs.spring.io/spring-boot/how-to/jersey.html#howto .jersey.alongside-another-web-framework
63+
ServletProperties.FILTER_FORWARD_ON_404, true
64+
))
5565
;
5666
}
5767

β€Žspring/fluentforms-jersey-spring-boot-autoconfigure/src/main/java/com/_4point/aem/fluentforms/spring/JerseyConfig.javaβ€Ž

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
Β (0)