Commit a903b5d5 by Dave Syer

Fix guava imports

parent 25651f48
...@@ -17,6 +17,8 @@ ...@@ -17,6 +17,8 @@
package org.springframework.cloud.netflix.eureka.server; package org.springframework.cloud.netflix.eureka.server;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
...@@ -42,8 +44,6 @@ import org.springframework.core.type.filter.AnnotationTypeFilter; ...@@ -42,8 +44,6 @@ import org.springframework.core.type.filter.AnnotationTypeFilter;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.sun.jersey.api.core.DefaultResourceConfig; import com.sun.jersey.api.core.DefaultResourceConfig;
import com.sun.jersey.spi.container.servlet.ServletContainer; import com.sun.jersey.spi.container.servlet.ServletContainer;
...@@ -58,10 +58,8 @@ public class EurekaServerConfiguration extends WebMvcConfigurerAdapter { ...@@ -58,10 +58,8 @@ public class EurekaServerConfiguration extends WebMvcConfigurerAdapter {
/** /**
* List of packages containing Jersey resources required by the Eureka server * List of packages containing Jersey resources required by the Eureka server
*/ */
private static String[] EUREKA_PACKAGES = new String[] { private static String[] EUREKA_PACKAGES = new String[] { "com.netflix.discovery",
"com.netflix.discovery", "com.netflix.eureka" };
"com.netflix.eureka"};
@Bean @Bean
@ConditionalOnProperty(prefix = "eureka.dashboard", name = "enabled", matchIfMissing = true) @ConditionalOnProperty(prefix = "eureka.dashboard", name = "enabled", matchIfMissing = true)
...@@ -76,7 +74,8 @@ public class EurekaServerConfiguration extends WebMvcConfigurerAdapter { ...@@ -76,7 +74,8 @@ public class EurekaServerConfiguration extends WebMvcConfigurerAdapter {
* @return * @return
*/ */
@Bean @Bean
public FilterRegistrationBean jerseyFilterRegistration(javax.ws.rs.core.Application eurekaJerseyApp) { public FilterRegistrationBean jerseyFilterRegistration(
javax.ws.rs.core.Application eurekaJerseyApp) {
FilterRegistrationBean bean = new FilterRegistrationBean(); FilterRegistrationBean bean = new FilterRegistrationBean();
bean.setFilter(new ServletContainer(eurekaJerseyApp)); bean.setFilter(new ServletContainer(eurekaJerseyApp));
bean.setOrder(Ordered.LOWEST_PRECEDENCE); bean.setOrder(Ordered.LOWEST_PRECEDENCE);
...@@ -91,9 +90,11 @@ public class EurekaServerConfiguration extends WebMvcConfigurerAdapter { ...@@ -91,9 +90,11 @@ public class EurekaServerConfiguration extends WebMvcConfigurerAdapter {
* required by the Eureka server. * required by the Eureka server.
*/ */
@Bean @Bean
public javax.ws.rs.core.Application jerseyApplication(Environment environment, ResourceLoader resourceLoader) { public javax.ws.rs.core.Application jerseyApplication(Environment environment,
ResourceLoader resourceLoader) {
ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider(false, environment); ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider(
false, environment);
// Filter to include only classes that have a particular annotation. // Filter to include only classes that have a particular annotation.
// //
...@@ -102,18 +103,19 @@ public class EurekaServerConfiguration extends WebMvcConfigurerAdapter { ...@@ -102,18 +103,19 @@ public class EurekaServerConfiguration extends WebMvcConfigurerAdapter {
// Find classes in Eureka packages (or subpackages) // Find classes in Eureka packages (or subpackages)
// //
Set<Class<?>> classes = Sets.newHashSet(); Set<Class<?>> classes = new HashSet<Class<?>>();
for(String basePackage: EUREKA_PACKAGES) { for (String basePackage : EUREKA_PACKAGES) {
Set<BeanDefinition> beans = provider.findCandidateComponents(basePackage); Set<BeanDefinition> beans = provider.findCandidateComponents(basePackage);
for (BeanDefinition bd : beans) { for (BeanDefinition bd : beans) {
Class<?> cls = ClassUtils.resolveClassName(bd.getBeanClassName(), resourceLoader.getClassLoader()); Class<?> cls = ClassUtils.resolveClassName(bd.getBeanClassName(),
resourceLoader.getClassLoader());
classes.add(cls); classes.add(cls);
} }
} }
// Construct the Jersey ResourceConfig // Construct the Jersey ResourceConfig
// //
Map<String, Object> propsAndFeatures = Maps.newHashMap(); Map<String, Object> propsAndFeatures = new HashMap<String, Object>();
propsAndFeatures.put( propsAndFeatures.put(
// Skip static content used by the webapp // Skip static content used by the webapp
ServletContainer.PROPERTY_WEB_PAGE_CONTENT_REGEX, ServletContainer.PROPERTY_WEB_PAGE_CONTENT_REGEX,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment