diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ConditionalOnRibbonZookeeper.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ConditionalOnRibbonZookeeper.java index 2c025ab2..36425732 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ConditionalOnRibbonZookeeper.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ConditionalOnRibbonZookeeper.java @@ -16,15 +16,17 @@ package org.springframework.cloud.zookeeper.discovery; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; + /** * Wrapper annotation to enable Ribbon for Zookeeper + * + * @since 1.0.0 */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.TYPE, ElementType.METHOD}) diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/RibbonZookeeperAutoConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/RibbonZookeeperAutoConfiguration.java index d7d65849..695aeff8 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/RibbonZookeeperAutoConfiguration.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/RibbonZookeeperAutoConfiguration.java @@ -25,7 +25,11 @@ import org.springframework.cloud.netflix.ribbon.SpringClientFactory; import org.springframework.context.annotation.Configuration; /** + * {@link org.springframework.boot.autoconfigure.EnableAutoConfiguration Auto-configuration} + * that sets up Ribbon for Zookeeper. + * * @author Dave Syer + * @since 1.0.0 */ @Configuration @EnableConfigurationProperties @@ -34,6 +38,4 @@ import org.springframework.context.annotation.Configuration; @AutoConfigureAfter(RibbonAutoConfiguration.class) @RibbonClients(defaultConfiguration = ZookeeperRibbonClientConfiguration.class) public class RibbonZookeeperAutoConfiguration { - - } diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClient.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClient.java index a33cca2c..dff20400 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClient.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClient.java @@ -24,6 +24,7 @@ import java.util.List; import java.util.Map; import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.curator.x.discovery.ServiceInstance; import org.springframework.cloud.client.DefaultServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; @@ -33,13 +34,16 @@ import org.springframework.util.ReflectionUtils; import static org.springframework.util.ReflectionUtils.rethrowRuntimeException; /** + * Zookeeper version of {@link DiscoveryClient}. Capable of resolving aliases from + * {@link ZookeeperDependencies} to service names in Zookeeper. + * * @author Spencer Gibb - * @author Marcin Grzejszczak, 4financeIT + * @author Marcin Grzejszczak + * @since 1.0.0 */ public class ZookeeperDiscoveryClient implements DiscoveryClient { - private static final Log log = org.apache.commons.logging.LogFactory - .getLog(ZookeeperDiscoveryClient.class); + private static final Log log = LogFactory.getLog(ZookeeperDiscoveryClient.class); private ZookeeperServiceDiscovery serviceDiscovery; @@ -64,11 +68,9 @@ public class ZookeeperDiscoveryClient implements DiscoveryClient { private static org.springframework.cloud.client.ServiceInstance createServiceInstance(String serviceId, ServiceInstance serviceInstance) { boolean secure = serviceInstance.getSslPort() != null; Integer port = serviceInstance.getPort(); - if (secure) { port = serviceInstance.getSslPort(); } - Map metadata; if (serviceInstance.getPayload() != null) { metadata = serviceInstance.getPayload().getMetadata(); @@ -85,13 +87,10 @@ public class ZookeeperDiscoveryClient implements DiscoveryClient { String serviceIdToQuery = getServiceIdToQuery(serviceId); Collection> zkInstances = this.serviceDiscovery .getServiceDiscovery().queryForInstances(serviceIdToQuery); - - ArrayList instances = new ArrayList<>(); - + List instances = new ArrayList<>(); for (ServiceInstance instance : zkInstances) { instances.add(createServiceInstance(serviceIdToQuery, instance)); } - return instances; } catch (Exception exception) { ReflectionUtils.rethrowRuntimeException(exception); diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClientConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClientConfiguration.java index c597b083..bfcbe3f3 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClientConfiguration.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryClientConfiguration.java @@ -31,7 +31,11 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; /** + * {@link org.springframework.cloud.client.discovery.DiscoveryClient} configuration + * for Zookeeper. + * * @author Spencer Gibb + * @since 1.0.0 */ @Configuration @ConditionalOnProperty(value = "spring.cloud.zookeeper.discovery.enabled", matchIfMissing = true) diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryHealthIndicator.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryHealthIndicator.java index 41bbd2be..d978de3b 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryHealthIndicator.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryHealthIndicator.java @@ -17,18 +17,22 @@ package org.springframework.cloud.zookeeper.discovery; import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.curator.x.discovery.ServiceInstance; import org.springframework.boot.actuate.health.AbstractHealthIndicator; import org.springframework.boot.actuate.health.Health; import org.springframework.cloud.zookeeper.discovery.dependency.ZookeeperDependencies; /** + * {@link org.springframework.boot.actuate.health.HealthIndicator} that presents + * the status of all instances registered in Zookeeper. + * * @author Spencer Gibb + * @since 1.0.0 */ public class ZookeeperDiscoveryHealthIndicator extends AbstractHealthIndicator { - private static final Log log = org.apache.commons.logging.LogFactory - .getLog(ZookeeperDiscoveryHealthIndicator.class); + private static final Log log = LogFactory.getLog(ZookeeperDiscoveryHealthIndicator.class); private ZookeeperServiceDiscovery serviceDiscovery; private ZookeeperDependencies zookeeperDependencies; diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryProperties.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryProperties.java index 4566186b..8b3b2a10 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryProperties.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperDiscoveryProperties.java @@ -22,16 +22,29 @@ import java.util.Map; import org.springframework.boot.context.properties.ConfigurationProperties; /** + * Properties related to Zookeeper's Service Discovery. + * * @author Spencer Gibb + * @since 1.0.0 */ @ConfigurationProperties("spring.cloud.zookeeper.discovery") public class ZookeeperDiscoveryProperties { private boolean enabled = true; + /** + * Root Zookeeper folder in which all instances are registered + */ private String root = "/services"; + /** + * The URI specification to resolve during service registration in Zookeeper + */ private String uriSpec = "{scheme}://{address}:{port}"; + /** + * Predefined host with which a service can register itself in Zookeeper. Corresponds + * to the {code address} from the URI spec. + */ private String instanceHost; /** @@ -82,13 +95,11 @@ public class ZookeeperDiscoveryProperties { @Override public String toString() { - final StringBuffer sb = new StringBuffer("ZookeeperDiscoveryProperties{"); - sb.append("enabled=").append(this.enabled); - sb.append(", root='").append(this.root).append('\''); - sb.append(", uriSpec='").append(this.uriSpec).append('\''); - sb.append(", instanceHost='").append(this.instanceHost).append('\''); - sb.append(", metadata=").append(this.metadata); - sb.append('}'); - return sb.toString(); + return "ZookeeperDiscoveryProperties{" + "enabled=" + this.enabled + + ", root='" + this.root + '\'' + + ", uriSpec='" + this.uriSpec + '\'' + + ", instanceHost='" + this.instanceHost + '\'' + + ", metadata=" + this.metadata + + '}'; } } diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperInstance.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperInstance.java index f535d52b..c69580f5 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperInstance.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperInstance.java @@ -20,7 +20,10 @@ import java.util.HashMap; import java.util.Map; /** + * Represents the default payload of a registered service in Zookeeper. + * * @author Spencer Gibb + * @since 1.0.0 */ public class ZookeeperInstance { private String id; @@ -63,11 +66,9 @@ public class ZookeeperInstance { @Override public String toString() { - final StringBuffer sb = new StringBuffer("ZookeeperInstance{"); - sb.append("id='").append(this.id).append('\''); - sb.append(", name='").append(this.name).append('\''); - sb.append(", metadata=").append(this.metadata); - sb.append('}'); - return sb.toString(); + return "ZookeeperInstance{" + "id='" + this.id + '\'' + + ", name='" + this.name + '\'' + + ", metadata=" + this.metadata + + '}'; } } diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperLifecycle.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperLifecycle.java index 4d61ac84..369b8b27 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperLifecycle.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperLifecycle.java @@ -20,7 +20,11 @@ import org.springframework.cloud.client.discovery.AbstractDiscoveryLifecycle; import org.springframework.util.ReflectionUtils; /** + * Zookeeper {@link org.springframework.cloud.client.discovery.DiscoveryLifecycle} + * that uses {@link ZookeeperServiceDiscovery} to register and de-register instances. + * * @author Spencer Gibb + * @since 1.0.0 */ public class ZookeeperLifecycle extends AbstractDiscoveryLifecycle { diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperRibbonClientConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperRibbonClientConfiguration.java index 6301bb53..d4a7679f 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperRibbonClientConfiguration.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperRibbonClientConfiguration.java @@ -28,6 +28,7 @@ import com.netflix.loadbalancer.PingUrl; import com.netflix.loadbalancer.ServerList; 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; @@ -45,16 +46,16 @@ import static com.netflix.client.config.CommonClientConfigKey.EnableZoneAffinity /** * Preprocessor that configures defaults for zookeeper-discovered ribbon clients. Such as: * @zone, NIWSServerListClassName, DeploymentContextBasedVipAddresses, - * NFLoadBalancerRuleClassName, NIWSServerListFilterClassName and more + * NFLoadBalancerRuleClassName, NIWSServerListFilterClassName and more. * * @author Spencer Gibb * @author Dave Syer - * @author Marcin Grzejszczak, 4financeIT + * @author Marcin Grzejszczak + * @since 1.0.0 */ @Configuration public class ZookeeperRibbonClientConfiguration { - private static final Log log = org.apache.commons.logging.LogFactory - .getLog(ZookeeperRibbonClientConfiguration.class); + private static final Log log = LogFactory.getLog(ZookeeperRibbonClientConfiguration.class); protected static final String VALUE_NOT_SET = "__not__set__"; protected static final String DEFAULT_NAMESPACE = "ribbon"; diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServer.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServer.java index d64c04e9..b91572c6 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServer.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServer.java @@ -21,7 +21,10 @@ import com.netflix.loadbalancer.Server; import org.apache.curator.x.discovery.ServiceInstance; /** + * A Zookeeper version of a {@link Server Ribbon Server} + * * @author Spencer Gibb + * @since 1.0.0 */ public class ZookeeperServer extends Server { diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServerList.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServerList.java index 70bdee04..4393f0ac 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServerList.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServerList.java @@ -32,8 +32,13 @@ import org.springframework.util.StringUtils; import static org.springframework.util.ReflectionUtils.rethrowRuntimeException; /** + * Zookeeper version of {@link AbstractServerList} that returns the list of + * servers on which instances are ran. The implementation is capable of resolving + * the servers from {@link ZookeeperDependencies}. + * * @author Spencer Gibb - * @author Marcin Grzejszczak, 4financeIT + * @author Marcin Grzejszczak + * @since 1.0.0 */ public class ZookeeperServerList extends AbstractServerList { @@ -80,7 +85,6 @@ public class ZookeeperServerList extends AbstractServerList { for (ServiceInstance instance : instances) { servers.add(new ZookeeperServer(instance)); } - return servers; } catch (Exception e) { diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServiceDiscovery.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServiceDiscovery.java index d10163e4..7002c704 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServiceDiscovery.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServiceDiscovery.java @@ -34,7 +34,11 @@ import org.springframework.context.ApplicationContextAware; import org.springframework.util.ReflectionUtils; /** + * Service discovery for Zookeeper that sets up {@link ServiceDiscovery} + * and {@link ServiceInstance}. + * * @author Spencer Gibb + * @since 1.0.0 */ public class ZookeeperServiceDiscovery implements ApplicationContextAware { @@ -104,6 +108,10 @@ public class ZookeeperServiceDiscovery implements ApplicationContextAware { } } + /** + * One can override this method to provide custom way of registering a service + * instance (e.g. when no payload is required). + */ protected void configureServiceInstance(AtomicReference> serviceInstance, String appName, ApplicationContext context, @@ -124,7 +132,9 @@ public class ZookeeperServiceDiscovery implements ApplicationContextAware { } // @formatter:on } - + /** + * One can override this method to provide custom way of registering {@link ServiceDiscovery} + */ protected void configureServiceDiscovery(AtomicReference> serviceDiscovery, CuratorFramework curator, ZookeeperDiscoveryProperties properties, InstanceSerializer instanceSerializer, diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServiceInstances.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServiceInstances.java index 99302312..76aa090a 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServiceInstances.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServiceInstances.java @@ -6,13 +6,20 @@ import java.util.Iterator; import java.util.List; import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.curator.x.discovery.ServiceInstance; import org.springframework.cloud.zookeeper.discovery.dependency.ZookeeperDependencies; +/** + * An {@link Iterable} representing registered Zookeeper instances. If using + * {@link ZookeeperDependencies} it will return a list of registered Zookeeper instances + * corresponding to the ones defined in the dependencies. + * + * @since 1.0.0 + */ public class ZookeeperServiceInstances implements Iterable> { - private static final Log log = org.apache.commons.logging.LogFactory - .getLog(ZookeeperServiceInstances.class); + private static final Log log = LogFactory.getLog(ZookeeperServiceInstances.class); private final ZookeeperServiceDiscovery serviceDiscovery; private final ZookeeperDependencies zookeeperDependencies; diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServiceWatch.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServiceWatch.java index 65e1bd6c..4ffa5e2f 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServiceWatch.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/ZookeeperServiceWatch.java @@ -31,7 +31,11 @@ import org.springframework.context.ApplicationListener; import org.springframework.util.ReflectionUtils; /** + * A {@link TreeCacheListener} that sends {@link HeartbeatEvent} when an + * entry inside Zookeeper has changed. + * * @author Spencer Gibb + * @since 1.0.0 */ public class ZookeeperServiceWatch implements ApplicationListener>, TreeCacheListener, diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ConditionalOnDependenciesNotPassed.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ConditionalOnDependenciesNotPassed.java index 0977e56d..5a6fdbc8 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ConditionalOnDependenciesNotPassed.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ConditionalOnDependenciesNotPassed.java @@ -16,17 +16,18 @@ package org.springframework.cloud.zookeeper.discovery.dependency; -import org.springframework.context.annotation.Conditional; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.springframework.context.annotation.Conditional; + /** * Annotation to turn off a feature if Zookeeper dependencies have NOT been passed * * @author Marcin Grzejszczak + * @since 1.0.0 */ @Target({ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ConditionalOnDependenciesPassed.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ConditionalOnDependenciesPassed.java index b46ac42f..4d1c952e 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ConditionalOnDependenciesPassed.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ConditionalOnDependenciesPassed.java @@ -16,18 +16,19 @@ package org.springframework.cloud.zookeeper.discovery.dependency; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.context.annotation.Conditional; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.annotation.Conditional; + /** * Annotation to turn on a feature if Zookeeper dependencies have been passed * - * @author Marcin Grzejszczak, 4financeIT + * @author Marcin Grzejszczak + * @since 1.0.0 */ @Target({ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependenciesBasedLoadBalancer.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependenciesBasedLoadBalancer.java index db656a90..7f4f01a6 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependenciesBasedLoadBalancer.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependenciesBasedLoadBalancer.java @@ -29,17 +29,18 @@ import com.netflix.loadbalancer.Server; import com.netflix.loadbalancer.ServerList; import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * LoadBalancer that delegates to other rules depending on the provided load balancing strategy * in the {@link ZookeeperDependency#getLoadBalancerType()} * - * @author Marcin Grzejszczak, 4financeIT + * @author Marcin Grzejszczak + * @since 1.0.0 */ public class DependenciesBasedLoadBalancer extends DynamicServerListLoadBalancer { - private static final Log log = org.apache.commons.logging.LogFactory - .getLog(DependenciesBasedLoadBalancer.class); + private static final Log log = LogFactory.getLog(DependenciesBasedLoadBalancer.class); private final Map ruleCache = new ConcurrentHashMap<>(); diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependenciesNotPassedCondition.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependenciesNotPassedCondition.java index 08eee5a1..e923f5da 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependenciesNotPassedCondition.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependenciesNotPassedCondition.java @@ -24,6 +24,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; * was turned on * * @author Marcin Grzejszczak + * @since 1.0.0 */ public class DependenciesNotPassedCondition extends DependenciesPassedCondition { diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependenciesPassedCondition.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependenciesPassedCondition.java index a4524652..dacb7d7f 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependenciesPassedCondition.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependenciesPassedCondition.java @@ -15,19 +15,20 @@ */ package org.springframework.cloud.zookeeper.discovery.dependency; +import java.util.Map; + import org.springframework.boot.autoconfigure.condition.ConditionOutcome; import org.springframework.boot.autoconfigure.condition.SpringBootCondition; import org.springframework.boot.bind.RelaxedPropertyResolver; import org.springframework.context.annotation.ConditionContext; import org.springframework.core.type.AnnotatedTypeMetadata; -import java.util.Map; - /** * Condition that verifies if the Dependencies have been passed in an appropriate * place in the application properties. * - * @author Marcin Grzejszczak, 4financeIT + * @author Marcin Grzejszczak + * @since 1.0.0 */ public class DependenciesPassedCondition extends SpringBootCondition { diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyEnvironmentPostProcessor.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyEnvironmentPostProcessor.java index 97c575de..a81afd70 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyEnvironmentPostProcessor.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyEnvironmentPostProcessor.java @@ -34,6 +34,7 @@ import org.springframework.util.StringUtils; * to /${spring.cloud.zookeeper.prefix}/${spring.application.name} * * @author Spencer Gibb + * @since 1.0.0 */ public class DependencyEnvironmentPostProcessor implements EnvironmentPostProcessor, Ordered { diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyFeignClientAutoConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyFeignClientAutoConfiguration.java index 0c4241cd..00ae7dca 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyFeignClientAutoConfiguration.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyFeignClientAutoConfiguration.java @@ -41,10 +41,11 @@ import feign.Request; import feign.Response; /** + * Configuration for ensuring that headers are set for a given dependency when + * Feign is used. * - * Configuration for ensuring that headers are set for a given dependency. - * - * @author Marcin Grzejszczak, 4financeIT + * @author Marcin Grzejszczak + * @since 1.0.0 */ @Configuration @ConditionalOnDependenciesPassed diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyRestTemplateAutoConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyRestTemplateAutoConfiguration.java index c93f5932..5039f1bc 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyRestTemplateAutoConfiguration.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyRestTemplateAutoConfiguration.java @@ -37,9 +37,10 @@ import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.client.RestTemplate; /** - * Customizes RestTemplate to support passing of params from dependency + * Customizes RestTemplate to support passing of params from dependency. * - * @author Marcin Grzejszczak, 4financeIT + * @author Marcin Grzejszczak + * @since 1.0.0 */ @AutoConfigureAfter(DependencyRibbonAutoConfiguration.class) @ConditionalOnRibbonZookeeper diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyRibbonAutoConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyRibbonAutoConfiguration.java index 9f8782fb..bdcba2be 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyRibbonAutoConfiguration.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/DependencyRibbonAutoConfiguration.java @@ -20,6 +20,7 @@ import com.netflix.loadbalancer.ILoadBalancer; import com.netflix.loadbalancer.Server; import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -38,7 +39,8 @@ import org.springframework.context.annotation.Configuration; * Provides LoadBalancerClient that at runtime can pick proper load balancing strategy * basing on the Zookeeper dependencies from properties * - * @author Marcin Grzejszczak, 4financeIT + * @author Marcin Grzejszczak + * @since 1.0.0 */ @AutoConfigureBefore(RibbonAutoConfiguration.class) @ConditionalOnRibbonZookeeper @@ -46,8 +48,7 @@ import org.springframework.context.annotation.Configuration; @ConditionalOnDependenciesPassed public class DependencyRibbonAutoConfiguration { - private static final Log log = org.apache.commons.logging.LogFactory - .getLog(DependencyRibbonAutoConfiguration.class); + private static final Log log = LogFactory.getLog(DependencyRibbonAutoConfiguration.class); @Autowired ApplicationContext applicationContext; diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/LoadBalancerType.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/LoadBalancerType.java index b63dbfa1..b8f209e3 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/LoadBalancerType.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/LoadBalancerType.java @@ -16,9 +16,10 @@ package org.springframework.cloud.zookeeper.discovery.dependency; /** - * @author Marcin Grzejszczak, 4financeIT + * @author Marcin Grzejszczak * @author Spencer Gibb + * @since 1.0.0 */ public enum LoadBalancerType { - STICKY, RANDOM, ROUND_ROBIN; + STICKY, RANDOM, ROUND_ROBIN } diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/StickyRule.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/StickyRule.java index 368456df..ea8ff04b 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/StickyRule.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/StickyRule.java @@ -26,17 +26,18 @@ import com.netflix.loadbalancer.IRule; import com.netflix.loadbalancer.Server; import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * Load balancing rule that returns always the same instance. * * Ported from {@code org.apache.curator.x.discovery.strategies.StickyStrategy} * - * author: Marcin Grzejszczak, 4financeIT + * @author Marcin Grzejszczak + * @since 1.0.0 */ public class StickyRule extends AbstractLoadBalancerRule { - private static final Log log = org.apache.commons.logging.LogFactory - .getLog(StickyRule.class); + private static final Log log = LogFactory.getLog(StickyRule.class); private final IRule masterStrategy; private final AtomicReference ourInstance = new AtomicReference<>(null); private final AtomicInteger instanceNumber = new AtomicInteger(-1); diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/StubsConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/StubsConfiguration.java index 2a076165..6d874b00 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/StubsConfiguration.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/StubsConfiguration.java @@ -5,9 +5,10 @@ import java.util.Arrays; import org.springframework.util.StringUtils; /** - * Representation of a stubs location + * Representation of a stubs location. * * @author Marcin Grzejszczak + * @since 1.0.0 */ public class StubsConfiguration { private static final String DEFAULT_STUBS_CLASSIFIER = "stubs"; diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ZookeeperDependencies.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ZookeeperDependencies.java index 50ec0b1d..0e62f163 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ZookeeperDependencies.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ZookeeperDependencies.java @@ -30,7 +30,8 @@ import org.springframework.util.StringUtils; /** * Representation of this service's dependencies in Zookeeper * - * @author Marcin Grzejszczak, 4financeIT + * @author Marcin Grzejszczak + * @since 1.0.0 */ @ConfigurationProperties("spring.cloud.zookeeper") public class ZookeeperDependencies { diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ZookeeperDependenciesAutoConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ZookeeperDependenciesAutoConfiguration.java index f5119b5a..0ed81b8c 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ZookeeperDependenciesAutoConfiguration.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ZookeeperDependenciesAutoConfiguration.java @@ -23,12 +23,10 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; /** - * Provides autoconfiguration for Zookeeper dependency set up in properties. - * - * @see ZookeeperDependencies - * - * @author Marcin Grzejszczak, 4financeIT + * Provides AutoConfiguration for Zookeeper dependency set up in properties. * + * @author Marcin Grzejszczak + * @since 1.0.0 */ @Configuration @EnableConfigurationProperties diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ZookeeperDependency.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ZookeeperDependency.java index c025f28f..b96d4d51 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ZookeeperDependency.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/dependency/ZookeeperDependency.java @@ -25,8 +25,11 @@ import org.springframework.util.StringUtils; import static java.util.Collections.singletonList; /** - * @author Marcin Grzejszczak, 4financeIT + * Represents a particular dependency of Zookeeper instance. + * + * @author Marcin Grzejszczak * @author Spencer Gibb + * @since 1.0.0 */ public class ZookeeperDependency { diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DefaultDependencyWatcher.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DefaultDependencyWatcher.java index 59745b3a..2090e3c3 100755 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DefaultDependencyWatcher.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DefaultDependencyWatcher.java @@ -33,11 +33,12 @@ import org.springframework.util.ReflectionUtils; * This Dependency Watcher will verify the presence of dependencies upon startup and registers listeners * to changing of state of dependencies during the application's lifecycle. * + * @author Marcin Grzejszczak + * @author Michal Chmielarz, 4financeIT + * @since 1.0.0 + * * @see DependencyPresenceOnStartupVerifier * @see DependencyWatcherListener - * - * @author Marcin Grzejszczak, 4financeIT - * @author Michal Chmielarz, 4financeIT */ public class DefaultDependencyWatcher implements DependencyRegistrationHookProvider, ApplicationListener> { diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyRegistrationHookProvider.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyRegistrationHookProvider.java index 11dc33f6..66786555 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyRegistrationHookProvider.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyRegistrationHookProvider.java @@ -21,7 +21,8 @@ import java.io.IOException; * Implementations of this interface are required to register dependency registration hooks * on startup and their cleaning upon application context shutdown. * - * @author 4financeIT + * @author Marcin Grzejszczak + * @since 1.0.0 */ public enum DependencyState { CONNECTED, diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyStateChangeListenerRegistry.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyStateChangeListenerRegistry.java index f6175674..da7314af 100755 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyStateChangeListenerRegistry.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyStateChangeListenerRegistry.java @@ -18,22 +18,22 @@ package org.springframework.cloud.zookeeper.discovery.watcher; import java.util.List; import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.state.ConnectionState; import org.apache.curator.x.discovery.ServiceCache; import org.apache.curator.x.discovery.details.ServiceCacheListener; /** - * * Informs all the DependencyWatcherListeners that a dependency's state has changed * - * @author Marcin Grzejszczak, 4financeIT + * @author Marcin Grzejszczak * @author Tomasz Nurkiewicz, 4financeIT + * @since 1.0.0 */ public class DependencyStateChangeListenerRegistry implements ServiceCacheListener { - private static final Log log = org.apache.commons.logging.LogFactory - .getLog(DependencyStateChangeListenerRegistry.class); + private static final Log log = LogFactory.getLog(DependencyStateChangeListenerRegistry.class); private final List listeners; private final String dependencyName; diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyWatcherAutoConfiguration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyWatcherAutoConfiguration.java index 68df106d..d3d1f2a2 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyWatcherAutoConfiguration.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyWatcherAutoConfiguration.java @@ -35,9 +35,10 @@ import java.util.List; * Provides hooks for observing dependency lifecycle in Zookeeper. * Needs custom dependencies to be set in order to work. * - * @see ZookeeperDependencies + * @author Marcin Grzejszczak + * @since 1.0.0 * - * @author Marcin Grzejszczak, 4financeIT + * @see ZookeeperDependencies */ @Configuration @EnableConfigurationProperties @@ -58,8 +59,8 @@ public class DependencyWatcherAutoConfiguration { @ConditionalOnMissingBean public DependencyRegistrationHookProvider dependencyWatcher( ZookeeperServiceDiscovery serviceDiscovery, - DependencyPresenceOnStartupVerifier dependencyPresenceOnStartupVerifier, - ZookeeperDependencies zookeeperDependencies) { + DependencyPresenceOnStartupVerifier dependencyPresenceOnStartupVerifier, + ZookeeperDependencies zookeeperDependencies) { return new DefaultDependencyWatcher(serviceDiscovery, dependencyPresenceOnStartupVerifier, this.dependencyWatcherListeners, diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyWatcherListener.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyWatcherListener.java index 521b6b76..86c0bd09 100755 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyWatcherListener.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/DependencyWatcherListener.java @@ -19,7 +19,10 @@ package org.springframework.cloud.zookeeper.discovery.watcher; * Performs logic upon change of state of a dependency {@link DependencyState} * in the service discovery system. * - * @author 4financeIT + * @see LogMissingDependencyChecker */ public class DefaultDependencyPresenceOnStartupVerifier extends DependencyPresenceOnStartupVerifier { public DefaultDependencyPresenceOnStartupVerifier() { diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/DependencyPresenceOnStartupVerifier.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/DependencyPresenceOnStartupVerifier.java index dc90b108..3138f3e6 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/DependencyPresenceOnStartupVerifier.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/DependencyPresenceOnStartupVerifier.java @@ -18,17 +18,17 @@ package org.springframework.cloud.zookeeper.discovery.watcher.presence; import org.apache.curator.x.discovery.ServiceCache; /** - * * Verifier that checks for presence of mandatory dependencies and delegates to an optional * presence checker verification of presence of optional dependencies. * * The default implementation of required dependencies will result in shutting down of the application * if the dependency is missing. * - * @see FailOnMissingDependencyChecker - * - * @author Marcin Grzejszczak, 4financeIT + * @author Marcin Grzejszczak * @author Tomasz Szymanski, 4financeIT + * @version 1.0.0 + * + * @see FailOnMissingDependencyChecker */ public abstract class DependencyPresenceOnStartupVerifier { private static final PresenceChecker MANDATORY_DEPENDENCY_CHECKER = new FailOnMissingDependencyChecker(); diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/FailOnMissingDependencyChecker.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/FailOnMissingDependencyChecker.java index c8e71118..c1abe117 100755 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/FailOnMissingDependencyChecker.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/FailOnMissingDependencyChecker.java @@ -20,11 +20,11 @@ import java.util.List; import org.apache.curator.x.discovery.ServiceInstance; /** - * * Will result in throwing an exception if there are no running instances of the dependency * - * @author Marcin Grzejszczak, 4financeIT + * @author Marcin Grzejszczak * @author Adam Chudzik, 4financeIT + * @since 1.0.0 */ public class FailOnMissingDependencyChecker implements PresenceChecker { @Override diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/LogMissingDependencyChecker.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/LogMissingDependencyChecker.java index 2ffa2aa1..88f61409 100755 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/LogMissingDependencyChecker.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/LogMissingDependencyChecker.java @@ -18,24 +18,25 @@ package org.springframework.cloud.zookeeper.discovery.watcher.presence; import java.util.List; import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.curator.x.discovery.ServiceInstance; /** - * * Will log the missing microservice dependency * - * @author Marcin Grzejszczak, 4financeIT + * @author Marcin Grzejszczak * @author Tomasz Dziurko, 4financeIT + * @since 1.0.0 */ public class LogMissingDependencyChecker implements PresenceChecker { - private static final Log log = org.apache.commons.logging.LogFactory - .getLog(LogMissingDependencyChecker.class); + private static final Log log = LogFactory.getLog(LogMissingDependencyChecker.class); @Override public void checkPresence(String dependencyName, List> serviceInstances) { if (serviceInstances.isEmpty()) { - log.warn("Microservice dependency with name ["+dependencyName+"] is missing."); + log.warn("Microservice dependency with name [" + dependencyName + + "] is missing."); } } diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/NoInstancesRunningException.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/NoInstancesRunningException.java index 654279b8..b7699fe1 100755 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/NoInstancesRunningException.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/NoInstancesRunningException.java @@ -16,7 +16,8 @@ package org.springframework.cloud.zookeeper.discovery.watcher.presence; /** - * @author 4financeIT + * @author Marcin Grzejszczak + * @since 1.0.0 */ public interface PresenceChecker {