From bfe651860e5012950c9bf199f0103fd8da146242 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Thu, 15 Jan 2015 11:57:07 -0700 Subject: [PATCH] change package or protected fields to private fixes gh-7 --- .../discovery/AbstractDiscoveryLifecycle.java | 18 +++++++++++++----- .../DiscoveryCompositeHealthIndicator.java | 6 +++++- .../discovery/ManagementServerPortUtils.java | 2 +- .../NoopDiscoveryClientConfiguration.java | 2 +- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/springframework/cloud/client/discovery/AbstractDiscoveryLifecycle.java b/src/main/java/org/springframework/cloud/client/discovery/AbstractDiscoveryLifecycle.java index db0f4d30..f48a4cb4 100644 --- a/src/main/java/org/springframework/cloud/client/discovery/AbstractDiscoveryLifecycle.java +++ b/src/main/java/org/springframework/cloud/client/discovery/AbstractDiscoveryLifecycle.java @@ -30,15 +30,19 @@ import org.springframework.core.env.Environment; public abstract class AbstractDiscoveryLifecycle implements DiscoveryLifecycle, ApplicationContextAware { - protected boolean autoStartup = true; + private boolean autoStartup = true; - protected boolean running; + private boolean running; - protected int order = 0; + private int order = 0; - protected ApplicationContext context; + private ApplicationContext context; - protected Environment environment; + private Environment environment; + + protected ApplicationContext getContext() { + return context; + } @Override public void setApplicationContext(ApplicationContext applicationContext) @@ -47,6 +51,10 @@ public abstract class AbstractDiscoveryLifecycle implements DiscoveryLifecycle, this.environment = this.context.getEnvironment(); } + protected Environment getEnvironment() { + return environment; + } + @Override public boolean isAutoStartup() { return this.autoStartup; diff --git a/src/main/java/org/springframework/cloud/client/discovery/DiscoveryCompositeHealthIndicator.java b/src/main/java/org/springframework/cloud/client/discovery/DiscoveryCompositeHealthIndicator.java index 8ca2c899..0b79b2b5 100644 --- a/src/main/java/org/springframework/cloud/client/discovery/DiscoveryCompositeHealthIndicator.java +++ b/src/main/java/org/springframework/cloud/client/discovery/DiscoveryCompositeHealthIndicator.java @@ -39,7 +39,7 @@ public class DiscoveryCompositeHealthIndicator extends CompositeHealthIndicator } public static class Holder implements HealthIndicator { - DiscoveryHealthIndicator delegate; + private DiscoveryHealthIndicator delegate; public Holder(DiscoveryHealthIndicator delegate) { this.delegate = delegate; @@ -49,6 +49,10 @@ public class DiscoveryCompositeHealthIndicator extends CompositeHealthIndicator public Health health() { return this.delegate.health(); } + + protected DiscoveryHealthIndicator getDelegate() { + return delegate; + } } } diff --git a/src/main/java/org/springframework/cloud/client/discovery/ManagementServerPortUtils.java b/src/main/java/org/springframework/cloud/client/discovery/ManagementServerPortUtils.java index e0a3564e..9df63084 100644 --- a/src/main/java/org/springframework/cloud/client/discovery/ManagementServerPortUtils.java +++ b/src/main/java/org/springframework/cloud/client/discovery/ManagementServerPortUtils.java @@ -79,6 +79,6 @@ public class ManagementServerPortUtils { || (port != 0 && port.equals(serverProperties.getPort())) ? SAME : DIFFERENT); } - }; + } } diff --git a/src/main/java/org/springframework/cloud/client/discovery/NoopDiscoveryClientConfiguration.java b/src/main/java/org/springframework/cloud/client/discovery/NoopDiscoveryClientConfiguration.java index 2bd2e9fa..515d032d 100644 --- a/src/main/java/org/springframework/cloud/client/discovery/NoopDiscoveryClientConfiguration.java +++ b/src/main/java/org/springframework/cloud/client/discovery/NoopDiscoveryClientConfiguration.java @@ -89,7 +89,7 @@ public class NoopDiscoveryClientConfiguration implements @Override public void onApplicationEvent(ContextRefreshedEvent event) { - this.context.publishEvent(new InstanceRegisteredEvent(this, + this.context.publishEvent(new InstanceRegisteredEvent<>(this, this.environment)); }