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 bf2633573..7a769cb8d 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 @@ -21,11 +21,10 @@ import java.util.concurrent.atomic.AtomicBoolean; import javax.annotation.PreDestroy; +import lombok.extern.apachecommons.CommonsLog; import org.apache.commons.configuration.ConfigurationBuilder; import org.apache.commons.configuration.EnvironmentConfiguration; import org.apache.commons.configuration.SystemConfiguration; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.endpoint.Endpoint; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; @@ -52,11 +51,9 @@ import static com.netflix.config.ConfigurationManager.URL_CONFIG_NAME; */ @Configuration @ConditionalOnClass({ ConcurrentCompositeConfiguration.class, ConfigurationBuilder.class }) +@CommonsLog public class ArchaiusAutoConfiguration { - private static final Logger logger = LoggerFactory - .getLogger(ArchaiusAutoConfiguration.class); - private static final AtomicBoolean initialized = new AtomicBoolean(false); @Autowired @@ -94,7 +91,7 @@ public class ArchaiusAutoConfiguration { String appName = this.env.getProperty("spring.application.name"); if (appName == null) { appName = "application"; - logger.warn("No spring.application.name found, defaulting to 'application'"); + log.warn("No spring.application.name found, defaulting to 'application'"); } // this is deprecated, but currently it seams the only way to set it initially System.setProperty(DEPLOYMENT_APPLICATION_ID_PROPERTY, appName); @@ -119,7 +116,7 @@ public class ArchaiusAutoConfiguration { config.addConfiguration(defaultURLConfig, URL_CONFIG_NAME); } catch (Throwable ex) { - logger.error("Cannot create config from " + defaultURLConfig, ex); + log.error("Cannot create config from " + defaultURLConfig, ex); } // TODO: sys/env above urls? @@ -141,7 +138,7 @@ public class ArchaiusAutoConfiguration { } else { // TODO: reinstall ConfigurationManager - logger.warn("Netflix ConfigurationManager has already been installed, unable to re-install"); + log.warn("Netflix ConfigurationManager has already been installed, unable to re-install"); } } diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/config/DiscoveryClientConfigServiceBootstrapConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/config/DiscoveryClientConfigServiceBootstrapConfiguration.java index 7d751d683..9b96cae1a 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/config/DiscoveryClientConfigServiceBootstrapConfiguration.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/config/DiscoveryClientConfigServiceBootstrapConfiguration.java @@ -16,7 +16,7 @@ package org.springframework.cloud.netflix.config; -import lombok.extern.slf4j.Slf4j; +import lombok.extern.apachecommons.CommonsLog; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; @@ -46,7 +46,7 @@ import com.netflix.discovery.DiscoveryClient; @Configuration @EnableDiscoveryClient @Import(EurekaClientAutoConfiguration.class) -@Slf4j +@CommonsLog public class DiscoveryClientConfigServiceBootstrapConfiguration implements ApplicationListener { diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/DataCenterAwareMarshallingStrategy.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/DataCenterAwareMarshallingStrategy.java index e781fb2e5..592725b6b 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/DataCenterAwareMarshallingStrategy.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/DataCenterAwareMarshallingStrategy.java @@ -16,8 +16,7 @@ package org.springframework.cloud.netflix.eureka; -import lombok.extern.slf4j.Slf4j; - +import lombok.extern.apachecommons.CommonsLog; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; import org.springframework.aop.framework.ProxyFactory; @@ -146,7 +145,7 @@ public class DataCenterAwareMarshallingStrategy implements MarshallingStrategy { } } - @Slf4j + @CommonsLog private static class SetVersionInterceptor implements MethodInterceptor { private ApplicationContext context; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java index 0f485543c..c5055614f 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java @@ -22,8 +22,7 @@ import java.util.concurrent.atomic.AtomicInteger; import javax.annotation.PreDestroy; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import lombok.extern.apachecommons.CommonsLog; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.endpoint.Endpoint; import org.springframework.boot.actuate.metrics.reader.MetricReader; @@ -61,11 +60,9 @@ import com.netflix.discovery.shared.EurekaJerseyClient; @EnableConfigurationProperties @ConditionalOnClass(EurekaClientConfig.class) @ConditionalOnProperty(value = "eureka.client.enabled", matchIfMissing = true) +@CommonsLog public class EurekaDiscoveryClientConfiguration implements SmartLifecycle, Ordered { - private static final Logger logger = LoggerFactory - .getLogger(EurekaDiscoveryClientConfiguration.class); - private AtomicBoolean running = new AtomicBoolean(false); private int order = 0; @@ -84,13 +81,13 @@ public class EurekaDiscoveryClientConfiguration implements SmartLifecycle, Order @PreDestroy public void close() { closeDiscoveryClientJersey(); - logger.info("Removing application {} from eureka", - this.instanceConfig.getAppname()); + log.info("Removing application " + this.instanceConfig.getAppname() + + " from eureka"); DiscoveryManager.getInstance().shutdownComponent(); } private void closeDiscoveryClientJersey() { - logger.info("Closing DiscoveryClient.jerseyClient"); + log.info("Closing DiscoveryClient.jerseyClient"); Field jerseyClientField = ReflectionUtils.findField( com.netflix.discovery.DiscoveryClient.class, "discoveryJerseyClient", EurekaJerseyClient.JerseyClient.class); @@ -105,7 +102,7 @@ public class EurekaDiscoveryClientConfiguration implements SmartLifecycle, Order } } catch (Exception ex) { - logger.error("Error closing DiscoveryClient.jerseyClient", ex); + log.error("Error closing DiscoveryClient.jerseyClient", ex); } } } @@ -121,9 +118,10 @@ public class EurekaDiscoveryClientConfiguration implements SmartLifecycle, Order if (!this.running.get() && this.instanceConfig.getNonSecurePort() > 0) { discoveryManagerIntitializer().init(); - logger.info("Registering application {} with eureka with status {}", - this.instanceConfig.getAppname(), - this.instanceConfig.getInitialStatus()); + log.info("Registering application " + this.instanceConfig.getAppname() + + " with eureka with status " + + this.instanceConfig.getInitialStatus()); + ApplicationInfoManager.getInstance().setInstanceStatus( this.instanceConfig.getInitialStatus()); @@ -139,9 +137,8 @@ public class EurekaDiscoveryClientConfiguration implements SmartLifecycle, Order @Override public void stop() { - logger.info( - "Unregistering application {} with eureka with status OUT_OF_SERVICE", - this.instanceConfig.getAppname()); + log.info("Unregistering application " + this.instanceConfig.getAppname() + + " with eureka with status OUT_OF_SERVICE"); ApplicationInfoManager.getInstance().setInstanceStatus( InstanceStatus.OUT_OF_SERVICE); this.running.set(false); diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/SpringEncoder.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/SpringEncoder.java index 4d1b6ce7f..be8646a47 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/SpringEncoder.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/SpringEncoder.java @@ -23,8 +23,7 @@ import java.util.Collection; import javax.inject.Provider; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import lombok.extern.apachecommons.CommonsLog; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.web.HttpMessageConverters; import org.springframework.http.HttpHeaders; @@ -43,10 +42,9 @@ import static org.springframework.cloud.netflix.feign.FeignUtils.getHttpHeaders; /** * @author Spencer Gibb */ +@CommonsLog public class SpringEncoder implements Encoder { - private static final Logger logger = LoggerFactory.getLogger(SpringEncoder.class); - @Autowired private Provider messageConverters; @@ -67,14 +65,14 @@ public class SpringEncoder implements Encoder { for (HttpMessageConverter messageConverter : this.messageConverters.get() .getConverters()) { if (messageConverter.canWrite(requestType, requestContentType)) { - if (logger.isDebugEnabled()) { + if (log.isDebugEnabled()) { if (requestContentType != null) { - logger.debug("Writing [" + requestBody + "] as \"" + log.debug("Writing [" + requestBody + "] as \"" + requestContentType + "\" using [" + messageConverter + "]"); } else { - logger.debug("Writing [" + requestBody + "] using [" + log.debug("Writing [" + requestBody + "] using [" + messageConverter + "]"); } diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/servo/ServoMetricCollector.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/servo/ServoMetricCollector.java index 15daf7822..1398bff9a 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/servo/ServoMetricCollector.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/servo/ServoMetricCollector.java @@ -21,8 +21,7 @@ import java.util.Date; import java.util.List; import java.util.concurrent.TimeUnit; -import lombok.extern.slf4j.Slf4j; - +import lombok.extern.apachecommons.CommonsLog; import org.springframework.beans.factory.DisposableBean; import org.springframework.boot.actuate.metrics.Metric; import org.springframework.boot.actuate.metrics.reader.MetricReader; @@ -43,7 +42,7 @@ import com.netflix.servo.publish.PollScheduler; * @author Dave Syer * @author Christian Dupuis */ -@Slf4j +@CommonsLog public class ServoMetricCollector implements DisposableBean { public ServoMetricCollector(MetricWriter metrics) { diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/ProxyRouteLocator.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/ProxyRouteLocator.java index 91f1363b6..82e1036db 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/ProxyRouteLocator.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/ProxyRouteLocator.java @@ -25,8 +25,8 @@ import java.util.concurrent.atomic.AtomicReference; import lombok.AllArgsConstructor; import lombok.Data; -import lombok.extern.slf4j.Slf4j; +import lombok.extern.apachecommons.CommonsLog; import org.springframework.cloud.client.discovery.DiscoveryClient; import org.springframework.cloud.netflix.zuul.ZuulProperties.ZuulRoute; import org.springframework.util.AntPathMatcher; @@ -36,7 +36,7 @@ import org.springframework.util.StringUtils; /** * @author Spencer Gibb */ -@Slf4j +@CommonsLog public class ProxyRouteLocator implements RouteLocator { public static final String DEFAULT_ROUTE = "/**"; @@ -163,7 +163,7 @@ public class ProxyRouteLocator implements RouteLocator { for (ZuulRoute entry : routeEntries.values()) { String route = entry.getPath(); if (routes.containsKey(route)) { - log.warn("Overwriting route {}: already defined by {}", route, + log.warn("Overwriting route "+route+": already defined by " + routes.get(route)); } routes.put(route, entry); 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 f6c44f041..7b93e17df 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,8 +22,7 @@ import java.util.Map; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import lombok.extern.apachecommons.CommonsLog; import org.springframework.util.ReflectionUtils; import com.netflix.zuul.FilterLoader; @@ -36,11 +35,9 @@ import com.netflix.zuul.monitoring.MonitoringHelper; * * TODO: .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS) */ +@CommonsLog public class ZuulFilterInitializer implements ServletContextListener { - private static final Logger LOGGER = LoggerFactory - .getLogger(ZuulFilterInitializer.class); - private Map filters; public ZuulFilterInitializer(Map filters) { @@ -50,7 +47,7 @@ public class ZuulFilterInitializer implements ServletContextListener { @Override public void contextInitialized(ServletContextEvent sce) { - LOGGER.info("Starting filter initializer context listener"); + log.info("Starting filter initializer context listener"); // FIXME: mocks monitoring infrastructure as we don't need it for this simple app MonitoringHelper.initMocks(); @@ -64,7 +61,7 @@ public class ZuulFilterInitializer implements ServletContextListener { @Override public void contextDestroyed(ServletContextEvent sce) { - LOGGER.info("Stopping filter initializer context listener"); + log.info("Stopping filter initializer context listener"); FilterRegistry registry = FilterRegistry.instance(); for (Map.Entry entry : this.filters.entrySet()) { registry.remove(entry.getKey()); @@ -88,7 +85,7 @@ public class ZuulFilterInitializer implements ServletContextListener { * FilterLoader.getInstance().setCompiler(new GroovyCompiler()); * * final String scriptRoot = props.getFilterRoot(); - * LOGGER.info("Using file system script: " + scriptRoot); + * log.info("Using file system script: " + scriptRoot); * * try { FilterFileManager.setFilenameFilter(new GroovyFileFilter()); * FilterFileManager.init(5, scriptRoot + "/pre", scriptRoot + "/route", scriptRoot + diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/post/SendErrorFilter.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/post/SendErrorFilter.java index 773542a61..c3481e4e0 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/post/SendErrorFilter.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/post/SendErrorFilter.java @@ -18,8 +18,7 @@ package org.springframework.cloud.netflix.zuul.filters.post; import javax.servlet.RequestDispatcher; -import lombok.extern.slf4j.Slf4j; - +import lombok.extern.apachecommons.CommonsLog; import org.springframework.beans.factory.annotation.Value; import com.google.common.base.Throwables; @@ -29,7 +28,7 @@ import com.netflix.zuul.context.RequestContext; /** * @author Spencer Gibb */ -@Slf4j +@CommonsLog public class SendErrorFilter extends ZuulFilter { protected static final String SEND_ERROR_FILTER_RAN = "sendErrorFilter.ran"; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/pre/PreDecorationFilter.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/pre/PreDecorationFilter.java index 5e9c3bb27..47592ed4d 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/pre/PreDecorationFilter.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/pre/PreDecorationFilter.java @@ -21,8 +21,7 @@ import java.net.URL; import javax.servlet.http.HttpServletResponse; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import lombok.extern.apachecommons.CommonsLog; import org.springframework.cloud.netflix.zuul.ProxyRouteLocator; import org.springframework.cloud.netflix.zuul.ProxyRouteLocator.ProxyRouteSpec; import org.springframework.cloud.netflix.zuul.ZuulProperties; @@ -31,10 +30,9 @@ import org.springframework.util.StringUtils; import com.netflix.zuul.ZuulFilter; import com.netflix.zuul.context.RequestContext; +@CommonsLog public class PreDecorationFilter extends ZuulFilter { - private static Logger LOG = LoggerFactory.getLogger(PreDecorationFilter.class); - private ProxyRouteLocator routeLocator; private ZuulProperties properties; @@ -91,7 +89,7 @@ public class PreDecorationFilter extends ZuulFilter { } } else { - LOG.warn("No route found for uri: " + requestURI); + log.warn("No route found for uri: " + requestURI); ctx.set("error.status_code", HttpServletResponse.SC_NOT_FOUND); } return null; diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RibbonRoutingFilter.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RibbonRoutingFilter.java index f34de87f9..9ef202a62 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RibbonRoutingFilter.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RibbonRoutingFilter.java @@ -28,8 +28,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.ws.rs.core.MultivaluedMap; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import lombok.extern.apachecommons.CommonsLog; import org.springframework.cloud.netflix.ribbon.SpringClientFactory; import org.springframework.cloud.netflix.zuul.filters.ProxyRequestHelper; import org.springframework.util.LinkedMultiValueMap; @@ -45,10 +44,9 @@ import com.netflix.zuul.context.RequestContext; import com.netflix.zuul.exception.ZuulException; import com.sun.jersey.core.util.MultivaluedMapImpl; +@CommonsLog public class RibbonRoutingFilter extends ZuulFilter { - private static final Logger LOG = LoggerFactory.getLogger(RibbonRoutingFilter.class); - public static final String CONTENT_ENCODING = "Content-Encoding"; private SpringClientFactory clientFactory; @@ -179,7 +177,7 @@ public class RibbonRoutingFilter extends ZuulFilter { } } catch (IOException ex) { - LOG.error("Error during getRequestBody", ex); + log.error("Error during getRequestBody", ex); } return requestEntity; } diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/SimpleHostRoutingFilter.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/SimpleHostRoutingFilter.java index f808ebe20..36c27ffba 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/SimpleHostRoutingFilter.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/SimpleHostRoutingFilter.java @@ -42,6 +42,7 @@ import javax.net.ssl.X509TrustManager; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import lombok.extern.apachecommons.CommonsLog; import org.apache.http.Header; import org.apache.http.HttpHost; import org.apache.http.HttpRequest; @@ -64,8 +65,6 @@ import org.apache.http.message.BasicHttpRequest; import org.apache.http.params.CoreConnectionPNames; import org.apache.http.params.HttpParams; import org.apache.http.protocol.HttpContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.cloud.netflix.zuul.filters.ProxyRequestHelper; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; @@ -77,13 +76,11 @@ import com.netflix.zuul.ZuulFilter; import com.netflix.zuul.constants.ZuulConstants; import com.netflix.zuul.context.RequestContext; +@CommonsLog public class SimpleHostRoutingFilter extends ZuulFilter { public static final String CONTENT_ENCODING = "Content-Encoding"; - private static final Logger LOG = LoggerFactory - .getLogger(SimpleHostRoutingFilter.class); - private static final Runnable CLIENTLOADER = new Runnable() { @Override public void run() { @@ -120,7 +117,7 @@ public class SimpleHostRoutingFilter extends ZuulFilter { hc.getConnectionManager().closeExpiredConnections(); } catch (Throwable ex) { - LOG.error("error closing expired connections", ex); + log.error("error closing expired connections", ex); } } }, 30000, 5000); @@ -211,11 +208,11 @@ public class SimpleHostRoutingFilter extends ZuulFilter { break; default: httpRequest = new BasicHttpRequest(verb, uri + getQueryString()); - LOG.debug(uri + getQueryString()); + log.debug(uri + getQueryString()); } try { httpRequest.setHeaders(convertHeaders(headers)); - LOG.debug(httpHost.getHostName() + " " + httpHost.getPort() + " " + log.debug(httpHost.getHostName() + " " + httpHost.getPort() + " " + httpHost.getSchemeName()); HttpResponse zuulResponse = forwardRequest(httpclient, httpHost, httpRequest); this.helper.appendDebug(info, zuulResponse.getStatusLine().getStatusCode(), @@ -319,7 +316,7 @@ public class SimpleHostRoutingFilter extends ZuulFilter { oldClient.getConnectionManager().shutdown(); } catch (Throwable ex) { - LOG.error("error shutting down old connection manager", ex); + log.error("error shutting down old connection manager", ex); } } }, 30000); diff --git a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/LeaseManagerMessageBroker.java b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/LeaseManagerMessageBroker.java index 6867a0e9f..968f057ff 100644 --- a/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/LeaseManagerMessageBroker.java +++ b/spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/event/LeaseManagerMessageBroker.java @@ -20,8 +20,7 @@ import java.util.List; import javax.annotation.Nullable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import lombok.extern.apachecommons.CommonsLog; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cloud.netflix.eureka.server.advice.LeaseManagerLite; import org.springframework.context.ApplicationContext; @@ -38,9 +37,8 @@ import static com.google.common.collect.Iterables.tryFind; /** * @author Spencer Gibb */ +@CommonsLog public class LeaseManagerMessageBroker implements LeaseManagerLite { - private static final Logger logger = LoggerFactory - .getLogger(LeaseManagerMessageBroker.class); @Autowired private ApplicationContext ctxt; @@ -52,8 +50,8 @@ public class LeaseManagerMessageBroker implements LeaseManagerLite @Override public void register(InstanceInfo info, int leaseDuration, boolean isReplication) { - logger.debug("register {}, vip {}, leaseDuration {}, isReplication {}", - info.getAppName(), info.getVIPAddress(), leaseDuration, isReplication); + log.debug("register " + info.getAppName() + ", vip " + info.getVIPAddress() + + ", leaseDuration " + leaseDuration + ", isReplication " + isReplication); // TODO: what to publish from info (whole object?) this.ctxt.publishEvent(new EurekaInstanceRegisteredEvent(this, info, leaseDuration, isReplication)); @@ -61,8 +59,8 @@ public class LeaseManagerMessageBroker implements LeaseManagerLite @Override public boolean cancel(String appName, String serverId, boolean isReplication) { - logger.debug("cancel {}, serverId {}, isReplication {}", appName, serverId, - isReplication); + log.debug("cancel " + appName + " serverId " + serverId + ", isReplication {}" + + isReplication); this.ctxt.publishEvent(new EurekaInstanceCanceledEvent(this, appName, serverId, isReplication)); return false; @@ -71,8 +69,8 @@ public class LeaseManagerMessageBroker implements LeaseManagerLite @Override public boolean renew(final String appName, final String serverId, boolean isReplication) { - logger.debug("renew {}, serverId {}, isReplication {}", appName, serverId, - isReplication); + log.debug("renew " + appName + " serverId " + serverId + ", isReplication {}" + + isReplication); List applications = PeerAwareInstanceRegistry.getInstance() .getSortedApplications(); Optional app = tryFind(applications, new Predicate() { diff --git a/spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/netflix/hystrix/amqp/HystrixStreamTask.java b/spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/netflix/hystrix/amqp/HystrixStreamTask.java index 2ca2f38c1..a4096d20f 100644 --- a/spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/netflix/hystrix/amqp/HystrixStreamTask.java +++ b/spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/netflix/hystrix/amqp/HystrixStreamTask.java @@ -22,8 +22,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.concurrent.LinkedBlockingQueue; -import lombok.extern.slf4j.Slf4j; - +import lombok.extern.apachecommons.CommonsLog; import org.codehaus.jackson.JsonFactory; import org.codehaus.jackson.JsonGenerator; import org.springframework.beans.BeansException; @@ -46,7 +45,7 @@ import com.netflix.hystrix.util.HystrixRollingNumberEvent; * @author Spencer Gibb * @see com.netflix.hystrix.contrib.metrics.eventstream.HystrixMetricsPoller.MetricsPoller */ -@Slf4j +@CommonsLog public class HystrixStreamTask implements ApplicationContextAware { @Autowired diff --git a/spring-cloud-netflix-hystrix-dashboard/pom.xml b/spring-cloud-netflix-hystrix-dashboard/pom.xml index def4e50c0..d5089c0f5 100644 --- a/spring-cloud-netflix-hystrix-dashboard/pom.xml +++ b/spring-cloud-netflix-hystrix-dashboard/pom.xml @@ -52,6 +52,13 @@ org.webjars d3js + + org.projectlombok + lombok + + compile + true + org.springframework.boot spring-boot-starter-test 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 bff1d9989..8fa9538c1 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 @@ -26,6 +26,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import lombok.extern.apachecommons.CommonsLog; import org.apache.http.Header; import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; @@ -35,8 +36,6 @@ import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.impl.conn.PoolingClientConnectionManager; import org.apache.http.params.HttpConnectionParams; import org.apache.http.params.HttpParams; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.freemarker.FreeMarkerAutoConfiguration; import org.springframework.boot.context.embedded.ServletRegistrationBean; import org.springframework.context.annotation.Bean; @@ -87,13 +86,11 @@ public class HystrixDashboardConfiguration { * not yet support CORS (https://bugs.webkit.org/show_bug.cgi?id=61862) so that a UI * can request a stream from a different server. */ + @CommonsLog public static class ProxyStreamServlet extends HttpServlet { private static final long serialVersionUID = 1L; - private static final Logger logger = LoggerFactory - .getLogger(ProxyStreamServlet.class); - public ProxyStreamServlet() { super(); } @@ -141,7 +138,7 @@ public class HystrixDashboardConfiguration { } } String proxyUrl = url.toString(); - logger.info("\n\nProxy opening connection to: " + proxyUrl + "\n\n"); + log.info("\n\nProxy opening connection to: " + proxyUrl + "\n\n"); try { httpget = new HttpGet(proxyUrl); HttpClient client = ProxyConnectionManager.httpClient; @@ -177,7 +174,7 @@ public class HystrixDashboardConfiguration { .equalsIgnoreCase("ClientAbortException")) { // don't throw an exception as this means the user closed // the connection - logger.debug("Connection closed by client. Will stop proxying ..."); + log.debug("Connection closed by client. Will stop proxying ..."); // break out of the while loop break; } @@ -191,7 +188,7 @@ public class HystrixDashboardConfiguration { } } catch (Exception ex) { - logger.error("Error proxying request: " + url, ex); + log.error("Error proxying request: " + url, ex); } finally { if (httpget != null) { @@ -199,7 +196,7 @@ public class HystrixDashboardConfiguration { httpget.abort(); } catch (Exception ex) { - logger.error("failed aborting proxy connection.", ex); + log.error("failed aborting proxy connection.", ex); } } @@ -225,7 +222,7 @@ public class HystrixDashboardConfiguration { threadSafeConnectionManager); static { - logger.debug("Initialize ProxyConnectionManager"); + log.debug("Initialize ProxyConnectionManager"); /* common settings */ HttpParams httpParams = httpClient.getParams(); HttpConnectionParams.setConnectionTimeout(httpParams, 5000); diff --git a/spring-cloud-netflix-turbine-amqp/src/main/java/org/springframework/cloud/netflix/turbine/amqp/Aggregator.java b/spring-cloud-netflix-turbine-amqp/src/main/java/org/springframework/cloud/netflix/turbine/amqp/Aggregator.java index fe029f71f..3886f69db 100644 --- a/spring-cloud-netflix-turbine-amqp/src/main/java/org/springframework/cloud/netflix/turbine/amqp/Aggregator.java +++ b/spring-cloud-netflix-turbine-amqp/src/main/java/org/springframework/cloud/netflix/turbine/amqp/Aggregator.java @@ -19,8 +19,7 @@ package org.springframework.cloud.netflix.turbine.amqp; import java.io.IOException; import java.util.Map; -import lombok.extern.slf4j.Slf4j; - +import lombok.extern.apachecommons.CommonsLog; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.annotation.ServiceActivator; @@ -34,7 +33,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; * @author Spencer Gibb */ @MessageEndpoint -@Slf4j +@CommonsLog public class Aggregator { @Autowired @@ -50,7 +49,7 @@ public class Aggregator { Map map = this.objectMapper.readValue(payload, Map.class); Map data = getPayloadData(map); - log.debug("Received hystrix stream payload: {}", data); + log.debug("Received hystrix stream payload: " + data); this.subject.onNext(data); } catch (IOException ex) { diff --git a/spring-cloud-netflix-turbine-amqp/src/main/java/org/springframework/cloud/netflix/turbine/amqp/TurbineAmqpConfiguration.java b/spring-cloud-netflix-turbine-amqp/src/main/java/org/springframework/cloud/netflix/turbine/amqp/TurbineAmqpConfiguration.java index bc502632b..868303af6 100644 --- a/spring-cloud-netflix-turbine-amqp/src/main/java/org/springframework/cloud/netflix/turbine/amqp/TurbineAmqpConfiguration.java +++ b/spring-cloud-netflix-turbine-amqp/src/main/java/org/springframework/cloud/netflix/turbine/amqp/TurbineAmqpConfiguration.java @@ -23,8 +23,7 @@ import io.reactivex.netty.protocol.text.sse.ServerSentEvent; import java.util.Map; -import lombok.extern.slf4j.Slf4j; - +import lombok.extern.apachecommons.CommonsLog; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.SmartLifecycle; @@ -45,7 +44,7 @@ import static io.reactivex.netty.pipeline.PipelineConfigurators.sseServerConfigu * @author Spencer Gibb */ @Configuration -@Slf4j +@CommonsLog @EnableConfigurationProperties(TurbineAmqpProperties.class) public class TurbineAmqpConfiguration implements SmartLifecycle { diff --git a/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/EurekaInstanceDiscovery.java b/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/EurekaInstanceDiscovery.java index 1adbb84d2..8e257c44c 100644 --- a/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/EurekaInstanceDiscovery.java +++ b/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/EurekaInstanceDiscovery.java @@ -22,8 +22,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import lombok.extern.apachecommons.CommonsLog; import org.springframework.expression.Expression; import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.expression.spel.support.StandardEvaluationContext; @@ -52,11 +51,9 @@ import com.netflix.turbine.discovery.InstanceDiscovery; * * @author Spencer Gibb */ +@CommonsLog public class EurekaInstanceDiscovery implements InstanceDiscovery { - private static final Logger logger = LoggerFactory - .getLogger(EurekaInstanceDiscovery.class); - // Property the controls the list of applications that are enabled in Eureka private static final DynamicStringProperty ApplicationList = DynamicPropertyFactory .getInstance().getStringProperty("turbine.appConfig", ""); @@ -82,22 +79,22 @@ public class EurekaInstanceDiscovery implements InstanceDiscovery { List instances = new ArrayList(); List appNames = parseApps(); if (appNames == null || appNames.size() == 0) { - logger.info("No apps configured, returning an empty instance list"); + log.info("No apps configured, returning an empty instance list"); return instances; } - logger.info("Fetching instance list for apps: " + appNames); + log.info("Fetching instance list for apps: " + appNames); for (String appName : appNames) { try { instances.addAll(getInstancesForApp(appName)); } catch (Exception ex) { - logger.error("Failed to fetch instances for app: " + appName + log.error("Failed to fetch instances for app: " + appName + ", retrying once more", ex); try { instances.addAll(getInstancesForApp(appName)); } catch (Exception retryException) { - logger.error("Failed again to fetch instances for app: " + appName + log.error("Failed again to fetch instances for app: " + appName + ", giving up", ex); } } @@ -113,16 +110,15 @@ public class EurekaInstanceDiscovery implements InstanceDiscovery { */ private List getInstancesForApp(String appName) throws Exception { List instances = new ArrayList(); - logger.info("Fetching instances for app: {}", appName); + log.info("Fetching instances for app: " + appName); Application app = DiscoveryManager.getInstance().getDiscoveryClient() .getApplication(appName); if (app == null) { - logger.warn("Eureka returned null for app: {}", appName); + log.warn("Eureka returned null for app: " + appName); } List instancesForApp = app.getInstances(); if (instancesForApp != null) { - logger.info("Received instance list for app: {} = {}", appName, - instancesForApp.size()); + log.info("Received instance list for app: "+appName+" = " + instancesForApp.size()); for (InstanceInfo iInfo : instancesForApp) { Instance instance = marshallInstanceInfo(iInfo); if (instance != null) { diff --git a/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/SpringAggregatorFactory.java b/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/SpringAggregatorFactory.java index 0c3574328..a03f14c89 100644 --- a/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/SpringAggregatorFactory.java +++ b/spring-cloud-netflix-turbine/src/main/java/org/springframework/cloud/netflix/turbine/SpringAggregatorFactory.java @@ -20,8 +20,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import lombok.extern.apachecommons.CommonsLog; import com.netflix.config.DynamicPropertyFactory; import com.netflix.config.DynamicStringProperty; @@ -39,9 +38,8 @@ import static com.netflix.turbine.monitor.cluster.AggregateClusterMonitor.Aggreg /** * @author Spencer Gibb */ +@CommonsLog public class SpringAggregatorFactory implements ClusterMonitorFactory { - private static final Logger logger = LoggerFactory - .getLogger(SpringAggregatorFactory.class); private static final DynamicStringProperty aggClusters = DynamicPropertyFactory .getInstance().getStringProperty("turbine.aggregator.clusterConfig", null); @@ -62,7 +60,7 @@ public class SpringAggregatorFactory implements ClusterMonitorFactory clusterMonitor = AggregatorClusterMonitorConsole .findMonitor(clusterName + "_agg"); if (clusterMonitor == null) { - logger.info("Could not find monitors: " + log.info("Could not find monitors: " + AggregatorClusterMonitorConsole.toString()); clusterMonitor = new SpringClusterMonitor(clusterName + "_agg", clusterName); clusterMonitor = AggregatorClusterMonitorConsole @@ -80,7 +78,7 @@ public class SpringAggregatorFactory implements ClusterMonitorFactory