✨ SpringMVC aem proxy implementation optional based on more criteria

SpringMVC implementation can now be overridden by having other
autoconfigurations override it (as in the case of
fluentforms-jersey-spring-boot-starter).  It can also be overridden via
an explicit configuration setting (fluentforms.rproxy.type).

Author: rmcdouga

spring/ConfigurationProperties.md

@@ -43,6 +43,9 @@ be set to `/clientApp` (as in `fluentforms.rproxy.clientPrefix=/clientApp`).
 
 `fluentforms.rproxy.afBaseLocation` - TBD - This needs to be documented.
 
+`fluentforms.rproxy.type` - This is used to set the mechanism used to reverse-proxy secondary resources to AEM.  If the value is `springmvc`, then Spring MVC is used to implement the reverse proxy.  If it is `jersey`, then JAX-RS Jersey is used.  This property is optional and, if omitted, then the autoconfiguration will choose `springmvc` if no other type is available.  It will typically use a different implementation if it is available (e.g. if `fluentforms-jersey-spring-starter` is on the class path).  This means that under normal circumstances, this setting should not have to be set and is only intended to be used to override the autoconfiguration mechanisms.
+
+
 ### Rest Client Properties
 
 Fluent Forms can be configured to use one of two different REST client libraries.  It can use either the Jersey client libraries or the Spring RestClient libraries.  it was originally developed to use the Jersey client libraries however this some drawbacks - firstly, the Spring requires special configuration when you combine it with libraries that use  the built in Spring Web Mechanisms (e.g. Spring MVC, Spring Boot Activator, etc. - see [https://docs.spring.io/spring-boot/how-to/jersey.html](https://docs.spring.io/spring-boot/how-to/jersey.html)). Secondly, Spring Jersey is an extra dependency that duplicates functionality that is already available in the Spring Framework, so it causes some jar bloat.

spring/fluentforms-spring-boot-autoconfigure/src/main/java/com/_4point/aem/fluentforms/spring/AemProxyAutoConfiguration.java

@@ -26,43 +26,22 @@
 @AutoConfiguration
 @ConditionalOnWebApplication(type=Type.SERVLET)
 @ConditionalOnProperty(prefix="fluentforms.rproxy", name="enabled", havingValue="true", matchIfMissing=true )
+@ConditionalOnProperty(prefix="fluentforms.rproxy", name="type", havingValue="springmvc", matchIfMissing=true )
 @EnableConfigurationProperties({AemConfiguration.class, AemProxyConfiguration.class})
+@ConditionalOnMissingBean(AemProxyImplemention.class)
 public class AemProxyAutoConfiguration {
-
-//	/**
-//	 * Configures the JAX-RS resources associated with reverse proxying resources and submissions from
-//	 * Adaptive Forms. 
-//	 * 
-//	 * @param aemConfig
-//	 * 		AEM configuration typically configured using application.properties files.  This is
-//	 * 		typically injected by the Spring Framework.
-//	 * @param aemProxyConfig
-//	 * 		AEM proxy-specific configuration typically configured using application.properties files.
-//	 * 		This is typically injected by the Spring Framework.
-//	 * @param aemProxyTaskExecutor 
-//	 * @return
-//	 * 		JAX-RS Resource configuration customizer that is used by the spring-jersey starter to configure
-//	 * 		JAX-RS Resources (i.e. endpoints)
-//	 */
-//	@Bean
-//	public ResourceConfigCustomizer afProxyConfigurer(AemConfiguration aemConfig, AemProxyConfiguration aemProxyConfig, @Autowired(required = false) SslBundles sslBundles, TaskExecutor aemProxyTaskExecutor) {
-//		return config->config.register(new AemProxyEndpoint(aemConfig, aemProxyConfig, sslBundles, aemProxyTaskExecutor))
-//					  		 .register(new AemProxyAfSubmission())
-//					  		 ;
-//	}
-//	
-//	/**
-//	 * Supply a TaskExecutor for use by the AemProxyEndpoint.  This is used to process csrf token requests because they are Chunked.
-//	 * 
-//	 * @return the taskeExecutor that will be used to process csrf token requests.
-//	 */
-//	@Bean
-//	public TaskExecutor aemProxyTaskExecutor() {
-//		var executor = new SimpleAsyncTaskExecutor("AemProxy-");
-//		// Use virtual threads if available.  This will be the default for Java 21 and later.
-//		executor.setVirtualThreads(JavaVersion.getJavaVersion().isEqualOrNewerThan(JavaVersion.TWENTY_ONE));
-//		return executor;
-//	}
+	
+	/**
+	 * Marker bean to indicate that the Spring MVC-based AEM Proxy implementation is being used.
+	 * 
+	 * @return
+	 */
+	@Bean
+	AemProxyImplemention aemProxyImplemention() {
+		return new AemProxyImplemention() {
+			// This is just a marker bean.
+		};
+	}
 
 	@Bean
 	AemProxyEndpoint aemProxyEndpoint(AemConfiguration aemConfig, AemProxyConfiguration aemProxyConfig, @Autowired(required = false) RestClientSsl restClientSsl) {

spring/fluentforms-spring-boot-autoconfigure/src/main/java/com/_4point/aem/fluentforms/spring/AemProxyImplemention.java

@@ -0,0 +1,9 @@
+package com._4point.aem.fluentforms.spring;
+
+/**
+ * This is a placeholder interface used to identify the AEM Proxy Implementation,  Each implementation
+ * (spring-mvc, jersey, etc.) will provide a bean that implements this one so that only one implementation is used.
+ */
+public interface AemProxyImplemention {
+
+}

spring/fluentforms-spring-boot-autoconfigure/src/test/java/com/_4point/aem/fluentforms/spring/AutoConfigurationTest.java

@@ -43,6 +43,8 @@ private static class SpringBootMocks {
 
 	private static final AutoConfigurations LOCAL_SUBMIT_CONFIG = AutoConfigurations.of(FluentFormsAutoConfiguration.class, AemProxyAutoConfiguration.class, DummyLocalSubmitHandler.class, SpringBootMocks.class);
 
+	private static final AutoConfigurations ALTERNATE_PROXY_CONFIG = AutoConfigurations.of(DummyProxyImplementation.class, FluentFormsAutoConfiguration.class, AemProxyAutoConfiguration.class, SpringBootMocks.class);
+
 	// Tests to make sure that only the FluentFormsLibraries are loaded in a non-web application.
 	private static final ContextConsumer<? super AssertableApplicationContext> FF_LIBRARIES_ONLY = (context) -> {
 		assertAll(
@@ -108,6 +110,9 @@ private static class SpringBootMocks {
 	private final WebApplicationContextRunner webLocalSubmitContextRunner = new WebApplicationContextRunner()
 		    .withConfiguration(LOCAL_SUBMIT_CONFIG);
 
+	private final WebApplicationContextRunner webAlternateProxyContextRunner = new WebApplicationContextRunner()
+		    .withConfiguration(ALTERNATE_PROXY_CONFIG);
+	
 	// Only the services that do not require a web server should be started.
 	@Test
 	void nonWebContext_StartNonWebServices() {
@@ -165,6 +170,35 @@ void webContext_StartAllServices_LocalSubmit() {
 	    		.run(WEB_LOCAL_SUBMIT_SERVICES);
 	}
 
+	// Only the FluentForms libraries are instantiated by this autoconfiguration when an alternate proxy implementation is supplied.
+	@Test
+	void webContext_StartAllServices_AlternateProxySupplied() {
+	    this.webAlternateProxyContextRunner
+	    		.withPropertyValues("fluentforms.aem.servername=localhost", "fluentforms.aem.port=4502",
+	    							"fluentforms.aem.user=user", "fluentforms.aem.password=password")
+	    		.run(WEB_FF_LIBRARIES_ONLY);
+	}
+
+	// Only the FluentForms libraries are instantiated when an alternate proxy tyoe is configured.
+	@Test
+	void webContext_ProxyDisabled_AlternateProxyConfigured() {
+	    this.webContextRunner
+	    		.withPropertyValues("fluentforms.aem.servername=localhost", "fluentforms.aem.port=4502",
+	    							"fluentforms.aem.user=user", "fluentforms.aem.password=password",
+	    							"fluentforms.rproxy.type=someothertype")
+	    		.run(WEB_FF_LIBRARIES_ONLY);
+	}
+
+	// All services should start when the default proxy type is configured.
+	@Test
+	void webContext_ProxyEnabled_DefaultProxyConfigured() {
+	    this.webContextRunner
+	    		.withPropertyValues("fluentforms.aem.servername=localhost", "fluentforms.aem.port=4502",
+	    							"fluentforms.aem.user=user", "fluentforms.aem.password=password",
+	    							"fluentforms.rproxy.type=springmvc")
+	    		.run(WEB_ALL_DEFAULT_SERVICES);
+	}
+	
 
 	public static class DummyLocalSubmitHandler implements AfSubmissionHandler {
 
@@ -178,4 +212,8 @@ public SubmitResponse processSubmission(Submission submission) {
 			return null;
 		}
 	}
+	
+	public static class DummyProxyImplementation implements AemProxyImplemention {
+		
+	}
 }