Commit 6379e15c by Gregor Zurowski

Remove Lombok logging from spring-cloud-netflix-eureka-client module

parent 46cbaa05
...@@ -34,8 +34,6 @@ import com.netflix.appinfo.HealthCheckHandler; ...@@ -34,8 +34,6 @@ import com.netflix.appinfo.HealthCheckHandler;
import com.netflix.discovery.EurekaClient; import com.netflix.discovery.EurekaClient;
import com.netflix.discovery.EurekaClientConfig; import com.netflix.discovery.EurekaClientConfig;
import lombok.extern.apachecommons.CommonsLog;
/** /**
* @author Dave Syer * @author Dave Syer
* @author Spencer Gibb * @author Spencer Gibb
...@@ -46,7 +44,6 @@ import lombok.extern.apachecommons.CommonsLog; ...@@ -46,7 +44,6 @@ import lombok.extern.apachecommons.CommonsLog;
@EnableConfigurationProperties @EnableConfigurationProperties
@ConditionalOnClass(EurekaClientConfig.class) @ConditionalOnClass(EurekaClientConfig.class)
@ConditionalOnProperty(value = "eureka.client.enabled", matchIfMissing = true) @ConditionalOnProperty(value = "eureka.client.enabled", matchIfMissing = true)
@CommonsLog
public class EurekaDiscoveryClientConfiguration { public class EurekaDiscoveryClientConfiguration {
class Marker {} class Marker {}
......
...@@ -21,16 +21,17 @@ import java.util.Map; ...@@ -21,16 +21,17 @@ import java.util.Map;
import com.netflix.appinfo.EurekaInstanceConfig; import com.netflix.appinfo.EurekaInstanceConfig;
import com.netflix.appinfo.InstanceInfo; import com.netflix.appinfo.InstanceInfo;
import com.netflix.appinfo.LeaseInfo; import com.netflix.appinfo.LeaseInfo;
import org.apache.commons.logging.Log;
import lombok.extern.apachecommons.CommonsLog; import org.apache.commons.logging.LogFactory;
/** /**
* See com.netflix.appinfo.providers.EurekaConfigBasedInstanceInfoProvider * See com.netflix.appinfo.providers.EurekaConfigBasedInstanceInfoProvider
* @author Spencer Gibb * @author Spencer Gibb
*/ */
@CommonsLog
public class InstanceInfoFactory { public class InstanceInfoFactory {
private static final Log log = LogFactory.getLog(InstanceInfoFactory.class);
public InstanceInfo create(EurekaInstanceConfig config) { public InstanceInfo create(EurekaInstanceConfig config) {
LeaseInfo.Builder leaseInfoBuilder = LeaseInfo.Builder.newBuilder() LeaseInfo.Builder leaseInfoBuilder = LeaseInfo.Builder.newBuilder()
.setRenewalIntervalInSecs(config.getLeaseRenewalIntervalInSeconds()) .setRenewalIntervalInSecs(config.getLeaseRenewalIntervalInSeconds())
......
...@@ -20,6 +20,8 @@ import javax.annotation.PostConstruct; ...@@ -20,6 +20,8 @@ import javax.annotation.PostConstruct;
import javax.inject.Provider; import javax.inject.Provider;
import com.netflix.discovery.EurekaClient; 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.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
...@@ -43,8 +45,6 @@ import static com.netflix.client.config.CommonClientConfigKey.DeploymentContextB ...@@ -43,8 +45,6 @@ import static com.netflix.client.config.CommonClientConfigKey.DeploymentContextB
import static com.netflix.client.config.CommonClientConfigKey.EnableZoneAffinity; import static com.netflix.client.config.CommonClientConfigKey.EnableZoneAffinity;
import static org.springframework.cloud.netflix.ribbon.RibbonUtils.setRibbonProperty; 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: * Preprocessor that configures defaults for eureka-discovered ribbon clients. Such as:
* <code>@zone</code>, NIWSServerListClassName, DeploymentContextBasedVipAddresses, * <code>@zone</code>, NIWSServerListClassName, DeploymentContextBasedVipAddresses,
...@@ -55,9 +55,10 @@ import lombok.extern.apachecommons.CommonsLog; ...@@ -55,9 +55,10 @@ import lombok.extern.apachecommons.CommonsLog;
* @author Ryan Baxter * @author Ryan Baxter
*/ */
@Configuration @Configuration
@CommonsLog
public class EurekaRibbonClientConfiguration { public class EurekaRibbonClientConfiguration {
private static final Log log = LogFactory.getLog(EurekaRibbonClientConfiguration.class);
@Value("${ribbon.eureka.approximateZoneFromHostname:false}") @Value("${ribbon.eureka.approximateZoneFromHostname:false}")
private boolean approximateZoneFromHostname = false; private boolean approximateZoneFromHostname = false;
......
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