From 854fd67109b1c5a58a71650006c9976179d3e4e4 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Thu, 2 Nov 2017 06:13:05 +0100
Subject: [PATCH] Removed security code

---
 .../TraceWebClientAutoConfiguration.java      | 86 +------------------
 1 file changed, 1 insertion(+), 85 deletions(-)

diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java
index d0e918f46..7109279d5 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java
@@ -94,88 +94,4 @@ public class TraceWebClientAutoConfiguration {
 			return new TraceWebClientBeanPostProcessor(beanFactory);
 		}
 	}
-
-//	@Configuration
-//	@ConditionalOnClass({ UserInfoRestTemplateCustomizer.class, OAuth2RestTemplate.class })
-	protected static class TraceOAuthConfiguration {
-
-		@Autowired BeanFactory beanFactory;
-
-//		@Bean
-//		UserInfoRestTemplateCustomizerBPP userInfoRestTemplateCustomizerBeanPostProcessor() {
-//			return new UserInfoRestTemplateCustomizerBPP(this.beanFactory);
-//		}
-
-		// TODO: Bring back security support
-//		@Bean
-//		@ConditionalOnMissingBean
-//		UserInfoRestTemplateCustomizer traceUserInfoRestTemplateCustomizer() {
-//			return new TraceUserInfoRestTemplateCustomizer(this.beanFactory);
-//		}
-
-//		private static class UserInfoRestTemplateCustomizerBPP implements BeanPostProcessor {
-//
-//			private final BeanFactory beanFactory;
-//
-//			UserInfoRestTemplateCustomizerBPP(BeanFactory beanFactory) {
-//				this.beanFactory = beanFactory;
-//			}
-//
-//			@Override
-//			public Object postProcessBeforeInitialization(Object bean,
-//					String beanName) throws BeansException {
-//				return bean;
-//			}
-//
-//			@Override
-//			public Object postProcessAfterInitialization(final Object bean,
-//					String beanName) throws BeansException {
-//				final BeanFactory beanFactory = this.beanFactory;
-//				if (bean instanceof UserInfoRestTemplateCustomizer &&
-//						!(bean instanceof TraceUserInfoRestTemplateCustomizer)) {
-//					return new TraceUserInfoRestTemplateCustomizer(beanFactory, bean);
-//				}
-//				return bean;
-//			}
-//		}
-	}
-}
-
-class RestTemplateInterceptorInjector {
-	private final TraceRestTemplateInterceptor interceptor;
-
-	RestTemplateInterceptorInjector(TraceRestTemplateInterceptor interceptor) {
-		this.interceptor = interceptor;
-	}
-
-	void inject(RestTemplate restTemplate) {
-		List<ClientHttpRequestInterceptor> interceptors = new ArrayList<ClientHttpRequestInterceptor>(
-				restTemplate.getInterceptors());
-		interceptors.add(this.interceptor);
-		restTemplate.setInterceptors(interceptors);
-	}
-}
-
-//class TraceUserInfoRestTemplateCustomizer implements UserInfoRestTemplateCustomizer {
-//
-//	private final BeanFactory beanFactory;
-//	private final Object delegate;
-//
-//	TraceUserInfoRestTemplateCustomizer(BeanFactory beanFactory) {
-//		this(beanFactory, null);
-//	}
-//
-//	TraceUserInfoRestTemplateCustomizer(BeanFactory beanFactory, Object bean) {
-//		this.beanFactory = beanFactory;
-//		this.delegate = bean;
-//	}
-//
-//	@Override public void customize(OAuth2RestTemplate template) {
-//		final TraceRestTemplateInterceptor interceptor =
-//				this.beanFactory.getBean(TraceRestTemplateInterceptor.class);
-//		new RestTemplateInterceptorInjector(interceptor).inject(template);
-//		if (this.delegate != null) {
-//			((UserInfoRestTemplateCustomizer) this.delegate).customize(template);
-//		}
-//	}
-//}
\ No newline at end of file
+}
\ No newline at end of file