From 46cbaa053c42c0bffeef317f8df1631f1809c8ba Mon Sep 17 00:00:00 2001 From: Marco Schulte Date: Wed, 12 Jul 2017 21:41:32 +0200 Subject: [PATCH 1/5] Fixed NPE if origin is unset (#2100) --- .../netflix/hystrix/dashboard/HystrixDashboardConfiguration.java | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-cloud-netflix-hystrix-dashboard/src/main/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardConfiguration.java b/spring-cloud-netflix-hystrix-dashboard/src/main/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardConfiguration.java index 71b6f7d4..643b5335 100644 --- a/spring-cloud-netflix-hystrix-dashboard/src/main/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardConfiguration.java +++ b/spring-cloud-netflix-hystrix-dashboard/src/main/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardConfiguration.java @@ -135,6 +135,7 @@ public class HystrixDashboardConfiguration { response.getWriter() .println( "Required parameter 'origin' missing. Example: 107.20.175.135:7001"); + return; } origin = origin.trim(); From 5b075623ffb57d13881d2860fe06e245d60b12e4 Mon Sep 17 00:00:00 2001 From: Gregor Zurowski Date: Thu, 13 Jul 2017 08:48:56 +0200 Subject: [PATCH 2/5] Remove Lombok logging from spring-cloud-netflix-core module Signed-off-by: Gregor Zurowski --- .../cloud/netflix/archaius/ArchaiusAutoConfiguration.java | 7 ++++--- .../netflix/feign/support/ResponseEntityDecoder.java | 2 -- .../cloud/netflix/feign/support/SpringEncoder.java | 6 ++++-- .../cloud/netflix/metrics/servo/ServoMonitorCache.java | 8 +++++--- .../cloud/netflix/zuul/ZuulFilterInitializer.java | 7 ++++--- .../cloud/netflix/zuul/filters/ProxyRequestHelper.java | 7 ++++--- .../cloud/netflix/zuul/filters/SimpleRouteLocator.java | 8 +++++--- .../netflix/zuul/filters/TraceProxyRequestHelper.java | 3 --- .../filters/discovery/DiscoveryClientRouteLocator.java | 7 ++++--- .../cloud/netflix/zuul/FormZuulProxyApplicationTests.java | 3 --- .../zuul/FormZuulServletProxyApplicationTests.java | 7 ++++--- 11 files changed, 34 insertions(+), 31 deletions(-) diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/archaius/ArchaiusAutoConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/archaius/ArchaiusAutoConfiguration.java index 64ae8614..f12fb5f5 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/archaius/ArchaiusAutoConfiguration.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/archaius/ArchaiusAutoConfiguration.java @@ -38,6 +38,8 @@ import org.apache.commons.configuration.SystemConfiguration; import org.apache.commons.configuration.event.ConfigurationEvent; import org.apache.commons.configuration.event.ConfigurationListener; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.condition.ConditionalOnEnabledEndpoint; import org.springframework.boot.actuate.endpoint.Endpoint; @@ -60,18 +62,17 @@ import static com.netflix.config.ConfigurationManager.ENV_CONFIG_NAME; import static com.netflix.config.ConfigurationManager.SYS_CONFIG_NAME; import static com.netflix.config.ConfigurationManager.URL_CONFIG_NAME; -import lombok.extern.apachecommons.CommonsLog; - /** * @author Spencer Gibb */ @Configuration @ConditionalOnClass({ ConcurrentCompositeConfiguration.class, ConfigurationBuilder.class }) -@CommonsLog @AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE) public class ArchaiusAutoConfiguration { + private static final Log log = LogFactory.getLog(ArchaiusAutoConfiguration.class); + private static final AtomicBoolean initialized = new AtomicBoolean(false); @Autowired diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/support/ResponseEntityDecoder.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/support/ResponseEntityDecoder.java index ba4149b0..a9ccbc8c 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/support/ResponseEntityDecoder.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/support/ResponseEntityDecoder.java @@ -14,14 +14,12 @@ import org.springframework.util.MultiValueMap; import feign.FeignException; import feign.Response; import feign.codec.Decoder; -import lombok.extern.slf4j.Slf4j; /** * Decoder adds compatibility for Spring MVC's ResponseEntity to any other decoder via * composition. * @author chadjaros */ -@Slf4j public class ResponseEntityDecoder implements Decoder { private Decoder decoder; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/support/SpringEncoder.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/support/SpringEncoder.java index 39351ded..69359c7f 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/support/SpringEncoder.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/support/SpringEncoder.java @@ -23,6 +23,8 @@ import java.lang.reflect.Type; import java.nio.charset.Charset; import java.util.Collection; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.ObjectFactory; import org.springframework.boot.autoconfigure.web.HttpMessageConverters; import org.springframework.http.HttpHeaders; @@ -34,7 +36,6 @@ import org.springframework.http.converter.HttpMessageConverter; import feign.RequestTemplate; import feign.codec.EncodeException; import feign.codec.Encoder; -import lombok.extern.apachecommons.CommonsLog; import static org.springframework.cloud.netflix.feign.support.FeignUtils.getHeaders; import static org.springframework.cloud.netflix.feign.support.FeignUtils.getHttpHeaders; @@ -42,9 +43,10 @@ import static org.springframework.cloud.netflix.feign.support.FeignUtils.getHttp /** * @author Spencer Gibb */ -@CommonsLog public class SpringEncoder implements Encoder { + private static final Log log = LogFactory.getLog(SpringEncoder.class); + private ObjectFactory messageConverters; public SpringEncoder(ObjectFactory messageConverters) { diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/metrics/servo/ServoMonitorCache.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/metrics/servo/ServoMonitorCache.java index 35ad0a21..79fb2c65 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/metrics/servo/ServoMonitorCache.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/metrics/servo/ServoMonitorCache.java @@ -19,16 +19,18 @@ import java.util.Map; import com.netflix.servo.MonitorRegistry; import com.netflix.servo.monitor.BasicTimer; import com.netflix.servo.monitor.MonitorConfig; - -import lombok.extern.apachecommons.CommonsLog; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * Servo does not provide a mechanism to retrieve an existing monitor by name + tags. * * @author Jon Schneider */ -@CommonsLog public class ServoMonitorCache { + + private static final Log log = LogFactory.getLog(ServoMonitorCache.class); + private final Map timerCache = new HashMap<>(); private final MonitorRegistry monitorRegistry; private final ServoMetricsConfigBean config; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/ZuulFilterInitializer.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/ZuulFilterInitializer.java index 2d347331..166eecc7 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/ZuulFilterInitializer.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/ZuulFilterInitializer.java @@ -22,6 +22,8 @@ import java.util.Map; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.util.ReflectionUtils; import com.netflix.zuul.FilterLoader; @@ -30,17 +32,16 @@ import com.netflix.zuul.filters.FilterRegistry; import com.netflix.zuul.monitoring.CounterFactory; import com.netflix.zuul.monitoring.TracerFactory; -import lombok.extern.apachecommons.CommonsLog; - /** * Initializes various Zuul components including {@link ZuulFilter}. * * @author Spencer Gibb * */ -@CommonsLog public class ZuulFilterInitializer { + private static final Log log = LogFactory.getLog(ZuulFilterInitializer.class); + private final Map filters; private final CounterFactory counterFactory; private final TracerFactory tracerFactory; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/ProxyRequestHelper.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/ProxyRequestHelper.java index 043eede8..1f220f51 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/ProxyRequestHelper.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/ProxyRequestHelper.java @@ -31,6 +31,8 @@ import java.util.Set; import javax.servlet.http.HttpServletRequest; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.cloud.netflix.zuul.util.RequestUtils; import org.springframework.http.HttpHeaders; import org.springframework.util.LinkedMultiValueMap; @@ -46,16 +48,15 @@ import static org.springframework.cloud.netflix.zuul.filters.support.FilterConst import static org.springframework.http.HttpHeaders.CONTENT_ENCODING; import static org.springframework.http.HttpHeaders.CONTENT_LENGTH; -import lombok.extern.apachecommons.CommonsLog; - /** * @author Dave Syer * @author Marcos Barbero * @author Spencer Gibb */ -@CommonsLog public class ProxyRequestHelper { + private static final Log log = LogFactory.getLog(ProxyRequestHelper.class); + /** * Zuul context key for a collection of ignored headers for the current request. * Pre-filters can set this up as a set of lowercase strings. diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/SimpleRouteLocator.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/SimpleRouteLocator.java index d5798b1e..29639c52 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/SimpleRouteLocator.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/SimpleRouteLocator.java @@ -24,6 +24,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.atomic.AtomicReference; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.cloud.netflix.zuul.filters.ZuulProperties.ZuulRoute; import org.springframework.cloud.netflix.zuul.util.RequestUtils; import org.springframework.core.Ordered; @@ -31,15 +33,15 @@ import org.springframework.util.AntPathMatcher; import org.springframework.util.PathMatcher; import org.springframework.util.StringUtils; -import lombok.extern.apachecommons.CommonsLog; - /** * Simple {@link RouteLocator} based on configuration data held in {@link ZuulProperties}. * * @author Dave Syer */ -@CommonsLog public class SimpleRouteLocator implements RouteLocator, Ordered { + + private static final Log log = LogFactory.getLog(SimpleRouteLocator.class); + private static final int DEFAULT_ORDER = 0; private ZuulProperties properties; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/TraceProxyRequestHelper.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/TraceProxyRequestHelper.java index e5b4895f..74a9b1e6 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/TraceProxyRequestHelper.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/TraceProxyRequestHelper.java @@ -32,12 +32,9 @@ import org.springframework.util.MultiValueMap; import com.netflix.zuul.context.RequestContext; -import lombok.extern.apachecommons.CommonsLog; - /** * @author Spencer Gibb */ -@CommonsLog public class TraceProxyRequestHelper extends ProxyRequestHelper { private TraceRepository traces; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/discovery/DiscoveryClientRouteLocator.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/discovery/DiscoveryClientRouteLocator.java index d459c148..ac45a22e 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/discovery/DiscoveryClientRouteLocator.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/discovery/DiscoveryClientRouteLocator.java @@ -21,6 +21,8 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; import org.springframework.cloud.netflix.zuul.filters.RefreshableRouteLocator; @@ -31,8 +33,6 @@ import org.springframework.cloud.netflix.zuul.filters.ZuulProperties.ZuulRoute; import org.springframework.util.PatternMatchUtils; import org.springframework.util.StringUtils; -import lombok.extern.apachecommons.CommonsLog; - /** * A {@link RouteLocator} that combines static, configured routes with those from a * {@link DiscoveryClient}. The discovery client takes precedence. @@ -40,10 +40,11 @@ import lombok.extern.apachecommons.CommonsLog; * @author Spencer Gibb * @author Dave Syer */ -@CommonsLog public class DiscoveryClientRouteLocator extends SimpleRouteLocator implements RefreshableRouteLocator { + private static final Log log = LogFactory.getLog(DiscoveryClientRouteLocator.class); + public static final String DEFAULT_ROUTE = "/**"; private DiscoveryClient discovery; diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/FormZuulProxyApplicationTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/FormZuulProxyApplicationTests.java index ccdcca8d..bf09a16f 100644 --- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/FormZuulProxyApplicationTests.java +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/FormZuulProxyApplicationTests.java @@ -66,8 +66,6 @@ import static org.junit.Assert.assertEquals; import static org.springframework.cloud.netflix.zuul.filters.support.FilterConstants.PRE_TYPE; import static org.springframework.util.StreamUtils.copyToString; -import lombok.extern.slf4j.Slf4j; - @RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(classes = FormZuulProxyApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = { "zuul.routes.simple:/simple/**" }) @@ -228,7 +226,6 @@ public class FormZuulProxyApplicationTests { @RibbonClients({ @RibbonClient(name = "simple", configuration = FormRibbonClientConfiguration.class), @RibbonClient(name = "psimple", configuration = FormRibbonClientConfiguration.class) }) -@Slf4j class FormZuulProxyApplication { @RequestMapping(value = "/form", method = RequestMethod.POST) diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/FormZuulServletProxyApplicationTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/FormZuulServletProxyApplicationTests.java index 7296961d..410d4790 100644 --- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/FormZuulServletProxyApplicationTests.java +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/FormZuulServletProxyApplicationTests.java @@ -25,6 +25,8 @@ import com.netflix.loadbalancer.ServerList; import com.netflix.zuul.ZuulFilter; import com.netflix.zuul.context.RequestContext; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -63,8 +65,6 @@ import org.springframework.web.multipart.MultipartFile; import static org.junit.Assert.assertEquals; import static org.springframework.cloud.netflix.zuul.filters.support.FilterConstants.PRE_TYPE; -import lombok.extern.slf4j.Slf4j; - @RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(classes = FormZuulServletProxyApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = "zuul.routes.simple:/simple/**") @DirtiesContext @@ -145,9 +145,10 @@ public class FormZuulServletProxyApplicationTests { @RestController @EnableZuulProxy @RibbonClients(@RibbonClient(name = "simple", configuration = ServletFormRibbonClientConfiguration.class)) -@Slf4j class FormZuulServletProxyApplication { + private static final Log log = LogFactory.getLog(FormZuulServletProxyApplication.class); + @RequestMapping(value = "/form", method = RequestMethod.POST) public String accept(@RequestParam MultiValueMap form) throws IOException { From 6379e15ce1790dc2d817461987a46c5b9de0eaec Mon Sep 17 00:00:00 2001 From: Gregor Zurowski Date: Thu, 13 Jul 2017 09:20:29 +0200 Subject: [PATCH 3/5] Remove Lombok logging from spring-cloud-netflix-eureka-client module Signed-off-by: Gregor Zurowski --- .../netflix/eureka/EurekaDiscoveryClientConfiguration.java | 3 --- .../cloud/netflix/eureka/InstanceInfoFactory.java | 7 ++++--- .../ribbon/eureka/EurekaRibbonClientConfiguration.java | 7 ++++--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java index 42b7b303..07a8edd3 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java +++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java @@ -34,8 +34,6 @@ import com.netflix.appinfo.HealthCheckHandler; import com.netflix.discovery.EurekaClient; import com.netflix.discovery.EurekaClientConfig; -import lombok.extern.apachecommons.CommonsLog; - /** * @author Dave Syer * @author Spencer Gibb @@ -46,7 +44,6 @@ import lombok.extern.apachecommons.CommonsLog; @EnableConfigurationProperties @ConditionalOnClass(EurekaClientConfig.class) @ConditionalOnProperty(value = "eureka.client.enabled", matchIfMissing = true) -@CommonsLog public class EurekaDiscoveryClientConfiguration { class Marker {} diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/InstanceInfoFactory.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/InstanceInfoFactory.java index 362b0f86..f92891ca 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/InstanceInfoFactory.java +++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/InstanceInfoFactory.java @@ -21,16 +21,17 @@ import java.util.Map; import com.netflix.appinfo.EurekaInstanceConfig; import com.netflix.appinfo.InstanceInfo; import com.netflix.appinfo.LeaseInfo; - -import lombok.extern.apachecommons.CommonsLog; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * See com.netflix.appinfo.providers.EurekaConfigBasedInstanceInfoProvider * @author Spencer Gibb */ -@CommonsLog public class InstanceInfoFactory { + private static final Log log = LogFactory.getLog(InstanceInfoFactory.class); + public InstanceInfo create(EurekaInstanceConfig config) { LeaseInfo.Builder leaseInfoBuilder = LeaseInfo.Builder.newBuilder() .setRenewalIntervalInSecs(config.getLeaseRenewalIntervalInSeconds()) diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/EurekaRibbonClientConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/EurekaRibbonClientConfiguration.java index 06a1cf81..a96d39b7 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/EurekaRibbonClientConfiguration.java +++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/EurekaRibbonClientConfiguration.java @@ -20,6 +20,8 @@ import javax.annotation.PostConstruct; import javax.inject.Provider; import com.netflix.discovery.EurekaClient; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -43,8 +45,6 @@ import static com.netflix.client.config.CommonClientConfigKey.DeploymentContextB import static com.netflix.client.config.CommonClientConfigKey.EnableZoneAffinity; import static org.springframework.cloud.netflix.ribbon.RibbonUtils.setRibbonProperty; -import lombok.extern.apachecommons.CommonsLog; - /** * Preprocessor that configures defaults for eureka-discovered ribbon clients. Such as: * @zone, NIWSServerListClassName, DeploymentContextBasedVipAddresses, @@ -55,9 +55,10 @@ import lombok.extern.apachecommons.CommonsLog; * @author Ryan Baxter */ @Configuration -@CommonsLog public class EurekaRibbonClientConfiguration { + private static final Log log = LogFactory.getLog(EurekaRibbonClientConfiguration.class); + @Value("${ribbon.eureka.approximateZoneFromHostname:false}") private boolean approximateZoneFromHostname = false; From 8022342e81594d215c92d59d1e71274b1f1a5511 Mon Sep 17 00:00:00 2001 From: Gregor Zurowski Date: Thu, 13 Jul 2017 09:21:32 +0200 Subject: [PATCH 4/5] Remove Lombok logging from spring-cloud-netflix-eureka-server module Signed-off-by: Gregor Zurowski --- .../netflix/eureka/server/EurekaServerBootstrap.java | 8 +++++--- .../server/EurekaServerInitializerConfiguration.java | 7 ++++--- .../cloud/netflix/eureka/server/InstanceRegistry.java | 6 ++++-- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerBootstrap.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerBootstrap.java index dfff3698..c689a2ea 100644 --- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerBootstrap.java +++ b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerBootstrap.java @@ -34,14 +34,16 @@ import com.netflix.eureka.aws.AwsBinderDelegate; import com.netflix.eureka.registry.PeerAwareInstanceRegistry; import com.netflix.eureka.util.EurekaMonitors; import com.thoughtworks.xstream.XStream; - -import lombok.extern.apachecommons.CommonsLog; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * @author Spencer Gibb */ -@CommonsLog public class EurekaServerBootstrap { + + private static final Log log = LogFactory.getLog(EurekaServerBootstrap.class); + private static final String TEST = "test"; private static final String ARCHAIUS_DEPLOYMENT_ENVIRONMENT = "archaius.deployment.environment"; diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerInitializerConfiguration.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerInitializerConfiguration.java index 07b045b1..5a8d5ca1 100644 --- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerInitializerConfiguration.java +++ b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaServerInitializerConfiguration.java @@ -18,6 +18,8 @@ package org.springframework.cloud.netflix.eureka.server; import javax.servlet.ServletContext; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cloud.netflix.eureka.server.event.EurekaRegistryAvailableEvent; import org.springframework.cloud.netflix.eureka.server.event.EurekaServerStartedEvent; @@ -30,16 +32,15 @@ import org.springframework.web.context.ServletContextAware; import com.netflix.eureka.EurekaServerConfig; -import lombok.extern.apachecommons.CommonsLog; - /** * @author Dave Syer */ @Configuration -@CommonsLog public class EurekaServerInitializerConfiguration implements ServletContextAware, SmartLifecycle, Ordered { + private static final Log log = LogFactory.getLog(EurekaServerInitializerConfiguration.class); + @Autowired private EurekaServerConfig eurekaServerConfig; diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/InstanceRegistry.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/InstanceRegistry.java index 6b28086f..4ef2568f 100644 --- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/InstanceRegistry.java +++ b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/InstanceRegistry.java @@ -19,6 +19,8 @@ package org.springframework.cloud.netflix.eureka.server; import java.util.List; import com.netflix.eureka.lease.Lease; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.beans.BeansException; import org.springframework.cloud.netflix.eureka.server.event.EurekaInstanceCanceledEvent; import org.springframework.cloud.netflix.eureka.server.event.EurekaInstanceRegisteredEvent; @@ -35,16 +37,16 @@ import com.netflix.eureka.EurekaServerConfig; import com.netflix.eureka.registry.PeerAwareInstanceRegistryImpl; import com.netflix.eureka.resources.ServerCodecs; -import lombok.extern.apachecommons.CommonsLog; import org.springframework.context.ApplicationEvent; /** * @author Spencer Gibb */ -@CommonsLog public class InstanceRegistry extends PeerAwareInstanceRegistryImpl implements ApplicationContextAware { + private static final Log log = LogFactory.getLog(InstanceRegistry.class); + private ApplicationContext ctxt; private int defaultOpenForTrafficCount; From 63d77a8b81b69f401f8a5d0c7acf29af14eb368c Mon Sep 17 00:00:00 2001 From: Gregor Zurowski Date: Thu, 13 Jul 2017 09:38:53 +0200 Subject: [PATCH 5/5] Fix Maven warnings about missing plugin versions Signed-off-by: Gregor Zurowski --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 2b38982c..26a5bb66 100644 --- a/pom.xml +++ b/pom.xml @@ -28,6 +28,9 @@ 1.4.0.BUILD-SNAPSHOT Ditmars.BUILD-SNAPSHOT + + 3.6.1 + 2.10 2.19.1 jacoco @@ -40,6 +43,7 @@ org.apache.maven.plugins maven-eclipse-plugin + ${maven-eclipse-plugin.version} false @@ -56,6 +60,7 @@ maven-compiler-plugin + ${maven-compiler-plugin.version} 1.7 1.7