/*
 * Copyright 2012-2016 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.springframework.boot.actuate.autoconfigure;

import javax.servlet.Servlet;
import javax.servlet.ServletRegistration;

import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.actuate.trace.TraceProperties;
import org.springframework.boot.actuate.trace.TraceRepository;
import org.springframework.boot.actuate.trace.WebRequestTraceFilter;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.web.ErrorAttributes;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.web.servlet.DispatcherServlet;

/**
 * {@link EnableAutoConfiguration Auto-configuration} for {@link WebRequestTraceFilter
 * tracing}.
 *
 * @author Dave Syer
 */
@ConditionalOnClass({ Servlet.class, DispatcherServlet.class, ServletRegistration.class })
@AutoConfigureAfter(TraceRepositoryAutoConfiguration.class)
@EnableConfigurationProperties(TraceProperties.class)
public class TraceWebFilterAutoConfiguration {

	@Autowired
	private TraceRepository traceRepository;

	@Autowired(required = false)
	private ErrorAttributes errorAttributes;

	@Autowired
	TraceProperties traceProperties = new TraceProperties();

	@Bean
	public WebRequestTraceFilter webRequestLoggingFilter(BeanFactory beanFactory) {
		WebRequestTraceFilter filter = new WebRequestTraceFilter(this.traceRepository,
				this.traceProperties);

		if (this.errorAttributes != null) {
			filter.setErrorAttributes(this.errorAttributes);
		}
		return filter;
	}

}

@@ -844,28 +844,22 @@
 ory.
-annotation.Autowired
+ObjectProvider
 ;%0Aim
@@ -1465,16 +1465,77 @@
 n.Bean;%0A
+import org.springframework.context.annotation.Configuration;%0A
 import o
@@ -1922,16 +1922,31 @@
 .class)%0A
+@Configuration%0A
 public c
@@ -1985,28 +1985,16 @@
 tion %7B%0A%0A
-%09@Autowired%0A
 %09private
@@ -1994,16 +1994,22 @@
 private 
+final 
 TraceRep
@@ -2039,36 +2039,55 @@
 ;%0A%0A%09
-@Autowired(required = false)
+private final TraceProperties traceProperties;%0A
 %0A%09pr
@@ -2092,16 +2092,22 @@
 private 
+final 
 ErrorAtt
@@ -2137,76 +2137,331 @@
 ;%0A%0A%09
-@Autowired%0A%09TraceProperties traceProperties = new TraceProperties();
+public TraceWebFilterAutoConfiguration(TraceRepository traceRepository,%0A%09%09%09TraceProperties traceProperties,%0A%09%09%09ObjectProvider%3CErrorAttributes%3E errorAttributesProvider) %7B%0A%09%09this.traceRepository = traceRepository;%0A%09%09this.traceProperties = traceProperties;%0A%09%09this.errorAttributes = errorAttributesProvider.getIfAvailable();%0A%09%7D
 %0A%0A%09@

Update TraceWebFilterAutoConfiguration to use constructor injection