From b3abb02e14a9c07c36dde84941fc6fb49c2df5f6 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Tue, 26 Apr 2016 18:47:38 +0100 Subject: [PATCH] Remove featureless ZookeeperEndpoint --- .../zookeeper/ZookeeperAutoConfiguration.java | 6 --- .../cloud/zookeeper/ZookeeperEndpoint.java | 45 ------------------- 2 files changed, 51 deletions(-) delete mode 100644 spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperEndpoint.java diff --git a/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperAutoConfiguration.java b/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperAutoConfiguration.java index 035cfa48..137156e0 100644 --- a/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperAutoConfiguration.java +++ b/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperAutoConfiguration.java @@ -86,12 +86,6 @@ public class ZookeeperAutoConfiguration { @Configuration @ConditionalOnClass(Endpoint.class) protected static class ZookeeperHealthConfig { - @Bean - @ConditionalOnMissingBean - public ZookeeperEndpoint zookeeperEndpoint() { - return new ZookeeperEndpoint(); - } - @Bean @ConditionalOnMissingBean @ConditionalOnEnabledHealthIndicator("zookeeper") diff --git a/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperEndpoint.java b/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperEndpoint.java deleted file mode 100644 index 332dc0ee..00000000 --- a/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/ZookeeperEndpoint.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2013-2015 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.cloud.zookeeper; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.actuate.endpoint.AbstractEndpoint; -import org.springframework.boot.context.properties.ConfigurationProperties; - -/** - * A Zookeeper {@link org.springframework.boot.actuate.endpoint.Endpoint} that returns - * {@link ZookeeperData}. - * - * @author Spencer Gibb - * @since 1.0.0 - */ -@ConfigurationProperties(prefix = "endpoints.zookeeper", ignoreUnknownFields = false) -public class ZookeeperEndpoint extends AbstractEndpoint { - - @Autowired - public ZookeeperEndpoint() { - super("zookeeper", false, true); - } - - @Override - public ZookeeperData invoke() { - return new ZookeeperData(); - } - - public static class ZookeeperData { - } -}