/*
 * Copyright 2016-2021 the original author or authors.
 *
 * Licensed 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.joinfaces.autoconfigure.tomcat;

import org.apache.catalina.Context;

import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.boot.web.embedded.tomcat.TomcatContextCustomizer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

/**
 * Creating tomcat auto configuration to enable jsf read facelets at integration
 * tests.
 *
 * @author Marcelo Fernandes
 * @author Lars Grefer
 */
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(Context.class)
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
public class TomcatAutoConfiguration {

	@Bean
	public TomcatContextCustomizer jsfTomcatContextCustomizer() {
		return context -> context.addLifecycleListener(new JsfTomcatLifecycleListener(context));
	}
}

@@ -912,31 +912,108 @@
 omcat.Tomcat
-Context
+ServletWebServerFactory;%0Aimport org.springframework.boot.web.server.WebServerFactory
 Customizer;%0A
@@ -1489,39 +1489,73 @@
 %09public 
-TomcatContextCustomizer
+WebServerFactoryCustomizer%3CTomcatServletWebServerFactory%3E
  jsfTomc
@@ -1556,23 +1556,23 @@
 sfTomcat
-Context
+Factory
 Customiz
@@ -1587,16 +1587,62 @@
 %09return 
+factory -%3E factory.addContextCustomizers(%0A%09%09%09%09
 context 
@@ -1713,15 +1713,19 @@
 ontext))
+%0A%09%09)
 ;%0A%09%7D%0A%7D%0A

Fix TomcatAutoConfiguration for custom TomcatServletWebServerFactory beans