diff --git a/pom.xml b/pom.xml index f490c564..aba9328e 100644 --- a/pom.xml +++ b/pom.xml @@ -125,28 +125,13 @@ spring-cloud-netflix-dependencies spring-cloud-netflix-core spring-cloud-netflix-hystrix-dashboard - spring-cloud-netflix-hystrix-amqp spring-cloud-netflix-hystrix-stream spring-cloud-netflix-eureka-client spring-cloud-netflix-eureka-server - spring-cloud-netflix-spectator spring-cloud-netflix-turbine spring-cloud-netflix-turbine-stream spring-cloud-netflix-sidecar spring-cloud-starter-netflix - spring-cloud-starter-archaius - spring-cloud-starter-atlas - spring-cloud-starter-eureka - spring-cloud-starter-eureka-server - spring-cloud-starter-feign - spring-cloud-starter-hystrix - spring-cloud-starter-hystrix-dashboard - spring-cloud-starter-ribbon - spring-cloud-starter-spectator - spring-cloud-starter-turbine - spring-cloud-starter-turbine-amqp - spring-cloud-starter-turbine-stream - spring-cloud-starter-zuul docs diff --git a/spring-cloud-netflix-hystrix-amqp/.jdk8 b/spring-cloud-netflix-hystrix-amqp/.jdk8 deleted file mode 100644 index e69de29b..00000000 diff --git a/spring-cloud-netflix-hystrix-amqp/pom.xml b/spring-cloud-netflix-hystrix-amqp/pom.xml deleted file mode 100644 index 7241938e..00000000 --- a/spring-cloud-netflix-hystrix-amqp/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud - spring-cloud-netflix - 2.0.0.BUILD-SNAPSHOT - .. - - spring-cloud-netflix-hystrix-amqp - spring-cloud-netflix-hystrix-amqp - Spring Cloud Netflix Hystrix AMQP (deprecated, please use spring-cloud-netflix-hystrix-stream) - https://projects.spring.io/spring-cloud - - Pivotal Software, Inc. - https://www.spring.io - - - ${basedir}/../.. - - - - org.springframework.cloud - spring-cloud-netflix-hystrix-stream - - - org.springframework.cloud - spring-cloud-starter-stream-rabbit - - - diff --git a/spring-cloud-netflix-hystrix-amqp/src/main/resources/META-INF/spring.provides b/spring-cloud-netflix-hystrix-amqp/src/main/resources/META-INF/spring.provides deleted file mode 100644 index e1782585..00000000 --- a/spring-cloud-netflix-hystrix-amqp/src/main/resources/META-INF/spring.provides +++ /dev/null @@ -1 +0,0 @@ -provides: spring-cloud-netflix-turbine-amqp \ No newline at end of file diff --git a/spring-cloud-netflix-spectator/.jdk8 b/spring-cloud-netflix-spectator/.jdk8 deleted file mode 100644 index e69de29b..00000000 diff --git a/spring-cloud-netflix-spectator/pom.xml b/spring-cloud-netflix-spectator/pom.xml deleted file mode 100644 index f3346e75..00000000 --- a/spring-cloud-netflix-spectator/pom.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud - spring-cloud-netflix - 2.0.0.BUILD-SNAPSHOT - .. - - spring-cloud-netflix-spectator - jar - Spring Cloud Netflix Spectator - Spring Cloud Netflix Spectator - - ${basedir}/.. - 0.30.0 - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - - - - - com.netflix.spectator - spectator-api - ${spectator.version} - - - com.netflix.spectator - spectator-reg-servo - ${spectator.version} - - - - - - org.springframework.boot - spring-boot - - - org.springframework.boot - spring-boot-autoconfigure - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.cloud - spring-cloud-netflix-core - - - org.springframework - spring-webmvc - - - javax.servlet - javax.servlet-api - provided - - - com.netflix.servo - servo-core - - - com.netflix.spectator - spectator-api - - - com.netflix.spectator - spectator-reg-servo - - - org.springframework.boot - spring-boot-starter-test - test - - - diff --git a/spring-cloud-netflix-spectator/src/main/java/org/springframework/cloud/netflix/metrics/spectator/SpectatorMetricReader.java b/spring-cloud-netflix-spectator/src/main/java/org/springframework/cloud/netflix/metrics/spectator/SpectatorMetricReader.java deleted file mode 100644 index 38ac0211..00000000 --- a/spring-cloud-netflix-spectator/src/main/java/org/springframework/cloud/netflix/metrics/spectator/SpectatorMetricReader.java +++ /dev/null @@ -1,69 +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.netflix.metrics.spectator; - -import java.util.List; -import java.util.stream.Collectors; - -import org.springframework.boot.actuate.metrics.Metric; -import org.springframework.boot.actuate.metrics.reader.MetricReader; - -import com.netflix.spectator.api.Id; -import com.netflix.spectator.api.Registry; - -import static java.util.stream.StreamSupport.stream; - -/** - * Reads metrics from Spectator, placing Spectator tags in the form - * name(k1=v1,k2=v2) where name is the metric name and the - * contents of the parentheses are tag key-value pairs. - * - * @author Jon Schneider - */ -public class SpectatorMetricReader implements MetricReader { - private Registry registry; - - public SpectatorMetricReader(Registry registry) { - this.registry = registry; - } - - protected static String asHierarchicalName(Id id) { - List tags = stream(id.tags().spliterator(), false).map( - t -> t.key() + "=" + t.value()).collect(Collectors.toList()); - return id.name() + "(" + String.join(",", tags) + ")"; - } - - @Override - public Metric findOne(String name) { - throw new UnsupportedOperationException( - "cannot construct a tag-based Spectator id from a hierarchical name"); - } - - @Override - public Iterable> findAll() { - return stream(registry.spliterator(), false) - .flatMap( - metric -> stream(metric.measure().spliterator(), false).map( - measure -> new Metric<>(asHierarchicalName(measure.id()), - measure.value()))) - .sorted((m1, m2) -> m1.getName().compareTo(m2.getName())) - .collect(Collectors.toList()); - } - - @Override - public long count() { - return stream(registry.spliterator(), false).flatMap( - m -> stream(m.measure().spliterator(), false)).count(); - } -} diff --git a/spring-cloud-netflix-spectator/src/main/java/org/springframework/cloud/netflix/metrics/spectator/SpectatorMetricServices.java b/spring-cloud-netflix-spectator/src/main/java/org/springframework/cloud/netflix/metrics/spectator/SpectatorMetricServices.java deleted file mode 100644 index 55162f75..00000000 --- a/spring-cloud-netflix-spectator/src/main/java/org/springframework/cloud/netflix/metrics/spectator/SpectatorMetricServices.java +++ /dev/null @@ -1,112 +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.netflix.metrics.spectator; - -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicLong; - -import org.springframework.boot.actuate.metrics.CounterService; -import org.springframework.boot.actuate.metrics.GaugeService; - -import com.netflix.spectator.api.Id; -import com.netflix.spectator.api.Registry; -import com.netflix.spectator.impl.AtomicDouble; - -/** - * Provides a CounterService and GaugeService implementation - * backed by Spectator. - * - * @author Jon Schneider - */ -public class SpectatorMetricServices implements CounterService, GaugeService { - private final Registry registry; - - private final ConcurrentMap counters = new ConcurrentHashMap<>(); - private final ConcurrentMap gauges = new ConcurrentHashMap<>(); - - public SpectatorMetricServices(Registry registry) { - this.registry = registry; - } - - protected static String stripMetricName(String metricName) { - return metricName.replaceFirst("^(timer|histogram|meter)\\.", ""); - } - - @Override - public void increment(String name) { - incrementInternal(name, 1L); - } - - @Override - public void decrement(String name) { - incrementInternal(name, -1L); - } - - private void incrementInternal(String name, long value) { - if (name.startsWith("status.")) { - // drop this metric since we are capturing it already with - // SpectatorHandlerInterceptor, - // and we are able to glean more information like exceptionType from that - // mechanism than what - // boot provides us - } - else if (name.startsWith("meter.")) { - registry.counter(stripMetricName(name)).increment(value); - } - else { - final Id id = registry.createId(name); - final AtomicLong gauge = getCounterStorage(id); - gauge.addAndGet(value); - } - } - - @Override - public void reset(String name) { - final Id id = registry.createId(stripMetricName(name)); - counters.remove(id); - gauges.remove(id); - } - - @Override - public void submit(String name, double dValue) { - if (name.startsWith("histogram.")) { - registry.distributionSummary(stripMetricName(name)).record((long) dValue); - } - else if (name.startsWith("timer.")) { - // Input is in milliseconds. Convert to nanos before casting to long to allow - // sub-millisecond durations to be recorded correctly. - long value = (long) (dValue * 1e6); - registry.timer(stripMetricName(name)).record(value, TimeUnit.NANOSECONDS); - } - else { - final Id id = registry.createId(name); - final AtomicDouble gauge = getGaugeStorage(id); - gauge.set(dValue); - } - } - - private AtomicDouble getGaugeStorage(Id id) { - final AtomicDouble newGauge = new AtomicDouble(0); - final AtomicDouble existingGauge = gauges.putIfAbsent(id, newGauge); - return existingGauge == null ? registry.gauge(id, newGauge) : existingGauge; - } - - private AtomicLong getCounterStorage(Id id) { - final AtomicLong newCounter = new AtomicLong(0); - final AtomicLong existingCounter = counters.putIfAbsent(id, newCounter); - return existingCounter == null ? registry.gauge(id, newCounter) : existingCounter; - } -} diff --git a/spring-cloud-netflix-spectator/src/main/java/org/springframework/cloud/netflix/metrics/spectator/SpectatorMetricsAutoConfiguration.java b/spring-cloud-netflix-spectator/src/main/java/org/springframework/cloud/netflix/metrics/spectator/SpectatorMetricsAutoConfiguration.java deleted file mode 100644 index 4866e357..00000000 --- a/spring-cloud-netflix-spectator/src/main/java/org/springframework/cloud/netflix/metrics/spectator/SpectatorMetricsAutoConfiguration.java +++ /dev/null @@ -1,95 +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.netflix.metrics.spectator; - -import org.springframework.boot.actuate.autoconfigure.metrics.MetricRepositoryAutoConfiguration; -import org.springframework.boot.actuate.endpoint.MetricReaderPublicMetrics; -import org.springframework.boot.actuate.metrics.CounterService; -import org.springframework.boot.actuate.metrics.GaugeService; -import org.springframework.boot.actuate.metrics.reader.MetricReader; -import org.springframework.boot.autoconfigure.AutoConfigureBefore; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.cloud.netflix.metrics.DefaultMetricsTagProvider; -import org.springframework.cloud.netflix.metrics.MetricsInterceptorConfiguration; -import org.springframework.cloud.netflix.metrics.MetricsTagProvider; -import org.springframework.cloud.netflix.metrics.servo.ServoMetricsConfigBean; -import org.springframework.cloud.netflix.metrics.servo.ServoMonitorCache; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; - -import com.netflix.servo.DefaultMonitorRegistry; -import com.netflix.servo.MonitorRegistry; -import com.netflix.spectator.api.Registry; -import com.netflix.spectator.servo.ServoRegistry; - -/** - * Configures a basic Spectator registry that bridges to the legacy Servo API. We use this - * bridge because servo contains an Atlas plugin that allows us to easily send all - * Spectator metrics to Atlas. Servo contains a similar plugin for Graphite. - * - * Conditionally configures both an MVC interceptor and a RestTemplate interceptor that - * records metrics for request handling timings. - * - * @author Jon Schneider - */ -@Configuration -@AutoConfigureBefore(MetricRepositoryAutoConfiguration.class) -@ConditionalOnClass({ Registry.class, MetricReader.class }) -@Import(MetricsInterceptorConfiguration.class) -public class SpectatorMetricsAutoConfiguration { - - @Bean - @ConditionalOnMissingBean - public ServoMetricsConfigBean servoMetricsConfig() { - return new ServoMetricsConfigBean(); - } - - @Bean - @ConditionalOnMissingBean - public MonitorRegistry monitorRegistry(ServoMetricsConfigBean configBean) { - System.setProperty(DefaultMonitorRegistry.class.getCanonicalName() - + ".registryClass", configBean.getRegistryClass()); - return DefaultMonitorRegistry.getInstance(); - } - - @Bean - @ConditionalOnMissingBean(Registry.class) - Registry registry(MonitorRegistry monitorRegistry) { - return new ServoRegistry(); - } - - @Bean - public ServoMonitorCache monitorCache(MonitorRegistry monitorRegistry, ServoMetricsConfigBean configBean) { - return new ServoMonitorCache(monitorRegistry, configBean); - } - - @Bean - @ConditionalOnMissingBean({ CounterService.class, GaugeService.class }) - public SpectatorMetricServices spectatorMetricServices(Registry metricRegistry) { - return new SpectatorMetricServices(metricRegistry); - } - - @Bean - public MetricReaderPublicMetrics spectatorPublicMetrics(Registry metricRegistry) { - SpectatorMetricReader reader = new SpectatorMetricReader(metricRegistry); - return new MetricReaderPublicMetrics(reader); - } - - @Bean - public MetricsTagProvider defaultMetricsTagProvider() { - return new DefaultMetricsTagProvider(); - } -} diff --git a/spring-cloud-netflix-spectator/src/main/resources/META-INF/spring.factories b/spring-cloud-netflix-spectator/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 2f16dbb5..00000000 --- a/spring-cloud-netflix-spectator/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.netflix.metrics.spectator.SpectatorMetricsAutoConfiguration \ No newline at end of file diff --git a/spring-cloud-netflix-spectator/src/test/java/org/springframework/cloud/netflix/metrics/spectator/SpectatorMetricReaderTests.java b/spring-cloud-netflix-spectator/src/test/java/org/springframework/cloud/netflix/metrics/spectator/SpectatorMetricReaderTests.java deleted file mode 100644 index 68e3194e..00000000 --- a/spring-cloud-netflix-spectator/src/test/java/org/springframework/cloud/netflix/metrics/spectator/SpectatorMetricReaderTests.java +++ /dev/null @@ -1,99 +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.netflix.metrics.spectator; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Map; - -import org.junit.Test; - -import com.netflix.spectator.api.Id; -import com.netflix.spectator.api.Tag; - -import static org.junit.Assert.assertEquals; -import static org.springframework.cloud.netflix.metrics.spectator.SpectatorMetricReader.asHierarchicalName; - -/** - * @author Jon Schneider - */ -public class SpectatorMetricReaderTests { - @Test - public void convertSpectatorMetricWithTagsToHierarchicalName() { - Id mWithTags = new SimpleId("m", "t1", "val1", "t2", "val2"); - assertEquals("m(t1=val1,t2=val2)", asHierarchicalName(mWithTags)); - } - - private class SimpleTag implements Tag { - String key; - String value; - - public SimpleTag(String key, String value) { - this.key = key; - this.value = value; - } - - @Override - public String key() { - return key; - } - - @Override - public String value() { - return value; - } - } - - private class SimpleId implements Id { - String name; - Collection tags; - - public SimpleId(String name, String... tagPairs) { - this.name = name; - tags = new ArrayList<>(); - for (int i = 0; i < tagPairs.length; i += 2) - tags.add(new SimpleTag(tagPairs[i], tagPairs[i + 1])); - } - - @Override - public String name() { - return name; - } - - @Override - public Iterable tags() { - return tags; - } - - @Override - public Id withTag(String s, String s1) { - return null; - } - - @Override - public Id withTag(Tag tag) { - return null; - } - - @Override - public Id withTags(Iterable iterable) { - return null; - } - - @Override - public Id withTags(Map map) { - return null; - } - } -} diff --git a/spring-cloud-netflix-spectator/src/test/java/org/springframework/cloud/netflix/metrics/spectator/SpectatorMetricServicesTests.java b/spring-cloud-netflix-spectator/src/test/java/org/springframework/cloud/netflix/metrics/spectator/SpectatorMetricServicesTests.java deleted file mode 100644 index 0624ff88..00000000 --- a/spring-cloud-netflix-spectator/src/test/java/org/springframework/cloud/netflix/metrics/spectator/SpectatorMetricServicesTests.java +++ /dev/null @@ -1,123 +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.netflix.metrics.spectator; - -import com.netflix.spectator.api.DefaultRegistry; -import com.netflix.spectator.api.Measurement; -import com.netflix.spectator.api.Registry; -import org.junit.Test; - -import java.util.Iterator; -import java.util.concurrent.TimeUnit; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.springframework.cloud.netflix.metrics.spectator.SpectatorMetricServices.stripMetricName; - -public class SpectatorMetricServicesTests { - @Test - public void metricNameWithNoTypeIsLeftUnchanged() { - assertEquals("foo", stripMetricName("foo")); - assertEquals("foo.bar", stripMetricName("foo.bar")); - } - - @Test - public void metricTypeIsStrippedFromMetricName() { - assertEquals("foo", stripMetricName("timer.foo")); - assertEquals("foo", stripMetricName("histogram.foo")); - assertEquals("foo", stripMetricName("meter.foo")); - } - - @Test - public void metricTypeNameEmbeddedInMiddleOfMetricNameIsNotRemoved() { - assertEquals("bar.timer.foo", stripMetricName("bar.timer.foo")); - } - - @Test - public void meterPrefixShouldIncrementCounter() { - Registry registry = new DefaultRegistry(); - SpectatorMetricServices ms = new SpectatorMetricServices(registry); - ms.increment("meter.test"); - assertEquals(1, registry.counter("test").count()); - } - - @Test - public void otherPrefixShouldUpdateGauge() { - Registry registry = new DefaultRegistry(); - SpectatorMetricServices ms = new SpectatorMetricServices(registry); - - ms.increment("gauge.test"); - assertGaugeEquals(registry, "gauge.test", 1.0); - - ms.decrement("gauge.test"); - assertGaugeEquals(registry, "gauge.test", 0.0); - } - - @Test - public void histogramSubmit() { - Registry registry = new DefaultRegistry(); - SpectatorMetricServices ms = new SpectatorMetricServices(registry); - ms.submit("histogram.test", 42.0); - assertEquals(1L, registry.distributionSummary("test").count()); - assertEquals(42L, registry.distributionSummary("test").totalAmount()); - } - - @Test - public void timerSubmit() { - Registry registry = new DefaultRegistry(); - SpectatorMetricServices ms = new SpectatorMetricServices(registry); - ms.submit("timer.test", 42.0); - assertEquals(1L, registry.timer("test").count()); - assertEquals(TimeUnit.MILLISECONDS.toNanos(42L), registry.timer("test").totalTime()); - } - - @Test - public void timerMicrosSubmit() { - Registry registry = new DefaultRegistry(); - SpectatorMetricServices ms = new SpectatorMetricServices(registry); - ms.submit("timer.test", 0.042); - assertEquals(1L, registry.timer("test").count()); - assertEquals(TimeUnit.MICROSECONDS.toNanos(42L), registry.timer("test").totalTime()); - } - - @Test - public void gaugeSubmit() { - Registry registry = new DefaultRegistry(); - SpectatorMetricServices ms = new SpectatorMetricServices(registry); - ms.submit("gauge.test", 42.0); - assertGaugeEquals(registry, "gauge.test", 42.0); - - ms.submit("gauge.test", 1.0); - assertGaugeEquals(registry, "gauge.test", 1.0); - } - - @Test - public void gaugeSubmitManyTimes() { - // Sanity check for memory leak reported in: - // https://github.com/Netflix/spectator/issues/264 - Registry registry = new DefaultRegistry(); - SpectatorMetricServices ms = new SpectatorMetricServices(registry); - for (int i = 0; i < 10000; ++i) { - ms.submit("gauge.test", 42.0); - assertGaugeEquals(registry, "gauge.test", 42.0); - } - } - - private void assertGaugeEquals(Registry registry, String name, double expected) { - Iterator it = registry.get(registry.createId(name)).measure().iterator(); - assertTrue(it.hasNext()); - assertEquals(expected, it.next().value(), 1e-3); - assertTrue(!it.hasNext()); - } -} diff --git a/spring-cloud-netflix-spectator/src/test/java/org/springframework/cloud/netflix/metrics/spectator/SpectatorMetricsHandlerInterceptorIntegrationTests.java b/spring-cloud-netflix-spectator/src/test/java/org/springframework/cloud/netflix/metrics/spectator/SpectatorMetricsHandlerInterceptorIntegrationTests.java deleted file mode 100644 index 9e41ba8c..00000000 --- a/spring-cloud-netflix-spectator/src/test/java/org/springframework/cloud/netflix/metrics/spectator/SpectatorMetricsHandlerInterceptorIntegrationTests.java +++ /dev/null @@ -1,163 +0,0 @@ -/* - * Copyright 2013-2017 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.netflix.metrics.spectator; - -import static org.junit.Assert.assertFalse; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -import javax.servlet.http.HttpServletRequest; - -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.ImportAutoConfiguration; -import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; -import org.springframework.cloud.netflix.metrics.MetricsHandlerInterceptor; -import org.springframework.cloud.netflix.metrics.servo.ServoMonitorCache; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.http.HttpStatus; -import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.web.bind.annotation.ControllerAdvice; -import org.springframework.web.bind.annotation.ExceptionHandler; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseStatus; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.context.WebApplicationContext; -import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.config.annotation.EnableWebMvc; - -import com.netflix.servo.MonitorRegistry; -import com.netflix.servo.monitor.BasicTimer; -import com.netflix.servo.monitor.MonitorConfig; - -/** - * @author Jon Schneider - */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = SpectatorMetricsTestConfig.class) -@WebAppConfiguration -@TestPropertySource(properties = "netflix.metrics.rest.metricName=metricName") -@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD) -public class SpectatorMetricsHandlerInterceptorIntegrationTests { - @Autowired - WebApplicationContext webAppContext; - - @Autowired - MonitorRegistry registry; - - @Autowired - ServoMonitorCache servoMonitorCache; - - MockMvc mvc; - - @Test - public void autoConfigurationWiresTheMetricsInterceptor() { - assertFalse( - webAppContext.getBeansOfType(MetricsHandlerInterceptor.class).isEmpty()); - } - - @Before - public void setup() { - mvc = MockMvcBuilders.webAppContextSetup(webAppContext).build(); - } - - @Test - public void metricsGatheredWhenSuccess() throws Exception { - mvc.perform(get("/test/some/request/10")).andExpect(status().isOk()); - assertTimer("test_some_request_-id-", null, 200); - } - - @Test - public void metricsGatheredWhenClientRequestBad() throws Exception { - mvc.perform(get("/test/some/request/oops")) - .andExpect(status().is4xxClientError()); - assertTimer("test_some_request_-id-", null, 400); - } - - @Test - public void metricsGatheredWhenUnhandledError() throws Exception { - try { - mvc.perform(get("/test/some/unhandledError/10")).andExpect(status().isOk()); - } - catch (Exception e) { - } - assertTimer("test_some_unhandledError_-id-", "RuntimeException", 200); - } - - @Test - public void metricsGatheredWhenHandledError() throws Exception { - mvc.perform(get("/test/some/error/10")).andExpect(status().is4xxClientError()); - assertTimer("test_some_error_-id-", null, 422); - } - - protected void assertTimer(String uriTag, String exceptionType, Integer status) { - MonitorConfig.Builder builder = new MonitorConfig.Builder("metricName") - .withTag("method", "GET").withTag("uri", uriTag) - .withTag("status", status.toString()); - - if (exceptionType != null) - builder = builder.withTag("exception", exceptionType); - - BasicTimer timer = servoMonitorCache.getTimer(builder.build()); - Assert.assertEquals(1L, (long) timer.getCount()); - } -} - -@Configuration -@EnableWebMvc -@ImportAutoConfiguration({ SpectatorMetricsAutoConfiguration.class, - PropertyPlaceholderAutoConfiguration.class }) -class SpectatorMetricsTestConfig { - @Bean - SpectatorMetricsTestController testController() { - return new SpectatorMetricsTestController(); - } -} - -@RestController -@RequestMapping("/test/some") -@ControllerAdvice -class SpectatorMetricsTestController { - @RequestMapping("/request/{id}") - public String testSomeRequest(@PathVariable Long id) { - return id.toString(); - } - - @RequestMapping("/error/{id}") - public String testSomeHandledError(@PathVariable Long id) { - throw new IllegalStateException("Boom on $id!"); - } - - @RequestMapping("/unhandledError/{id}") - public String testSomeUnhandledError(@PathVariable Long id) { - throw new RuntimeException("Boom on $id!"); - } - - @ExceptionHandler(value = IllegalStateException.class) - @ResponseStatus(code = HttpStatus.UNPROCESSABLE_ENTITY) - ModelAndView defaultErrorHandler(HttpServletRequest request, Exception e) { - return new ModelAndView("error"); - } -} \ No newline at end of file diff --git a/spring-cloud-starter-archaius/pom.xml b/spring-cloud-starter-archaius/pom.xml deleted file mode 100644 index 00e183af..00000000 --- a/spring-cloud-starter-archaius/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud - spring-cloud-netflix - 2.0.0.BUILD-SNAPSHOT - .. - - spring-cloud-starter-archaius - spring-cloud-starter-archaius - Spring Cloud Starter Archaius (deprecated, please use spring-cloud-starter-netflix-archaius) - https://projects.spring.io/spring-cloud - - Pivotal Software, Inc. - https://www.spring.io - - - ${basedir}/../.. - - - - org.springframework.cloud - spring-cloud-starter-netflix-archaius - - - diff --git a/spring-cloud-starter-archaius/src/main/java/org/springframework/cloud/starter/archaius/ArchaiusStarterDeprecationWarningAutoConfiguration.java b/spring-cloud-starter-archaius/src/main/java/org/springframework/cloud/starter/archaius/ArchaiusStarterDeprecationWarningAutoConfiguration.java deleted file mode 100644 index 4f46f6c6..00000000 --- a/spring-cloud-starter-archaius/src/main/java/org/springframework/cloud/starter/archaius/ArchaiusStarterDeprecationWarningAutoConfiguration.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.springframework.cloud.starter.archaius; - -/** - * Auto configuration to print deprecation warning about starter. - * @author Ryan Baxter - */ - -import javax.annotation.PostConstruct; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.context.annotation.Configuration; - -@Configuration -@Deprecated -public class ArchaiusStarterDeprecationWarningAutoConfiguration { - private static final Log LOGGER = LogFactory.getLog(ArchaiusStarterDeprecationWarningAutoConfiguration.class); - - @PostConstruct - public void logWarning() { - LOGGER.warn("spring-cloud-starter-archaius is deprecated as of Spring Cloud Netflix 1.4.0, " + - "please migrate to spring-cloud-starter-netflix-archaius"); - } -} diff --git a/spring-cloud-starter-archaius/src/main/resources/META-INF/spring.factories b/spring-cloud-starter-archaius/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 81251113..00000000 --- a/spring-cloud-starter-archaius/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -# Auto Configure -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.starter.archaius.ArchaiusStarterDeprecationWarningAutoConfiguration \ No newline at end of file diff --git a/spring-cloud-starter-atlas/pom.xml b/spring-cloud-starter-atlas/pom.xml deleted file mode 100644 index f5787786..00000000 --- a/spring-cloud-starter-atlas/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud - spring-cloud-netflix - 2.0.0.BUILD-SNAPSHOT - .. - - spring-cloud-starter-atlas - spring-cloud-starter-atlas - Spring Cloud Starter Atlas (deprecated, please use spring-cloud-starter-netflix-atlas - https://projects.spring.io/spring-cloud - - Pivotal Software, Inc. - https://www.spring.io - - - ${basedir}/../.. - - - - org.springframework.cloud - spring-cloud-starter-netflix-atlas - - - diff --git a/spring-cloud-starter-atlas/src/main/java/org/springframework/cloud/starter/atlas/AtlasStarterDeprecationWarningAutoConfiguration.java b/spring-cloud-starter-atlas/src/main/java/org/springframework/cloud/starter/atlas/AtlasStarterDeprecationWarningAutoConfiguration.java deleted file mode 100644 index e37d7602..00000000 --- a/spring-cloud-starter-atlas/src/main/java/org/springframework/cloud/starter/atlas/AtlasStarterDeprecationWarningAutoConfiguration.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.springframework.cloud.starter.atlas; - -import javax.annotation.PostConstruct; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.context.annotation.Configuration; - -/** - * Auto configuration to print warning about atlas starter deprecation. - * @author Ryan Baxter - */ -@Configuration -@Deprecated -public class AtlasStarterDeprecationWarningAutoConfiguration { - private static final Log LOGGER = LogFactory.getLog(AtlasStarterDeprecationWarningAutoConfiguration.class); - - @PostConstruct - public void logWarning() { - LOGGER.warn("spring-cloud-starter-atlas is deprecated as of Spring Cloud Netflix 1.4.0, " + - "please migrate to spring-cloud-starter-netflix-atlas"); - } -} diff --git a/spring-cloud-starter-atlas/src/main/resources/META-INF/spring.factories b/spring-cloud-starter-atlas/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 18290ce1..00000000 --- a/spring-cloud-starter-atlas/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -# Auto Configure -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.starter.atlas.AtlasStarterDeprecationWarningAutoConfiguration \ No newline at end of file diff --git a/spring-cloud-starter-eureka-server/pom.xml b/spring-cloud-starter-eureka-server/pom.xml deleted file mode 100644 index 6eec04ce..00000000 --- a/spring-cloud-starter-eureka-server/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud - spring-cloud-netflix - 2.0.0.BUILD-SNAPSHOT - .. - - spring-cloud-starter-eureka-server - spring-cloud-starter-eureka-server - Spring Cloud Starter Eureka Server (deprecated, please use spring-cloud-starter-netflix-eureka-server) - https://projects.spring.io/spring-cloud - - Pivotal Software, Inc. - https://www.spring.io - - - ${basedir}/../.. - - - - org.springframework.cloud - spring-cloud-starter-netflix-eureka-server - - - diff --git a/spring-cloud-starter-eureka-server/src/main/java/org/springframework/cloud/starter/eureka/server/EurekaServerStarterDeprecationWarningAutoConfiguration.java b/spring-cloud-starter-eureka-server/src/main/java/org/springframework/cloud/starter/eureka/server/EurekaServerStarterDeprecationWarningAutoConfiguration.java deleted file mode 100644 index 9b580dd3..00000000 --- a/spring-cloud-starter-eureka-server/src/main/java/org/springframework/cloud/starter/eureka/server/EurekaServerStarterDeprecationWarningAutoConfiguration.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.springframework.cloud.starter.eureka.server; - -import javax.annotation.PostConstruct; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.context.annotation.Configuration; - -/** - * Auto configuration to print deprecation warning for spring-cloud-starter-eureka-server - * @author Ryan Baxter - */ -@Configuration -@Deprecated -public class EurekaServerStarterDeprecationWarningAutoConfiguration { - private static final Log LOGGER = LogFactory.getLog(EurekaServerStarterDeprecationWarningAutoConfiguration.class); - - @PostConstruct - public void logWarning() { - LOGGER.warn("spring-cloud-starter-eureka-server is deprecated as of Spring Cloud Netflix 1.4.0, " + - "please migrate to spring-cloud-starter-netflix-eureka-server"); - } -} diff --git a/spring-cloud-starter-eureka-server/src/main/resources/META-INF/spring.factories b/spring-cloud-starter-eureka-server/src/main/resources/META-INF/spring.factories deleted file mode 100644 index b860d497..00000000 --- a/spring-cloud-starter-eureka-server/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -# Auto Configure -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.starter.eureka.server.EurekaServerStarterDeprecationWarningAutoConfiguration \ No newline at end of file diff --git a/spring-cloud-starter-eureka/pom.xml b/spring-cloud-starter-eureka/pom.xml deleted file mode 100644 index f2248d55..00000000 --- a/spring-cloud-starter-eureka/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud - spring-cloud-netflix - 2.0.0.BUILD-SNAPSHOT - .. - - spring-cloud-starter-eureka - spring-cloud-starter-eureka - Spring Cloud Starter Eureka (deprecated, please use spring-cloud-starter-netflix-eureka-client - https://projects.spring.io/spring-cloud - - Pivotal Software, Inc. - https://www.spring.io - - - ${basedir}/../.. - - - - org.springframework.cloud - spring-cloud-starter-netflix-eureka-client - - - diff --git a/spring-cloud-starter-eureka/src/main/java/org/springframework/cloud/starter/eureka/EurekaStarterDeprecationWarningAutoConfiguration.java b/spring-cloud-starter-eureka/src/main/java/org/springframework/cloud/starter/eureka/EurekaStarterDeprecationWarningAutoConfiguration.java deleted file mode 100644 index 78f5570a..00000000 --- a/spring-cloud-starter-eureka/src/main/java/org/springframework/cloud/starter/eureka/EurekaStarterDeprecationWarningAutoConfiguration.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.springframework.cloud.starter.eureka; - -import javax.annotation.PostConstruct; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.context.annotation.Configuration; - -/** - * Auto configuration to print warning message about Eureka starter deprecation - * @author Ryan Baxter - */ -@Configuration -@Deprecated -public class EurekaStarterDeprecationWarningAutoConfiguration { - private static final Log LOGGER = LogFactory.getLog(EurekaStarterDeprecationWarningAutoConfiguration.class); - - @PostConstruct - public void logWarning() { - LOGGER.warn("spring-cloud-starter-eureka is deprecated as of Spring Cloud Netflix 1.4.0, " + - "please migrate to spring-cloud-starter-netflix-eureka"); - } -} diff --git a/spring-cloud-starter-eureka/src/main/resources/META-INF/spring.factories b/spring-cloud-starter-eureka/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 72e87223..00000000 --- a/spring-cloud-starter-eureka/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -# Auto Configure -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.starter.eureka.EurekaStarterDeprecationWarningAutoConfiguration \ No newline at end of file diff --git a/spring-cloud-starter-feign/pom.xml b/spring-cloud-starter-feign/pom.xml deleted file mode 100644 index 5465e8d1..00000000 --- a/spring-cloud-starter-feign/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud - spring-cloud-netflix - 2.0.0.BUILD-SNAPSHOT - .. - - spring-cloud-starter-feign - spring-cloud-starter-feign - Spring Cloud Starter Feign (deprecated, please use spring-cloud-starter-openfeign) - https://projects.spring.io/spring-cloud - - Pivotal Software, Inc. - https://www.spring.io - - - ${basedir}/../.. - - - - org.springframework.cloud - spring-cloud-starter-openfeign - - - diff --git a/spring-cloud-starter-feign/src/main/java/org/springframework/cloud/starter/feign/FeignStarterDeprecationWarningAutoConfiguration.java b/spring-cloud-starter-feign/src/main/java/org/springframework/cloud/starter/feign/FeignStarterDeprecationWarningAutoConfiguration.java deleted file mode 100644 index 0fae2f04..00000000 --- a/spring-cloud-starter-feign/src/main/java/org/springframework/cloud/starter/feign/FeignStarterDeprecationWarningAutoConfiguration.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.springframework.cloud.starter.feign; - -import javax.annotation.PostConstruct; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.context.annotation.Configuration; - -/** - * Auto configuration to log warning about deprecation of starter - * @author Ryan Baxter - */ -@Configuration -@Deprecated -public class FeignStarterDeprecationWarningAutoConfiguration { - private static final Log LOGGER = LogFactory.getLog(FeignStarterDeprecationWarningAutoConfiguration.class); - - @PostConstruct - public void logWarning() { - LOGGER.warn("spring-cloud-starter-feign is deprecated as of Spring Cloud Netflix 1.4.0, " + - "please migrate to spring-cloud-starter-openfeign"); - } -} diff --git a/spring-cloud-starter-feign/src/resources/META-INF/spring.factories b/spring-cloud-starter-feign/src/resources/META-INF/spring.factories deleted file mode 100644 index b2fd5b0f..00000000 --- a/spring-cloud-starter-feign/src/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -# Auto Configure -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -oorg.springframework.cloud.starter.feign.FeignStarterDeprecationWarningAutoConfiguration \ No newline at end of file diff --git a/spring-cloud-starter-hystrix-dashboard/pom.xml b/spring-cloud-starter-hystrix-dashboard/pom.xml deleted file mode 100644 index 3ee05f30..00000000 --- a/spring-cloud-starter-hystrix-dashboard/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud - spring-cloud-netflix - 2.0.0.BUILD-SNAPSHOT - .. - - spring-cloud-starter-hystrix-dashboard - spring-cloud-starter-hystrix-dashboard - Spring Cloud Starter Hystrix Dashboard (deprecated, please use spring-cloud-starter-hystrix-dashboard) - https://projects.spring.io/spring-cloud - - Pivotal Software, Inc. - https://www.spring.io - - - ${basedir}/../.. - - - - org.springframework.cloud - spring-cloud-starter-netflix-hystrix-dashboard - - - diff --git a/spring-cloud-starter-hystrix-dashboard/src/main/java/org/springframework/cloud/starter/hystrix/dashboard/HystrixDashboardDeprecationWarningAutoConfiguration.java b/spring-cloud-starter-hystrix-dashboard/src/main/java/org/springframework/cloud/starter/hystrix/dashboard/HystrixDashboardDeprecationWarningAutoConfiguration.java deleted file mode 100644 index e9ffbf39..00000000 --- a/spring-cloud-starter-hystrix-dashboard/src/main/java/org/springframework/cloud/starter/hystrix/dashboard/HystrixDashboardDeprecationWarningAutoConfiguration.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.springframework.cloud.starter.hystrix.dashboard; - -import javax.annotation.PostConstruct; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.context.annotation.Configuration; - -/** - * Auto configuration to log a warning about starter being deprecated - * @author Ryan Baxter - */ -@Configuration -@Deprecated -public class HystrixDashboardDeprecationWarningAutoConfiguration { - private static final Log LOGGER = LogFactory.getLog(HystrixDashboardDeprecationWarningAutoConfiguration.class); - - @PostConstruct - public void logWarning() { - LOGGER.warn("spring-cloud-starter-hystrix-dashboard is deprecated as of Spring Cloud Netflix 1.4.0, " + - "please migrate to spring-cloud-starter-netflix-hystrix-dashboard"); - } -} diff --git a/spring-cloud-starter-hystrix-dashboard/src/resources/META-INF/spring.factories b/spring-cloud-starter-hystrix-dashboard/src/resources/META-INF/spring.factories deleted file mode 100644 index 4c76033e..00000000 --- a/spring-cloud-starter-hystrix-dashboard/src/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -# Auto Configure -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.starter.hystrix.dashboard.HystrixDashboardDeprecationWarningAutoConfiguration \ No newline at end of file diff --git a/spring-cloud-starter-hystrix/pom.xml b/spring-cloud-starter-hystrix/pom.xml deleted file mode 100644 index 9f4353ea..00000000 --- a/spring-cloud-starter-hystrix/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud - spring-cloud-netflix - 2.0.0.BUILD-SNAPSHOT - .. - - spring-cloud-starter-hystrix - spring-cloud-starter-hystrix - Spring Cloud Starter Hystrix (deprecated, please use spring-cloud-starter-netflix-hystrix) - https://projects.spring.io/spring-cloud - - Pivotal Software, Inc. - https://www.spring.io - - - ${basedir}/../.. - - - - org.springframework.cloud - spring-cloud-starter-netflix-hystrix - - - diff --git a/spring-cloud-starter-hystrix/src/main/java/org/springframework/cloud/starter/hystrix/HystrixStarterDeprecationWarningAutoConfiguration.java b/spring-cloud-starter-hystrix/src/main/java/org/springframework/cloud/starter/hystrix/HystrixStarterDeprecationWarningAutoConfiguration.java deleted file mode 100644 index 0ab42c0f..00000000 --- a/spring-cloud-starter-hystrix/src/main/java/org/springframework/cloud/starter/hystrix/HystrixStarterDeprecationWarningAutoConfiguration.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.springframework.cloud.starter.hystrix; - -import javax.annotation.PostConstruct; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.context.annotation.Configuration; - -/** - * Auto configuration class to print deprecation warning for starter - * @author Ryan Baxter - */ -@Configuration -@Deprecated -public class HystrixStarterDeprecationWarningAutoConfiguration { - private static final Log LOGGER = LogFactory.getLog(HystrixStarterDeprecationWarningAutoConfiguration.class); - - @PostConstruct - public void logWarning() { - LOGGER.warn("spring-cloud-starter-hystrix is deprecated as of Spring Cloud Netflix 1.4.0, " + - "please migrate to spring-cloud-starter-netflix-hystrix"); - } -} diff --git a/spring-cloud-starter-hystrix/src/resources/META-INF/spring.factories b/spring-cloud-starter-hystrix/src/resources/META-INF/spring.factories deleted file mode 100644 index e8fcc3bc..00000000 --- a/spring-cloud-starter-hystrix/src/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -# Auto Configure -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.starter.hystrix.HystrixStarterDeprecationWarningAutoConfiguration \ No newline at end of file diff --git a/spring-cloud-starter-ribbon/pom.xml b/spring-cloud-starter-ribbon/pom.xml deleted file mode 100644 index d046f0e0..00000000 --- a/spring-cloud-starter-ribbon/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud - spring-cloud-netflix - 2.0.0.BUILD-SNAPSHOT - .. - - spring-cloud-starter-ribbon - spring-cloud-starter-ribbon - Spring Cloud Starter Ribbon (deprecated, please use spring-cloud-starter-netflix-ribbon) - https://projects.spring.io/spring-cloud - - Pivotal Software, Inc. - https://www.spring.io - - - ${basedir}/../.. - - - - org.springframework.cloud - spring-cloud-starter-netflix-ribbon - - - diff --git a/spring-cloud-starter-ribbon/src/main/java/org/springframework/cloud/starter/ribbon/RibbonDeprecationWarningAutoConfiguration.java b/spring-cloud-starter-ribbon/src/main/java/org/springframework/cloud/starter/ribbon/RibbonDeprecationWarningAutoConfiguration.java deleted file mode 100644 index bc1f86e9..00000000 --- a/spring-cloud-starter-ribbon/src/main/java/org/springframework/cloud/starter/ribbon/RibbonDeprecationWarningAutoConfiguration.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.springframework.cloud.starter.ribbon; - -import javax.annotation.PostConstruct; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.context.annotation.Configuration; - -/** - * Auto configuration to print deprecation warning for starter - * @author Ryan Baxter - */ -@Configuration -@Deprecated -public class RibbonDeprecationWarningAutoConfiguration { - private static final Log LOGGER = LogFactory.getLog(RibbonDeprecationWarningAutoConfiguration.class); - - @PostConstruct - public void logWarning() { - LOGGER.warn("spring-cloud-starter-ribbon is deprecated as of Spring Cloud Netflix 1.4.0, " + - "please migrate to spring-cloud-starter-netflix-ribbon"); - } -} diff --git a/spring-cloud-starter-ribbon/src/resources/META-INF/spring.factories b/spring-cloud-starter-ribbon/src/resources/META-INF/spring.factories deleted file mode 100644 index 2ff63c60..00000000 --- a/spring-cloud-starter-ribbon/src/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -# Auto Configure -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.starter.ribbon.RibbonDeprecationWarningAutoConfiguration \ No newline at end of file diff --git a/spring-cloud-starter-spectator/pom.xml b/spring-cloud-starter-spectator/pom.xml deleted file mode 100644 index 99285081..00000000 --- a/spring-cloud-starter-spectator/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud - spring-cloud-netflix - 2.0.0.BUILD-SNAPSHOT - .. - - spring-cloud-starter-spectator - spring-cloud-starter-spectator - Spring Cloud Starter Spectator (deprecated, please use spring-cloud-starter-netflix-spectator) - https://projects.spring.io/spring-cloud - - Pivotal Software, Inc. - https://www.spring.io - - - ${basedir}/../.. - - - - org.springframework.cloud - spring-cloud-starter-netflix-spectator - - - diff --git a/spring-cloud-starter-spectator/src/main/java/org/springframework/cloud/starter/spectator/SpectatorDeprecationWarningAutoConfiguration.java b/spring-cloud-starter-spectator/src/main/java/org/springframework/cloud/starter/spectator/SpectatorDeprecationWarningAutoConfiguration.java deleted file mode 100644 index 0d83acd1..00000000 --- a/spring-cloud-starter-spectator/src/main/java/org/springframework/cloud/starter/spectator/SpectatorDeprecationWarningAutoConfiguration.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.springframework.cloud.starter.spectator; - -import javax.annotation.PostConstruct; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.context.annotation.Configuration; - -/** - * Auto configuration to print deprecation warning for starter - * @author Ryan Baxter - */ -@Configuration -@Deprecated -public class SpectatorDeprecationWarningAutoConfiguration { - private static final Log LOGGER = LogFactory.getLog(SpectatorDeprecationWarningAutoConfiguration.class); - - @PostConstruct - public void logWarning() { - LOGGER.warn("spring-cloud-starter-spectator is deprecated as of Spring Cloud Netflix 1.4.0, " + - "please migrate to spring-cloud-starter-netflix-spectator"); - } -} diff --git a/spring-cloud-starter-spectator/src/resources/META-INF/spring.factories b/spring-cloud-starter-spectator/src/resources/META-INF/spring.factories deleted file mode 100644 index a8e36332..00000000 --- a/spring-cloud-starter-spectator/src/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -# Auto Configure -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.starter.spectator.SpectatorDeprecationWarningAutoConfiguration \ No newline at end of file diff --git a/spring-cloud-starter-turbine-amqp/pom.xml b/spring-cloud-starter-turbine-amqp/pom.xml deleted file mode 100644 index c9293554..00000000 --- a/spring-cloud-starter-turbine-amqp/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud - spring-cloud-netflix - 2.0.0.BUILD-SNAPSHOT - .. - - spring-cloud-starter-turbine-amqp - spring-cloud-starter-turbine-amqp - Spring Cloud Starter Turbine AMQP (deprecated, please use spring-cloud-starter-netflix-turbine-stream) - https://projects.spring.io/spring-cloud - - Pivotal Software, Inc. - https://www.spring.io - - - ${basedir}/../.. - - - - org.springframework.cloud - spring-cloud-starter-netflix-turbine-amqp - - - diff --git a/spring-cloud-starter-turbine-amqp/src/main/java/org/springframework/cloud/starter/turbine/amqp/TurbineAmqpDeprecationWarningAutoConfiguration.java b/spring-cloud-starter-turbine-amqp/src/main/java/org/springframework/cloud/starter/turbine/amqp/TurbineAmqpDeprecationWarningAutoConfiguration.java deleted file mode 100644 index 7b56c611..00000000 --- a/spring-cloud-starter-turbine-amqp/src/main/java/org/springframework/cloud/starter/turbine/amqp/TurbineAmqpDeprecationWarningAutoConfiguration.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.springframework.cloud.starter.turbine.amqp; - -import javax.annotation.PostConstruct; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.context.annotation.Configuration; - -/** - * Auto configuration class to print deprecation warning for starter - * @author Ryan Baxter - */ -@Configuration -@Deprecated -public class TurbineAmqpDeprecationWarningAutoConfiguration { - private static final Log LOGGER = LogFactory.getLog(TurbineAmqpDeprecationWarningAutoConfiguration.class); - - @PostConstruct - public void logWarning() { - LOGGER.warn("spring-cloud-starter-turbine-amqp is deprecated as of Spring Cloud Netflix 1.4.0, " + - "please migrate to spring-cloud-starter-netflix-turbine-amqp"); - } -} diff --git a/spring-cloud-starter-turbine-amqp/src/main/resources/META-INF/spring.factories b/spring-cloud-starter-turbine-amqp/src/main/resources/META-INF/spring.factories deleted file mode 100644 index cbcd3394..00000000 --- a/spring-cloud-starter-turbine-amqp/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -# Auto Configure -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.starter.turbine.amqp.TurbineAmqpDeprecationWarningAutoConfiguration \ No newline at end of file diff --git a/spring-cloud-starter-turbine-stream/pom.xml b/spring-cloud-starter-turbine-stream/pom.xml deleted file mode 100644 index ca8a6e04..00000000 --- a/spring-cloud-starter-turbine-stream/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud - spring-cloud-netflix - 2.0.0.BUILD-SNAPSHOT - .. - - spring-cloud-starter-turbine-stream - spring-cloud-starter-turbine-stream - Spring Cloud Starter Turbine Stream (deprecated, please use spring-cloud-starter-netflix-turbine-stream) - https://projects.spring.io/spring-cloud - - Pivotal Software, Inc. - https://www.spring.io - - - ${basedir}/../.. - 2.0.0-DP.2 - - - - org.springframework.cloud - spring-cloud-starter-netflix-turbine-stream - - - diff --git a/spring-cloud-starter-turbine-stream/src/main/java/org/springframework/cloud/starter/turbine/stream/TurbineStreamDeprecationWarningAutoConfiguration.java b/spring-cloud-starter-turbine-stream/src/main/java/org/springframework/cloud/starter/turbine/stream/TurbineStreamDeprecationWarningAutoConfiguration.java deleted file mode 100644 index 0038e75d..00000000 --- a/spring-cloud-starter-turbine-stream/src/main/java/org/springframework/cloud/starter/turbine/stream/TurbineStreamDeprecationWarningAutoConfiguration.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.springframework.cloud.starter.turbine.stream; - -import javax.annotation.PostConstruct; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.context.annotation.Configuration; - -/** - * Auto configuration to print deprecation warning for starter - * @author Ryan Baxter - */ -@Configuration -@Deprecated -public class TurbineStreamDeprecationWarningAutoConfiguration { - private static final Log LOGGER = LogFactory.getLog(TurbineStreamDeprecationWarningAutoConfiguration.class); - - @PostConstruct - public void logWarning() { - LOGGER.warn("spring-cloud-starter-turbine-stream is deprecated as of Spring Cloud Netflix 1.4.0, " + - "please migrate to spring-cloud-starter-netflix-turbine-stream"); - } -} diff --git a/spring-cloud-starter-turbine-stream/src/resources/META-INF/spring.factories b/spring-cloud-starter-turbine-stream/src/resources/META-INF/spring.factories deleted file mode 100644 index d25a14ad..00000000 --- a/spring-cloud-starter-turbine-stream/src/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -# Auto Configure -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.starter.turbine.stream.TurbineStreamDeprecationWarningAutoConfiguration \ No newline at end of file diff --git a/spring-cloud-starter-turbine/pom.xml b/spring-cloud-starter-turbine/pom.xml deleted file mode 100644 index 181fcf2b..00000000 --- a/spring-cloud-starter-turbine/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud - spring-cloud-netflix - 2.0.0.BUILD-SNAPSHOT - .. - - spring-cloud-starter-turbine - spring-cloud-starter-turbine - Spring Cloud Starter Turbine (deprecated, please use spring-cloud-starter-netflix-turbine) - https://projects.spring.io/spring-cloud - - Pivotal Software, Inc. - https://www.spring.io - - - ${basedir}/../.. - 1.0.0 - - - - org.springframework.cloud - spring-cloud-starter-netflix-turbine - - - diff --git a/spring-cloud-starter-turbine/src/main/java/org/springframework/cloud/starter/turbine/TurbineDeprecationWarningAutoConfiguration.java b/spring-cloud-starter-turbine/src/main/java/org/springframework/cloud/starter/turbine/TurbineDeprecationWarningAutoConfiguration.java deleted file mode 100644 index 6d0f5cd8..00000000 --- a/spring-cloud-starter-turbine/src/main/java/org/springframework/cloud/starter/turbine/TurbineDeprecationWarningAutoConfiguration.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.springframework.cloud.starter.turbine; - -import javax.annotation.PostConstruct; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.context.annotation.Configuration; - -/** - * Auto configuration to print deprecation warning - * @author Ryan Baxter - */ -@Configuration -@Deprecated -public class TurbineDeprecationWarningAutoConfiguration { - private static final Log LOGGER = LogFactory.getLog(TurbineDeprecationWarningAutoConfiguration.class); - - @PostConstruct - public void logWarning() { - LOGGER.warn("spring-cloud-starter-turbine is deprecated as of Spring Cloud Netflix 1.4.0, " + - "please migrate to spring-cloud-starter-netflix-turbine"); - } -} diff --git a/spring-cloud-starter-turbine/src/resources/META-INF/spring.factories b/spring-cloud-starter-turbine/src/resources/META-INF/spring.factories deleted file mode 100644 index e41c926b..00000000 --- a/spring-cloud-starter-turbine/src/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -# Auto Configure -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.starter.turbine.TurbineDeprecationWarningAutoConfiguration \ No newline at end of file diff --git a/spring-cloud-starter-zuul/pom.xml b/spring-cloud-starter-zuul/pom.xml deleted file mode 100644 index bdcc38dd..00000000 --- a/spring-cloud-starter-zuul/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud - spring-cloud-netflix - 2.0.0.BUILD-SNAPSHOT - .. - - spring-cloud-starter-zuul - spring-cloud-starter-zuul - Spring Cloud Starter Zuul (deprecated, please use spring-cloud-starter-netflix-zuul) - https://projects.spring.io/spring-cloud - - Pivotal Software, Inc. - https://www.spring.io - - - ${basedir}/../.. - - - - org.springframework.cloud - spring-cloud-starter-netflix-zuul - - - diff --git a/spring-cloud-starter-zuul/src/main/java/org/springframework/cloud/starter/zuul/ZuulDeprecationWarningAutoConfiguration.java b/spring-cloud-starter-zuul/src/main/java/org/springframework/cloud/starter/zuul/ZuulDeprecationWarningAutoConfiguration.java deleted file mode 100644 index 25884f6e..00000000 --- a/spring-cloud-starter-zuul/src/main/java/org/springframework/cloud/starter/zuul/ZuulDeprecationWarningAutoConfiguration.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.springframework.cloud.starter.zuul; - -import javax.annotation.PostConstruct; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.context.annotation.Configuration; - -/** - * Auto configuration to print deprecation warning for starter - * @author Ryan Baxter - */ -@Configuration -@Deprecated -public class ZuulDeprecationWarningAutoConfiguration { - private static final Log LOGGER = LogFactory.getLog(ZuulDeprecationWarningAutoConfiguration.class); - - @PostConstruct - public void logWarning() { - LOGGER.warn("spring-cloud-starter-zuul is deprecated as of Spring Cloud Netflix 1.4.0, " + - "please migrate to spring-cloud-starter-netflix-zuul"); - } -} diff --git a/spring-cloud-starter-zuul/src/resources/META-INF/spring.factories b/spring-cloud-starter-zuul/src/resources/META-INF/spring.factories deleted file mode 100644 index ae19b960..00000000 --- a/spring-cloud-starter-zuul/src/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -# Auto Configure -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.cloud.starter.zuul.ZuulDeprecationWarningAutoConfiguration \ No newline at end of file