From 80e4408de7c4f4209edc8f5252cd083df7db9480 Mon Sep 17 00:00:00 2001 From: Olga MaciaszekSharma Date: Mon, 26 Apr 2021 19:23:24 +0200 Subject: [PATCH] Remove Ribbon, Hystrix, Zuul and Turbine references from docs and checkstyle. --- docs/src/main/asciidoc/README.adoc | 6 ---- docs/src/main/asciidoc/intro.adoc | 3 +- docs/src/main/asciidoc/maintenance-mode.adoc | 25 --------------- docs/src/main/asciidoc/sagan-index.adoc | 8 +---- .../main/asciidoc/spring-cloud-netflix.adoc | 3 -- src/checkstyle/checkstyle-suppressions.xml | 32 ------------------- 6 files changed, 2 insertions(+), 75 deletions(-) delete mode 100644 docs/src/main/asciidoc/maintenance-mode.adoc diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index 30e7fcca7..2b3210927 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -11,13 +11,7 @@ include::intro.adoc[] * Service Discovery: Eureka instances can be registered and clients can discover the instances using Spring-managed beans * Service Discovery: an embedded Eureka server can be created with declarative Java configuration -* Circuit Breaker: Hystrix clients can be built with a simple annotation-driven method decorator -* Circuit Breaker: embedded Hystrix dashboard with declarative Java configuration -* Client Side Load Balancer: Ribbon -* External Configuration: a bridge from the Spring Environment to Archaius (enables native configuration of Netflix components using Spring Boot conventions) -* Router and Filter: automatic registration of Zuul filters, and a simple convention over configuration approach to reverse proxy creation -include::maintenance-mode.adoc[] == Building diff --git a/docs/src/main/asciidoc/intro.adoc b/docs/src/main/asciidoc/intro.adoc index 6631b3f2c..6d1e599eb 100644 --- a/docs/src/main/asciidoc/intro.adoc +++ b/docs/src/main/asciidoc/intro.adoc @@ -4,6 +4,5 @@ This project provides Netflix OSS integrations for Spring Boot apps through auto and binding to the Spring Environment and other Spring programming model idioms. With a few simple annotations you can quickly enable and configure the common patterns inside your application and build large distributed systems with battle-tested Netflix components. The -patterns provided include Service Discovery (Eureka), Circuit Breaker (Hystrix), -Intelligent Routing (Zuul) and Client Side Load Balancing (Ribbon). +patterns provided include Service Discovery (Eureka). diff --git a/docs/src/main/asciidoc/maintenance-mode.adoc b/docs/src/main/asciidoc/maintenance-mode.adoc deleted file mode 100644 index 1ab6cbe4e..000000000 --- a/docs/src/main/asciidoc/maintenance-mode.adoc +++ /dev/null @@ -1,25 +0,0 @@ -include::_attributes.adoc[] - -== Modules In Maintenance Mode - -Placing a module in maintenance mode means that the Spring Cloud team will no longer be adding new features to the module. -We will fix blocker bugs and security issues, and we will also consider and review small pull requests from the community. - -We intend to continue to support these modules for a period of at least a year from the general availability -of the Greenwich release train. - -The following Spring Cloud Netflix modules and corresponding starters will be placed into maintenance mode: - -* spring-cloud-netflix-archaius -* spring-cloud-netflix-concurrency-limits -* spring-cloud-netflix-hystrix-contract -* spring-cloud-netflix-hystrix-dashboard -* spring-cloud-netflix-hystrix-stream -* spring-cloud-netflix-hystrix -* spring-cloud-netflix-ribbon -* spring-cloud-netflix-turbine-stream -* spring-cloud-netflix-turbine -* spring-cloud-netflix-zuul - -NOTE: This does not include the Eureka modules. - diff --git a/docs/src/main/asciidoc/sagan-index.adoc b/docs/src/main/asciidoc/sagan-index.adoc index f18d3fc3b..a5f210799 100644 --- a/docs/src/main/asciidoc/sagan-index.adoc +++ b/docs/src/main/asciidoc/sagan-index.adoc @@ -1,4 +1,4 @@ -Spring Cloud Netflix provides Netflix OSS integrations for Spring Boot apps through autoconfiguration and binding to the Spring Environment and other Spring programming model idioms. With a few simple annotations you can quickly enable and configure the common patterns inside your application and build large distributed systems with battle-tested Netflix components. The patterns provided include Service Discovery (Eureka), Circuit Breaker (Hystrix), Intelligent Routing (Zuul) and Client Side Load Balancing (Ribbon).. +Spring Cloud Netflix provides Netflix OSS integrations for Spring Boot apps through autoconfiguration and binding to the Spring Environment and other Spring programming model idioms. With a few simple annotations you can quickly enable and configure the common patterns inside your application and build large distributed systems with battle-tested Netflix components. The patterns provided include Service Discovery (Eureka). ## Features @@ -6,12 +6,6 @@ Spring Cloud Netflix features: * Service Discovery: Eureka instances can be registered and clients can discover the instances using Spring-managed beans * Service Discovery: an embedded Eureka server can be created with declarative Java configuration -* Circuit Breaker: Hystrix clients can be built with a simple annotation-driven method decorator -* Circuit Breaker: embedded Hystrix dashboard with declarative Java configuration -* Declarative REST Client: Feign creates a dynamic implementation of an interface decorated with JAX-RS or Spring MVC annotations -* Client Side Load Balancer: Ribbon -* External Configuration: a bridge from the Spring Environment to Archaius (enables native configuration of Netflix components using Spring Boot conventions) -* Router and Filter: automatic registration of Zuul filters, and a simple convention over configuration approach to reverse proxy creation ## Getting Started diff --git a/docs/src/main/asciidoc/spring-cloud-netflix.adoc b/docs/src/main/asciidoc/spring-cloud-netflix.adoc index 0c9bd5a85..205a195ed 100755 --- a/docs/src/main/asciidoc/spring-cloud-netflix.adoc +++ b/docs/src/main/asciidoc/spring-cloud-netflix.adoc @@ -292,7 +292,6 @@ The following example shows the dependencies you need to add: You need not use the raw Netflix `EurekaClient`. Also, it is usually more convenient to use it behind a wrapper of some sort. Spring Cloud has support for <> (a REST client builder) and <> through the logical Eureka service identifiers (VIPs) instead of physical URLs. -To configure Ribbon with a fixed list of physical servers, you can set `.ribbon.listOfServers` to a comma-separated list of physical addresses (or hostnames), where `` is the ID of the client. You can also use the `org.springframework.cloud.client.discovery.DiscoveryClient`, which provides a simple API (not specific to Netflix) for discovery clients, as shown in the following example: @@ -440,8 +439,6 @@ Clients also have an in-memory cache of Eureka registrations (so they do not hav By default, every Eureka server is also a Eureka client and requires (at least one) service URL to locate a peer. If you do not provide it, the service runs and works, but it fills your logs with a lot of noise about not being able to register with the peer. -See also <> on the client side for Zones and Regions. - [[spring-cloud-eureka-server-standalone-mode]] === Standalone Mode diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml index d22cad749..4d9d7390e 100644 --- a/src/checkstyle/checkstyle-suppressions.xml +++ b/src/checkstyle/checkstyle-suppressions.xml @@ -3,44 +3,12 @@ "-//Puppy Crawl//DTD Suppressions 1.1//EN" "https://www.puppycrawl.com/dtds/suppressions_1_1.dtd"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -