Update SNAPSHOT to 2.1.1.RELEASE

# Conflicts:
#	docs/README.adoc
#	pom.xml
#	spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java
#	spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java
#	spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/ConditionalOnRibbonAndEurekaEnabled.java
#	spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfigurationTests.java

.circleci/config.yml

@@ -0,0 +1,42 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: springcloud/pipeline-base
+        user: appuser
+    environment:
+      _JAVA_OPTIONS: "-Xms1024m -Xmx2048m"
+      TERM: dumb
+    branches:
+      ignore:
+        - gh-pages # list of branches to ignore
+    resource_class: large
+    steps:
+      - checkout
+      - restore_cache:
+          key: sc-netflix-{{ .Branch }}
+      - run:
+          name: "Download dependencies"
+          command: |
+            cd spring-cloud-netflix-hystrix-contract && ../mvnw clean install && \
+            ./mvnw -s .settings.xml -U --fail-never dependency:go-offline || true
+      - save_cache:
+          key: sc-netflix-{{ .Branch }}
+          paths:
+            - ~/.m2
+      - run:
+          name: "Running build"
+          command: ./mvnw -s .settings.xml clean org.jacoco:jacoco-maven-plugin:prepare-agent install -U -P sonar -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+      - run:
+          name: "Aggregate test results"
+          when: always
+          command: |
+            mkdir -p ~/junit/
+            find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} ~/junit/ \;
+            bash <(curl -s https://codecov.io/bash)
+      - store_artifacts:
+          path: ~/junit/
+          destination: artifacts
+      - store_test_results:
+          path: ~/junit/
+          destination: testartifacts

.editorconfig

@@ -0,0 +1,16 @@
+root=true
+
+[*.java]
+indent_style = tab
+indent_size = 4
+continuation_indent_size = 8
+
+[*.groovy]
+indent_style = tab
+indent_size = 4
+continuation_indent_size = 8
+
+[*.xml]
+indent_style = tab
+indent_size = 4
+continuation_indent_size = 8

.github/CONTRIBUTING.md

@@ -0,0 +1,45 @@
+
+# Contributing
+
+Spring Cloud is released under the non-restrictive Apache 2.0 license,
+and follows a very standard Github development process, using Github
+tracker for issues and merging pull requests into master. If you want
+to contribute even something trivial please do not hesitate, but
+follow the guidelines below.
+
+## Sign the Contributor License Agreement
+Before we accept a non-trivial patch or pull request we will need you to sign the
+[Contributor License Agreement](https://cla.pivotal.io/sign/spring).
+Signing the contributor's agreement does not grant anyone commit rights to the main
+repository, but it does mean that we can accept your contributions, and you will get an
+author credit if we do.  Active contributors might be asked to join the core team, and
+given the ability to merge pull requests.
+
+## Code of Conduct
+This project adheres to the Contributor Covenant [code of
+conduct](https://github.com/spring-cloud/spring-cloud-build/blob/master/docs/src/main/asciidoc/code-of-conduct.adoc). By participating, you  are expected to uphold this code. Please report
+unacceptable behavior to spring-code-of-conduct@pivotal.io.
+
+## Code Conventions and Housekeeping
+None of these is essential for a pull request, but they will all help.  They can also be
+added after the original pull request but before a merge.
+
+* Use the Spring Framework code format conventions. If you use Eclipse
+  you can import formatter settings using the
+  `eclipse-code-formatter.xml` file from the
+  [Spring Cloud Build](https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml) project. If using IntelliJ, you can use the
+  [Eclipse Code Formatter Plugin](http://plugins.jetbrains.com/plugin/6546) to import the same file.
+* Make sure all new `.java` files to have a simple Javadoc class comment with at least an
+  `@author` tag identifying you, and preferably at least a paragraph on what the class is
+  for.
+* Add the ASF license header comment to all new `.java` files (copy from existing files
+  in the project)
+* Add yourself as an `@author` to the .java files that you modify substantially (more
+  than cosmetic changes).
+* Add some Javadocs and, if you change the namespace, some XSD doc elements.
+* A few unit tests would help a lot as well -- someone has to do it.
+* If no-one else is using your branch, please rebase it against the current master (or
+  other target branch in the main project).
+* When writing a commit message please follow [these conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html),
+  if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit
+  message (where XXXX is the issue number).

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,20 @@
+<!--
+Thanks for raising a Spring Cloud issue. What sort of issue are you raising?
+
+Question
+
+Please ask questions about how to use something, or to understand why something isn't
+working as you expect it to, on Stack Overflow using the spring-cloud tag.
+
+Bug report
+
+Please provide details of the problem, including the version of Spring Cloud that you
+are using. If possible, please provide a test case or sample application that reproduces
+the problem. This makes it much easier for us to diagnose the problem and to verify that
+we have fixed it.
+
+Enhancement
+
+Please start by describing the problem that you are trying to solve. There may already
+be a solution, or there may be a way to solve it that you hadn't considered.
+-->

.mvn/wrapper/MavenWrapperDownloader.java

@@ -0,0 +1,107 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you 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.
+*/
+
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL =
+            "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.0/maven-wrapper-0.4.0.jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+            ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+            ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if(mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if(mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: : " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if(!outputFile.getParentFile().exists()) {
+            if(!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                        "- ERROR creating output direcrory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}

.mvn/wrapper/maven-wrapper.properties

@@ -1 +1 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.2/apache-maven-3.5.2-bin.zip

README.adoc

@@ -19,11 +19,34 @@ Intelligent Routing (Zuul) and Client Side Load Balancing (Ribbon).
 * 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
 
+
+== 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-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 or concurrency-limits modules.
+
+
 == Building
 
 :jdkversion: 1.8

circle.yml

@@ -1,27 +0,0 @@
-general:
-  branches:
-    ignore:
-      - gh-pages # list of branches to ignore
-machine:
-  java:
-    version: oraclejdk8
-  environment:
-    _JAVA_OPTIONS: "-Xms1024m -Xmx2048m"
-dependencies:
-  override:
-    - cd spring-cloud-netflix-hystrix-contract && ../mvnw clean install
-    - ./mvnw -s .settings.xml -U --fail-never dependency:go-offline || true
-test:
-  override:
-    - ./mvnw -s .settings.xml clean org.jacoco:jacoco-maven-plugin:prepare-agent install -U -P sonar -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
-  post:
-    - find . -type f -regex ".*/spring-cloud-*.*/target/*.*" | cpio -pdm $CIRCLE_ARTIFACTS
-    - mkdir -p $CIRCLE_TEST_REPORTS/junit/
-    - find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;
-    - bash <(curl -s https://codecov.io/bash)
-
-notify:
-  webhooks:
-    # A list of hook hashes, containing the url field
-    # gitter hook
-    - url: https://webhooks.gitter.im/e/22e6bb4eb945dd61ba54

config/releaser.yml

@@ -1,3 +1,3 @@
 releaser:
   maven:
-    buildCommand: ./scripts/build.sh
+    buildCommand: ./scripts/build.sh  {{systemProps}}

docs/README.adoc

@@ -0,0 +1,325 @@
+////
+DO NOT EDIT THIS FILE. IT WAS GENERATED.
+Manual changes to this file will be lost when it is generated again.
+Edit the files in the src/main/asciidoc/ directory instead.
+////
+
+image::https://circleci.com/gh/spring-cloud/spring-cloud-netflix/tree/master.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-cloud/spring-cloud-netflix/tree/master"]
+image::https://codecov.io/gh/spring-cloud/spring-cloud-netflix/branch/master/graph/badge.svg["Codecov", link="https://codecov.io/gh/spring-cloud/spring-cloud-netflix/branch/master"]
+image::https://api.codacy.com/project/badge/Grade/a6885a06921e4f72a0df0b7aabd6d118["Codacy code quality", link="https://www.codacy.com/app/Spring-Cloud/spring-cloud-netflix?utm_source=github.com&utm_medium=referral&utm_content=spring-cloud/spring-cloud-netflix&utm_campaign=Badge_Grade"]
+
+
+This project 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).
+
+
+== 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
+* 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
+
+
+== 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-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 or concurrency-limits modules.
+
+
+== Building
+
+:jdkversion: 1.8
+
+=== Basic Compile and Test
+
+To build the source you will need to install JDK {jdkversion}.
+
+Spring Cloud uses Maven for most build-related activities, and you
+should be able to get off the ground quite quickly by cloning the
+project you are interested in and typing
+
+----
+$ ./mvnw install
+----
+
+NOTE: You can also install Maven (>=3.3.3) yourself and run the `mvn` command
+in place of `./mvnw` in the examples below. If you do that you also
+might need to add `-P spring` if your local Maven settings do not
+contain repository declarations for spring pre-release artifacts.
+
+NOTE: Be aware that you might need to increase the amount of memory
+available to Maven by setting a `MAVEN_OPTS` environment variable with
+a value like `-Xmx512m -XX:MaxPermSize=128m`. We try to cover this in
+the `.mvn` configuration, so if you find you have to do it to make a
+build succeed, please raise a ticket to get the settings added to
+source control.
+
+For hints on how to build the project look in `.travis.yml` if there
+is one. There should be a "script" and maybe "install" command. Also
+look at the "services" section to see if any services need to be
+running locally (e.g. mongo or rabbit).  Ignore the git-related bits
+that you might find in "before_install" since they're related to setting git
+credentials and you already have those.
+
+The projects that require middleware generally include a
+`docker-compose.yml`, so consider using
+http://compose.docker.io/[Docker Compose] to run the middeware servers
+in Docker containers. See the README in the
+https://github.com/spring-cloud-samples/scripts[scripts demo
+repository] for specific instructions about the common cases of mongo,
+rabbit and redis.
+
+NOTE: If all else fails, build with the command from `.travis.yml` (usually
+`./mvnw install`).
+
+=== Documentation
+
+The spring-cloud-build module has a "docs" profile, and if you switch
+that on it will try to build asciidoc sources from
+`src/main/asciidoc`. As part of that process it will look for a
+`README.adoc` and process it by loading all the includes, but not
+parsing or rendering it, just copying it to `${main.basedir}`
+(defaults to `${basedir}`, i.e. the root of the project). If there are
+any changes in the README it will then show up after a Maven build as
+a modified file in the correct place. Just commit it and push the change.
+
+=== Working with the code
+If you don't have an IDE preference we would recommend that you use
+http://www.springsource.com/developer/sts[Spring Tools Suite] or
+http://eclipse.org[Eclipse] when working with the code. We use the
+http://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools
+should also work without issue as long as they use Maven 3.3.3 or better.
+
+==== Importing into eclipse with m2eclipse
+We recommend the http://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with
+eclipse. If you don't already have m2eclipse installed it is available from the "eclipse
+marketplace".
+
+NOTE: Older versions of m2e do not support Maven 3.3, so once the
+projects are imported into Eclipse you will also need to tell
+m2eclipse to use the right profile for the projects.  If you
+see many different errors related to the POMs in the projects, check
+that you have an up to date installation.  If you can't upgrade m2e,
+add the "spring" profile to your `settings.xml`. Alternatively you can
+copy the repository settings from the "spring" profile of the parent
+pom into your `settings.xml`.
+
+==== Importing into eclipse without m2eclipse
+If you prefer not to use m2eclipse you can generate eclipse project metadata using the
+following command:
+
+[indent=0]
+----
+	$ ./mvnw eclipse:eclipse
+----
+
+The generated eclipse projects can be imported by selecting `import existing projects`
+from the `file` menu.
+
+
+
+== Contributing
+
+:spring-cloud-build-branch: master
+
+Spring Cloud is released under the non-restrictive Apache 2.0 license,
+and follows a very standard Github development process, using Github
+tracker for issues and merging pull requests into master. If you want
+to contribute even something trivial please do not hesitate, but
+follow the guidelines below.
+
+=== Sign the Contributor License Agreement
+Before we accept a non-trivial patch or pull request we will need you to sign the
+https://cla.pivotal.io/sign/spring[Contributor License Agreement].
+Signing the contributor's agreement does not grant anyone commit rights to the main
+repository, but it does mean that we can accept your contributions, and you will get an
+author credit if we do.  Active contributors might be asked to join the core team, and
+given the ability to merge pull requests.
+
+=== Code of Conduct
+This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/master/docs/src/main/asciidoc/code-of-conduct.adoc[code of
+conduct]. By participating, you  are expected to uphold this code. Please report
+unacceptable behavior to spring-code-of-conduct@pivotal.io.
+
+=== Code Conventions and Housekeeping
+None of these is essential for a pull request, but they will all help.  They can also be
+added after the original pull request but before a merge.
+
+* Use the Spring Framework code format conventions. If you use Eclipse
+  you can import formatter settings using the
+  `eclipse-code-formatter.xml` file from the
+  https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring
+  Cloud Build] project. If using IntelliJ, you can use the
+  http://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter
+  Plugin] to import the same file.
+* Make sure all new `.java` files to have a simple Javadoc class comment with at least an
+  `@author` tag identifying you, and preferably at least a paragraph on what the class is
+  for.
+* Add the ASF license header comment to all new `.java` files (copy from existing files
+  in the project)
+* Add yourself as an `@author` to the .java files that you modify substantially (more
+  than cosmetic changes).
+* Add some Javadocs and, if you change the namespace, some XSD doc elements.
+* A few unit tests would help a lot as well -- someone has to do it.
+* If no-one else is using your branch, please rebase it against the current master (or
+  other target branch in the main project).
+* When writing a commit message please follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions],
+  if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit
+  message (where XXXX is the issue number).
+
+=== Checkstyle
+
+Spring Cloud Build comes with a set of checkstyle rules. You can find them in the `spring-cloud-build-tools` module. The most notable files under the module are:
+
+.spring-cloud-build-tools/
+----
+└── src
+    ├── checkstyle
+    │   └── checkstyle-suppressions.xml <3>
+    └── main
+        └── resources
+            ├── checkstyle-header.txt <2>
+            └── checkstyle.xml <1>
+----
+<1> Default Checkstyle rules
+<2> File header setup
+<3> Default suppression rules
+
+==== Checkstyle configuration
+
+Checkstyle rules are *disabled by default*. To add checkstyle to your project just define the following properties and plugins.
+
+.pom.xml
+----
+<properties>
+<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError> <1>
+        <maven-checkstyle-plugin.failsOnViolation>true
+        </maven-checkstyle-plugin.failsOnViolation> <2>
+        <maven-checkstyle-plugin.includeTestSourceDirectory>true
+        </maven-checkstyle-plugin.includeTestSourceDirectory> <3>
+</properties>
+
+<build>
+        <plugins>
+            <plugin> <4>
+                <groupId>io.spring.javaformat</groupId>
+                <artifactId>spring-javaformat-maven-plugin</artifactId>
+            </plugin>
+            <plugin> <5>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+            </plugin>
+        </plugins>
+
+    <reporting>
+        <plugins>
+            <plugin> <5>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </reporting>
+</build>
+----
+<1> Fails the build upon Checkstyle errors
+<2> Fails the build upon Checkstyle violations
+<3> Checkstyle analyzes also the test sources
+<4> Add the Spring Java Format plugin that will reformat your code to pass most of the Checkstyle formatting rules
+<5> Add checkstyle plugin to your build and reporting phases
+
+If you need to suppress some rules (e.g. line length needs to be longer), then it's enough for you to define a file under `${project.root}/src/checkstyle/checkstyle-suppressions.xml` with your suppressions. Example:
+
+.projectRoot/src/checkstyle/checkstyle-suppresions.xml
+----
+<?xml version="1.0"?>
+<!DOCTYPE suppressions PUBLIC
+		"-//Puppy Crawl//DTD Suppressions 1.1//EN"
+		"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+<suppressions>
+	<suppress files=".*ConfigServerApplication\.java" checks="HideUtilityClassConstructor"/>
+	<suppress files=".*ConfigClientWatch\.java" checks="LineLengthCheck"/>
+</suppressions>
+----
+
+It's advisable to copy the `${spring-cloud-build.rootFolder}/.editorconfig` and `${spring-cloud-build.rootFolder}/.springformat` to your project. That way, some default formatting rules will be applied. You can do so by running this script:
+
+```bash
+$ curl https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/.editorconfig -o .editorconfig
+$ touch .springformat
+```
+
+=== IDE setup
+
+==== Intellij IDEA
+
+In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin.
+
+.spring-cloud-build-tools/
+----
+└── src
+    ├── checkstyle
+    │   └── checkstyle-suppressions.xml <3>
+    └── main
+        └── resources
+            ├── checkstyle-header.txt <2>
+            ├── checkstyle.xml <1>
+            └── intellij
+                ├── Intellij_Project_Defaults.xml <4>
+                └── Intellij_Spring_Boot_Java_Conventions.xml <5>
+----
+<1> Default Checkstyle rules
+<2> File header setup
+<3> Default suppression rules
+<4> Project defaults for Intellij that apply most of Checkstyle rules
+<5> Project style conventions for Intellij that apply most of Checkstyle rules
+
+.Code style
+
+image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-code-style.png[Code style]
+
+Go to `File` -> `Settings` -> `Editor` -> `Code style`. There click on the icon next to the `Scheme` section. There, click on the `Import Scheme` value and pick the `Intellij IDEA code style XML` option. Import the `spring-cloud-build-tools/src/main/resources/intellij/Intellij_Spring_Boot_Java_Conventions.xml` file.
+
+.Inspection profiles
+
+image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-inspections.png[Code style]
+
+Go to `File` -> `Settings` -> `Editor` -> `Inspections`. There click on the icon next to the `Profile` section. There, click on the `Import Profile` and import the `spring-cloud-build-tools/src/main/resources/intellij/Intellij_Project_Defaults.xml` file.
+
+.Checkstyle
+
+To have Intellij work with Checkstyle, you have to install the `Checkstyle` plugin. It's advisable to also install the `Assertions2Assertj` to automatically convert the JUnit assertions
+
+image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-checkstyle.png[Checkstyle]
+
+Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on the `+` icon in the `Configuration file` section. There, you'll have to define where the checkstyle rules should be picked from. In the image above, we've picked the rules from the cloned Spring Cloud Build repository. However, you can point to the Spring Cloud Build's GitHub repository (e.g. for the `checkstyle.xml` : `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle.xml`). We need to provide the following variables:
+
+- `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL.
+- `checkstyle.suppressions.file` - default suppressions. Please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` URL.
+- `checkstyle.additional.suppressions.file` - this variable corresponds to suppressions in your local project. E.g. you're working on `spring-cloud-contract`. Then point to the `project-root/src/checkstyle/checkstyle-suppressions.xml` folder. Example for `spring-cloud-contract` would be: `/home/username/spring-cloud-contract/src/checkstyle/checkstyle-suppressions.xml`.
+
+IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources.

docs/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>2.0.0.M3</version>
+		<version>2.1.1.RELEASE</version>
 	</parent>
 	<artifactId>spring-cloud-netflix-docs</artifactId>
 	<packaging>pom</packaging>
@@ -13,8 +13,7 @@
 	<description>Spring Cloud Docs</description>
 	<properties>
 		<docs.main>spring-cloud-netflix</docs.main>
-		<main.basedir>${basedir}/..</main.basedir>
-		<docs.whitelisted.branches>1.0.x,1.1.x,1.2.x,1.3.x,2.0.x</docs.whitelisted.branches>
+		<docs.whitelisted.branches>1.2.x,1.3.x,1.4.x</docs.whitelisted.branches>
 	</properties>
 	<build>
 		<plugins>

docs/src/main/asciidoc/README.adoc

@@ -11,11 +11,12 @@ include::intro.adoc[]
 * 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
 
+include::maintenance-mode.adoc[]
+
 == Building
 
 include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/building-jdk8.adoc[]

docs/src/main/asciidoc/maintenance-mode.adoc

@@ -0,0 +1,23 @@
+
+== 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-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 or concurrency-limits modules.
+

eclipse/eclipse-code-formatter.xml

@@ -1,295 +1,315 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<profiles version="12">
-<profile kind="CodeFormatterProfile" name="Spring Cloud Java Conventions" version="12">
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="8"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="90"/>
-<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.compiler.source" value="1.8"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.8"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.8"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="tab"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="90"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
-</profile>
+<profiles version="13">
+	<profile kind="CodeFormatterProfile" name="Spring Cloud Java Conventions" version="12">
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment" value="common_lines"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation" value="common_lines"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement" value="common_lines"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration" value="common_lines"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
+		<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement" value="common_lines"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+		<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="90"/>
+		<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause" value="common_lines"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_type_parameters" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+		<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation" value="common_lines"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_module_statements" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+		<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines" value="2147483647"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
+		<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause" value="common_lines"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+		<setting id="org.eclipse.jdt.core.compiler.source" value="9"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="9"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration" value="common_lines"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_type_arguments" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.compiler.compliance" value="9"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration" value="common_lines"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header" value="0"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="tab"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="90"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+	</profile>
 </profiles>

eclipse/org.eclipse.jdt.core.prefs

@@ -10,9 +10,10 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
 org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
 org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -51,11 +52,11 @@ org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=default
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
 org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
@@ -102,7 +103,9 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.processAnnotations=disabled
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
@@ -113,11 +116,14 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_e
 org.eclipse.jdt.core.formatter.alignment_for_assignment=0
 org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -127,6 +133,8 @@ org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
+org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
 org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
 org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
 org.eclipse.jdt.core.formatter.blank_lines_after_package=1
@@ -153,6 +161,7 @@ org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false
 org.eclipse.jdt.core.formatter.comment.format_block_comments=true
 org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
@@ -184,7 +193,8 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
 org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=8
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
@@ -212,7 +222,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
@@ -379,11 +389,24 @@ org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
 org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
 org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
 org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
 org.eclipse.jdt.core.formatter.tabulation.char=tab
 org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_on_off_tags=true
 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
 org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter

mvnw

@@ -54,38 +54,16 @@ case "`uname`" in
   CYGWIN*) cygwin=true ;;
   MINGW*) mingw=true;;
   Darwin*) darwin=true
-           #
-           # Look for the Apple JDKs first to preserve the existing behaviour, and then look
-           # for the new JDKs provided by Oracle.
-           #
-           if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then
-             #
-             # Apple JDKs
-             #
-             export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
-           fi
-
-           if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then
-             #
-             # Apple JDKs
-             #
-             export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
-           fi
-
-           if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then
-             #
-             # Oracle JDKs
-             #
-             export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
-           fi
-
-           if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then
-             #
-             # Apple JDKs
-             #
-             export JAVA_HOME=`/usr/libexec/java_home`
-           fi
-           ;;
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+    if [ -z "$JAVA_HOME" ]; then
+      if [ -x "/usr/libexec/java_home" ]; then
+        export JAVA_HOME="`/usr/libexec/java_home`"
+      else
+        export JAVA_HOME="/Library/Java/Home"
+      fi
+    fi
+    ;;
 esac
 
 if [ -z "$JAVA_HOME" ] ; then
@@ -130,7 +108,7 @@ if $cygwin ; then
     CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
 fi
 
-# For Migwn, ensure paths are in UNIX format before anything is touched
+# For Mingw, ensure paths are in UNIX format before anything is touched
 if $mingw ; then
   [ -n "$M2_HOME" ] &&
     M2_HOME="`(cd "$M2_HOME"; pwd)`"
@@ -184,27 +162,28 @@ fi
 
 CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME=`cygpath --path --windows "$M2_HOME"`
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
-fi
-
 # traverses directory structure from process work directory to filesystem root
 # first directory with .mvn subdirectory is considered project base directory
 find_maven_basedir() {
-  local basedir=$(pwd)
-  local wdir=$(pwd)
+
+  if [ -z "$1" ]
+  then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
   while [ "$wdir" != '/' ] ; do
     if [ -d "$wdir"/.mvn ] ; then
       basedir=$wdir
       break
     fi
-    wdir=$(cd "$wdir/.."; pwd)
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=`cd "$wdir/.."; pwd`
+    fi
+    # end of workaround
   done
   echo "${basedir}"
 }
@@ -216,13 +195,87 @@ concat_lines() {
   fi
 }
 
-export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)}
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+  exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found .mvn/wrapper/maven-wrapper.jar"
+    fi
+else
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+    fi
+    jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.0/maven-wrapper-0.4.0.jar"
+    while IFS="=" read key value; do
+      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+      esac
+    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Downloading from: $jarUrl"
+    fi
+    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+
+    if command -v wget > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found wget ... using wget"
+        fi
+        wget "$jarUrl" -O "$wrapperJarPath"
+    elif command -v curl > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found curl ... using curl"
+        fi
+        curl -o "$wrapperJarPath" "$jarUrl"
+    else
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Falling back to using Java to download"
+        fi
+        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        if [ -e "$javaClass" ]; then
+            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Compiling MavenWrapperDownloader.java ..."
+                fi
+                # Compiling the Java class
+                ("$JAVA_HOME/bin/javac" "$javaClass")
+            fi
+            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                # Running the downloader
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Running MavenWrapperDownloader.java ..."
+                fi
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+            fi
+        fi
+    fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+  echo $MAVEN_PROJECTBASEDIR
+fi
 MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
 
-# Provide a "standardized" way to retrieve the CLI args that will
-# work with both Windows and non-Windows executions.
-MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
-export MAVEN_CMD_LINE_ARGS
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
 
 WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
@@ -232,22 +285,22 @@ echo "The found version is [${VERSION}]"
 
 if echo $VERSION | egrep -q 'M|RC'; then
     echo Activating \"milestone\" profile for version=\"$VERSION\"
-    echo $MAVEN_ARGS | grep -q milestone || MAVEN_ARGS="$MAVEN_ARGS -Pmilestone"
+    echo $MAVEN_CONFIG | grep -q milestone || MAVEN_CONFIG="$MAVEN_CONFIG -Pmilestone"
 else
     echo Deactivating \"milestone\" profile for version=\"$VERSION\"
-    echo $MAVEN_ARGS | grep -q milestone && MAVEN_ARGS=$(echo $MAVEN_ARGS | sed -e 's/-Pmilestone//')
+    echo $MAVEN_CONFIG | grep -q milestone && MAVEN_CONFIG=$(echo $MAVEN_CONFIG | sed -e 's/-Pmilestone//')
 fi
 
 if echo $VERSION | egrep -q 'RELEASE'; then
     echo Activating \"central\" profile for version=\"$VERSION\"
-    echo $MAVEN_ARGS | grep -q milestone || MAVEN_ARGS="$MAVEN_ARGS -Pcentral"
+    echo $MAVEN_CONFIG | grep -q milestone || MAVEN_CONFIG="$MAVEN_CONFIG -Pcentral"
 else
     echo Deactivating \"central\" profile for version=\"$VERSION\"
-    echo $MAVEN_ARGS | grep -q central && MAVEN_ARGS=$(echo $MAVEN_ARGS | sed -e 's/-Pcentral//')
+    echo $MAVEN_CONFIG | grep -q central && MAVEN_CONFIG=$(echo $MAVEN_CONFIG | sed -e 's/-Pcentral//')
 fi
 
 exec "$JAVACMD" \
   $MAVEN_OPTS \
   -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
   "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
-  ${WRAPPER_LAUNCHER} ${MAVEN_ARGS} "$@"
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

mvnw.cmd

@@ -1,145 +1,161 @@
-@REM ----------------------------------------------------------------------------
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements.  See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership.  The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License.  You may obtain a copy of the License at
-@REM
-@REM    http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied.  See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-@REM ----------------------------------------------------------------------------
-
-@REM ----------------------------------------------------------------------------
-@REM Maven2 Start Up Batch script
-@REM
-@REM Required ENV vars:
-@REM JAVA_HOME - location of a JDK home dir
-@REM
-@REM Optional ENV vars
-@REM M2_HOME - location of maven2's installed home dir
-@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
-@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
-@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
-@REM     e.g. to debug Maven itself, use
-@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-@REM ----------------------------------------------------------------------------
-
-@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
-@echo off
-@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
-@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
-
-@REM set %HOME% to equivalent of $HOME
-if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
-
-@REM Execute a user defined script before this one
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
-@REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
-if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
-:skipRcPre
-
-@setlocal
-
-set ERROR_CODE=0
-
-@REM To isolate internal variables from possible post scripts, we use another setlocal
-@setlocal
-
-@REM ==== START VALIDATION ====
-if not "%JAVA_HOME%" == "" goto OkJHome
-
-echo.
-echo Error: JAVA_HOME not found in your environment. >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-:OkJHome
-if exist "%JAVA_HOME%\bin\java.exe" goto init
-
-echo.
-echo Error: JAVA_HOME is set to an invalid directory. >&2
-echo JAVA_HOME = "%JAVA_HOME%" >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-@REM ==== END VALIDATION ====
-
-:init
-
-set MAVEN_CMD_LINE_ARGS=%*
-
-@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
-@REM Fallback to current working directory if not found.
-
-set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
-IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
-
-set EXEC_DIR=%CD%
-set WDIR=%EXEC_DIR%
-:findBaseDir
-IF EXIST "%WDIR%"\.mvn goto baseDirFound
-cd ..
-IF "%WDIR%"=="%CD%" goto baseDirNotFound
-set WDIR=%CD%
-goto findBaseDir
-
-:baseDirFound
-set MAVEN_PROJECTBASEDIR=%WDIR%
-cd "%EXEC_DIR%"
-goto endDetectBaseDir
-
-:baseDirNotFound
-set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
-cd "%EXEC_DIR%"
-
-:endDetectBaseDir
-
-IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
-
-@setlocal EnableExtensions EnableDelayedExpansion
-for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
-@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
-
-:endReadAdditionalConfig
-
-SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-
-set WRAPPER_JAR="".\.mvn\wrapper\maven-wrapper.jar""
-set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
-if ERRORLEVEL 1 goto error
-goto end
-
-:error
-set ERROR_CODE=1
-
-:end
-@endlocal & set ERROR_CODE=%ERROR_CODE%
-
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
-@REM check for post script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
-if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
-:skipRcPost
-
-@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%" == "on" pause
-
-if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
-
-exit /B %ERROR_CODE%
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven2 Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.0/maven-wrapper-0.4.0.jar"
+FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO (
+	IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B 
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    echo Found %WRAPPER_JAR%
+) else (
+    echo Couldn't find %WRAPPER_JAR%, downloading it ...
+	echo Downloading from: %DOWNLOAD_URL%
+    powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"
+    echo Finished downloading %WRAPPER_JAR%
+)
+@REM End of extension
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%

pom.xml

@@ -3,14 +3,14 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-netflix</artifactId>
-	<version>2.0.0.M3</version>
+	<version>2.1.1.RELEASE</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Netflix</name>
 	<description>Spring Cloud Netflix</description>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.0.0.M4</version>
+		<version>2.1.3.RELEASE</version>
 		<relativePath />
 	</parent>
 	<scm>
@@ -21,24 +21,22 @@
 	</scm>
 	<properties>
 		<bintray.package>netflix</bintray.package>
-		<main.basedir>${basedir}</main.basedir>
-		<netty.version>4.0.27.Final</netty.version>
-		<jackson.version>2.7.3</jackson.version>
-		<spring-cloud-commons.version>2.0.0.M3</spring-cloud-commons.version>
-		<spring-cloud-config.version>2.0.0.M3</spring-cloud-config.version>
-		<spring-cloud-stream.version>Elmhurst.M2</spring-cloud-stream.version>
+		<spring-cloud-commons.version>2.1.1.RELEASE</spring-cloud-commons.version>
+		<spring-cloud-config.version>2.1.1.RELEASE</spring-cloud-config.version>
+		<spring-cloud-stream.version>Fishtown.SR2</spring-cloud-stream.version>
 		<!-- Has to be a stable version (not one that depends on this version of netflix): -->
-		<donotreplacespring-cloud-contract.version>1.1.2.RELEASE</donotreplacespring-cloud-contract.version>
+		<donotreplacespring-cloud-contract.version>2.0.2.RELEASE</donotreplacespring-cloud-contract.version>
 
-		<!-- Plugin versions -->
-		<maven-compiler-plugin.version>3.6.1</maven-compiler-plugin.version>
-		<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
 		<!-- Sonar -->
-		<surefire.plugin.version>2.19.1</surefire.plugin.version>
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 		<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
 		<sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec</sonar.jacoco.reportPath>
 		<sonar.language>java</sonar.language>
+		<maven-checkstyle-plugin.includeTestSourceDirectory>true
+		</maven-checkstyle-plugin.includeTestSourceDirectory>
+		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
+		<maven-checkstyle-plugin.failOnViolation>true
+		</maven-checkstyle-plugin.failOnViolation>
 	</properties>
 	<build>
 		<plugins>
@@ -51,11 +49,11 @@
 					<additionalConfig>
 						<file>
 							<name>.settings/org.eclipse.jdt.ui.prefs</name>
-							<location>${main.basedir}/eclipse/org.eclipse.jdt.ui.prefs</location>
+							<location>${maven.multiModuleProjectDirectory}/eclipse/org.eclipse.jdt.ui.prefs</location>
 						</file>
 						<file>
 							<name>.settings/org.eclipse.jdt.core.prefs</name>
-							<location>${main.basedir}/eclipse/org.eclipse.jdt.core.prefs</location>
+							<location>${maven.multiModuleProjectDirectory}/eclipse/org.eclipse.jdt.core.prefs</location>
 						</file>
 					</additionalConfig>
 				</configuration>
@@ -68,6 +66,14 @@
 					<target>1.8</target>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>io.spring.javaformat</groupId>
+				<artifactId>spring-javaformat-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+			</plugin>
 		</plugins>
 	</build>
 	<dependencyManagement>
@@ -120,28 +126,40 @@
 				<scope>import</scope>
 			</dependency>
 			<dependency>
-				<groupId>io.netty</groupId>
-				<artifactId>netty-codec-http</artifactId>
-				<version>${netty.version}</version>
+				<groupId>javax.inject</groupId>
+				<artifactId>javax.inject</artifactId>
+				<version>1</version>
 			</dependency>
+			<!-- archaius dependencies that are now runtime -->
 			<dependency>
-				<groupId>io.netty</groupId>
-				<artifactId>netty-transport-native-epoll</artifactId>
-				<version>${netty.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.fasterxml.jackson.dataformat</groupId>
-				<artifactId>jackson-dataformat-smile</artifactId>
-				<version>${jackson.version}</version>
+				<groupId>commons-configuration</groupId>
+				<artifactId>commons-configuration</artifactId>
+				<version>1.8</version>
+				<exclusions>
+					<exclusion>
+						<groupId>commons-logging</groupId>
+						<artifactId>commons-logging</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
+			<!-- end archaius deps -->
 		</dependencies>
 	</dependencyManagement>
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</reporting>
 	<modules>
 		<module>spring-cloud-netflix-dependencies</module>
 		<module>spring-cloud-netflix-archaius</module>
 		<!-- Not part of the reactor build: build and deploy separately -->
 		<!--module>spring-cloud-netflix-hystrix-contract</module-->
 		<module>spring-cloud-netflix-core</module>
+		<module>spring-cloud-netflix-concurrency-limits</module>
 		<module>spring-cloud-netflix-hystrix-dashboard</module>
 		<module>spring-cloud-netflix-hystrix-stream</module>
 		<module>spring-cloud-netflix-eureka-client</module>
@@ -150,9 +168,11 @@
 		<module>spring-cloud-netflix-turbine-stream</module>
 		<module>spring-cloud-netflix-sidecar</module>
 		<module>spring-cloud-netflix-zuul</module>
+		<module>spring-cloud-netflix-ribbon</module>
 		<module>spring-cloud-starter-netflix</module>
+		<module>spring-cloud-netflix-hystrix</module>
 		<module>docs</module>
-	</modules>
+    </modules>
 	<profiles>
 		<profile>
 			<id>spring</id>

scripts/build.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-(cd spring-cloud-netflix-hystrix-contract && ../mvnw clean install)
-./mvnw clean install
+(cd spring-cloud-netflix-hystrix-contract && ../mvnw clean install -B -Pdocs ${@})
+./mvnw clean install -B -Pdocs ${@}

scripts/compileOnly.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+(cd spring-cloud-netflix-hystrix-contract && ../mvnw clean install -B -Pdocs -DskipTests)
+./mvnw clean install -B -Pdocs -DskipTests -fae

spring-cloud-netflix-archaius/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>spring-cloud-netflix</artifactId>
         <groupId>org.springframework.cloud</groupId>
-        <version>2.0.0.M3</version>
+        <version>2.1.1.RELEASE</version>
         <relativePath>..</relativePath> <!-- lookup parent from repository -->
     </parent>
 
@@ -15,9 +15,6 @@
     <packaging>jar</packaging>
     <name>Spring Cloud Netflix Archaius</name>
     <description>Spring Cloud Netflix Archaius</description>
-    <properties>
-        <main.basedir>${basedir}/..</main.basedir>
-    </properties>
 
     <dependencies>
         <dependency>
@@ -40,11 +37,6 @@
             <artifactId>commons-configuration</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <optional>true</optional>
-        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -53,4 +45,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>

spring-cloud-netflix-archaius/src/main/java/org/springframework/cloud/netflix/archaius/ArchaiusAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-2019 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.
@@ -24,6 +24,13 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.annotation.PreDestroy;
 
+import com.netflix.config.AggregatedConfiguration;
+import com.netflix.config.ConcurrentCompositeConfiguration;
+import com.netflix.config.ConfigurationManager;
+import com.netflix.config.DeploymentContext;
+import com.netflix.config.DynamicProperty;
+import com.netflix.config.DynamicPropertyFactory;
+import com.netflix.config.DynamicURLConfiguration;
 import org.apache.commons.configuration.AbstractConfiguration;
 import org.apache.commons.configuration.ConfigurationBuilder;
 import org.apache.commons.configuration.EnvironmentConfiguration;
@@ -32,6 +39,7 @@ import org.apache.commons.configuration.event.ConfigurationEvent;
 import org.apache.commons.configuration.event.ConfigurationListener;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
 import org.springframework.boot.actuate.health.Health;
@@ -48,14 +56,6 @@ import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.Environment;
 import org.springframework.util.ReflectionUtils;
 
-import com.netflix.config.AggregatedConfiguration;
-import com.netflix.config.ConcurrentCompositeConfiguration;
-import com.netflix.config.ConfigurationManager;
-import com.netflix.config.DeploymentContext;
-import com.netflix.config.DynamicProperty;
-import com.netflix.config.DynamicPropertyFactory;
-import com.netflix.config.DynamicURLConfiguration;
-
 import static com.netflix.config.ConfigurationManager.APPLICATION_PROPERTIES;
 import static com.netflix.config.ConfigurationManager.DISABLE_DEFAULT_ENV_CONFIG;
 import static com.netflix.config.ConfigurationManager.DISABLE_DEFAULT_SYS_CONFIG;
@@ -98,52 +98,21 @@ public class ArchaiusAutoConfiguration {
 	}
 
 	@Bean
-	public static ConfigurableEnvironmentConfiguration configurableEnvironmentConfiguration(ConfigurableEnvironment env,
-																							ApplicationContext context) {
-		Map<String, AbstractConfiguration> abstractConfigurationMap = context.getBeansOfType(AbstractConfiguration.class);
-		List<AbstractConfiguration> externalConfigurations = new ArrayList<>(abstractConfigurationMap.values());
-		ConfigurableEnvironmentConfiguration envConfig = new ConfigurableEnvironmentConfiguration(env);
+	public static ConfigurableEnvironmentConfiguration configurableEnvironmentConfiguration(
+			ConfigurableEnvironment env, ApplicationContext context) {
+		Map<String, AbstractConfiguration> abstractConfigurationMap = context
+				.getBeansOfType(AbstractConfiguration.class);
+		List<AbstractConfiguration> externalConfigurations = new ArrayList<>(
+				abstractConfigurationMap.values());
+		ConfigurableEnvironmentConfiguration envConfig = new ConfigurableEnvironmentConfiguration(
+				env);
 		configureArchaius(envConfig, env, externalConfigurations);
 		return envConfig;
 	}
 
-	@Configuration
-	@ConditionalOnClass(Health.class)
-	protected static class ArchaiusEndpointConfiguration {
-		@Bean
-		@ConditionalOnEnabledEndpoint
-		protected ArchaiusEndpoint archaiusEndpoint() {
-			return new ArchaiusEndpoint();
-		}
-	}
-
-	@Configuration
-	@ConditionalOnProperty(value = "archaius.propagate.environmentChangedEvent", matchIfMissing = true)
-	@ConditionalOnClass(EnvironmentChangeEvent.class)
-	protected static class PropagateEventsConfiguration
-			implements ApplicationListener<EnvironmentChangeEvent> {
-		@Autowired
-		private Environment env;
-
-		@Override
-		public void onApplicationEvent(EnvironmentChangeEvent event) {
-			AbstractConfiguration manager = ConfigurationManager.getConfigInstance();
-			for (String key : event.getKeys()) {
-				for (ConfigurationListener listener : manager
-						.getConfigurationListeners()) {
-					Object source = event.getSource();
-					// TODO: Handle add vs set vs delete?
-					int type = AbstractConfiguration.EVENT_SET_PROPERTY;
-					String value = this.env.getProperty(key);
-					boolean beforeUpdate = false;
-					listener.configurationChanged(new ConfigurationEvent(source, type,
-							key, value, beforeUpdate));
-				}
-			}
-		}
-	}
-
-	protected static void configureArchaius(ConfigurableEnvironmentConfiguration envConfig, ConfigurableEnvironment env, List<AbstractConfiguration> externalConfigurations) {
+	protected static void configureArchaius(
+			ConfigurableEnvironmentConfiguration envConfig, ConfigurableEnvironment env,
+			List<AbstractConfiguration> externalConfigurations) {
 		if (initialized.compareAndSet(false, true)) {
 			String appName = env.getProperty("spring.application.name");
 			if (appName == null) {
@@ -196,7 +165,8 @@ public class ArchaiusAutoConfiguration {
 		}
 	}
 
-	private static void addArchaiusConfiguration(ConcurrentCompositeConfiguration config) {
+	private static void addArchaiusConfiguration(
+			ConcurrentCompositeConfiguration config) {
 		if (ConfigurationManager.isConfigurationInstalled()) {
 			AbstractConfiguration installedConfiguration = ConfigurationManager
 					.getConfigInstance();
@@ -224,4 +194,44 @@ public class ArchaiusAutoConfiguration {
 		ReflectionUtils.setField(field, null, value);
 	}
 
+	@Configuration
+	@ConditionalOnClass(Health.class)
+	protected static class ArchaiusEndpointConfiguration {
+
+		@Bean
+		@ConditionalOnEnabledEndpoint
+		protected ArchaiusEndpoint archaiusEndpoint() {
+			return new ArchaiusEndpoint();
+		}
+
+	}
+
+	@Configuration
+	@ConditionalOnProperty(value = "archaius.propagate.environmentChangedEvent", matchIfMissing = true)
+	@ConditionalOnClass(EnvironmentChangeEvent.class)
+	protected static class PropagateEventsConfiguration
+			implements ApplicationListener<EnvironmentChangeEvent> {
+
+		@Autowired
+		private Environment env;
+
+		@Override
+		public void onApplicationEvent(EnvironmentChangeEvent event) {
+			AbstractConfiguration manager = ConfigurationManager.getConfigInstance();
+			for (String key : event.getKeys()) {
+				for (ConfigurationListener listener : manager
+						.getConfigurationListeners()) {
+					Object source = event.getSource();
+					// TODO: Handle add vs set vs delete?
+					int type = AbstractConfiguration.EVENT_SET_PROPERTY;
+					String value = this.env.getProperty(key);
+					boolean beforeUpdate = false;
+					listener.configurationChanged(new ConfigurationEvent(source, type,
+							key, value, beforeUpdate));
+				}
+			}
+		}
+
+	}
+
 }

spring-cloud-netflix-archaius/src/main/java/org/springframework/cloud/netflix/archaius/ArchaiusDelegatingProxyUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 the original author or authors.
+ * Copyright 2013-2019 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.
@@ -16,24 +16,30 @@
 
 package org.springframework.cloud.netflix.archaius;
 
+import com.netflix.config.ConfigurationManager;
 import org.apache.commons.configuration.AbstractConfiguration;
+
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
 
-import com.netflix.config.ConfigurationManager;
-
 /**
  * @author Dave Syer
  */
-public class ArchaiusDelegatingProxyUtils {
+public final class ArchaiusDelegatingProxyUtils {
 
+	private ArchaiusDelegatingProxyUtils() {
+	}
+
+	/**
+	 * {@code ApplicationContext} class name.
+	 */
 	public static String APPLICATION_CONTEXT = ApplicationContext.class.getName();
 
 	public static <T> T getNamedInstance(Class<T> type, String name) {
 		ApplicationContext context = (ApplicationContext) ConfigurationManager
 				.getConfigInstance().getProperty(APPLICATION_CONTEXT);
-		return context != null && context.containsBean(name) ? context
-				.getBean(name, type) : null;
+		return context != null && context.containsBean(name) ? context.getBean(name, type)
+				: null;
 	}
 
 	public static <T> T getInstanceWithPrefix(Class<T> type, String prefix) {

spring-cloud-netflix-archaius/src/main/java/org/springframework/cloud/netflix/archaius/ArchaiusEndpoint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 the original author or authors.
+ * Copyright 2013-2019 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.
@@ -20,17 +20,19 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import com.netflix.config.ConcurrentCompositeConfiguration;
+import com.netflix.config.ConfigurationManager;
 import org.apache.commons.configuration.AbstractConfiguration;
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.EnvironmentConfiguration;
 import org.apache.commons.configuration.SystemConfiguration;
+
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
 import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
 
-import com.netflix.config.ConcurrentCompositeConfiguration;
-import com.netflix.config.ConfigurationManager;
-
 /**
+ * An actuator endpoint that returns Archaius configuration.
+ *
  * @author Dave Syer
  */
 @Endpoint(id = "archaius")
@@ -38,7 +40,7 @@ public class ArchaiusEndpoint {
 
 	@ReadOperation
 	public Map<String, Object> invoke() {
-		Map<String, Object> map = new LinkedHashMap<String, Object>();
+		Map<String, Object> map = new LinkedHashMap<>();
 		AbstractConfiguration config = ConfigurationManager.getConfigInstance();
 		if (config instanceof ConcurrentCompositeConfiguration) {
 			ConcurrentCompositeConfiguration composite = (ConcurrentCompositeConfiguration) config;

spring-cloud-netflix-archaius/src/main/java/org/springframework/cloud/netflix/archaius/ConfigurableEnvironmentConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-2019 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.
@@ -23,6 +23,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.configuration.AbstractConfiguration;
+
 import org.springframework.core.env.CompositePropertySource;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.EnumerablePropertySource;
@@ -31,6 +32,8 @@ import org.springframework.core.env.PropertySource;
 import org.springframework.core.env.StandardEnvironment;
 
 /**
+ * EnvironmentConfiguration wrapper class providing further configuration possibilities.
+ *
  * @author Spencer Gibb
  */
 public class ConfigurableEnvironmentConfiguration extends AbstractConfiguration {
@@ -64,7 +67,8 @@ public class ConfigurableEnvironmentConfiguration extends AbstractConfiguration
 	@Override
 	public Iterator<String> getKeys() {
 		List<String> result = new ArrayList<>();
-		for (Map.Entry<String, PropertySource<?>> entry : getPropertySources().entrySet()) {
+		for (Map.Entry<String, PropertySource<?>> entry : getPropertySources()
+				.entrySet()) {
 			PropertySource<?> source = entry.getValue();
 			if (source instanceof EnumerablePropertySource) {
 				EnumerablePropertySource<?> enumerable = (EnumerablePropertySource<?>) source;
@@ -78,8 +82,9 @@ public class ConfigurableEnvironmentConfiguration extends AbstractConfiguration
 
 	private Map<String, PropertySource<?>> getPropertySources() {
 		Map<String, PropertySource<?>> map = new LinkedHashMap<>();
-		MutablePropertySources sources = (this.environment != null ? this.environment
-				.getPropertySources() : new StandardEnvironment().getPropertySources());
+		MutablePropertySources sources = (this.environment != null
+				? this.environment.getPropertySources()
+				: new StandardEnvironment().getPropertySources());
 		for (PropertySource<?> source : sources) {
 			extract("", map, source);
 		}

spring-cloud-netflix-archaius/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -0,0 +1,10 @@
+{
+  "properties": [
+    {
+      "defaultValue": "true",
+      "name": "archaius.propagate.environmentChangedEvent",
+      "description": "Propagates EnvironmentChanged events to Archaius ConfigurationManager.",
+      "type": "java.lang.Boolean"
+    }
+  ]
+}

spring-cloud-netflix-archaius/src/test/java/org/springframework/cloud/netflix/archaius/ArchaiusAutoConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-2019 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.
@@ -18,22 +18,18 @@ package org.springframework.cloud.netflix.archaius;
 
 import java.util.Collections;
 
-import org.apache.commons.configuration.AbstractConfiguration;
-import org.apache.commons.configuration.event.ConfigurationEvent;
-import org.apache.commons.configuration.event.ConfigurationListener;
-import org.junit.After;
-import org.junit.Test;
-import org.springframework.boot.test.util.EnvironmentTestUtils;
-import org.springframework.cloud.context.environment.EnvironmentChangeEvent;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-
 import com.netflix.config.ConfigurationManager;
 import com.netflix.config.DynamicPropertyFactory;
 import com.netflix.config.DynamicStringProperty;
+import org.apache.commons.configuration.AbstractConfiguration;
+import org.junit.After;
+import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import org.springframework.boot.test.util.TestPropertyValues;
+import org.springframework.cloud.context.environment.EnvironmentChangeEvent;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Dave Syer
@@ -41,6 +37,7 @@ import static org.junit.Assert.assertNull;
 public class ArchaiusAutoConfigurationTests {
 
 	private AnnotationConfigApplicationContext context;
+
 	private Object propertyValue;
 
 	@After
@@ -56,27 +53,23 @@ public class ArchaiusAutoConfigurationTests {
 				ArchaiusAutoConfiguration.class);
 		AbstractConfiguration config = this.context
 				.getBean(ConfigurableEnvironmentConfiguration.class);
-		assertNotNull(config.getString("java.io.tmpdir"));
+		assertThat(config.getString("java.io.tmpdir")).isNotNull();
 	}
 
 	@Test
 	public void environmentChangeEventPropagated() {
 		this.context = new AnnotationConfigApplicationContext(
 				ArchaiusAutoConfiguration.class);
-		ConfigurationManager.getConfigInstance().addConfigurationListener(
-				new ConfigurationListener() {
-					@Override
-					public void configurationChanged(ConfigurationEvent event) {
-						if (event.getPropertyName().equals("my.prop")) {
-							ArchaiusAutoConfigurationTests.this.propertyValue = event
-									.getPropertyValue();
-						}
-					}
-				});
-		EnvironmentTestUtils.addEnvironment(this.context, "my.prop=my.newval");
-		this.context.publishEvent(new EnvironmentChangeEvent(Collections
-				.singleton("my.prop")));
-		assertEquals("my.newval", this.propertyValue);
+		ConfigurationManager.getConfigInstance().addConfigurationListener(event -> {
+			if (event.getPropertyName().equals("my.prop")) {
+				ArchaiusAutoConfigurationTests.this.propertyValue = event
+						.getPropertyValue();
+			}
+		});
+		TestPropertyValues.of("my.prop=my.newval").applyTo(this.context);
+		this.context.publishEvent(
+				new EnvironmentChangeEvent(Collections.singleton("my.prop")));
+		assertThat(this.propertyValue).isEqualTo("my.newval");
 	}
 
 	@Test
@@ -88,9 +81,9 @@ public class ArchaiusAutoConfigurationTests {
 		DynamicStringProperty staticProperty = DynamicPropertyFactory.getInstance()
 				.getStringProperty("archaius.file.property", null);
 
-		assertNull(dbProperty.getValue());
-		assertNotNull(staticProperty.getValue());
-		assertEquals("Static config file property", staticProperty.getValue());
+		assertThat(dbProperty.getValue()).isNull();
+		assertThat(staticProperty.getValue()).isNotNull();
+		assertThat(staticProperty.getValue()).isEqualTo("Static config file property");
 	}
 
 	@Test
@@ -104,12 +97,12 @@ public class ArchaiusAutoConfigurationTests {
 		DynamicStringProperty staticProperty = DynamicPropertyFactory.getInstance()
 				.getStringProperty("archaius.file.property", null);
 
-		assertNotNull(dbProperty.getValue());
-		assertNotNull(secondDbProperty.getValue());
-		assertNotNull(staticProperty.getValue());
-		assertEquals("this is a db property", dbProperty.getValue());
-		assertEquals("this is another db property", secondDbProperty.getValue());
-		assertEquals("Static config file property", staticProperty.getValue());
+		assertThat(dbProperty.getValue()).isNotNull();
+		assertThat(secondDbProperty.getValue()).isNotNull();
+		assertThat(staticProperty.getValue()).isNotNull();
+		assertThat(dbProperty.getValue()).isEqualTo("this is a db property");
+		assertThat(secondDbProperty.getValue()).isEqualTo("this is another db property");
+		assertThat(staticProperty.getValue()).isEqualTo("Static config file property");
 	}
 
 }

spring-cloud-netflix-archaius/src/test/java/org/springframework/cloud/netflix/archaius/ArchaiusEndpointTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 the original author or authors.
+ * Copyright 2013-2019 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.
@@ -18,14 +18,13 @@ package org.springframework.cloud.netflix.archaius;
 
 import java.util.Map;
 
-import org.junit.Test;
-import org.springframework.core.env.StandardEnvironment;
-
 import com.netflix.config.ConcurrentCompositeConfiguration;
 import com.netflix.config.ConfigurationManager;
+import org.junit.Test;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.springframework.core.env.StandardEnvironment;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Dave Syer
@@ -37,7 +36,7 @@ public class ArchaiusEndpointTests {
 	@Test
 	public void detectsPropertiesWhenSet() {
 		ConfigurationManager.getConfigInstance().setProperty("foo", "bar");
-		assertTrue(this.endpoint.invoke().containsKey("foo"));
+		assertThat(this.endpoint.invoke().containsKey("foo")).isTrue();
 	}
 
 	@Test
@@ -46,12 +45,12 @@ public class ArchaiusEndpointTests {
 				ConfigurationManager.getConfigInstance());
 		ConfigurableEnvironmentConfiguration config = new ConfigurableEnvironmentConfiguration(
 				new StandardEnvironment());
-		assertTrue(config.containsKey("user.dir"));
+		assertThat(config.containsKey("user.dir")).isTrue();
 		composite.addConfiguration(config);
 		ConfigurationManager.getConfigInstance().setProperty("foo", "bar");
 		Map<String, Object> map = this.endpoint.invoke();
-		assertTrue(map.containsKey("foo"));
-		assertFalse(map.containsKey("user.dir"));
+		assertThat(map.containsKey("foo")).isTrue();
+		assertThat(map.containsKey("user.dir")).isFalse();
 	}
 
 }

spring-cloud-netflix-archaius/src/test/java/org/springframework/cloud/netflix/archaius/TestArchaiusExternalConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-2019 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.
@@ -16,13 +16,13 @@
 
 package org.springframework.cloud.netflix.archaius;
 
+import com.netflix.config.ConcurrentMapConfiguration;
 import org.apache.commons.configuration.AbstractConfiguration;
+
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import com.netflix.config.ConcurrentMapConfiguration;
-
 /**
  * @author Alexandru-George Burghelea
  */
@@ -33,8 +33,8 @@ public class TestArchaiusExternalConfiguration {
 	@Qualifier("dynamicConfiguration")
 	public AbstractConfiguration createDynamicConfiguration() {
 		ConcurrentMapConfiguration config = new ConcurrentMapConfiguration();
-		config.addProperty("db.property","this is a db property");
-		config.addProperty("db.second.property","this is another db property");
+		config.addProperty("db.property", "this is a db property");
+		config.addProperty("db.second.property", "this is another db property");
 		return config;
 	}
 

spring-cloud-netflix-concurrency-limits/pom.xml

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.cloud</groupId>
+		<artifactId>spring-cloud-netflix</artifactId>
+		<version>2.1.1.RELEASE</version>
+		<relativePath>..</relativePath> <!-- lookup parent from repository -->
+	</parent>
+	<artifactId>spring-cloud-netflix-concurrency-limits</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Cloud Netflix Concurrency Limits</name>
+	<url>https://projects.spring.io/spring-cloud/</url>
+	<dependencies>
+		<dependency>
+			<groupId>com.netflix.concurrency-limits</groupId>
+			<artifactId>concurrency-limits-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.concurrency-limits</groupId>
+			<artifactId>concurrency-limits-servlet</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-configuration-processor</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<!--<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-commons</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-context</artifactId>
+			<optional>true</optional>
+		</dependency>-->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-webflux</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-test-support</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>io.projectreactor</groupId>
+			<artifactId>reactor-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>

spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/micrometer/MicrometerMetricRegistry.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2013-2019 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.concurrency.limits.micrometer;
+
+import java.util.function.Supplier;
+
+import com.netflix.concurrency.limits.MetricRegistry;
+import io.micrometer.core.instrument.DistributionSummary;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Tags;
+
+/**
+ * A Micrometer-specific {@link MetricRegistry} implementation.
+ *
+ * @author Spencer Gibb
+ */
+public class MicrometerMetricRegistry implements MetricRegistry {
+
+	private final MeterRegistry meterRegistry;
+
+	// TODO: baseId?
+
+	public MicrometerMetricRegistry(MeterRegistry meterRegistry) {
+		this.meterRegistry = meterRegistry;
+	}
+
+	@Override
+	public SampleListener registerDistribution(String id, String... tagNameValuePairs) {
+		DistributionSummary summary = this.meterRegistry.summary(id, tagNameValuePairs);
+		return value -> summary.record(value.longValue());
+	}
+
+	@Override
+	public void registerGauge(String id, Supplier<Number> supplier,
+			String... tagNameValuePairs) {
+		this.meterRegistry.gauge(id, Tags.of(tagNameValuePairs), supplier.get());
+	}
+
+}

spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/reactive/ConcurrencyLimitsWebFilter.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2013-2019 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.concurrency.limits.reactive;
+
+import com.netflix.concurrency.limits.Limiter;
+import reactor.core.publisher.Mono;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.server.ServerWebExchange;
+import org.springframework.web.server.WebFilter;
+import org.springframework.web.server.WebFilterChain;
+
+/**
+ * A {@link WebFilter} implementation providing the possibility to use Netflix
+ * {@link Limiter} to handle requests.
+ *
+ * @author Spencer Gibb
+ */
+public class ConcurrencyLimitsWebFilter implements WebFilter {
+
+	private final Limiter<ServerWebExchange> limiter;
+
+	public ConcurrencyLimitsWebFilter(Limiter<ServerWebExchange> limiter) {
+		this.limiter = limiter;
+	}
+
+	@Override
+	public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
+		return limiter.acquire(exchange)
+				.map(listener -> chain.filter(exchange)
+						.doOnSuccess(v -> listener.onSuccess())
+						.doOnError(throwable -> listener.onIgnore()))
+				.orElseGet(() -> {
+					exchange.getResponse().setStatusCode(HttpStatus.TOO_MANY_REQUESTS);
+					// TODO: set body
+					return exchange.getResponse().setComplete();
+				});
+	}
+
+}

spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/reactive/ReactiveConcurrencyLimitsAutoConfiguration.java

@@ -0,0 +1,67 @@
+/*
+ * Copyright 2013-2019 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.concurrency.limits.reactive;
+
+import java.util.function.Consumer;
+
+import com.netflix.concurrency.limits.Limiter;
+import reactor.core.publisher.Mono;
+
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.server.ServerWebExchange;
+import org.springframework.web.server.WebFilter;
+
+/**
+ * Reactive autoconfiguration class for registering Netflix {@link Limiter} bean.
+ *
+ * @author Spencer Gibb
+ */
+@Configuration
+@ConditionalOnWebApplication(type = Type.REACTIVE)
+@ConditionalOnClass({ WebFilter.class, Mono.class })
+public class ReactiveConcurrencyLimitsAutoConfiguration {
+
+	private final ObjectProvider<Consumer<ServerWebExchangeLimiterBuilder>> configurerProvider;
+
+	public ReactiveConcurrencyLimitsAutoConfiguration(
+			ObjectProvider<Consumer<ServerWebExchangeLimiterBuilder>> configurerProvider) {
+		this.configurerProvider = configurerProvider;
+	}
+
+	@Bean
+	@ConditionalOnMissingBean
+	public Limiter<ServerWebExchange> webfluxLimiter() {
+		ServerWebExchangeLimiterBuilder builder = new ServerWebExchangeLimiterBuilder();
+
+		this.configurerProvider.ifAvailable(consumer -> consumer.accept(builder));
+
+		return builder.build();
+	}
+
+	@Bean
+	public ConcurrencyLimitsWebFilter concurrencyLimitsWebFilter(
+			Limiter<ServerWebExchange> limiter) {
+		return new ConcurrencyLimitsWebFilter(limiter);
+	}
+
+}

spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/reactive/ServerWebExchangeLimiterBuilder.java

@@ -0,0 +1,100 @@
+/*
+ * Copyright 2013-2019 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.concurrency.limits.reactive;
+
+import java.util.Optional;
+import java.util.function.Function;
+
+import com.netflix.concurrency.limits.limiter.AbstractPartitionedLimiter;
+
+import org.springframework.web.server.ServerWebExchange;
+
+/**
+ * Builder for ServerWebExchange Limiter.
+ *
+ * @author Spencer Gibb
+ */
+public class ServerWebExchangeLimiterBuilder extends
+		AbstractPartitionedLimiter.Builder<ServerWebExchangeLimiterBuilder, ServerWebExchange> {
+
+	/**
+	 * Partition the limit by header.
+	 * @param name header name
+	 * @return Chainable builder
+	 */
+	public ServerWebExchangeLimiterBuilder partitionByHeader(String name) {
+		return partitionResolver(
+				exchange -> exchange.getRequest().getHeaders().getFirst(name));
+	}
+
+	/**
+	 * Partition the limit by {@link Principal}. Percentages of the limit are partitioned
+	 * to named groups. Group membership is derived from the provided mapping function.
+	 * @param principalToGroup Mapping function from {@link Principal} to a named group.
+	 * @param configurer Configuration function though which group percentages may be
+	 * specified Unspecified group values may only use excess capacity.
+	 * @return Chainable builder
+	 */
+	/*
+	 * public ServerWebExchangeLimiterBuilder partitionByUserPrincipal(Function<Principal,
+	 * String> principalToGroup,
+	 * Consumer<LookupPartitionStrategy.Builder<ServerWebExchange>> configurer) { return
+	 * partitionResolver( exchange ->
+	 * Optional.ofNullable(request.getUserPrincipal()).map(principalToGroup).orElse(null),
+	 * configurer); }
+	 */
+
+	/**
+	 * Partition the limit by request attribute.
+	 * @param name attribute name
+	 * @return Chainable builder
+	 */
+	public ServerWebExchangeLimiterBuilder partitionByAttribute(String name) {
+		return partitionResolver(exchange -> exchange.getAttribute(name));
+	}
+
+	/**
+	 * Partition the limit by request parameter.
+	 * @param name parameter name
+	 * @return Chainable builder
+	 */
+	public ServerWebExchangeLimiterBuilder partitionByParameter(String name) {
+		return partitionResolver(
+				exchange -> exchange.getRequest().getQueryParams().getFirst(name));
+	}
+
+	/**
+	 * Partition the limit by the full path. Percentages of the limit are partitioned to
+	 * named groups. Group membership is derived from the provided mapping function.
+	 * @param pathToGroup Mapping function from full path to a named group.
+	 * @return Chainable builder
+	 */
+	public ServerWebExchangeLimiterBuilder partitionByPathInfo(
+			Function<String, String> pathToGroup) {
+		return partitionResolver(exchange -> {
+			// TODO: pathWithinApplication?
+			String path = exchange.getRequest().getPath().contextPath().value();
+			return Optional.ofNullable(path).map(pathToGroup).orElse(null);
+		});
+	}
+
+	@Override
+	protected ServerWebExchangeLimiterBuilder self() {
+		return this;
+	}
+
+}

spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/web/ConcurrencyLimitsHandlerInterceptor.java

@@ -0,0 +1,91 @@
+/*
+ * Copyright 2013-2019 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.concurrency.limits.web;
+
+import java.io.IOException;
+import java.util.Optional;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.netflix.concurrency.limits.Limiter;
+import com.netflix.concurrency.limits.Limiter.Listener;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.ModelAndView;
+
+/**
+ * A {@link HandlerInterceptor} implementation providing the possibility to use Netflix
+ * {@link Limiter} to handle requests.
+ *
+ * @author Spencer Gibb
+ */
+public class ConcurrencyLimitsHandlerInterceptor implements HandlerInterceptor {
+
+	private final Limiter<HttpServletRequest> limiter;
+
+	public ConcurrencyLimitsHandlerInterceptor(Limiter<HttpServletRequest> limiter) {
+		this.limiter = limiter;
+	}
+
+	@Override
+	public boolean preHandle(HttpServletRequest request, HttpServletResponse response,
+			Object handler) throws Exception {
+		Optional<Listener> listener = limiter.acquire(request);
+		if (listener.isPresent()) {
+			request.setAttribute("concurrency_limiter_listener", listener.get());
+			return true;
+		}
+
+		try {
+			// TODO: headers with information?
+			/*
+			 * response.sendError(HttpStatus.TOO_MANY_REQUESTS.value());
+			 * response.getWriter().print("Concurrency limit exceeded");
+			 */
+			response.sendError(HttpStatus.TOO_MANY_REQUESTS.value(),
+					"Concurrency limit exceeded");
+		}
+		catch (IOException e) {
+			// ignore
+		}
+		return false;
+	}
+
+	@Override
+	public void postHandle(HttpServletRequest request, HttpServletResponse response,
+			Object handler, ModelAndView modelAndView) throws Exception {
+
+	}
+
+	@Override
+	public void afterCompletion(HttpServletRequest request, HttpServletResponse response,
+			Object handler, Exception ex) throws Exception {
+		Listener listener = (Listener) request
+				.getAttribute("concurrency_limiter_listener");
+		if (listener != null) {
+			if (ex != null) {
+				listener.onIgnore();
+			}
+			else {
+				listener.onSuccess();
+			}
+		}
+	}
+
+}

spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/web/MvcConcurrencyLimitsAutoConfiguration.java

@@ -0,0 +1,78 @@
+/*
+ * Copyright 2013-2019 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.concurrency.limits.web;
+
+import java.util.function.Consumer;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.netflix.concurrency.limits.Limiter;
+import com.netflix.concurrency.limits.servlet.ServletLimiterBuilder;
+
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * MVC autoconfiguration class for registering Netflix {@link Limiter} bean.
+ *
+ * @author Spencer Gibb
+ */
+@Configuration
+@ConditionalOnWebApplication(type = Type.SERVLET)
+@ConditionalOnClass({ HttpServletRequest.class, HandlerInterceptor.class })
+public class MvcConcurrencyLimitsAutoConfiguration implements WebMvcConfigurer {
+
+	private final ObjectProvider<Consumer<ServletLimiterBuilder>> configurerProvider;
+
+	public MvcConcurrencyLimitsAutoConfiguration(
+			ObjectProvider<Consumer<ServletLimiterBuilder>> configurerProvider) {
+		this.configurerProvider = configurerProvider;
+	}
+
+	@Bean
+	@ConditionalOnMissingBean
+	public Limiter<HttpServletRequest> servletLimiter() {
+		ServletLimiterBuilder builder = new ServletLimiterBuilder();
+
+		this.configurerProvider.ifAvailable(consumer -> consumer.accept(builder));
+
+		return builder.build();
+	}
+
+	@Configuration
+	protected static class HandlerInterceptorConfiguration implements WebMvcConfigurer {
+
+		@Autowired
+		private Limiter<HttpServletRequest> limiter;
+
+		@Override
+		public void addInterceptors(InterceptorRegistry registry) {
+			registry.addInterceptor(new ConcurrencyLimitsHandlerInterceptor(limiter));
+		}
+
+	}
+
+}

spring-cloud-netflix-concurrency-limits/src/main/resources/META-INF/spring.factories

@@ -0,0 +1,3 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.springframework.cloud.netflix.concurrency.limits.reactive.ReactiveConcurrencyLimitsAutoConfiguration,\
+org.springframework.cloud.netflix.concurrency.limits.web.MvcConcurrencyLimitsAutoConfiguration

spring-cloud-netflix-concurrency-limits/src/test/java/org/springframework/cloud/netflix/concurrency/limits/micrometer/MicrometerMetricRegistryTests.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2013-2019 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.concurrency.limits.micrometer;
+
+import io.micrometer.core.instrument.Gauge;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class MicrometerMetricRegistryTests {
+
+	@Test
+	public void testGuage() {
+		MeterRegistry registry = new SimpleMeterRegistry();
+		MicrometerMetricRegistry metricRegistry = new MicrometerMetricRegistry(registry);
+
+		metricRegistry.registerGauge("bar", () -> 10);
+
+		Gauge bar = registry.get("bar").gauge();
+
+		assertThat(bar.value()).isEqualTo(10.0);
+	}
+
+	@Test
+	@Ignore // FIXME: micrometer doesn't allow recreating a gauge
+	public void testUnregister() {
+		MeterRegistry registry = new SimpleMeterRegistry();
+		MicrometerMetricRegistry metricRegistry = new MicrometerMetricRegistry(registry);
+
+		metricRegistry.registerGauge("bar", () -> 10);
+		metricRegistry.registerGauge("bar", () -> 20);
+
+		Gauge bar = registry.get("bar").gauge();
+
+		assertThat(bar.value()).isEqualTo(20.0);
+
+	}
+
+}

spring-cloud-netflix-concurrency-limits/src/test/java/org/springframework/cloud/netflix/concurrency/limits/reactive/ConcurrencyLimitsWebFilterTests.java

@@ -0,0 +1,75 @@
+/*
+ * Copyright 2013-2019 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.concurrency.limits.reactive;
+
+import java.util.function.Consumer;
+
+import com.netflix.concurrency.limits.limit.FixedLimit;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.cloud.netflix.concurrency.limits.test.AbstractConcurrencyLimitsTests;
+import org.springframework.cloud.test.ClassPathExclusions;
+import org.springframework.cloud.test.ModifiedClassPathRunner;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Import;
+import org.springframework.util.SocketUtils;
+import org.springframework.web.reactive.function.client.WebClient;
+
+@RunWith(ModifiedClassPathRunner.class)
+@ClassPathExclusions({ "spring-boot-starter-tomcat-*", "tomcat-embed-*" })
+public class ConcurrencyLimitsWebFilterTests extends AbstractConcurrencyLimitsTests {
+
+	private int port;
+
+	@Before
+	public void init() {
+		port = SocketUtils.findAvailableTcpPort();
+		client = WebClient.create("http://localhost:" + port);
+	}
+
+	@Test
+	@SuppressWarnings("Duplicates")
+	public void webFilterWorks() {
+
+		try (ConfigurableApplicationContext context = new SpringApplicationBuilder()
+				.properties("server.port=" + port,
+						"spring.main.web-application-type=reactive")
+				.sources(TestConfig.class).run()) {
+
+			assertLimiter(client);
+		}
+	}
+
+	@SpringBootConfiguration
+	@EnableAutoConfiguration
+	@Import(HelloControllerConfiguration.class)
+	protected static class TestConfig {
+
+		@Bean
+		public Consumer<ServerWebExchangeLimiterBuilder> limiterBuilderConfigurer() {
+			return limiterBuilder -> limiterBuilder.limit(FixedLimit.of(1));
+		}
+
+	}
+
+}

spring-cloud-netflix-concurrency-limits/src/test/java/org/springframework/cloud/netflix/concurrency/limits/test/AbstractConcurrencyLimitsTests.java

@@ -0,0 +1,80 @@
+/*
+ * Copyright 2013-2019 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.concurrency.limits.test;
+
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+import reactor.util.function.Tuple2;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.reactive.function.client.WebClient;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class AbstractConcurrencyLimitsTests {
+
+	protected WebClient client;
+
+	protected void assertLimiter(WebClient client) {
+		// TODO: assert the body
+		Flux<Tuple2<String, HttpStatus>> flux = Flux.range(1, 100)
+				.flatMap(integer -> client.get().uri("/").exchange(), 4)
+				// .log("reqs", Level.INFO)
+				.flatMap(response -> response.bodyToMono(String.class).defaultIfEmpty("")
+						/* .log("body2mono", Level.INFO) */
+						.zipWith(Mono.just(response.statusCode())));
+
+		Responses responses = new Responses();
+		StepVerifier.create(flux).thenConsumeWhile(response -> true, response -> {
+			HttpStatus status = response.getT2();
+			if (status.equals(HttpStatus.OK)) {
+				responses.success.incrementAndGet();
+			}
+			else if (status.equals(HttpStatus.TOO_MANY_REQUESTS)) {
+				responses.tooManyReqs.incrementAndGet();
+				String body = response.getT1();
+				// TODO: body from handler isn't coming thru
+				// assertThat(body).isEqualTo("Concurrency limit exceeded");
+			}
+			else {
+				responses.other.incrementAndGet();
+			}
+		}).verifyComplete();
+
+		System.out.println("Responses: " + responses);
+
+		assertThat(responses.other).hasValue(0);
+		assertThat(responses.tooManyReqs).hasValueGreaterThanOrEqualTo(1);
+
+	}
+
+	@Configuration
+	@RestController
+	protected static class HelloControllerConfiguration {
+
+		@GetMapping
+		public String get() {
+			return "Hello";
+		}
+
+	}
+
+}

spring-cloud-netflix-concurrency-limits/src/test/java/org/springframework/cloud/netflix/concurrency/limits/test/Responses.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2013-2019 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.
@@ -14,25 +14,24 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.netflix.feign;
+package org.springframework.cloud.netflix.concurrency.limits.test;
 
-import feign.Logger;
-import feign.slf4j.Slf4jLogger;
+import java.util.concurrent.atomic.AtomicInteger;
 
-/**
- * @author Venil Noronha
- */
-public class DefaultFeignLoggerFactory implements FeignLoggerFactory {
+import org.springframework.core.style.ToStringCreator;
 
-	private Logger logger;
+public class Responses {
 
-	public DefaultFeignLoggerFactory(Logger logger) {
-		this.logger = logger;
-	}
+	public AtomicInteger success = new AtomicInteger(0);
+
+	public AtomicInteger tooManyReqs = new AtomicInteger(0);
+
+	public AtomicInteger other = new AtomicInteger(0);
 
 	@Override
-	public Logger create(Class<?> type) {
-		return this.logger != null ? this.logger : new Slf4jLogger(type);
+	public String toString() {
+		return new ToStringCreator(this).append("success", success)
+				.append("tooManyReqs", tooManyReqs).append("other", other).toString();
 	}
 
 }

spring-cloud-netflix-concurrency-limits/src/test/java/org/springframework/cloud/netflix/concurrency/limits/web/ConcurrencyLimitsHandlerInterceptorTests.java

@@ -0,0 +1,69 @@
+/*
+ * Copyright 2013-2019 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.concurrency.limits.web;
+
+import java.util.function.Consumer;
+
+import com.netflix.concurrency.limits.limit.FixedLimit;
+import com.netflix.concurrency.limits.servlet.ServletLimiterBuilder;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.cloud.netflix.concurrency.limits.test.AbstractConcurrencyLimitsTests;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.web.reactive.function.client.WebClient;
+
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(properties = "logging.level.reactor.netty=DEBUG", webEnvironment = RANDOM_PORT)
+public class ConcurrencyLimitsHandlerInterceptorTests
+		extends AbstractConcurrencyLimitsTests {
+
+	@LocalServerPort
+	public int port;
+
+	@Before
+	public void init() {
+		client = WebClient.create("http://localhost:" + port);
+	}
+
+	@Test
+	public void handlerInterceptorWorks() {
+		assertLimiter(client);
+	}
+
+	@SpringBootConfiguration
+	@EnableAutoConfiguration
+	@Import(HelloControllerConfiguration.class)
+	protected static class TestConfig {
+
+		@Bean
+		public Consumer<ServletLimiterBuilder> limiterBuilderConfigurer() {
+			return servletLimiterBuilder -> servletLimiterBuilder.limit(FixedLimit.of(1));
+		}
+
+	}
+
+}

spring-cloud-netflix-core/pom.xml

@@ -5,210 +5,23 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>2.0.0.M3</version>
+		<version>2.1.1.RELEASE</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-netflix-core</artifactId>
 	<packaging>jar</packaging>
-	<name>Spring Cloud Netflix Core</name>
-	<description>Spring Cloud Netflix Core</description>
-	<properties>
-		<main.basedir>${basedir}/..</main.basedir>
-	</properties>
+	<name>Spring Cloud Netflix Core - Deprecated</name>
+	<description>Deprecated Spring Cloud Netflix Core - will be removed. Please use spring-cloud-netflix-hystrix instead.</description>
 	<dependencies>
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot</artifactId>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-netflix-hystrix</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-autoconfigure</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-actuator</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-security</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>io.projectreactor</groupId>
-			<artifactId>reactor-core</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>io.projectreactor</groupId>
-			<artifactId>reactor-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>io.reactivex</groupId>
-			<artifactId>rxjava-reactive-streams</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-aop</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.retry</groupId>
-			<artifactId>spring-retry</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-commons</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-context</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-netflix-archaius</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-configuration</groupId>
-			<artifactId>commons-configuration</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.servo</groupId>
-			<artifactId>servo-core</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.netflix-commons</groupId>
-			<artifactId>netflix-commons-util</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>javax.inject</groupId>
-			<artifactId>javax.inject</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.ribbon</groupId>
-			<artifactId>ribbon-loadbalancer</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>io.github.openfeign</groupId>
-			<artifactId>feign-core</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>io.github.openfeign</groupId>
-			<artifactId>feign-slf4j</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>io.github.openfeign</groupId>
-			<artifactId>feign-httpclient</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>io.github.openfeign</groupId>
-			<artifactId>feign-hystrix</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>io.github.openfeign</groupId>
-			<artifactId>feign-okhttp</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>io.github.openfeign</groupId>
-			<artifactId>feign-java8</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.hystrix</groupId>
-			<artifactId>hystrix-core</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.hystrix</groupId>
-			<artifactId>hystrix-metrics-event-stream</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.hystrix</groupId>
-			<artifactId>hystrix-javanica</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.ribbon</groupId>
-			<artifactId>ribbon</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.ribbon</groupId>
-			<artifactId>ribbon-core</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.ribbon</groupId>
-			<artifactId>ribbon-httpclient</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.zuul</groupId>
-			<artifactId>zuul-core</artifactId>
-			<optional>true</optional>
-			<exclusions>
-				<exclusion>
-					<artifactId>groovy-all</artifactId>
-					<groupId>org.codehaus.groovy</groupId>
-				</exclusion>
-				<exclusion>
-					<artifactId>mockito-all</artifactId>
-					<groupId>org.mockito</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>io.reactivex</groupId>
-			<artifactId>rxjava</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.sun.jersey.contribs</groupId>
-			<artifactId>jersey-apache-client4</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.squareup.okhttp3</groupId>
-			<artifactId>okhttp</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-core</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-test-support</artifactId>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 	<profiles>
 		<profile>

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/core/CoreAutoConfiguration.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2018-2019 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.core;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author Olga Maciaszek-Sharma
+ * @since 2.1.0
+ * @deprecated Module spring-cloud-netflix-core is deprecated as of 2.1.0, use
+ * spring-cloud-netflix-hystrix instead.
+ */
+@Configuration
+@Deprecated
+public class CoreAutoConfiguration {
+
+	private static final Log LOG = LogFactory.getLog(CoreAutoConfiguration.class);
+
+	public CoreAutoConfiguration() {
+		LOG.warn(
+				"This module is deprecated. It will be removed in the next major release. "
+						+ "Please use spring-cloud-netflix-hystrix instead.");
+	}
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/AnnotatedParameterProcessor.java

@@ -1,87 +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.feign;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.util.Collection;
-
-import feign.MethodMetadata;
-
-/**
- * Feign contract method parameter processor.
- *
- * @author Jakub Narloch
- * @author Abhijit Sarkar
- */
-public interface AnnotatedParameterProcessor {
-
-	/**
-	 * Retrieves the processor supported annotation type.
-	 *
-	 * @return the annotation type
-	 */
-	Class<? extends Annotation> getAnnotationType();
-
-	/**
-	 * Process the annotated parameter.
-	 *
-	 * @param context	the parameter context
-	 * @param annotation the annotation instance
-	 * @param method	 the method that contains the annotation
-	 * @return whether the parameter is http
-	 */
-	boolean processArgument(AnnotatedParameterContext context, Annotation annotation, Method method);
-
-	/**
-	 * Specifies the parameter context.
-	 *
-	 * @author Jakub Narloch
-	 */
-	interface AnnotatedParameterContext {
-
-		/**
-		 * Retrieves the method metadata.
-		 *
-		 * @return the method metadata
-		 */
-		MethodMetadata getMethodMetadata();
-
-		/**
-		 * Retrieves the index of the parameter.
-		 *
-		 * @return the parameter index
-		 */
-		int getParameterIndex();
-
-		/**
-		 * Sets the parameter name.
-		 *
-		 * @param name the name of the parameter
-		 */
-		void setParameterName(String name);
-
-		/**
-		 * Sets the template parameter.
-		 *
-		 * @param name the template parameter
-		 * @param rest the existing parameter values
-		 * @return parameters
-		 */
-		Collection<String> setTemplateParameter(String name, Collection<String> rest);
-	}
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/EnableFeignClients.java

@@ -1,88 +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.feign;
-
-import java.lang.annotation.Documented;
-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.Import;
-
-/**
- * Scans for interfaces that declare they are feign clients (via {@link FeignClient
- * <code>@FeignClient</code>}). Configures component scanning directives for use with
- * {@link org.springframework.context.annotation.Configuration
- * <code>@Configuration</code>} classes.
- *
- * @author Spencer Gibb
- * @author Dave Syer
- * @since 1.0
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-@Documented
-@Import(FeignClientsRegistrar.class)
-public @interface EnableFeignClients {
-
-	/**
-	 * Alias for the {@link #basePackages()} attribute. Allows for more concise annotation
-	 * declarations e.g.: {@code @ComponentScan("org.my.pkg")} instead of
-	 * {@code @ComponentScan(basePackages="org.my.pkg")}.
-	 * @return the array of 'basePackages'.
-	 */
-	String[] value() default {};
-
-	/**
-	 * Base packages to scan for annotated components.
-	 * <p>
-	 * {@link #value()} is an alias for (and mutually exclusive with) this attribute.
-	 * <p>
-	 * Use {@link #basePackageClasses()} for a type-safe alternative to String-based
-	 * package names.
-	 *
-	 * @return the array of 'basePackages'.
-	 */
-	String[] basePackages() default {};
-
-	/**
-	 * Type-safe alternative to {@link #basePackages()} for specifying the packages to
-	 * scan for annotated components. The package of each class specified will be scanned.
-	 * <p>
-	 * Consider creating a special no-op marker class or interface in each package that
-	 * serves no purpose other than being referenced by this attribute.
-	 *
-	 * @return the array of 'basePackageClasses'.
-	 */
-	Class<?>[] basePackageClasses() default {};
-
-	/**
-	 * A custom <code>@Configuration</code> for all feign clients. Can contain override
-	 * <code>@Bean</code> definition for the pieces that make up the client, for instance
-	 * {@link feign.codec.Decoder}, {@link feign.codec.Encoder}, {@link feign.Contract}.
-	 *
-	 * @see FeignClientsConfiguration for the defaults
-	 */
-	Class<?>[] defaultConfiguration() default {};
-
-	/**
-	 * List of classes annotated with @FeignClient. If not empty, disables classpath scanning.
-	 * @return
-	 */
-	Class<?>[] clients() default {};
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignAutoConfiguration.java

@@ -1,210 +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.feign;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.config.RegistryBuilder;
-import org.apache.http.conn.HttpClientConnectionManager;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.client.actuator.HasFeatures;
-import org.springframework.cloud.commons.httpclient.ApacheHttpClientConnectionManagerFactory;
-import org.springframework.cloud.commons.httpclient.ApacheHttpClientFactory;
-import org.springframework.cloud.commons.httpclient.OkHttpClientConnectionPoolFactory;
-import org.springframework.cloud.commons.httpclient.OkHttpClientFactory;
-import org.springframework.cloud.netflix.feign.support.FeignHttpClientProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import feign.Client;
-import feign.Feign;
-import feign.httpclient.ApacheHttpClient;
-import feign.okhttp.OkHttpClient;
-import okhttp3.ConnectionPool;
-
-import javax.annotation.PreDestroy;
-
-/**
- * @author Spencer Gibb
- * @author Julien Roy
- */
-@Configuration
-@ConditionalOnClass(Feign.class)
-@EnableConfigurationProperties({FeignClientProperties.class, FeignHttpClientProperties.class})
-public class FeignAutoConfiguration {
-
-	@Autowired(required = false)
-	private List<FeignClientSpecification> configurations = new ArrayList<>();
-
-	@Bean
-	public HasFeatures feignFeature() {
-		return HasFeatures.namedFeature("Feign", Feign.class);
-	}
-
-	@Bean
-	public FeignContext feignContext() {
-		FeignContext context = new FeignContext();
-		context.setConfigurations(this.configurations);
-		return context;
-	}
-
-	@Configuration
-	@ConditionalOnClass(name = "feign.hystrix.HystrixFeign")
-	protected static class HystrixFeignTargeterConfiguration {
-		@Bean
-		@ConditionalOnMissingBean
-		public Targeter feignTargeter() {
-			return new HystrixTargeter();
-		}
-	}
-
-	@Configuration
-	@ConditionalOnMissingClass("feign.hystrix.HystrixFeign")
-	protected static class DefaultFeignTargeterConfiguration {
-		@Bean
-		@ConditionalOnMissingBean
-		public Targeter feignTargeter() {
-			return new DefaultTargeter();
-		}
-	}
-
-	// the following configuration is for alternate feign clients if
-	// ribbon is not on the class path.
-	// see corresponding configurations in FeignRibbonClientAutoConfiguration
-	// for load balanced ribbon clients.
-	@Configuration
-	@ConditionalOnClass(ApacheHttpClient.class)
-	@ConditionalOnMissingClass("com.netflix.loadbalancer.ILoadBalancer")
-	@ConditionalOnMissingBean(CloseableHttpClient.class)
-	@ConditionalOnProperty(value = "feign.httpclient.enabled", matchIfMissing = true)
-	protected static class HttpClientFeignConfiguration {
-		private final Timer connectionManagerTimer = new Timer(
-				"FeignApacheHttpClientConfiguration.connectionManagerTimer", true);
-
-		@Autowired(required = false)
-		private RegistryBuilder registryBuilder;
-
-		private CloseableHttpClient httpClient;
-
-		@Bean
-		@ConditionalOnMissingBean(HttpClientConnectionManager.class)
-		public HttpClientConnectionManager connectionManager(
-				ApacheHttpClientConnectionManagerFactory connectionManagerFactory,
-				FeignHttpClientProperties httpClientProperties) {
-			final HttpClientConnectionManager connectionManager = connectionManagerFactory
-					.newConnectionManager(false, httpClientProperties.getMaxConnections(),
-							httpClientProperties.getMaxConnectionsPerRoute(),
-							httpClientProperties.getTimeToLive(),
-							httpClientProperties.getTimeToLiveUnit(), registryBuilder);
-			this.connectionManagerTimer.schedule(new TimerTask() {
-				@Override
-				public void run() {
-					connectionManager.closeExpiredConnections();
-				}
-			}, 30000, httpClientProperties.getConnectionTimerRepeat());
-			return connectionManager;
-		}
-
-		@Bean
-
-		public CloseableHttpClient httpClient(ApacheHttpClientFactory httpClientFactory,
-				HttpClientConnectionManager httpClientConnectionManager,
-				FeignHttpClientProperties httpClientProperties) {
-			RequestConfig defaultRequestConfig = RequestConfig.custom()
-					.setConnectTimeout(httpClientProperties.getConnectionTimeout())
-					.setRedirectsEnabled(httpClientProperties.isFollowRedirects())
-					.build();
-			this.httpClient = httpClientFactory.createBuilder().
-					setConnectionManager(httpClientConnectionManager).
-					setDefaultRequestConfig(defaultRequestConfig).build();
-			return this.httpClient;
-		}
-
-		@Bean
-		@ConditionalOnMissingBean(Client.class)
-		public Client feignClient(HttpClient httpClient) {
-			return new ApacheHttpClient(httpClient);
-		}
-
-		@PreDestroy
-		public void destroy() throws Exception {
-			connectionManagerTimer.cancel();
-			if(httpClient != null) {
-				httpClient.close();
-			}
-		}
-	}
-
-	@Configuration
-	@ConditionalOnClass(OkHttpClient.class)
-	@ConditionalOnMissingClass("com.netflix.loadbalancer.ILoadBalancer")
-	@ConditionalOnMissingBean(okhttp3.OkHttpClient.class)
-	@ConditionalOnProperty(value = "feign.okhttp.enabled")
-	protected static class OkHttpFeignConfiguration {
-
-		private okhttp3.OkHttpClient okHttpClient;
-
-		@Bean
-		@ConditionalOnMissingBean(ConnectionPool.class)
-		public ConnectionPool httpClientConnectionPool(FeignHttpClientProperties httpClientProperties,
-													   OkHttpClientConnectionPoolFactory connectionPoolFactory) {
-			Integer maxTotalConnections = httpClientProperties.getMaxConnections();
-			Long timeToLive = httpClientProperties.getTimeToLive();
-			TimeUnit ttlUnit = httpClientProperties.getTimeToLiveUnit();
-			return connectionPoolFactory.create(maxTotalConnections, timeToLive, ttlUnit);
-		}
-
-		@Bean
-		public okhttp3.OkHttpClient client(OkHttpClientFactory httpClientFactory,
-										   ConnectionPool connectionPool, FeignHttpClientProperties httpClientProperties) {
-			Boolean followRedirects = httpClientProperties.isFollowRedirects();
-			Integer connectTimeout = httpClientProperties.getConnectionTimeout();
-			this.okHttpClient = httpClientFactory.createBuilder(false).
-					connectTimeout(connectTimeout, TimeUnit.MILLISECONDS).
-					followRedirects(followRedirects).
-					connectionPool(connectionPool).build();
-			return this.okHttpClient;
-		}
-
-		@PreDestroy
-		public void destroy() {
-			if(okHttpClient != null) {
-				okHttpClient.dispatcher().executorService().shutdown();
-				okHttpClient.connectionPool().evictAll();
-			}
-		}
-
-		@Bean
-		@ConditionalOnMissingBean(Client.class)
-		public Client feignClient() {
-			return new OkHttpClient(this.okHttpClient);
-		}
-	}
-
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClient.java

@@ -1,114 +0,0 @@
-/*
- * Copyright 2013-2016 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.feign;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.core.annotation.AliasFor;
-
-/**
- * Annotation for interfaces declaring that a REST client with that interface should be
- * created (e.g. for autowiring into another component). If ribbon is available it will be
- * used to load balance the backend requests, and the load balancer can be configured
- * using a <code>@RibbonClient</code> with the same name (i.e. value) as the feign client.
- *
- * @author Spencer Gibb
- * @author Venil Noronha
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface FeignClient {
-
-	/**
-	 * The name of the service with optional protocol prefix. Synonym for {@link #name()
-	 * name}. A name must be specified for all clients, whether or not a url is provided.
-	 * Can be specified as property key, eg: ${propertyKey}.
-	 */
-	@AliasFor("name")
-	String value() default "";
-
-	/**
-	 * The service id with optional protocol prefix. Synonym for {@link #value() value}.
-	 *
-	 * @deprecated use {@link #name() name} instead
-	 */
-	@Deprecated
-	String serviceId() default "";
-
-	/**
-	 * The service id with optional protocol prefix. Synonym for {@link #value() value}.
-	 */
-	@AliasFor("value")
-	String name() default "";
-	
-	/**
-	 * Sets the <code>@Qualifier</code> value for the feign client.
-	 */
-	String qualifier() default "";
-
-	/**
-	 * An absolute URL or resolvable hostname (the protocol is optional).
-	 */
-	String url() default "";
-
-	/**
-	 * Whether 404s should be decoded instead of throwing FeignExceptions
-	 */
-	boolean decode404() default false;
-
-	/**
-	 * A custom <code>@Configuration</code> for the feign client. Can contain override
-	 * <code>@Bean</code> definition for the pieces that make up the client, for instance
-	 * {@link feign.codec.Decoder}, {@link feign.codec.Encoder}, {@link feign.Contract}.
-	 *
-	 * @see FeignClientsConfiguration for the defaults
-	 */
-	Class<?>[] configuration() default {};
-
-	/**
-	 * Fallback class for the specified Feign client interface. The fallback class must
-	 * implement the interface annotated by this annotation and be a valid spring bean.
-	 */
-	Class<?> fallback() default void.class;
-
-	/**
-	 * Define a fallback factory for the specified Feign client interface. The fallback
-	 * factory must produce instances of fallback classes that implement the interface
-	 * annotated by {@link FeignClient}. The fallback factory must be a valid spring
-	 * bean.
-	 *
-	 * @see feign.hystrix.FallbackFactory for details.
-	 */
-	Class<?> fallbackFactory() default void.class;
-
-	/**
-	 * Path prefix to be used by all method-level mappings. Can be used with or without
-	 * <code>@RibbonClient</code>.
-	 */
-	String path() default "";
-
-	/**
-	 * Whether to mark the feign proxy as a primary bean. Defaults to true.
-	 */
-	boolean primary() default true;
-
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClientFactoryBean.java

@@ -1,371 +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.feign;
-
-import java.util.Map;
-import java.util.Objects;
-
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.cloud.netflix.feign.ribbon.LoadBalancerFeignClient;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
-import feign.Client;
-import feign.Contract;
-import feign.Feign;
-import feign.Logger;
-import feign.Request;
-import feign.RequestInterceptor;
-import feign.Retryer;
-import feign.Target.HardCodedTarget;
-import feign.codec.Decoder;
-import feign.codec.Encoder;
-import feign.codec.ErrorDecoder;
-
-/**
- * @author Spencer Gibb
- * @author Venil Noronha
- * @author Eko Kurniawan Khannedy
- * @author Gregor Zurowski
- */
-class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean,
-		ApplicationContextAware {
-	/***********************************
-	 * WARNING! Nothing in this class should be @Autowired. It causes NPEs because of some lifecycle race condition.
-	 ***********************************/
-
-	private Class<?> type;
-
-	private String name;
-
-	private String url;
-
-	private String path;
-
-	private boolean decode404;
-
-	private ApplicationContext applicationContext;
-
-	private Class<?> fallback = void.class;
-
-	private Class<?> fallbackFactory = void.class;
-
-	@Override
-	public void afterPropertiesSet() throws Exception {
-		Assert.hasText(this.name, "Name must be set");
-	}
-
-	@Override
-	public void setApplicationContext(ApplicationContext context) throws BeansException {
-		this.applicationContext = context;
-	}
-
-	protected Feign.Builder feign(FeignContext context) {
-		FeignLoggerFactory loggerFactory = get(context, FeignLoggerFactory.class);
-		Logger logger = loggerFactory.create(this.type);
-
-		// @formatter:off
-		Feign.Builder builder = get(context, Feign.Builder.class)
-				// required values
-				.logger(logger)
-				.encoder(get(context, Encoder.class))
-				.decoder(get(context, Decoder.class))
-				.contract(get(context, Contract.class));
-		// @formatter:on
-
-		configureFeign(context, builder);
-
-		return builder;
-	}
-
-	protected void configureFeign(FeignContext context, Feign.Builder builder) {
-		FeignClientProperties properties = applicationContext.getBean(FeignClientProperties.class);
-		if (properties != null) {
-			if (properties.isDefaultToProperties()) {
-				configureUsingConfiguration(context, builder);
-				configureUsingProperties(properties.getConfig().get(properties.getDefaultConfig()), builder);
-				configureUsingProperties(properties.getConfig().get(this.name), builder);
-			} else {
-				configureUsingProperties(properties.getConfig().get(properties.getDefaultConfig()), builder);
-				configureUsingProperties(properties.getConfig().get(this.name), builder);
-				configureUsingConfiguration(context, builder);
-			}
-		} else {
-			configureUsingConfiguration(context, builder);
-		}
-	}
-
-	protected void configureUsingConfiguration(FeignContext context, Feign.Builder builder) {
-		Logger.Level level = getOptional(context, Logger.Level.class);
-		if (level != null) {
-			builder.logLevel(level);
-		}
-		Retryer retryer = getOptional(context, Retryer.class);
-		if (retryer != null) {
-			builder.retryer(retryer);
-		}
-		ErrorDecoder errorDecoder = getOptional(context, ErrorDecoder.class);
-		if (errorDecoder != null) {
-			builder.errorDecoder(errorDecoder);
-		}
-		Request.Options options = getOptional(context, Request.Options.class);
-		if (options != null) {
-			builder.options(options);
-		}
-		Map<String, RequestInterceptor> requestInterceptors = context.getInstances(
-				this.name, RequestInterceptor.class);
-		if (requestInterceptors != null) {
-			builder.requestInterceptors(requestInterceptors.values());
-		}
-
-		if (decode404) {
-			builder.decode404();
-		}
-	}
-
-	protected void configureUsingProperties(FeignClientProperties.FeignClientConfiguration config, Feign.Builder builder) {
-		if (config == null) {
-			return;
-		}
-
-		if (config.getLoggerLevel() != null) {
-			builder.logLevel(config.getLoggerLevel());
-		}
-
-		if (config.getConnectTimeout() != null && config.getReadTimeout() != null) {
-			builder.options(new Request.Options(config.getConnectTimeout(), config.getReadTimeout()));
-		}
-
-		if (config.getRetryer() != null) {
-			Retryer retryer = getOrInstantiate(config.getRetryer());
-			builder.retryer(retryer);
-		}
-
-		if (config.getErrorDecoder() != null) {
-			ErrorDecoder errorDecoder = getOrInstantiate(config.getErrorDecoder());
-			builder.errorDecoder(errorDecoder);
-		}
-
-		if (config.getRequestInterceptors() != null && !config.getRequestInterceptors().isEmpty()) {
-			// this will add request interceptor to builder, not replace existing
-			for (Class<RequestInterceptor> bean : config.getRequestInterceptors()) {
-				RequestInterceptor interceptor = getOrInstantiate(bean);
-				builder.requestInterceptor(interceptor);
-			}
-		}
-
-		if (config.getDecode404() != null) {
-			if (config.getDecode404()) {
-				builder.decode404();
-			}
-		}
-	}
-
-	private <T> T getOrInstantiate(Class<T> tClass) {
-		try {
-			return applicationContext.getBean(tClass);
-		} catch (NoSuchBeanDefinitionException e) {
-			return BeanUtils.instantiateClass(tClass);
-		}
-	}
-
-	protected <T> T get(FeignContext context, Class<T> type) {
-		T instance = context.getInstance(this.name, type);
-		if (instance == null) {
-			throw new IllegalStateException("No bean found of type " + type + " for "
-					+ this.name);
-		}
-		return instance;
-	}
-
-	protected <T> T getOptional(FeignContext context, Class<T> type) {
-		return context.getInstance(this.name, type);
-	}
-
-	protected <T> T loadBalance(Feign.Builder builder, FeignContext context,
-			HardCodedTarget<T> target) {
-		Client client = getOptional(context, Client.class);
-		if (client != null) {
-			builder.client(client);
-			Targeter targeter = get(context, Targeter.class);
-			return targeter.target(this, builder, context, target);
-		}
-
-		throw new IllegalStateException(
-				"No Feign Client for loadBalancing defined. Did you forget to include spring-cloud-starter-netflix-ribbon?");
-	}
-
-	@Override
-	public Object getObject() throws Exception {
-		FeignContext context = applicationContext.getBean(FeignContext.class);
-		Feign.Builder builder = feign(context);
-
-		if (!StringUtils.hasText(this.url)) {
-			String url;
-			if (!this.name.startsWith("http")) {
-				url = "http://" + this.name;
-			}
-			else {
-				url = this.name;
-			}
-			url += cleanPath();
-			return loadBalance(builder, context, new HardCodedTarget<>(this.type,
-					this.name, url));
-		}
-		if (StringUtils.hasText(this.url) && !this.url.startsWith("http")) {
-			this.url = "http://" + this.url;
-		}
-		String url = this.url + cleanPath();
-		Client client = getOptional(context, Client.class);
-		if (client != null) {
-			if (client instanceof LoadBalancerFeignClient) {
-				// not lod balancing because we have a url,
-				// but ribbon is on the classpath, so unwrap
-				client = ((LoadBalancerFeignClient)client).getDelegate();
-			}
-			builder.client(client);
-		}
-		Targeter targeter = get(context, Targeter.class);
-		return targeter.target(this, builder, context, new HardCodedTarget<>(
-				this.type, this.name, url));
-	}
-
-	private String cleanPath() {
-		String path = this.path.trim();
-		if (StringUtils.hasLength(path)) {
-			if (!path.startsWith("/")) {
-				path = "/" + path;
-			}
-			if (path.endsWith("/")) {
-				path = path.substring(0, path.length() - 1);
-			}
-		}
-		return path;
-	}
-
-	@Override
-	public Class<?> getObjectType() {
-		return this.type;
-	}
-
-	@Override
-	public boolean isSingleton() {
-		return true;
-	}
-
-	public Class<?> getType() {
-		return type;
-	}
-
-	public void setType(Class<?> type) {
-		this.type = type;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getUrl() {
-		return url;
-	}
-
-	public void setUrl(String url) {
-		this.url = url;
-	}
-
-	public String getPath() {
-		return path;
-	}
-
-	public void setPath(String path) {
-		this.path = path;
-	}
-
-	public boolean isDecode404() {
-		return decode404;
-	}
-
-	public void setDecode404(boolean decode404) {
-		this.decode404 = decode404;
-	}
-
-	public ApplicationContext getApplicationContext() {
-		return applicationContext;
-	}
-
-	public Class<?> getFallback() {
-		return fallback;
-	}
-
-	public void setFallback(Class<?> fallback) {
-		this.fallback = fallback;
-	}
-
-	public Class<?> getFallbackFactory() {
-		return fallbackFactory;
-	}
-
-	public void setFallbackFactory(Class<?> fallbackFactory) {
-		this.fallbackFactory = fallbackFactory;
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (this == o) return true;
-		if (o == null || getClass() != o.getClass()) return false;
-		FeignClientFactoryBean that = (FeignClientFactoryBean) o;
-		return Objects.equals(applicationContext, that.applicationContext) &&
-				decode404 == that.decode404 &&
-				Objects.equals(fallback, that.fallback) &&
-				Objects.equals(fallbackFactory, that.fallbackFactory) &&
-				Objects.equals(name, that.name) &&
-				Objects.equals(path, that.path) &&
-				Objects.equals(type, that.type) &&
-				Objects.equals(url, that.url);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(applicationContext, decode404, fallback, fallbackFactory,
-				name, path, type, url);
-	}
-
-	@Override
-	public String toString() {
-		return new StringBuilder("FeignClientFactoryBean{")
-				.append("type=").append(type).append(", ")
-				.append("name='").append(name).append("', ")
-				.append("url='").append(url).append("', ")
-				.append("path='").append(path).append("', ")
-				.append("decode404=").append(decode404).append(", ")
-				.append("applicationContext=").append(applicationContext).append(", ")
-				.append("fallback=").append(fallback).append(", ")
-				.append("fallbackFactory=").append(fallbackFactory)
-				.append("}").toString();
-	}
-
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClientProperties.java

@@ -1,173 +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.feign;
-
-import feign.Logger;
-import feign.RequestInterceptor;
-import feign.Retryer;
-import feign.codec.ErrorDecoder;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * @author Eko Kurniawan Khannedy
- */
-@ConfigurationProperties("feign.client")
-public class FeignClientProperties {
-
-	private boolean defaultToProperties = true;
-
-	private String defaultConfig = "default";
-
-	private Map<String, FeignClientConfiguration> config = new HashMap<>();
-
-	public boolean isDefaultToProperties() {
-		return defaultToProperties;
-	}
-
-	public void setDefaultToProperties(boolean defaultToProperties) {
-		this.defaultToProperties = defaultToProperties;
-	}
-
-	public String getDefaultConfig() {
-		return defaultConfig;
-	}
-
-	public void setDefaultConfig(String defaultConfig) {
-		this.defaultConfig = defaultConfig;
-	}
-
-	public Map<String, FeignClientConfiguration> getConfig() {
-		return config;
-	}
-
-	public void setConfig(Map<String, FeignClientConfiguration> config) {
-		this.config = config;
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (this == o) return true;
-		if (o == null || getClass() != o.getClass()) return false;
-		FeignClientProperties that = (FeignClientProperties) o;
-		return defaultToProperties == that.defaultToProperties &&
-				Objects.equals(defaultConfig, that.defaultConfig) &&
-				Objects.equals(config, that.config);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(defaultToProperties, defaultConfig, config);
-	}
-
-	public static class FeignClientConfiguration {
-
-		private Logger.Level loggerLevel;
-
-		private Integer connectTimeout;
-
-		private Integer readTimeout;
-
-		private Class<Retryer> retryer;
-
-		private Class<ErrorDecoder> errorDecoder;
-
-		private List<Class<RequestInterceptor>> requestInterceptors;
-
-		private Boolean decode404;
-
-		public Logger.Level getLoggerLevel() {
-			return loggerLevel;
-		}
-
-		public void setLoggerLevel(Logger.Level loggerLevel) {
-			this.loggerLevel = loggerLevel;
-		}
-
-		public Integer getConnectTimeout() {
-			return connectTimeout;
-		}
-
-		public void setConnectTimeout(Integer connectTimeout) {
-			this.connectTimeout = connectTimeout;
-		}
-
-		public Integer getReadTimeout() {
-			return readTimeout;
-		}
-
-		public void setReadTimeout(Integer readTimeout) {
-			this.readTimeout = readTimeout;
-		}
-
-		public Class<Retryer> getRetryer() {
-			return retryer;
-		}
-
-		public void setRetryer(Class<Retryer> retryer) {
-			this.retryer = retryer;
-		}
-
-		public Class<ErrorDecoder> getErrorDecoder() {
-			return errorDecoder;
-		}
-
-		public void setErrorDecoder(Class<ErrorDecoder> errorDecoder) {
-			this.errorDecoder = errorDecoder;
-		}
-
-		public List<Class<RequestInterceptor>> getRequestInterceptors() {
-			return requestInterceptors;
-		}
-
-		public void setRequestInterceptors(List<Class<RequestInterceptor>> requestInterceptors) {
-			this.requestInterceptors = requestInterceptors;
-		}
-
-		public Boolean getDecode404() {
-			return decode404;
-		}
-
-		public void setDecode404(Boolean decode404) {
-			this.decode404 = decode404;
-		}
-
-		@Override
-		public boolean equals(Object o) {
-			if (this == o) return true;
-			if (o == null || getClass() != o.getClass()) return false;
-			FeignClientConfiguration that = (FeignClientConfiguration) o;
-			return loggerLevel == that.loggerLevel &&
-					Objects.equals(connectTimeout, that.connectTimeout) &&
-					Objects.equals(readTimeout, that.readTimeout) &&
-					Objects.equals(retryer, that.retryer) &&
-					Objects.equals(errorDecoder, that.errorDecoder) &&
-					Objects.equals(requestInterceptors, that.requestInterceptors) &&
-					Objects.equals(decode404, that.decode404);
-		}
-
-		@Override
-		public int hashCode() {
-			return Objects.hash(loggerLevel, connectTimeout, readTimeout, retryer,
-					errorDecoder, requestInterceptors, decode404);
-		}
-	}
-
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClientSpecification.java

@@ -1,79 +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.feign;
-
-import org.springframework.cloud.context.named.NamedContextFactory;
-
-import java.util.Arrays;
-import java.util.Objects;
-
-/**
- * @author Dave Syer
- * @author Gregor Zurowski
- */
-class FeignClientSpecification implements NamedContextFactory.Specification {
-
-	private String name;
-
-	private Class<?>[] configuration;
-
-	public FeignClientSpecification() {}
-
-	public FeignClientSpecification(String name, Class<?>[] configuration) {
-		this.name = name;
-		this.configuration = configuration;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public Class<?>[] getConfiguration() {
-		return configuration;
-	}
-
-	public void setConfiguration(Class<?>[] configuration) {
-		this.configuration = configuration;
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (this == o) return true;
-		if (o == null || getClass() != o.getClass()) return false;
-		FeignClientSpecification that = (FeignClientSpecification) o;
-		return Objects.equals(name, that.name) &&
-				Arrays.equals(configuration, that.configuration);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(name, configuration);
-	}
-
-	@Override
-	public String toString() {
-		return new StringBuilder("FeignClientSpecification{")
-				.append("name='").append(name).append("', ")
-				.append("configuration=").append(Arrays.toString(configuration))
-				.append("}").toString();
-	}
-
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClientsConfiguration.java

@@ -1,128 +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.feign;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.factory.ObjectFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
-import org.springframework.cloud.netflix.feign.support.ResponseEntityDecoder;
-import org.springframework.cloud.netflix.feign.support.SpringDecoder;
-import org.springframework.cloud.netflix.feign.support.SpringEncoder;
-import org.springframework.cloud.netflix.feign.support.SpringMvcContract;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Scope;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.format.support.DefaultFormattingConversionService;
-import org.springframework.format.support.FormattingConversionService;
-
-import com.netflix.hystrix.HystrixCommand;
-
-import feign.Contract;
-import feign.Feign;
-import feign.Logger;
-import feign.Retryer;
-import feign.codec.Decoder;
-import feign.codec.Encoder;
-import feign.hystrix.HystrixFeign;
-import feign.optionals.OptionalDecoder;
-
-/**
- * @author Dave Syer
- * @author Venil Noronha
- */
-@Configuration
-public class FeignClientsConfiguration {
-
-	@Autowired
-	private ObjectFactory<HttpMessageConverters> messageConverters;
-
-	@Autowired(required = false)
-	private List<AnnotatedParameterProcessor> parameterProcessors = new ArrayList<>();
-
-	@Autowired(required = false)
-	private List<FeignFormatterRegistrar> feignFormatterRegistrars = new ArrayList<>();
-
-	@Autowired(required = false)
-	private Logger logger;
-
-	@Bean
-	@ConditionalOnMissingBean
-	public Decoder feignDecoder() {
-		return new OptionalDecoder(new ResponseEntityDecoder(new SpringDecoder(this.messageConverters)));
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	public Encoder feignEncoder() {
-		return new SpringEncoder(this.messageConverters);
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	public Contract feignContract(ConversionService feignConversionService) {
-		return new SpringMvcContract(this.parameterProcessors, feignConversionService);
-	}
-
-	@Bean
-	public FormattingConversionService feignConversionService() {
-		FormattingConversionService conversionService = new DefaultFormattingConversionService();
-		for (FeignFormatterRegistrar feignFormatterRegistrar : feignFormatterRegistrars) {
-			feignFormatterRegistrar.registerFormatters(conversionService);
-		}
-		return conversionService;
-	}
-
-	@Configuration
-	@ConditionalOnClass({ HystrixCommand.class, HystrixFeign.class })
-	protected static class HystrixFeignConfiguration {
-		@Bean
-		@Scope("prototype")
-		@ConditionalOnMissingBean
-		@ConditionalOnProperty(name = "feign.hystrix.enabled", matchIfMissing = false)
-		public Feign.Builder feignHystrixBuilder() {
-			return HystrixFeign.builder();
-		}
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	public Retryer feignRetryer() {
-		return Retryer.NEVER_RETRY;
-	}
-
-	@Bean
-	@Scope("prototype")
-	@ConditionalOnMissingBean
-	public Feign.Builder feignBuilder(Retryer retryer) {
-		return Feign.builder().retryer(retryer);
-	}
-
-	@Bean
-	@ConditionalOnMissingBean(FeignLoggerFactory.class)
-	public FeignLoggerFactory feignLoggerFactory() {
-		return new DefaultFeignLoggerFactory(logger);
-	}
-
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClientsRegistrar.java

@@ -1,420 +0,0 @@
-/*
- * Copyright 2013-2016 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.feign;
-
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.springframework.beans.factory.BeanClassLoaderAware;
-import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.config.BeanDefinitionHolder;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.EnvironmentAware;
-import org.springframework.context.ResourceLoaderAware;
-import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
-import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
-import org.springframework.core.annotation.AnnotationAttributes;
-import org.springframework.core.env.Environment;
-import org.springframework.core.io.ResourceLoader;
-import org.springframework.core.type.AnnotationMetadata;
-import org.springframework.core.type.ClassMetadata;
-import org.springframework.core.type.classreading.MetadataReader;
-import org.springframework.core.type.classreading.MetadataReaderFactory;
-import org.springframework.core.type.filter.AbstractClassTestingTypeFilter;
-import org.springframework.core.type.filter.AnnotationTypeFilter;
-import org.springframework.core.type.filter.TypeFilter;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.StringUtils;
-
-/**
- * @author Spencer Gibb
- * @author Jakub Narloch
- * @author Venil Noronha
- */
-class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar,
-		ResourceLoaderAware, BeanClassLoaderAware, EnvironmentAware {
-
-	// patterned after Spring Integration IntegrationComponentScanRegistrar
-	// and RibbonClientsConfigurationRegistgrar
-
-	private ResourceLoader resourceLoader;
-
-	private ClassLoader classLoader;
-
-	private Environment environment;
-
-	public FeignClientsRegistrar() {
-	}
-
-	@Override
-	public void setResourceLoader(ResourceLoader resourceLoader) {
-		this.resourceLoader = resourceLoader;
-	}
-
-	@Override
-	public void setBeanClassLoader(ClassLoader classLoader) {
-		this.classLoader = classLoader;
-	}
-
-	@Override
-	public void registerBeanDefinitions(AnnotationMetadata metadata,
-			BeanDefinitionRegistry registry) {
-		registerDefaultConfiguration(metadata, registry);
-		registerFeignClients(metadata, registry);
-	}
-
-	private void registerDefaultConfiguration(AnnotationMetadata metadata,
-			BeanDefinitionRegistry registry) {
-		Map<String, Object> defaultAttrs = metadata
-				.getAnnotationAttributes(EnableFeignClients.class.getName(), true);
-
-		if (defaultAttrs != null && defaultAttrs.containsKey("defaultConfiguration")) {
-			String name;
-			if (metadata.hasEnclosingClass()) {
-				name = "default." + metadata.getEnclosingClassName();
-			}
-			else {
-				name = "default." + metadata.getClassName();
-			}
-			registerClientConfiguration(registry, name,
-					defaultAttrs.get("defaultConfiguration"));
-		}
-	}
-
-	public void registerFeignClients(AnnotationMetadata metadata,
-			BeanDefinitionRegistry registry) {
-		ClassPathScanningCandidateComponentProvider scanner = getScanner();
-		scanner.setResourceLoader(this.resourceLoader);
-
-		Set<String> basePackages;
-
-		Map<String, Object> attrs = metadata
-				.getAnnotationAttributes(EnableFeignClients.class.getName());
-		AnnotationTypeFilter annotationTypeFilter = new AnnotationTypeFilter(
-				FeignClient.class);
-		final Class<?>[] clients = attrs == null ? null
-				: (Class<?>[]) attrs.get("clients");
-		if (clients == null || clients.length == 0) {
-			scanner.addIncludeFilter(annotationTypeFilter);
-			basePackages = getBasePackages(metadata);
-		}
-		else {
-			final Set<String> clientClasses = new HashSet<>();
-			basePackages = new HashSet<>();
-			for (Class<?> clazz : clients) {
-				basePackages.add(ClassUtils.getPackageName(clazz));
-				clientClasses.add(clazz.getCanonicalName());
-			}
-			AbstractClassTestingTypeFilter filter = new AbstractClassTestingTypeFilter() {
-				@Override
-				protected boolean match(ClassMetadata metadata) {
-					String cleaned = metadata.getClassName().replaceAll("\\$", ".");
-					return clientClasses.contains(cleaned);
-				}
-			};
-			scanner.addIncludeFilter(
-					new AllTypeFilter(Arrays.asList(filter, annotationTypeFilter)));
-		}
-
-		for (String basePackage : basePackages) {
-			Set<BeanDefinition> candidateComponents = scanner
-					.findCandidateComponents(basePackage);
-			for (BeanDefinition candidateComponent : candidateComponents) {
-				if (candidateComponent instanceof AnnotatedBeanDefinition) {
-					// verify annotated class is an interface
-					AnnotatedBeanDefinition beanDefinition = (AnnotatedBeanDefinition) candidateComponent;
-					AnnotationMetadata annotationMetadata = beanDefinition.getMetadata();
-					Assert.isTrue(annotationMetadata.isInterface(),
-							"@FeignClient can only be specified on an interface");
-
-					Map<String, Object> attributes = annotationMetadata
-							.getAnnotationAttributes(
-									FeignClient.class.getCanonicalName());
-
-					String name = getClientName(attributes);
-					registerClientConfiguration(registry, name,
-							attributes.get("configuration"));
-
-					registerFeignClient(registry, annotationMetadata, attributes);
-				}
-			}
-		}
-	}
-
-	private void registerFeignClient(BeanDefinitionRegistry registry,
-			AnnotationMetadata annotationMetadata, Map<String, Object> attributes) {
-		String className = annotationMetadata.getClassName();
-		BeanDefinitionBuilder definition = BeanDefinitionBuilder
-				.genericBeanDefinition(FeignClientFactoryBean.class);
-		validate(attributes);
-		definition.addPropertyValue("url", getUrl(attributes));
-		definition.addPropertyValue("path", getPath(attributes));
-		String name = getName(attributes);
-		definition.addPropertyValue("name", name);
-		definition.addPropertyValue("type", className);
-		definition.addPropertyValue("decode404", attributes.get("decode404"));
-		definition.addPropertyValue("fallback", attributes.get("fallback"));
-		definition.addPropertyValue("fallbackFactory", attributes.get("fallbackFactory"));
-		definition.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_BY_TYPE);
-
-		String alias = name + "FeignClient";
-		AbstractBeanDefinition beanDefinition = definition.getBeanDefinition();
-
-		boolean primary = (Boolean)attributes.get("primary"); // has a default, won't be null
-
-		beanDefinition.setPrimary(primary);
-
-		String qualifier = getQualifier(attributes);
-		if (StringUtils.hasText(qualifier)) {
-			alias = qualifier;
-		}
-
-		BeanDefinitionHolder holder = new BeanDefinitionHolder(beanDefinition, className,
-				new String[] { alias });
-		BeanDefinitionReaderUtils.registerBeanDefinition(holder, registry);
-	}
-
-	private void validate(Map<String, Object> attributes) {
-		AnnotationAttributes annotation = AnnotationAttributes.fromMap(attributes);
-		// This blows up if an aliased property is overspecified
-		// FIXME annotation.getAliasedString("name", FeignClient.class, null);
-	}
-
-	/* for testing */ String getName(Map<String, Object> attributes) {
-		String name = (String) attributes.get("serviceId");
-		if (!StringUtils.hasText(name)) {
-			name = (String) attributes.get("name");
-		}
-		if (!StringUtils.hasText(name)) {
-			name = (String) attributes.get("value");
-		}
-		name = resolve(name);
-		if (!StringUtils.hasText(name)) {
-			return "";
-		}
-
-		String host = null;
-		try {
-			String url;
-			if (!name.startsWith("http://") && !name.startsWith("https://")) {
-				url = "http://" + name;
-			} else {
-				url = name;
-			}
-			host = new URI(url).getHost();
-
-		}
-		catch (URISyntaxException e) {
-		}
-		Assert.state(host != null, "Service id not legal hostname (" + name + ")");
-		return name;
-	}
-
-	private String resolve(String value) {
-		if (StringUtils.hasText(value)) {
-			return this.environment.resolvePlaceholders(value);
-		}
-		return value;
-	}
-
-	private String getUrl(Map<String, Object> attributes) {
-		String url = resolve((String) attributes.get("url"));
-		if (StringUtils.hasText(url) && !(url.startsWith("#{") && url.contains("}"))) {
-			if (!url.contains("://")) {
-				url = "http://" + url;
-			}
-			try {
-				new URL(url);
-			}
-			catch (MalformedURLException e) {
-				throw new IllegalArgumentException(url + " is malformed", e);
-			}
-		}
-		return url;
-	}
-
-	private String getPath(Map<String, Object> attributes) {
-		String path = resolve((String) attributes.get("path"));
-		if (StringUtils.hasText(path)) {
-			path = path.trim();
-			if (!path.startsWith("/")) {
-				path = "/" + path;
-			}
-			if (path.endsWith("/")) {
-				path = path.substring(0, path.length() - 1);
-			}
-		}
-		return path;
-	}
-
-	protected ClassPathScanningCandidateComponentProvider getScanner() {
-		return new ClassPathScanningCandidateComponentProvider(false, this.environment) {
-
-			@Override
-			protected boolean isCandidateComponent(
-					AnnotatedBeanDefinition beanDefinition) {
-				if (beanDefinition.getMetadata().isIndependent()) {
-					// TODO until SPR-11711 will be resolved
-					if (beanDefinition.getMetadata().isInterface()
-							&& beanDefinition.getMetadata()
-									.getInterfaceNames().length == 1
-							&& Annotation.class.getName().equals(beanDefinition
-									.getMetadata().getInterfaceNames()[0])) {
-						try {
-							Class<?> target = ClassUtils.forName(
-									beanDefinition.getMetadata().getClassName(),
-									FeignClientsRegistrar.this.classLoader);
-							return !target.isAnnotation();
-						}
-						catch (Exception ex) {
-							this.logger.error(
-									"Could not load target class: "
-											+ beanDefinition.getMetadata().getClassName(),
-									ex);
-
-						}
-					}
-					return true;
-				}
-				return false;
-
-			}
-		};
-	}
-
-	protected Set<String> getBasePackages(AnnotationMetadata importingClassMetadata) {
-		Map<String, Object> attributes = importingClassMetadata
-				.getAnnotationAttributes(EnableFeignClients.class.getCanonicalName());
-
-		Set<String> basePackages = new HashSet<>();
-		for (String pkg : (String[]) attributes.get("value")) {
-			if (StringUtils.hasText(pkg)) {
-				basePackages.add(pkg);
-			}
-		}
-		for (String pkg : (String[]) attributes.get("basePackages")) {
-			if (StringUtils.hasText(pkg)) {
-				basePackages.add(pkg);
-			}
-		}
-		for (Class<?> clazz : (Class[]) attributes.get("basePackageClasses")) {
-			basePackages.add(ClassUtils.getPackageName(clazz));
-		}
-
-		if (basePackages.isEmpty()) {
-			basePackages.add(
-					ClassUtils.getPackageName(importingClassMetadata.getClassName()));
-		}
-		return basePackages;
-	}
-	
-	private String getQualifier(Map<String, Object> client) {
-		if (client == null) {
-			return null;
-		}
-		String qualifier = (String) client.get("qualifier");
-		if (StringUtils.hasText(qualifier)) {
-			return qualifier;
-		}
-		return null;
-	}
-
-	private String getClientName(Map<String, Object> client) {
-		if (client == null) {
-			return null;
-		}
-		String value = (String) client.get("value");
-		if (!StringUtils.hasText(value)) {
-			value = (String) client.get("name");
-		}
-		if (!StringUtils.hasText(value)) {
-			value = (String) client.get("serviceId");
-		}
-		if (StringUtils.hasText(value)) {
-			return value;
-		}
-
-		throw new IllegalStateException("Either 'name' or 'value' must be provided in @"
-				+ FeignClient.class.getSimpleName());
-	}
-
-	private void registerClientConfiguration(BeanDefinitionRegistry registry, Object name,
-			Object configuration) {
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder
-				.genericBeanDefinition(FeignClientSpecification.class);
-		builder.addConstructorArgValue(name);
-		builder.addConstructorArgValue(configuration);
-		registry.registerBeanDefinition(
-				name + "." + FeignClientSpecification.class.getSimpleName(),
-				builder.getBeanDefinition());
-	}
-
-	@Override
-	public void setEnvironment(Environment environment) {
-		this.environment = environment;
-	}
-
-	/**
-	 * Helper class to create a {@link TypeFilter} that matches if all the delegates
-	 * match.
-	 *
-	 * @author Oliver Gierke
-	 */
-	private static class AllTypeFilter implements TypeFilter {
-
-		private final List<TypeFilter> delegates;
-
-		/**
-		 * Creates a new {@link AllTypeFilter} to match if all the given delegates match.
-		 *
-		 * @param delegates must not be {@literal null}.
-		 */
-		public AllTypeFilter(List<TypeFilter> delegates) {
-
-			Assert.notNull(delegates);
-			this.delegates = delegates;
-		}
-
-		@Override
-		public boolean match(MetadataReader metadataReader,
-				MetadataReaderFactory metadataReaderFactory) throws IOException {
-
-			for (TypeFilter filter : this.delegates) {
-				if (!filter.match(metadataReader, metadataReaderFactory)) {
-					return false;
-				}
-			}
-
-			return true;
-		}
-	}
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignContext.java

@@ -1,34 +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.feign;
-
-import org.springframework.cloud.context.named.NamedContextFactory;
-
-/**
- * A factory that creates instances of feign classes. It creates a Spring
- * ApplicationContext per client name, and extracts the beans that it needs from there.
- *
- * @author Spencer Gibb
- * @author Dave Syer
- */
-public class FeignContext extends NamedContextFactory<FeignClientSpecification> {
-
-	public FeignContext() {
-		super(FeignClientsConfiguration.class, "feign", "feign.client.name");
-	}
-
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignFormatterRegistrar.java

@@ -1,29 +0,0 @@
-/*
- * Copyright 2013-2016 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.feign;
-
-import org.springframework.format.FormatterRegistrar;
-import org.springframework.format.support.FormattingConversionService;
-
-/**
- * Allows an application to customize the Feign {@link FormattingConversionService}.
- *
- * @author Matt Benson
- */
-public interface FeignFormatterRegistrar extends FormatterRegistrar {
-
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignLoggerFactory.java

@@ -1,36 +0,0 @@
-/*
- * Copyright 2016 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.feign;
-
-import feign.Logger;
-
-/**
- * Allows an application to use a custom Feign {@link Logger}.
- *
- * @author Venil Noronha
- */
-public interface FeignLoggerFactory {
-
-	/**
-	 * Factory method to provide a {@link Logger} for a given {@link Class}.
-	 *
-	 * @param type the {@link Class} for which a {@link Logger} instance is to be created
-	 * @return a {@link Logger} instance
-	 */
-	public Logger create(Class<?> type);
-
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/HystrixTargeter.java

@@ -1,111 +0,0 @@
-/*
- * Copyright 2013-2016 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.feign;
-
-import org.springframework.util.Assert;
-
-import feign.Feign;
-import feign.Target;
-import feign.hystrix.FallbackFactory;
-import feign.hystrix.HystrixFeign;
-import feign.hystrix.SetterFactory;
-
-/**
- * @author Spencer Gibb
- * @author Erik Kringen
- */
-@SuppressWarnings("unchecked")
-class HystrixTargeter implements Targeter {
-
-	@Override
-	public <T> T target(FeignClientFactoryBean factory, Feign.Builder feign, FeignContext context,
-						Target.HardCodedTarget<T> target) {
-		if (!(feign instanceof feign.hystrix.HystrixFeign.Builder)) {
-			return feign.target(target);
-		}
-		feign.hystrix.HystrixFeign.Builder builder = (feign.hystrix.HystrixFeign.Builder) feign;
-		SetterFactory setterFactory = getOptional(factory.getName(), context,
-			SetterFactory.class);
-		if (setterFactory != null) {
-			builder.setterFactory(setterFactory);
-		}
-		Class<?> fallback = factory.getFallback();
-		if (fallback != void.class) {
-			return targetWithFallback(factory.getName(), context, target, builder, fallback);
-		}
-		Class<?> fallbackFactory = factory.getFallbackFactory();
-		if (fallbackFactory != void.class) {
-			return targetWithFallbackFactory(factory.getName(), context, target, builder, fallbackFactory);
-		}
-
-		return feign.target(target);
-	}
-
-	private <T> T targetWithFallbackFactory(String feignClientName, FeignContext context,
-											Target.HardCodedTarget<T> target,
-											HystrixFeign.Builder builder,
-											Class<?> fallbackFactoryClass) {
-		FallbackFactory<? extends T> fallbackFactory = (FallbackFactory<? extends T>)
-			getFromContext("fallbackFactory", feignClientName, context, fallbackFactoryClass, FallbackFactory.class);
-		/* We take a sample fallback from the fallback factory to check if it returns a fallback
-		that is compatible with the annotated feign interface. */
-		Object exampleFallback = fallbackFactory.create(new RuntimeException());
-		Assert.notNull(exampleFallback,
-			String.format(
-			"Incompatible fallbackFactory instance for feign client %s. Factory may not produce null!",
-				feignClientName));
-		if (!target.type().isAssignableFrom(exampleFallback.getClass())) {
-			throw new IllegalStateException(
-				String.format(
-					"Incompatible fallbackFactory instance for feign client %s. Factory produces instances of '%s', but should produce instances of '%s'",
-					feignClientName, exampleFallback.getClass(), target.type()));
-		}
-		return builder.target(target, fallbackFactory);
-	}
-
-
-	private <T> T targetWithFallback(String feignClientName, FeignContext context,
-									 Target.HardCodedTarget<T> target,
-									 HystrixFeign.Builder builder, Class<?> fallback) {
-		T fallbackInstance = getFromContext("fallback", feignClientName, context, fallback, target.type());
-		return builder.target(target, fallbackInstance);
-	}
-
-	private <T> T getFromContext(String fallbackMechanism, String feignClientName, FeignContext context,
-								 Class<?> beanType, Class<T> targetType) {
-		Object fallbackInstance = context.getInstance(feignClientName, beanType);
-		if (fallbackInstance == null) {
-			throw new IllegalStateException(String.format(
-				"No " + fallbackMechanism + " instance of type %s found for feign client %s",
-				beanType, feignClientName));
-		}
-
-		if (!targetType.isAssignableFrom(beanType)) {
-			throw new IllegalStateException(
-					String.format(
-						"Incompatible " + fallbackMechanism + " instance. Fallback/fallbackFactory of type %s is not assignable to %s for feign client %s",
-						beanType, targetType, feignClientName));
-		}
-		return (T) fallbackInstance;
-	}
-
-	private <T> T getOptional(String feignClientName, FeignContext context,
-		Class<T> beanType) {
-		return context.getInstance(feignClientName, beanType);
-	}
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/Targeter.java

@@ -1,29 +0,0 @@
-/*
- * Copyright 2013-2016 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.feign;
-
-import feign.Feign;
-import feign.Target;
-
-/**
- * @author Spencer Gibb
- */
-interface Targeter {
-	<T> T target(FeignClientFactoryBean factory, Feign.Builder feign, FeignContext context,
-				 Target.HardCodedTarget<T> target);
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/annotation/PathVariableParameterProcessor.java

@@ -1,77 +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.feign.annotation;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.Map;
-
-import org.springframework.cloud.netflix.feign.AnnotatedParameterProcessor;
-import org.springframework.web.bind.annotation.PathVariable;
-
-import feign.MethodMetadata;
-
-import static feign.Util.checkState;
-import static feign.Util.emptyToNull;
-
-/**
- * {@link PathVariable} parameter processor.
- *
- * @author Jakub Narloch
- * @author Abhijit Sarkar
- * @see AnnotatedParameterProcessor
- */
-public class PathVariableParameterProcessor implements AnnotatedParameterProcessor {
-
-	private static final Class<PathVariable> ANNOTATION = PathVariable.class;
-
-	@Override
-	public Class<? extends Annotation> getAnnotationType() {
-		return ANNOTATION;
-	}
-
-	@Override
-	public boolean processArgument(AnnotatedParameterContext context, Annotation annotation, Method method) {
-		String name = ANNOTATION.cast(annotation).value();
-		checkState(emptyToNull(name) != null,
-				"PathVariable annotation was empty on param %s.", context.getParameterIndex());
-		context.setParameterName(name);
-
-		MethodMetadata data = context.getMethodMetadata();
-		String varName = '{' + name + '}';
-		if (!data.template().url().contains(varName)
-				&& !searchMapValues(data.template().queries(), varName)
-				&& !searchMapValues(data.template().headers(), varName)) {
-			data.formParams().add(name);
-		}
-		return true;
-	}
-
-	private <K, V> boolean searchMapValues(Map<K, Collection<V>> map, V search) {
-		Collection<Collection<V>> values = map.values();
-		if (values == null) {
-			return false;
-		}
-		for (Collection<V> entry : values) {
-			if (entry.contains(search)) {
-				return true;
-			}
-		}
-		return false;
-	}
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/annotation/RequestHeaderParameterProcessor.java

@@ -1,70 +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.feign.annotation;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.Map;
-
-import org.springframework.cloud.netflix.feign.AnnotatedParameterProcessor;
-import org.springframework.web.bind.annotation.RequestHeader;
-
-import feign.MethodMetadata;
-
-import static feign.Util.checkState;
-import static feign.Util.emptyToNull;
-
-/**
- * {@link RequestHeader} parameter processor.
- *
- * @author Jakub Narloch
- * @author Abhijit Sarkar
- * @see AnnotatedParameterProcessor
- */
-public class RequestHeaderParameterProcessor implements AnnotatedParameterProcessor {
-
-	private static final Class<RequestHeader> ANNOTATION = RequestHeader.class;
-
-	@Override
-	public Class<? extends Annotation> getAnnotationType() {
-		return ANNOTATION;
-	}
-
-	@Override
-	public boolean processArgument(AnnotatedParameterContext context, Annotation annotation, Method method) {
-		int parameterIndex = context.getParameterIndex();
-		Class<?> parameterType = method.getParameterTypes()[parameterIndex];
-		MethodMetadata data = context.getMethodMetadata();
-
-		if (Map.class.isAssignableFrom(parameterType)) {
-			checkState(data.headerMapIndex() == null, "Header map can only be present once.");
-			data.headerMapIndex(parameterIndex);
-
-			return true;
-		}
-
-		String name = ANNOTATION.cast(annotation).value();
-		checkState(emptyToNull(name) != null,
-				"RequestHeader.value() was empty on parameter %s", parameterIndex);
-		context.setParameterName(name);
-
-		Collection<String> header = context.setTemplateParameter(name, data.template().headers().get(name));
-		data.template().header(name, header);
-		return true;
-	}
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/annotation/RequestParamParameterProcessor.java

@@ -1,73 +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.feign.annotation;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.Map;
-
-import org.springframework.cloud.netflix.feign.AnnotatedParameterProcessor;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import static feign.Util.checkState;
-import static feign.Util.emptyToNull;
-
-import feign.MethodMetadata;
-
-/**
- * {@link RequestParam} parameter processor.
- *
- * @author Jakub Narloch
- * @author Abhijit Sarkar
- * @see AnnotatedParameterProcessor
- */
-public class RequestParamParameterProcessor implements AnnotatedParameterProcessor {
-
-	private static final Class<RequestParam> ANNOTATION = RequestParam.class;
-
-	@Override
-	public Class<? extends Annotation> getAnnotationType() {
-		return ANNOTATION;
-	}
-
-	@Override
-	public boolean processArgument(AnnotatedParameterContext context, Annotation annotation, Method method) {
-		int parameterIndex = context.getParameterIndex();
-		Class<?> parameterType = method.getParameterTypes()[parameterIndex];
-		MethodMetadata data = context.getMethodMetadata();
-
-		if (Map.class.isAssignableFrom(parameterType)) {
-			checkState(data.queryMapIndex() == null, "Query map can only be present once.");
-			data.queryMapIndex(parameterIndex);
-
-			return true;
-		}
-
-		RequestParam requestParam = ANNOTATION.cast(annotation);
-		String name = requestParam.value();
-		checkState(emptyToNull(name) != null,
-				"RequestParam.value() was empty on parameter %s",
-				parameterIndex);
-		context.setParameterName(name);
-
-		Collection<String> query = context.setTemplateParameter(name,
-				data.template().queries().get(name));
-		data.template().query(name, query);
-		return true;
-	}
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/encoding/BaseRequestInterceptor.java

@@ -1,63 +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.feign.encoding;
-
-import feign.RequestInterceptor;
-import feign.RequestTemplate;
-import org.springframework.util.Assert;
-
-/**
- * The base request interceptor.
- *
- * @author Jakub Narloch
- */
-public abstract class BaseRequestInterceptor implements RequestInterceptor {
-
-	/**
-	 * The encoding properties.
-	 */
-	private final FeignClientEncodingProperties properties;
-
-	/**
-	 * Creates new instance of {@link BaseRequestInterceptor}.
-	 *
-	 * @param properties the encoding properties
-	 */
-	protected BaseRequestInterceptor(FeignClientEncodingProperties properties) {
-		Assert.notNull(properties, "Properties can not be null");
-		this.properties = properties;
-	}
-
-	/**
-	 * Adds the header if it wasn't yet specified.
-	 *
-	 * @param requestTemplate the request
-	 * @param name			the header name
-	 * @param values		  the header values
-	 */
-	protected void addHeader(RequestTemplate requestTemplate, String name, String... values) {
-
-		if (!requestTemplate.headers().containsKey(name)) {
-			requestTemplate.header(name, values);
-		}
-	}
-
-	protected FeignClientEncodingProperties getProperties() {
-		return properties;
-	}
-
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/encoding/FeignAcceptGzipEncodingAutoConfiguration.java

@@ -1,49 +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.feign.encoding;
-
-import feign.Feign;
-import feign.httpclient.ApacheHttpClient;
-
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.netflix.feign.FeignAutoConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * Configures the Feign response compression.
- *
- * @author Jakub Narloch
- * @see FeignAcceptGzipEncodingInterceptor
- */
-@Configuration
-@EnableConfigurationProperties(FeignClientEncodingProperties.class)
-@ConditionalOnClass(Feign.class)
-@ConditionalOnBean(ApacheHttpClient.class)
-@ConditionalOnProperty(value = "feign.compression.response.enabled", matchIfMissing = false)
-@AutoConfigureAfter(FeignAutoConfiguration.class)
-public class FeignAcceptGzipEncodingAutoConfiguration {
-
-	@Bean
-	public FeignAcceptGzipEncodingInterceptor feignAcceptGzipEncodingInterceptor(FeignClientEncodingProperties properties) {
-		return new FeignAcceptGzipEncodingInterceptor(properties);
-	}
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/encoding/FeignAcceptGzipEncodingInterceptor.java

@@ -1,49 +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.feign.encoding;
-
-import feign.RequestTemplate;
-
-/**
- * Enables the HTTP response payload compression by specifying the {@code Accept-Encoding} headers.
- * Although this does not yet mean that the requests will be compressed, it requires the remote server
- * to understand the header and be configured to compress responses. Still no all responses might be compressed
- * based on the media type matching and other factors like the response content length.
- *
- * @author Jakub Narloch
- */
-public class FeignAcceptGzipEncodingInterceptor extends BaseRequestInterceptor {
-
-	/**
-	 * Creates new instance of {@link FeignAcceptGzipEncodingInterceptor}.
-	 *
-	 * @param properties the encoding properties
-	 */
-	protected FeignAcceptGzipEncodingInterceptor(FeignClientEncodingProperties properties) {
-		super(properties);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void apply(RequestTemplate template) {
-
-		addHeader(template, HttpEncoding.ACCEPT_ENCODING_HEADER, HttpEncoding.GZIP_ENCODING,
-				HttpEncoding.DEFLATE_ENCODING);
-	}
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/encoding/FeignClientEncodingProperties.java

@@ -1,80 +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.feign.encoding;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-import java.util.Arrays;
-import java.util.Objects;
-
-/**
- * The Feign encoding properties.
- *
- * @author Jakub Narloch
- */
-@ConfigurationProperties("feign.compression.request")
-public class FeignClientEncodingProperties {
-
-	/**
-	 * The list of supported mime types.
-	 */
-	private String[] mimeTypes = new String[]{"text/xml", "application/xml", "application/json"};
-
-	/**
-	 * The minimum threshold content size.
-	 */
-	private int minRequestSize = 2048;
-
-	public String[] getMimeTypes() {
-		return mimeTypes;
-	}
-
-	public void setMimeTypes(String[] mimeTypes) {
-		this.mimeTypes = mimeTypes;
-	}
-
-	public int getMinRequestSize() {
-		return minRequestSize;
-	}
-
-	public void setMinRequestSize(int minRequestSize) {
-		this.minRequestSize = minRequestSize;
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (this == o) return true;
-		if (o == null || getClass() != o.getClass()) return false;
-		FeignClientEncodingProperties that = (FeignClientEncodingProperties) o;
-		return Arrays.equals(mimeTypes, that.mimeTypes) &&
-				Objects.equals(minRequestSize, that.minRequestSize);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(mimeTypes, minRequestSize);
-	}
-
-	@Override
-	public String toString() {
-		return new StringBuilder("FeignClientEncodingProperties{")
-				.append("mimeTypes=").append(Arrays.toString(mimeTypes)).append(", ")
-				.append("minRequestSize=").append(minRequestSize)
-				.append("}").toString();
-	}
-
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/encoding/FeignContentGzipEncodingAutoConfiguration.java

@@ -1,49 +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.feign.encoding;
-
-import feign.Feign;
-import feign.httpclient.ApacheHttpClient;
-
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.netflix.feign.FeignAutoConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * Configures the Feign request compression.
- *
- * @author Jakub Narloch
- * @see FeignContentGzipEncodingInterceptor
- */
-@Configuration
-@EnableConfigurationProperties(FeignClientEncodingProperties.class)
-@ConditionalOnClass(Feign.class)
-@ConditionalOnBean(ApacheHttpClient.class)
-@ConditionalOnProperty(value = "feign.compression.request.enabled", matchIfMissing = false)
-@AutoConfigureAfter(FeignAutoConfiguration.class)
-public class FeignContentGzipEncodingAutoConfiguration {
-
-	@Bean
-	public FeignContentGzipEncodingInterceptor feignContentGzipEncodingInterceptor(FeignClientEncodingProperties properties) {
-		return new FeignContentGzipEncodingInterceptor(properties);
-	}
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/encoding/FeignContentGzipEncodingInterceptor.java

@@ -1,111 +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.feign.encoding;
-
-import feign.RequestTemplate;
-
-import java.util.Collection;
-import java.util.Map;
-
-/**
- * Enables the HTTP request payload compression by specifying the {@code Content-Encoding} headers.
- *
- * @author Jakub Narloch
- */
-public class FeignContentGzipEncodingInterceptor extends BaseRequestInterceptor {
-
-	/**
-	 * Creates new instance of {@link FeignContentGzipEncodingInterceptor}.
-	 *
-	 * @param properties the encoding properties
-	 */
-	protected FeignContentGzipEncodingInterceptor(FeignClientEncodingProperties properties) {
-		super(properties);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void apply(RequestTemplate template) {
-
-		if (requiresCompression(template)) {
-			addHeader(template, HttpEncoding.CONTENT_ENCODING_HEADER, HttpEncoding.GZIP_ENCODING,
-					HttpEncoding.DEFLATE_ENCODING);
-		}
-	}
-
-	/**
-	 * Returns whether the request requires GZIP compression.
-	 *
-	 * @param template the request template
-	 * @return true if request requires compression, false otherwise
-	 */
-	private boolean requiresCompression(RequestTemplate template) {
-
-		final Map<String, Collection<String>> headers = template.headers();
-		return matchesMimeType(headers.get(HttpEncoding.CONTENT_TYPE))
-				&& contentLengthExceedThreshold(headers.get(HttpEncoding.CONTENT_LENGTH));
-	}
-
-	/**
-	 * Returns whether the request content length exceed configured minimum size.
-	 *
-	 * @param contentLength the content length header value
-	 * @return true if length is grater than minimum size, false otherwise
-	 */
-	private boolean contentLengthExceedThreshold(Collection<String> contentLength) {
-
-		try {
-			if (contentLength == null || contentLength.size() != 1) {
-				return false;
-			}
-
-			final String strLen = contentLength.iterator().next();
-			final long length = Long.parseLong(strLen);
-			return length > getProperties().getMinRequestSize();
-		} catch (NumberFormatException ex) {
-			// ignores the exception
-		}
-		return false;
-	}
-
-	/**
-	 * Returns whether the content mime types matches the configures mime types.
-	 *
-	 * @param contentTypes the content types
-	 * @return true if any specified content type matches the request content types
-	 */
-	private boolean matchesMimeType(Collection<String> contentTypes) {
-		if (contentTypes == null || contentTypes.size() == 0) {
-			return false;
-		}
-
-		if (getProperties().getMimeTypes() == null || getProperties().getMimeTypes().length == 0) {
-			// no specific mime types has been set - matching everything
-			return true;
-		}
-
-		for (String mimeType : getProperties().getMimeTypes()) {
-			if (contentTypes.contains(mimeType)) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/encoding/HttpEncoding.java

@@ -1,55 +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.feign.encoding;
-
-/**
- * Lists all constants used by Feign encoders.
- *
- * @author Jakub Narloch
- */
-public interface HttpEncoding {
-
-	/**
-	 * The HTTP Content-Length header.
-	 */
-	String CONTENT_LENGTH = "Content-Length";
-
-	/**
-	 * The HTTP Content-Type header.
-	 */
-	String CONTENT_TYPE = "Content-Type";
-
-	/**
-	 * The HTTP Accept-Encoding header.
-	 */
-	String ACCEPT_ENCODING_HEADER = "Accept-Encoding";
-
-	/**
-	 * The HTTP Content-Encoding header.
-	 */
-	String CONTENT_ENCODING_HEADER = "Content-Encoding";
-
-	/**
-	 * The GZIP encoding.
-	 */
-	String GZIP_ENCODING = "gzip";
-
-	/**
-	 * The Deflate encoding.
-	 */
-	String DEFLATE_ENCODING = "deflate";
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/CachingSpringLoadBalancerFactory.java

@@ -1,75 +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.feign.ribbon;
-
-import java.util.Map;
-
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryPolicyFactory;
-import org.springframework.cloud.netflix.ribbon.RibbonLoadBalancedRetryPolicyFactory;
-import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
-import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
-import org.springframework.util.ConcurrentReferenceHashMap;
-
-import com.netflix.client.config.IClientConfig;
-import com.netflix.loadbalancer.ILoadBalancer;
-
-/**
- * Factory for SpringLoadBalancer instances that caches the entries created.
- *
- * @author Spencer Gibb
- * @author Dave Syer
- */
-public class CachingSpringLoadBalancerFactory {
-
-	private final SpringClientFactory factory;
-	private final LoadBalancedRetryPolicyFactory loadBalancedRetryPolicyFactory;
-	private boolean enableRetry = false;
-
-	private volatile Map<String, FeignLoadBalancer> cache = new ConcurrentReferenceHashMap<>();
-
-	public CachingSpringLoadBalancerFactory(SpringClientFactory factory) {
-		this.factory = factory;
-		this.loadBalancedRetryPolicyFactory = new RibbonLoadBalancedRetryPolicyFactory(factory);
-	}
-
-	public CachingSpringLoadBalancerFactory(SpringClientFactory factory,
-											LoadBalancedRetryPolicyFactory loadBalancedRetryPolicyFactory) {
-		this.factory = factory;
-		this.loadBalancedRetryPolicyFactory = loadBalancedRetryPolicyFactory;
-	}
-
-	public CachingSpringLoadBalancerFactory(SpringClientFactory factory,
-											LoadBalancedRetryPolicyFactory loadBalancedRetryPolicyFactory, boolean enableRetry) {
-		this.factory = factory;
-		this.loadBalancedRetryPolicyFactory = loadBalancedRetryPolicyFactory;
-		this.enableRetry = enableRetry;
-	}
-
-	public FeignLoadBalancer create(String clientName) {
-		if (this.cache.containsKey(clientName)) {
-			return this.cache.get(clientName);
-		}
-		IClientConfig config = this.factory.getClientConfig(clientName);
-		ILoadBalancer lb = this.factory.getLoadBalancer(clientName);
-		ServerIntrospector serverIntrospector = this.factory.getInstance(clientName, ServerIntrospector.class);
-		FeignLoadBalancer client = enableRetry ? new RetryableFeignLoadBalancer(lb, config, serverIntrospector,
-				loadBalancedRetryPolicyFactory) : new FeignLoadBalancer(lb, config, serverIntrospector);
-		this.cache.put(clientName, client);
-		return client;
-	}
-
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/DefaultFeignLoadBalancedConfiguration.java

@@ -1,38 +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.feign.ribbon;
-
-import feign.Client;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author Spencer Gibb
- */
-@Configuration
-class DefaultFeignLoadBalancedConfiguration {
-	@Bean
-	@ConditionalOnMissingBean
-	public Client feignClient(CachingSpringLoadBalancerFactory cachingFactory,
-							  SpringClientFactory clientFactory) {
-		return new LoadBalancerFeignClient(new Client.Default(null, null),
-				cachingFactory, clientFactory);
-	}
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/FeignLoadBalancer.java

@@ -1,220 +0,0 @@
-/*
- * Copyright 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.feign.ribbon;
-
-import feign.Client;
-import feign.Request;
-import feign.Response;
-
-import java.io.IOException;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpRequest;
-import com.netflix.client.AbstractLoadBalancerAwareClient;
-import com.netflix.client.ClientException;
-import com.netflix.client.ClientRequest;
-import com.netflix.client.IResponse;
-import com.netflix.client.RequestSpecificRetryHandler;
-import com.netflix.client.RetryHandler;
-import com.netflix.client.config.CommonClientConfigKey;
-import com.netflix.client.config.IClientConfig;
-import com.netflix.loadbalancer.ILoadBalancer;
-import com.netflix.loadbalancer.Server;
-
-import static org.springframework.cloud.netflix.ribbon.RibbonUtils.updateToHttpsIfNeeded;
-
-public class FeignLoadBalancer extends
-		AbstractLoadBalancerAwareClient<FeignLoadBalancer.RibbonRequest, FeignLoadBalancer.RibbonResponse> {
-
-	protected int connectTimeout;
-	protected int readTimeout;
-	protected IClientConfig clientConfig;
-	protected ServerIntrospector serverIntrospector;
-
-	public FeignLoadBalancer(ILoadBalancer lb, IClientConfig clientConfig,
-							 ServerIntrospector serverIntrospector) {
-		super(lb, clientConfig);
-		this.setRetryHandler(RetryHandler.DEFAULT);
-		this.clientConfig = clientConfig;
-		this.connectTimeout = clientConfig.get(CommonClientConfigKey.ConnectTimeout);
-		this.readTimeout = clientConfig.get(CommonClientConfigKey.ReadTimeout);
-		this.serverIntrospector = serverIntrospector;
-	}
-
-	@Override
-	public RibbonResponse execute(RibbonRequest request, IClientConfig configOverride)
-			throws IOException {
-		Request.Options options;
-		if (configOverride != null) {
-			options = new Request.Options(
-					configOverride.get(CommonClientConfigKey.ConnectTimeout,
-							this.connectTimeout),
-					(configOverride.get(CommonClientConfigKey.ReadTimeout,
-							this.readTimeout)));
-		}
-		else {
-			options = new Request.Options(this.connectTimeout, this.readTimeout);
-		}
-		Response response = request.client().execute(request.toRequest(), options);
-		return new RibbonResponse(request.getUri(), response);
-	}
-
-	@Override
-	public RequestSpecificRetryHandler getRequestSpecificRetryHandler(
-			RibbonRequest request, IClientConfig requestConfig) {
-		if (this.clientConfig.get(CommonClientConfigKey.OkToRetryOnAllOperations,
-				false)) {
-			return new RequestSpecificRetryHandler(true, true, this.getRetryHandler(),
-					requestConfig);
-		}
-		if (!request.toRequest().method().equals("GET")) {
-			return new RequestSpecificRetryHandler(true, false, this.getRetryHandler(),
-					requestConfig);
-		}
-		else {
-			return new RequestSpecificRetryHandler(true, true, this.getRetryHandler(),
-					requestConfig);
-		}
-	}
-
-	@Override
-	public URI reconstructURIWithServer(Server server, URI original) {
-		URI uri = updateToHttpsIfNeeded(original, this.clientConfig, this.serverIntrospector, server);
-		return super.reconstructURIWithServer(server, uri);
-	}
-
-	static class RibbonRequest extends ClientRequest implements Cloneable {
-
-		private final Request request;
-		private final Client client;
-
-		RibbonRequest(Client client, Request request, URI uri) {
-			this.client = client;
-			setUri(uri);
-			this.request = toRequest(request);
-		}
-
-		private Request toRequest(Request request) {
-			Map<String, Collection<String>> headers = new LinkedHashMap<>(
-					request.headers());
-			return Request.create(request.method(),getUri().toASCIIString(),headers,request.body(),request.charset());
-		}
-
-		Request toRequest() {
-			return toRequest(this.request);
-		}
-
-		Client client() {
-			return this.client;
-		}
-
-		HttpRequest toHttpRequest() {
-			return new HttpRequest() {
-				@Override
-				public HttpMethod getMethod() {
-					return HttpMethod.resolve(RibbonRequest.this.toRequest().method());
-				}
-
-				@Override
-				public String getMethodValue() {
-					return getMethod().name();
-				}
-
-				@Override
-				public URI getURI() {
-					return RibbonRequest.this.getUri();
-				}
-
-				@Override
-				public HttpHeaders getHeaders() {
-					Map<String, List<String>> headers = new HashMap<String, List<String>>();
-					Map<String, Collection<String>> feignHeaders = RibbonRequest.this.toRequest().headers();
-					for(String key : feignHeaders.keySet()) {
-						headers.put(key, new ArrayList<String>(feignHeaders.get(key)));
-					}
-					HttpHeaders httpHeaders = new HttpHeaders();
-					httpHeaders.putAll(headers);
-					return httpHeaders;
-
-				}
-			};
-		}
-
-
-		@Override
-		public Object clone() {
-			return new RibbonRequest(this.client, this.request, getUri());
-		}
-	}
-
-	static class RibbonResponse implements IResponse {
-
-		private final URI uri;
-		private final Response response;
-
-		RibbonResponse(URI uri, Response response) {
-			this.uri = uri;
-			this.response = response;
-		}
-
-		@Override
-		public Object getPayload() throws ClientException {
-			return this.response.body();
-		}
-
-		@Override
-		public boolean hasPayload() {
-			return this.response.body() != null;
-		}
-
-		@Override
-		public boolean isSuccess() {
-			return this.response.status() == 200;
-		}
-
-		@Override
-		public URI getRequestedURI() {
-			return this.uri;
-		}
-
-		@Override
-		public Map<String, Collection<String>> getHeaders() {
-			return this.response.headers();
-		}
-
-		Response toResponse() {
-			return this.response;
-		}
-
-		@Override
-		public void close() throws IOException {
-			if (this.response != null && this.response.body() != null) {
-				this.response.body().close();
-			}
-		}
-
-	}
-
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/FeignRetryPolicy.java

@@ -1,119 +0,0 @@
-/*
- *
- *  * Copyright 2013-2016 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.feign.ribbon;
-
-import java.net.URI;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.client.loadbalancer.InterceptorRetryPolicy;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryContext;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryPolicy;
-import org.springframework.cloud.client.loadbalancer.ServiceInstanceChooser;
-import org.springframework.http.HttpRequest;
-import org.springframework.retry.RetryContext;
-
-/**
- * @author Ryan Baxter
- */
-public class FeignRetryPolicy extends InterceptorRetryPolicy {
-	private HttpRequest request;
-	private String serviceId;
-	public FeignRetryPolicy(HttpRequest request, LoadBalancedRetryPolicy policy, ServiceInstanceChooser serviceInstanceChooser, String serviceName) {
-		super(request, policy, serviceInstanceChooser, serviceName);
-		this.request = request;
-		this.serviceId = serviceName;
-	}
-
-	@Override
-	public boolean canRetry(RetryContext context) {
-		/*
-		 * In InterceptorRetryPolicy.canRetry we ask the LoadBalancer to choose a server if one is not
-		 * set in the retry context and then return true.  RetryTemplat calls the canRetry method of
-		 * the policy even on its first execution.  So the fact that we didnt have a service instance set
-		 * in the RetryContext signaled that it was the first execution and we should return true.
-		 *
-		 * In the Feign scenario, Feign as actually already queried the load balancer for a service instance
-		 * and we set that service instance in the context when we call the open method of the policy.  So in
-		 * the Feign case we just return true if the retry count is 0 indicating we haven't yet made a failed
-		 * request.
-		 */
-		if(context.getRetryCount() == 0) {
-			return true;
-		}
-		return super.canRetry(context);
-	}
-
-	@Override
-	public RetryContext open(RetryContext parent) {
-		/*
-		 * With Feign (unlike Ribbon) the request already has the URI for the service instance
-		 * we are going to make the request to, so extract that information and set the service
-		 * instance in the context.  In the Ribbon scenario the URI in the request object still has
-		 * the service id so we choose and set the service instance later on.
-		 */
-		LoadBalancedRetryContext context = new LoadBalancedRetryContext(parent, this.request);
-		context.setServiceInstance(new FeignRetryPolicyServiceInstance(serviceId, request));
-		return context;
-	}
-
-	class FeignRetryPolicyServiceInstance implements ServiceInstance {
-
-		private String serviceId;
-		private HttpRequest request;
-		private Map<String, String> metadata;
-
-		FeignRetryPolicyServiceInstance(String serviceId, HttpRequest request) {
-			this.serviceId = serviceId;
-			this.request = request;
-			this.metadata = new HashMap<String, String>();
-		}
-
-		@Override
-		public String getServiceId() {
-			return serviceId;
-		}
-
-		@Override
-		public String getHost() {
-			return request.getURI().getHost();
-		}
-
-		@Override
-		public int getPort() {
-			return request.getURI().getPort();
-		}
-
-		@Override
-		public boolean isSecure() {
-			return "https".equals(request.getURI().getScheme());
-		}
-
-		@Override
-		public URI getUri() {
-			return request.getURI();
-		}
-
-		@Override
-		public Map<String, String> getMetadata() {
-			return metadata;
-		}
-	}
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/FeignRibbonClientAutoConfiguration.java

@@ -1,77 +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.feign.ribbon;
-
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryPolicyFactory;
-import org.springframework.cloud.netflix.feign.FeignAutoConfiguration;
-import org.springframework.cloud.netflix.feign.support.FeignHttpClientProperties;
-import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.Primary;
-
-import com.netflix.loadbalancer.ILoadBalancer;
-
-import feign.Feign;
-import feign.Request;
-
-/**
- * Autoconfiguration to be activated if Feign is in use and needs to be use Ribbon as a
- * load balancer.
- *
- * @author Dave Syer
- */
-@ConditionalOnClass({ ILoadBalancer.class, Feign.class })
-@Configuration
-@AutoConfigureBefore(FeignAutoConfiguration.class)
-@EnableConfigurationProperties({ FeignHttpClientProperties.class })
-//Order is important here, last should be the default, first should be optional
-// see https://github.com/spring-cloud/spring-cloud-netflix/issues/2086#issuecomment-316281653
-@Import({ HttpClientFeignLoadBalancedConfiguration.class,
-		OkHttpFeignLoadBalancedConfiguration.class,
-		DefaultFeignLoadBalancedConfiguration.class })
-public class FeignRibbonClientAutoConfiguration {
-
-	@Bean
-	@Primary
-	@ConditionalOnMissingClass("org.springframework.retry.support.RetryTemplate")
-	public CachingSpringLoadBalancerFactory cachingLBClientFactory(
-			SpringClientFactory factory) {
-		return new CachingSpringLoadBalancerFactory(factory);
-	}
-
-	@Bean
-	@Primary
-	@ConditionalOnClass(name = "org.springframework.retry.support.RetryTemplate")
-	public CachingSpringLoadBalancerFactory retryabeCachingLBClientFactory(
-			SpringClientFactory factory,
-			LoadBalancedRetryPolicyFactory retryPolicyFactory) {
-		return new CachingSpringLoadBalancerFactory(factory, retryPolicyFactory, true);
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	public Request.Options feignRequestOptions() {
-		return LoadBalancerFeignClient.DEFAULT_OPTIONS;
-	}
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/HttpClientFeignLoadBalancedConfiguration.java

@@ -1,113 +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.feign.ribbon;
-
-import feign.Client;
-import feign.httpclient.ApacheHttpClient;
-
-import java.util.Timer;
-import java.util.TimerTask;
-import javax.annotation.PreDestroy;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.config.RegistryBuilder;
-import org.apache.http.conn.HttpClientConnectionManager;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.commons.httpclient.ApacheHttpClientConnectionManagerFactory;
-import org.springframework.cloud.commons.httpclient.ApacheHttpClientFactory;
-import org.springframework.cloud.netflix.feign.support.FeignHttpClientProperties;
-import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author Spencer Gibb
- */
-@Configuration
-@ConditionalOnClass(ApacheHttpClient.class)
-@ConditionalOnProperty(value = "feign.httpclient.enabled", matchIfMissing = true)
-class HttpClientFeignLoadBalancedConfiguration {
-
-	@Configuration
-	@ConditionalOnMissingBean(CloseableHttpClient.class)
-	protected static class HttpClientFeignConfiguration {
-		private final Timer connectionManagerTimer = new Timer(
-				"FeignApacheHttpClientConfiguration.connectionManagerTimer", true);
-
-		private CloseableHttpClient httpClient;
-
-		@Autowired(required = false)
-		private RegistryBuilder registryBuilder;
-
-		@Bean
-		@ConditionalOnMissingBean(HttpClientConnectionManager.class)
-		public HttpClientConnectionManager connectionManager(
-				ApacheHttpClientConnectionManagerFactory connectionManagerFactory,
-				FeignHttpClientProperties httpClientProperties) {
-			final HttpClientConnectionManager connectionManager = connectionManagerFactory
-					.newConnectionManager(false, httpClientProperties.getMaxConnections(),
-							httpClientProperties.getMaxConnectionsPerRoute(),
-							httpClientProperties.getTimeToLive(),
-							httpClientProperties.getTimeToLiveUnit(), registryBuilder);
-			this.connectionManagerTimer.schedule(new TimerTask() {
-				@Override
-				public void run() {
-					connectionManager.closeExpiredConnections();
-				}
-			}, 30000, httpClientProperties.getConnectionTimerRepeat());
-			return connectionManager;
-		}
-
-		@Bean
-		public CloseableHttpClient httpClient(ApacheHttpClientFactory httpClientFactory,
-											  HttpClientConnectionManager httpClientConnectionManager,
-											  FeignHttpClientProperties httpClientProperties) {
-			RequestConfig defaultRequestConfig = RequestConfig.custom()
-					.setConnectTimeout(httpClientProperties.getConnectionTimeout())
-					.setRedirectsEnabled(httpClientProperties.isFollowRedirects())
-					.build();
-			this.httpClient = httpClientFactory.createBuilder().
-					setDefaultRequestConfig(defaultRequestConfig).
-					setConnectionManager(httpClientConnectionManager).build();
-			return this.httpClient;
-		}
-
-		@PreDestroy
-		public void destroy() throws Exception {
-			connectionManagerTimer.cancel();
-			if(httpClient != null) {
-				httpClient.close();
-			}
-		}
-	}
-
-
-		@Bean
-		@ConditionalOnMissingBean(Client.class)
-		public Client feignClient(CachingSpringLoadBalancerFactory cachingFactory,
-								  SpringClientFactory clientFactory, HttpClient httpClient) {
-			ApacheHttpClient delegate = new ApacheHttpClient(httpClient);
-			return new LoadBalancerFeignClient(delegate, cachingFactory, clientFactory);
-		}
-
-
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/LoadBalancerFeignClient.java

@@ -1,126 +0,0 @@
-/*
- * Copyright 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.feign.ribbon;
-
-import java.io.IOException;
-import java.net.URI;
-
-import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
-
-import com.netflix.client.ClientException;
-import com.netflix.client.config.CommonClientConfigKey;
-import com.netflix.client.config.DefaultClientConfigImpl;
-import com.netflix.client.config.IClientConfig;
-
-import feign.Client;
-import feign.Request;
-import feign.Response;
-
-/**
- * @author Dave Syer
- *
- */
-public class LoadBalancerFeignClient implements Client {
-
-	static final Request.Options DEFAULT_OPTIONS = new Request.Options();
-
-	private final Client delegate;
-	private CachingSpringLoadBalancerFactory lbClientFactory;
-	private SpringClientFactory clientFactory;
-
-	public LoadBalancerFeignClient(Client delegate,
-								   CachingSpringLoadBalancerFactory lbClientFactory,
-								   SpringClientFactory clientFactory) {
-		this.delegate = delegate;
-		this.lbClientFactory = lbClientFactory;
-		this.clientFactory = clientFactory;
-	}
-
-	@Override
-	public Response execute(Request request, Request.Options options) throws IOException {
-		try {
-			URI asUri = URI.create(request.url());
-			String clientName = asUri.getHost();
-			URI uriWithoutHost = cleanUrl(request.url(), clientName);
-			FeignLoadBalancer.RibbonRequest ribbonRequest = new FeignLoadBalancer.RibbonRequest(
-					this.delegate, request, uriWithoutHost);
-
-			IClientConfig requestConfig = getClientConfig(options, clientName);
-			return lbClient(clientName).executeWithLoadBalancer(ribbonRequest,
-					requestConfig).toResponse();
-		}
-		catch (ClientException e) {
-			IOException io = findIOException(e);
-			if (io != null) {
-				throw io;
-			}
-			throw new RuntimeException(e);
-		}
-	}
-
-	IClientConfig getClientConfig(Request.Options options, String clientName) {
-		IClientConfig requestConfig;
-		if (options == DEFAULT_OPTIONS) {
-			requestConfig = this.clientFactory.getClientConfig(clientName);
-		} else {
-			requestConfig = new FeignOptionsClientConfig(options);
-		}
-		return requestConfig;
-	}
-
-	protected IOException findIOException(Throwable t) {
-		if (t == null) {
-			return null;
-		}
-		if (t instanceof IOException) {
-			return (IOException) t;
-		}
-		return findIOException(t.getCause());
-	}
-
-	public Client getDelegate() {
-		return this.delegate;
-	}
-
-	static URI cleanUrl(String originalUrl, String host) {
-		return URI.create(originalUrl.replaceFirst(host, ""));
-	}
-
-	private FeignLoadBalancer lbClient(String clientName) {
-		return this.lbClientFactory.create(clientName);
-	}
-
-	static class FeignOptionsClientConfig extends DefaultClientConfigImpl {
-
-		public FeignOptionsClientConfig(Request.Options options) {
-			setProperty(CommonClientConfigKey.ConnectTimeout,
-					options.connectTimeoutMillis());
-			setProperty(CommonClientConfigKey.ReadTimeout, options.readTimeoutMillis());
-		}
-
-		@Override
-		public void loadProperties(String clientName) {
-
-		}
-
-		@Override
-		public void loadDefaultValues() {
-
-		}
-
-	}
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/OkHttpFeignLoadBalancedConfiguration.java

@@ -1,88 +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.feign.ribbon;
-
-import feign.Client;
-import feign.okhttp.OkHttpClient;
-import okhttp3.ConnectionPool;
-
-import java.util.concurrent.TimeUnit;
-import javax.annotation.PreDestroy;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.commons.httpclient.OkHttpClientConnectionPoolFactory;
-import org.springframework.cloud.commons.httpclient.OkHttpClientFactory;
-import org.springframework.cloud.netflix.feign.support.FeignHttpClientProperties;
-import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author Spencer Gibb
- */
-@Configuration
-@ConditionalOnClass(OkHttpClient.class)
-@ConditionalOnProperty(value = "feign.okhttp.enabled")
-class OkHttpFeignLoadBalancedConfiguration {
-
-	@Configuration
-	@ConditionalOnMissingBean(okhttp3.OkHttpClient.class)
-	protected static class OkHttpFeignConfiguration {
-		private okhttp3.OkHttpClient okHttpClient;
-
-		@Bean
-		@ConditionalOnMissingBean(ConnectionPool.class)
-		public ConnectionPool httpClientConnectionPool(FeignHttpClientProperties httpClientProperties,
-													   OkHttpClientConnectionPoolFactory connectionPoolFactory) {
-			Integer maxTotalConnections = httpClientProperties.getMaxConnections();
-			Long timeToLive = httpClientProperties.getTimeToLive();
-			TimeUnit ttlUnit = httpClientProperties.getTimeToLiveUnit();
-			return connectionPoolFactory.create(maxTotalConnections, timeToLive, ttlUnit);
-		}
-
-		@Bean
-		public okhttp3.OkHttpClient client(OkHttpClientFactory httpClientFactory,
-										   ConnectionPool connectionPool, FeignHttpClientProperties httpClientProperties) {
-			Boolean followRedirects = httpClientProperties.isFollowRedirects();
-			Integer connectTimeout = httpClientProperties.getConnectionTimeout();
-			this.okHttpClient = httpClientFactory.createBuilder(false).
-					connectTimeout(connectTimeout, TimeUnit.MILLISECONDS).
-					followRedirects(followRedirects).
-					connectionPool(connectionPool).build();
-			return this.okHttpClient;
-		}
-
-		@PreDestroy
-		public void destroy() {
-			if(okHttpClient != null) {
-				okHttpClient.dispatcher().executorService().shutdown();
-				okHttpClient.connectionPool().evictAll();
-			}
-		}
-	}
-
-	@Bean
-	@ConditionalOnMissingBean(Client.class)
-	public Client feignClient(CachingSpringLoadBalancerFactory cachingFactory,
-							  SpringClientFactory clientFactory, okhttp3.OkHttpClient okHttpClient) {
-		OkHttpClient delegate = new OkHttpClient(okHttpClient);
-		return new LoadBalancerFeignClient(delegate, cachingFactory, clientFactory);
-	}
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/RetryableFeignLoadBalancer.java

@@ -1,113 +0,0 @@
-/*
- *
- *  * Copyright 2013-2016 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.feign.ribbon;
-
-import feign.Request;
-import feign.Response;
-
-import java.io.IOException;
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryContext;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryPolicy;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryPolicyFactory;
-import org.springframework.cloud.client.loadbalancer.RetryableStatusCodeException;
-import org.springframework.cloud.client.loadbalancer.ServiceInstanceChooser;
-import org.springframework.cloud.netflix.ribbon.RibbonLoadBalancerClient;
-import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
-import org.springframework.retry.RetryCallback;
-import org.springframework.retry.RetryContext;
-import org.springframework.retry.policy.NeverRetryPolicy;
-import org.springframework.retry.support.RetryTemplate;
-import com.netflix.client.DefaultLoadBalancerRetryHandler;
-import com.netflix.client.RequestSpecificRetryHandler;
-import com.netflix.client.config.CommonClientConfigKey;
-import com.netflix.client.config.IClientConfig;
-import com.netflix.loadbalancer.ILoadBalancer;
-import com.netflix.loadbalancer.Server;
-
-/**
- * A {@link FeignLoadBalancer} that leverages Spring Retry to retry failed requests.
- * @author Ryan Baxter
- */
-public class RetryableFeignLoadBalancer extends FeignLoadBalancer implements ServiceInstanceChooser {
-
-	private final LoadBalancedRetryPolicyFactory loadBalancedRetryPolicyFactory;
-
-	public RetryableFeignLoadBalancer(ILoadBalancer lb, IClientConfig clientConfig,
-							 ServerIntrospector serverIntrospector, LoadBalancedRetryPolicyFactory loadBalancedRetryPolicyFactory) {
-		super(lb, clientConfig, serverIntrospector);
-		this.loadBalancedRetryPolicyFactory = loadBalancedRetryPolicyFactory;
-		this.setRetryHandler(new DefaultLoadBalancerRetryHandler(clientConfig));
-	}
-
-	@Override
-	public RibbonResponse execute(final RibbonRequest request, IClientConfig configOverride)
-			throws IOException {
-		final Request.Options options;
-		if (configOverride != null) {
-			options = new Request.Options(
-					configOverride.get(CommonClientConfigKey.ConnectTimeout,
-							this.connectTimeout),
-					(configOverride.get(CommonClientConfigKey.ReadTimeout,
-							this.readTimeout)));
-		}
-		else {
-			options = new Request.Options(this.connectTimeout, this.readTimeout);
-		}
-		final LoadBalancedRetryPolicy retryPolicy = loadBalancedRetryPolicyFactory.create(this.getClientName(), this);
-		RetryTemplate retryTemplate = new RetryTemplate();
-		retryTemplate.setRetryPolicy(retryPolicy == null ? new NeverRetryPolicy()
-				: new FeignRetryPolicy(request.toHttpRequest(), retryPolicy, this, this.getClientName()));
-		return retryTemplate.execute(new RetryCallback<RibbonResponse, IOException>() {
-			@Override
-			public RibbonResponse doWithRetry(RetryContext retryContext) throws IOException {
-				Request feignRequest = null;
-				//on retries the policy will choose the server and set it in the context
-				//extract the server and update the request being made
-				if(retryContext instanceof LoadBalancedRetryContext) {
-					ServiceInstance service = ((LoadBalancedRetryContext)retryContext).getServiceInstance();
-					if(service != null) {
-						feignRequest = ((RibbonRequest)request.replaceUri(reconstructURIWithServer(new Server(service.getHost(), service.getPort()), request.getUri()))).toRequest();
-					}
-				}
-				if(feignRequest == null) {
-					feignRequest = request.toRequest();
-				}
-				Response response = request.client().execute(feignRequest, options);
-				if(retryPolicy.retryableStatusCode(response.status())) {
-					response.close();
-					throw new RetryableStatusCodeException(RetryableFeignLoadBalancer.this.getClientName(), response.status());
-				}
-				return new RibbonResponse(request.getUri(), response);
-			}
-		});
-	}
-
-	@Override
-	public RequestSpecificRetryHandler getRequestSpecificRetryHandler(
-			FeignLoadBalancer.RibbonRequest request, IClientConfig requestConfig) {
-		return new RequestSpecificRetryHandler(false, false, this.getRetryHandler(), requestConfig);
-	}
-
-	@Override
-	public ServiceInstance choose(String serviceId) {
-		return new RibbonLoadBalancerClient.RibbonServer(serviceId,
-				this.getLoadBalancer().chooseServer(serviceId));
-	}
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/support/FallbackCommand.java

@@ -1,55 +0,0 @@
-package org.springframework.cloud.netflix.feign.support;
-
-import com.netflix.hystrix.HystrixCommand;
-import com.netflix.hystrix.HystrixCommandGroupKey;
-import com.netflix.hystrix.HystrixThreadPoolKey;
-
-/**
- * Convenience class for implementing feign fallbacks that return {@link HystrixCommand}.
- * Also useful for return types of {@link rx.Observable} and {@link java.util.concurrent.Future}.
- * For those return types, just call {@link FallbackCommand#observe()} or {@link FallbackCommand#queue()} respectively.
- * @author Spencer Gibb
- */
-public class FallbackCommand<T> extends HystrixCommand<T> {
-
-	private T result;
-
-	public FallbackCommand(T result) {
-		this(result, "fallback");
-	}
-
-	protected FallbackCommand(T result, String groupname) {
-		super(HystrixCommandGroupKey.Factory.asKey(groupname));
-		this.result = result;
-	}
-
-	public FallbackCommand(T result, HystrixCommandGroupKey group) {
-		super(group);
-		this.result = result;
-	}
-
-	public FallbackCommand(T result, HystrixCommandGroupKey group, int executionIsolationThreadTimeoutInMilliseconds) {
-		super(group, executionIsolationThreadTimeoutInMilliseconds);
-		this.result = result;
-	}
-
-	public FallbackCommand(T result, HystrixCommandGroupKey group, HystrixThreadPoolKey threadPool) {
-		super(group, threadPool);
-		this.result = result;
-	}
-
-	public FallbackCommand(T result, HystrixCommandGroupKey group, HystrixThreadPoolKey threadPool, int executionIsolationThreadTimeoutInMilliseconds) {
-		super(group, threadPool, executionIsolationThreadTimeoutInMilliseconds);
-		this.result = result;
-	}
-
-	public FallbackCommand(T result, Setter setter) {
-		super(setter);
-		this.result = result;
-	}
-
-	@Override
-	protected T run() throws Exception {
-		return this.result;
-	}
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/support/FeignHttpClientProperties.java

@@ -1,110 +0,0 @@
-/*
- *
- *  * Copyright 2013-2016 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.feign.support;
-
-import java.util.concurrent.TimeUnit;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-/**
- * @author Ryan Baxter
- */
-@ConfigurationProperties(prefix = "feign.httpclient")
-public class FeignHttpClientProperties {
-	public static final boolean DEFAULT_DISABLE_SSL_VALIDATION = false;
-	public static final int DEFAULT_MAX_CONNECTIONS = 200;
-	public static final int DEFAULT_MAX_CONNECTIONS_PER_ROUTE = 50;
-	public static final long DEFAULT_TIME_TO_LIVE = 900L;
-	public static final TimeUnit DEFAULT_TIME_TO_LIVE_UNIT = TimeUnit.SECONDS;
-	public static final boolean DEFAULT_FOLLOW_REDIRECTS = true;
-	public static final int DEFAULT_CONNECTION_TIMEOUT = 2000;
-	public static final int DEFAULT_CONNECTION_TIMER_REPEAT = 3000;
-
-	private boolean disableSslValidation = DEFAULT_DISABLE_SSL_VALIDATION;
-	private int maxConnections = DEFAULT_MAX_CONNECTIONS;
-	private int maxConnectionsPerRoute = DEFAULT_MAX_CONNECTIONS_PER_ROUTE;
-	private long timeToLive = DEFAULT_TIME_TO_LIVE;
-	private TimeUnit timeToLiveUnit = DEFAULT_TIME_TO_LIVE_UNIT;
-	private boolean followRedirects = DEFAULT_FOLLOW_REDIRECTS;
-	private int connectionTimeout = DEFAULT_CONNECTION_TIMEOUT;
-	private int connectionTimerRepeat = DEFAULT_CONNECTION_TIMER_REPEAT;
-
-	public int getConnectionTimerRepeat() {
-		return connectionTimerRepeat;
-	}
-
-	public void setConnectionTimerRepeat(int connectionTimerRepeat) {
-		this.connectionTimerRepeat = connectionTimerRepeat;
-	}
-
-	public boolean isDisableSslValidation() {
-		return disableSslValidation;
-	}
-
-	public void setDisableSslValidation(boolean disableSslValidation) {
-		this.disableSslValidation = disableSslValidation;
-	}
-
-	public int getMaxConnections() {
-		return maxConnections;
-	}
-
-	public void setMaxConnections(int maxConnections) {
-		this.maxConnections = maxConnections;
-	}
-
-	public int getMaxConnectionsPerRoute() {
-		return maxConnectionsPerRoute;
-	}
-
-	public void setMaxConnectionsPerRoute(int maxConnectionsPerRoute) {
-		this.maxConnectionsPerRoute = maxConnectionsPerRoute;
-	}
-
-	public long getTimeToLive() {
-		return timeToLive;
-	}
-
-	public void setTimeToLive(long timeToLive) {
-		this.timeToLive = timeToLive;
-	}
-
-	public TimeUnit getTimeToLiveUnit() {
-		return timeToLiveUnit;
-	}
-
-	public void setTimeToLiveUnit(TimeUnit timeToLiveUnit) {
-		this.timeToLiveUnit = timeToLiveUnit;
-	}
-
-	public boolean isFollowRedirects() {
-		return followRedirects;
-	}
-
-	public void setFollowRedirects(boolean followRedirects) {
-		this.followRedirects = followRedirects;
-	}
-
-	public int getConnectionTimeout() {
-		return connectionTimeout;
-	}
-
-	public void setConnectionTimeout(int connectionTimeout) {
-		this.connectionTimeout = connectionTimeout;
-	}
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/support/FeignUtils.java

@@ -1,50 +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.feign.support;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.http.HttpHeaders;
-
-/**
- * @author Spencer Gibb
- */
-public class FeignUtils {
-
-	static HttpHeaders getHttpHeaders(Map<String, Collection<String>> headers) {
-		HttpHeaders httpHeaders = new HttpHeaders();
-		for (Map.Entry<String, Collection<String>> entry : headers.entrySet()) {
-			httpHeaders.put(entry.getKey(), new ArrayList<>(entry.getValue()));
-		}
-		return httpHeaders;
-	}
-
-	static Map<String, Collection<String>> getHeaders(HttpHeaders httpHeaders) {
-		LinkedHashMap<String, Collection<String>> headers = new LinkedHashMap<>();
-
-		for (Map.Entry<String, List<String>> entry : httpHeaders.entrySet()) {
-			headers.put(entry.getKey(), entry.getValue());
-		}
-
-		return headers;
-	}
-
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/support/ResponseEntityDecoder.java

@@ -1,75 +0,0 @@
-package org.springframework.cloud.netflix.feign.support;
-
-import java.io.IOException;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.LinkedList;
-
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-
-import feign.FeignException;
-import feign.Response;
-import feign.codec.Decoder;
-
-/**
- * Decoder adds compatibility for Spring MVC's ResponseEntity to any other decoder via
- * composition.
- * @author chadjaros
- */
-public class ResponseEntityDecoder implements Decoder {
-
-	private Decoder decoder;
-
-	public ResponseEntityDecoder(Decoder decoder) {
-		this.decoder = decoder;
-	}
-
-	@Override
-	public Object decode(final Response response, Type type) throws IOException,
-			FeignException {
-
-		if (isParameterizeHttpEntity(type)) {
-			type = ((ParameterizedType) type).getActualTypeArguments()[0];
-			Object decodedObject = decoder.decode(response, type);
-
-			return createResponse(decodedObject, response);
-		}
-		else if (isHttpEntity(type)) {
-			return createResponse(null, response);
-		}
-		else {
-			return decoder.decode(response, type);
-		}
-	}
-
-	private boolean isParameterizeHttpEntity(Type type) {
-		if (type instanceof ParameterizedType) {
-			return isHttpEntity(((ParameterizedType) type).getRawType());
-		}
-		return false;
-	}
-
-	private boolean isHttpEntity(Type type) {
-		if (type instanceof Class) {
-			Class c = (Class) type;
-			return HttpEntity.class.isAssignableFrom(c);
-		}
-		return false;
-	}
-
-	@SuppressWarnings("unchecked")
-	private <T> ResponseEntity<T> createResponse(Object instance, Response response) {
-
-		MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
-		for (String key : response.headers().keySet()) {
-			headers.put(key, new LinkedList<>(response.headers().get(key)));
-		}
-
-		return new ResponseEntity<>((T) instance, headers, HttpStatus.valueOf(response
-				.status()));
-	}
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/support/SpringDecoder.java

@@ -1,111 +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.feign.support;
-
-import static org.springframework.cloud.netflix.feign.support.FeignUtils.getHttpHeaders;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.lang.reflect.WildcardType;
-
-import org.springframework.beans.factory.ObjectFactory;
-import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.client.ClientHttpResponse;
-import org.springframework.web.client.HttpMessageConverterExtractor;
-
-import feign.FeignException;
-import feign.Response;
-import feign.codec.DecodeException;
-import feign.codec.Decoder;
-
-/**
- * @author Spencer Gibb
- */
-public class SpringDecoder implements Decoder {
-
-	private ObjectFactory<HttpMessageConverters> messageConverters;
-
-	public SpringDecoder(ObjectFactory<HttpMessageConverters> messageConverters) {
-		this.messageConverters = messageConverters;
-	}
-
-	@Override
-	public Object decode(final Response response, Type type)
-			throws IOException, FeignException {
-		if (type instanceof Class || type instanceof ParameterizedType
-				|| type instanceof WildcardType) {
-			@SuppressWarnings({ "unchecked", "rawtypes" })
-			HttpMessageConverterExtractor<?> extractor = new HttpMessageConverterExtractor(
-					type, this.messageConverters.getObject().getConverters());
-
-			return extractor.extractData(new FeignResponseAdapter(response));
-		}
-		throw new DecodeException(
-				"type is not an instance of Class or ParameterizedType: " + type);
-	}
-
-	private class FeignResponseAdapter implements ClientHttpResponse {
-
-		private final Response response;
-
-		private FeignResponseAdapter(Response response) {
-			this.response = response;
-		}
-
-		@Override
-		public HttpStatus getStatusCode() throws IOException {
-			return HttpStatus.valueOf(this.response.status());
-		}
-
-		@Override
-		public int getRawStatusCode() throws IOException {
-			return this.response.status();
-		}
-
-		@Override
-		public String getStatusText() throws IOException {
-			return this.response.reason();
-		}
-
-		@Override
-		public void close() {
-			try {
-				this.response.body().close();
-			}
-			catch (IOException ex) {
-				// Ignore exception on close...
-			}
-		}
-
-		@Override
-		public InputStream getBody() throws IOException {
-			return this.response.body().asInputStream();
-		}
-
-		@Override
-		public HttpHeaders getHeaders() {
-			return getHttpHeaders(this.response.headers());
-		}
-
-	}
-
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/support/SpringEncoder.java

@@ -1,146 +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.feign.support;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.lang.reflect.Type;
-import java.nio.charset.Charset;
-import java.util.Collection;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.ObjectFactory;
-import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpOutputMessage;
-import org.springframework.http.MediaType;
-import org.springframework.http.converter.ByteArrayHttpMessageConverter;
-import org.springframework.http.converter.HttpMessageConverter;
-
-import feign.RequestTemplate;
-import feign.codec.EncodeException;
-import feign.codec.Encoder;
-
-import static org.springframework.cloud.netflix.feign.support.FeignUtils.getHeaders;
-import static org.springframework.cloud.netflix.feign.support.FeignUtils.getHttpHeaders;
-
-/**
- * @author Spencer Gibb
- */
-public class SpringEncoder implements Encoder {
-
-	private static final Log log = LogFactory.getLog(SpringEncoder.class);
-
-	private ObjectFactory<HttpMessageConverters> messageConverters;
-
-	public SpringEncoder(ObjectFactory<HttpMessageConverters> messageConverters) {
-		this.messageConverters = messageConverters;
-	}
-
-	@Override
-	public void encode(Object requestBody, Type bodyType, RequestTemplate request)
-			throws EncodeException {
-		// template.body(conversionService.convert(object, String.class));
-		if (requestBody != null) {
-			Class<?> requestType = requestBody.getClass();
-			Collection<String> contentTypes = request.headers().get("Content-Type");
-
-			MediaType requestContentType = null;
-			if (contentTypes != null && !contentTypes.isEmpty()) {
-				String type = contentTypes.iterator().next();
-				requestContentType = MediaType.valueOf(type);
-			}
-
-			for (HttpMessageConverter<?> messageConverter : this.messageConverters
-					.getObject().getConverters()) {
-				if (messageConverter.canWrite(requestType, requestContentType)) {
-					if (log.isDebugEnabled()) {
-						if (requestContentType != null) {
-							log.debug("Writing [" + requestBody + "] as \""
-									+ requestContentType + "\" using ["
-									+ messageConverter + "]");
-						}
-						else {
-							log.debug("Writing [" + requestBody + "] using ["
-									+ messageConverter + "]");
-						}
-
-					}
-
-					FeignOutputMessage outputMessage = new FeignOutputMessage(request);
-					try {
-						@SuppressWarnings("unchecked")
-						HttpMessageConverter<Object> copy = (HttpMessageConverter<Object>) messageConverter;
-						copy.write(requestBody, requestContentType, outputMessage);
-					}
-					catch (IOException ex) {
-						throw new EncodeException("Error converting request body", ex);
-					}
-					// clear headers
-					request.headers(null);
-					// converters can modify headers, so update the request
-					// with the modified headers
-					request.headers(getHeaders(outputMessage.getHeaders()));
-
-					// do not use charset for binary data
-					if (messageConverter instanceof ByteArrayHttpMessageConverter) {
-						request.body(outputMessage.getOutputStream().toByteArray(), null);
-					} else {
-						request.body(outputMessage.getOutputStream().toByteArray(), Charset.forName("UTF-8"));
-					}
-					return;
-				}
-			}
-			String message = "Could not write request: no suitable HttpMessageConverter "
-					+ "found for request type [" + requestType.getName() + "]";
-			if (requestContentType != null) {
-				message += " and content type [" + requestContentType + "]";
-			}
-			throw new EncodeException(message);
-		}
-	}
-
-	private class FeignOutputMessage implements HttpOutputMessage {
-
-		private final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-
-		private final HttpHeaders httpHeaders;
-
-		private FeignOutputMessage(RequestTemplate request) {
-			httpHeaders = getHttpHeaders(request.headers());
-		}
-
-		@Override
-		public OutputStream getBody() throws IOException {
-			return this.outputStream;
-		}
-
-		@Override
-		public HttpHeaders getHeaders() {
-			return this.httpHeaders;
-		}
-
-		public ByteArrayOutputStream getOutputStream() {
-			return this.outputStream;
-		}
-
-	}
-
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/support/SpringMvcContract.java

@@ -1,380 +0,0 @@
-/*
- * Copyright 2013-2016 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.feign.support;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.cloud.netflix.feign.AnnotatedParameterProcessor;
-import org.springframework.cloud.netflix.feign.annotation.PathVariableParameterProcessor;
-import org.springframework.cloud.netflix.feign.annotation.RequestHeaderParameterProcessor;
-import org.springframework.cloud.netflix.feign.annotation.RequestParamParameterProcessor;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.ResourceLoaderAware;
-import org.springframework.core.DefaultParameterNameDiscoverer;
-import org.springframework.core.ParameterNameDiscoverer;
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.core.convert.support.DefaultConversionService;
-import org.springframework.core.io.DefaultResourceLoader;
-import org.springframework.core.io.ResourceLoader;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import static feign.Util.checkState;
-import static feign.Util.emptyToNull;
-import static org.springframework.core.annotation.AnnotatedElementUtils.findMergedAnnotation;
-
-import feign.Contract;
-import feign.Feign;
-import feign.MethodMetadata;
-import feign.Param;
-
-/**
- * @author Spencer Gibb
- * @author Abhijit Sarkar
- */
-public class SpringMvcContract extends Contract.BaseContract
-		implements ResourceLoaderAware {
-
-	private static final String ACCEPT = "Accept";
-
-	private static final String CONTENT_TYPE = "Content-Type";
-
-	private static final ParameterNameDiscoverer PARAMETER_NAME_DISCOVERER = new DefaultParameterNameDiscoverer();
-
-	private final Map<Class<? extends Annotation>, AnnotatedParameterProcessor> annotatedArgumentProcessors;
-	private final Map<String, Method> processedMethods = new HashMap<>();
-
-	private final ConversionService conversionService;
-	private final Param.Expander expander;
-	private ResourceLoader resourceLoader = new DefaultResourceLoader();
-
-	public SpringMvcContract() {
-		this(Collections.emptyList());
-	}
-
-	public SpringMvcContract(
-			List<AnnotatedParameterProcessor> annotatedParameterProcessors) {
-		this(annotatedParameterProcessors, new DefaultConversionService());
-	}
-
-	public SpringMvcContract(
-			List<AnnotatedParameterProcessor> annotatedParameterProcessors,
-			ConversionService conversionService) {
-		Assert.notNull(annotatedParameterProcessors,
-				"Parameter processors can not be null.");
-		Assert.notNull(conversionService, "ConversionService can not be null.");
-
-		List<AnnotatedParameterProcessor> processors;
-		if (!annotatedParameterProcessors.isEmpty()) {
-			processors = new ArrayList<>(annotatedParameterProcessors);
-		}
-		else {
-			processors = getDefaultAnnotatedArgumentsProcessors();
-		}
-		this.annotatedArgumentProcessors = toAnnotatedArgumentProcessorMap(processors);
-		this.conversionService = conversionService;
-		this.expander = new ConvertingExpander(conversionService);
-	}
-
-	@Override
-	public void setResourceLoader(ResourceLoader resourceLoader) {
-		this.resourceLoader = resourceLoader;
-	}
-
-	@Override
-	protected void processAnnotationOnClass(MethodMetadata data, Class<?> clz) {
-		if (clz.getInterfaces().length == 0) {
-			RequestMapping classAnnotation = findMergedAnnotation(clz,
-					RequestMapping.class);
-			if (classAnnotation != null) {
-				// Prepend path from class annotation if specified
-				if (classAnnotation.value().length > 0) {
-					String pathValue = emptyToNull(classAnnotation.value()[0]);
-					pathValue = resolve(pathValue);
-					if (!pathValue.startsWith("/")) {
-						pathValue = "/" + pathValue;
-					}
-					data.template().insert(0, pathValue);
-				}
-			}
-		}
-	}
-
-	@Override
-	public MethodMetadata parseAndValidateMetadata(Class<?> targetType, Method method) {
-		this.processedMethods.put(Feign.configKey(targetType, method), method);
-		MethodMetadata md = super.parseAndValidateMetadata(targetType, method);
-
-		RequestMapping classAnnotation = findMergedAnnotation(targetType,
-				RequestMapping.class);
-		if (classAnnotation != null) {
-			// produces - use from class annotation only if method has not specified this
-			if (!md.template().headers().containsKey(ACCEPT)) {
-				parseProduces(md, method, classAnnotation);
-			}
-
-			// consumes -- use from class annotation only if method has not specified this
-			if (!md.template().headers().containsKey(CONTENT_TYPE)) {
-				parseConsumes(md, method, classAnnotation);
-			}
-
-			// headers -- class annotation is inherited to methods, always write these if
-			// present
-			parseHeaders(md, method, classAnnotation);
-		}
-		return md;
-	}
-
-	@Override
-	protected void processAnnotationOnMethod(MethodMetadata data,
-			Annotation methodAnnotation, Method method) {
-		if (!RequestMapping.class.isInstance(methodAnnotation) && !methodAnnotation
-				.annotationType().isAnnotationPresent(RequestMapping.class)) {
-			return;
-		}
-
-		RequestMapping methodMapping = findMergedAnnotation(method, RequestMapping.class);
-		// HTTP Method
-		RequestMethod[] methods = methodMapping.method();
-		if (methods.length == 0) {
-			methods = new RequestMethod[] { RequestMethod.GET };
-		}
-		checkOne(method, methods, "method");
-		data.template().method(methods[0].name());
-
-		// path
-		checkAtMostOne(method, methodMapping.value(), "value");
-		if (methodMapping.value().length > 0) {
-			String pathValue = emptyToNull(methodMapping.value()[0]);
-			if (pathValue != null) {
-				pathValue = resolve(pathValue);
-				// Append path from @RequestMapping if value is present on method
-				if (!pathValue.startsWith("/")
-						&& !data.template().toString().endsWith("/")) {
-					pathValue = "/" + pathValue;
-				}
-				data.template().append(pathValue);
-			}
-		}
-
-		// produces
-		parseProduces(data, method, methodMapping);
-
-		// consumes
-		parseConsumes(data, method, methodMapping);
-
-		// headers
-		parseHeaders(data, method, methodMapping);
-
-		data.indexToExpander(new LinkedHashMap<Integer, Param.Expander>());
-	}
-
-	private String resolve(String value) {
-		if (StringUtils.hasText(value)
-				&& this.resourceLoader instanceof ConfigurableApplicationContext) {
-			return ((ConfigurableApplicationContext) this.resourceLoader).getEnvironment()
-					.resolvePlaceholders(value);
-		}
-		return value;
-	}
-
-	private void checkAtMostOne(Method method, Object[] values, String fieldName) {
-		checkState(values != null && (values.length == 0 || values.length == 1),
-				"Method %s can only contain at most 1 %s field. Found: %s",
-				method.getName(), fieldName,
-				values == null ? null : Arrays.asList(values));
-	}
-
-	private void checkOne(Method method, Object[] values, String fieldName) {
-		checkState(values != null && values.length == 1,
-				"Method %s can only contain 1 %s field. Found: %s", method.getName(),
-				fieldName, values == null ? null : Arrays.asList(values));
-	}
-
-	@Override
-	protected boolean processAnnotationsOnParameter(MethodMetadata data,
-			Annotation[] annotations, int paramIndex) {
-		boolean isHttpAnnotation = false;
-
-		AnnotatedParameterProcessor.AnnotatedParameterContext context = new SimpleAnnotatedParameterContext(
-				data, paramIndex);
-		Method method = this.processedMethods.get(data.configKey());
-		for (Annotation parameterAnnotation : annotations) {
-			AnnotatedParameterProcessor processor = this.annotatedArgumentProcessors
-					.get(parameterAnnotation.annotationType());
-			if (processor != null) {
-				Annotation processParameterAnnotation;
-				// synthesize, handling @AliasFor, while falling back to parameter name on
-				// missing String #value():
-				processParameterAnnotation = synthesizeWithMethodParameterNameAsFallbackValue(
-						parameterAnnotation, method, paramIndex);
-				isHttpAnnotation |= processor.processArgument(context,
-						processParameterAnnotation, method);
-			}
-		}
-		if (isHttpAnnotation && data.indexToExpander().get(paramIndex) == null
-				&& this.conversionService.canConvert(
-						method.getParameterTypes()[paramIndex], String.class)) {
-			data.indexToExpander().put(paramIndex, this.expander);
-		}
-		return isHttpAnnotation;
-	}
-
-	private void parseProduces(MethodMetadata md, Method method,
-			RequestMapping annotation) {
-		checkAtMostOne(method, annotation.produces(), "produces");
-		String[] serverProduces = annotation.produces();
-		String clientAccepts = serverProduces.length == 0 ? null
-				: emptyToNull(serverProduces[0]);
-		if (clientAccepts != null) {
-			md.template().header(ACCEPT, clientAccepts);
-		}
-	}
-
-	private void parseConsumes(MethodMetadata md, Method method,
-			RequestMapping annotation) {
-		checkAtMostOne(method, annotation.consumes(), "consumes");
-		String[] serverConsumes = annotation.consumes();
-		String clientProduces = serverConsumes.length == 0 ? null
-				: emptyToNull(serverConsumes[0]);
-		if (clientProduces != null) {
-			md.template().header(CONTENT_TYPE, clientProduces);
-		}
-	}
-
-	private void parseHeaders(MethodMetadata md, Method method,
-			RequestMapping annotation) {
-		// TODO: only supports one header value per key
-		if (annotation.headers() != null && annotation.headers().length > 0) {
-			for (String header : annotation.headers()) {
-				int index = header.indexOf('=');
-				if (!header.contains("!=") && index >= 0) {
-					md.template().header(resolve(header.substring(0, index)),
-						resolve(header.substring(index + 1).trim()));
-				}
-			}
-		}
-	}
-
-	private Map<Class<? extends Annotation>, AnnotatedParameterProcessor> toAnnotatedArgumentProcessorMap(
-			List<AnnotatedParameterProcessor> processors) {
-		Map<Class<? extends Annotation>, AnnotatedParameterProcessor> result = new HashMap<>();
-		for (AnnotatedParameterProcessor processor : processors) {
-			result.put(processor.getAnnotationType(), processor);
-		}
-		return result;
-	}
-
-	private List<AnnotatedParameterProcessor> getDefaultAnnotatedArgumentsProcessors() {
-
-		List<AnnotatedParameterProcessor> annotatedArgumentResolvers = new ArrayList<>();
-
-		annotatedArgumentResolvers.add(new PathVariableParameterProcessor());
-		annotatedArgumentResolvers.add(new RequestParamParameterProcessor());
-		annotatedArgumentResolvers.add(new RequestHeaderParameterProcessor());
-
-		return annotatedArgumentResolvers;
-	}
-
-	private Annotation synthesizeWithMethodParameterNameAsFallbackValue(
-			Annotation parameterAnnotation, Method method, int parameterIndex) {
-		Map<String, Object> annotationAttributes = AnnotationUtils
-				.getAnnotationAttributes(parameterAnnotation);
-		Object defaultValue = AnnotationUtils.getDefaultValue(parameterAnnotation);
-		if (defaultValue instanceof String
-				&& defaultValue.equals(annotationAttributes.get(AnnotationUtils.VALUE))) {
-			Type[] parameterTypes = method.getGenericParameterTypes();
-			String[] parameterNames = PARAMETER_NAME_DISCOVERER.getParameterNames(method);
-			if (shouldAddParameterName(parameterIndex, parameterTypes, parameterNames)) {
-				annotationAttributes.put(AnnotationUtils.VALUE,
-						parameterNames[parameterIndex]);
-			}
-		}
-		return AnnotationUtils.synthesizeAnnotation(annotationAttributes,
-				parameterAnnotation.annotationType(), null);
-	}
-
-	private boolean shouldAddParameterName(int parameterIndex, Type[] parameterTypes, String[] parameterNames) {
-		// has a parameter name
-		return parameterNames != null && parameterNames.length > parameterIndex
-				// has a type
-				&& parameterTypes != null && parameterTypes.length > parameterIndex;
-	}
-
-	private class SimpleAnnotatedParameterContext
-			implements AnnotatedParameterProcessor.AnnotatedParameterContext {
-
-		private final MethodMetadata methodMetadata;
-
-		private final int parameterIndex;
-
-		public SimpleAnnotatedParameterContext(MethodMetadata methodMetadata,
-				int parameterIndex) {
-			this.methodMetadata = methodMetadata;
-			this.parameterIndex = parameterIndex;
-		}
-
-		@Override
-		public MethodMetadata getMethodMetadata() {
-			return this.methodMetadata;
-		}
-
-		@Override
-		public int getParameterIndex() {
-			return this.parameterIndex;
-		}
-
-		@Override
-		public void setParameterName(String name) {
-			nameParam(this.methodMetadata, name, this.parameterIndex);
-		}
-
-		@Override
-		public Collection<String> setTemplateParameter(String name,
-				Collection<String> rest) {
-			return addTemplatedParam(rest, name);
-		}
-	}
-
-	public static class ConvertingExpander implements Param.Expander {
-
-		private final ConversionService conversionService;
-
-		public ConvertingExpander(ConversionService conversionService) {
-			this.conversionService = conversionService;
-		}
-
-		@Override
-		public String expand(Object value) {
-			return this.conversionService.convert(value, String.class);
-		}
-
-	}
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixAutoConfiguration.java

@@ -1,46 +0,0 @@
-/*
- * Copyright 2013-2014 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.hystrix;
-
-import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
-import org.springframework.boot.actuate.autoconfigure.health.HealthIndicatorAutoConfiguration;
-import org.springframework.boot.actuate.health.HealthIndicator;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import com.netflix.hystrix.Hystrix;
-
-/**
- * Auto configuration for Hystrix.
- *
- * @author Christian Dupuis
- * @author Dave Syer
- */
-@Configuration
-@ConditionalOnClass({ Hystrix.class, HealthIndicator.class })
-@AutoConfigureAfter({ HealthIndicatorAutoConfiguration.class })
-public class HystrixAutoConfiguration {
-
-	@Bean
-	@ConditionalOnEnabledHealthIndicator("hystrix")
-	public HystrixHealthIndicator hystrixHealthIndicator() {
-		return new HystrixHealthIndicator();
-	}
-
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixCircuitBreakerConfiguration.java

@@ -1,176 +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.hystrix;
-
-import org.apache.catalina.core.ApplicationContext;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.cloud.client.actuator.HasFeatures;
-import org.springframework.cloud.client.actuator.NamedFeature;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import com.netflix.hystrix.Hystrix;
-import com.netflix.hystrix.contrib.javanica.aop.aspectj.HystrixCommandAspect;
-
-/**
- * @author Spencer Gibb
- * @author Christian Dupuis
- * @author Venil Noronha
- */
-@Configuration
-public class HystrixCircuitBreakerConfiguration {
-
-	@Bean
-	public HystrixCommandAspect hystrixCommandAspect() {
-		return new HystrixCommandAspect();
-	}
-
-	@Bean
-	public HystrixShutdownHook hystrixShutdownHook() {
-		return new HystrixShutdownHook();
-	}
-
-	@Bean
-	public HasFeatures hystrixFeature() {
-		return HasFeatures.namedFeatures(new NamedFeature("Hystrix", HystrixCommandAspect.class));
-	}
-
-	//FIXME: 2.0.0
-	/*@Configuration
-	@ConditionalOnProperty(value = "hystrix.metrics.enabled", matchIfMissing = true)
-	@ConditionalOnClass({ HystrixMetricsPoller.class, GaugeService.class })
-	@EnableConfigurationProperties(HystrixMetricsProperties.class)
-	protected static class HystrixMetricsPollerConfiguration implements SmartLifecycle {
-
-		private static Log logger = LogFactory
-				.getLog(HystrixMetricsPollerConfiguration.class);
-
-		@Autowired(required = false)
-		private GaugeService gauges;
-
-		@Autowired
-		private HystrixMetricsProperties metricsProperties;
-
-		private ObjectMapper mapper = new ObjectMapper();
-
-		private HystrixMetricsPoller poller;
-
-		private Set<String> reserved = new HashSet<String>(Arrays.asList("group", "name",
-				"type", "currentTime"));
-
-		@Override
-		public void start() {
-			if (this.gauges == null) {
-				return;
-			}
-			MetricsAsJsonPollerListener listener = new MetricsAsJsonPollerListener() {
-				@Override
-				public void handleJsonMetric(String json) {
-					try {
-						@SuppressWarnings("unchecked")
-						Map<String, Object> map = HystrixMetricsPollerConfiguration.this.mapper
-								.readValue(json, Map.class);
-						if (map != null && map.containsKey("type")) {
-							addMetrics(map, "hystrix.");
-						}
-					}
-					catch (IOException ex) {
-						// ignore
-					}
-				}
-
-			};
-			this.poller = new HystrixMetricsPoller(listener,
-					metricsProperties.getPollingIntervalMs());
-			// start polling and it will write directly to the listener
-			this.poller.start();
-			logger.info("Starting poller");
-		}
-
-		private void addMetrics(Map<String, Object> map, String root) {
-			StringBuilder prefixBuilder = new StringBuilder(root);
-			if (map.containsKey("type")) {
-				prefixBuilder.append((String) map.get("type"));
-				if (map.containsKey("group")) {
-					prefixBuilder.append(".").append(map.get("group"));
-				}
-				prefixBuilder.append(".").append(map.get("name"));
-			}
-			String prefix = prefixBuilder.toString();
-			for (String key : map.keySet()) {
-				Object value = map.get(key);
-				if (!this.reserved.contains(key)) {
-					if (value instanceof Number) {
-						String name = prefix + "." + key;
-						this.gauges.submit(name, ((Number) value).doubleValue());
-					}
-					else if (value instanceof Map) {
-						@SuppressWarnings("unchecked")
-						Map<String, Object> sub = (Map<String, Object>) value;
-						addMetrics(sub, prefix);
-					}
-				}
-			}
-		}
-
-		@Override
-		public void stop() {
-			if (this.poller != null) {
-				this.poller.shutdown();
-			}
-		}
-
-		@Override
-		public boolean isRunning() {
-			return this.poller != null ? this.poller.isRunning() : false;
-		}
-
-		@Override
-		public int getPhase() {
-			return Ordered.LOWEST_PRECEDENCE;
-		}
-
-		@Override
-		public boolean isAutoStartup() {
-			return true;
-		}
-
-		@Override
-		public void stop(Runnable callback) {
-			if (this.poller != null) {
-				this.poller.shutdown();
-			}
-			callback.run();
-		}
-
-	}*/
-
-	/**
-	 * {@link DisposableBean} that makes sure that Hystrix internal state is cleared when
-	 * {@link ApplicationContext} shuts down.
-	 */
-	private class HystrixShutdownHook implements DisposableBean {
-
-		@Override
-		public void destroy() throws Exception {
-			// Just call Hystrix to reset thread pool etc.
-			Hystrix.reset();
-		}
-
-	}
-
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixManagementContextConfiguration.java

@@ -1,71 +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.hystrix;
-
-import com.netflix.hystrix.contrib.javanica.aop.aspectj.HystrixCommandAspect;
-import org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration;
-import org.springframework.boot.actuate.autoconfigure.web.servlet.ManagementServletContext;
-import org.springframework.boot.actuate.health.Health;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.web.servlet.ServletRegistrationBean;
-import org.springframework.cloud.client.actuator.HasFeatures;
-import org.springframework.context.annotation.Bean;
-
-import com.netflix.hystrix.contrib.metrics.eventstream.HystrixMetricsStreamServlet;
-
-/**
- * See original {@link org.springframework.boot.actuate.autoconfigure.jolokia.JolokiaManagementContextConfiguration}
- */
-@ManagementContextConfiguration
-@ConditionalOnProperty(value = "management.hystrix.enabled", matchIfMissing = true)
-@ConditionalOnWebApplication
-@ConditionalOnBean(HystrixCommandAspect.class) // only install the stream if enabled
-@ConditionalOnClass({ Health.class, HystrixMetricsStreamServlet.class })
-@EnableConfigurationProperties(HystrixProperties.class)
-class HystrixManagementContextConfiguration {
-
-	private final ManagementServletContext managementServletContext;
-
-	private final HystrixProperties properties;
-
-	public HystrixManagementContextConfiguration(
-			ManagementServletContext managementServletContext,
-			HystrixProperties properties) {
-		this.managementServletContext = managementServletContext;
-		this.properties = properties;
-	}
-
-	@Bean
-	public ServletRegistrationBean<HystrixMetricsStreamServlet> hystrixMetricsStreamServlet() {
-		String path = this.managementServletContext.getContextPath()
-				+ this.properties.getPath();
-		String urlMapping = (path.endsWith("/") ? path + "*" : path + "/*");
-		ServletRegistrationBean<HystrixMetricsStreamServlet> registration = new ServletRegistrationBean<>(
-				new HystrixMetricsStreamServlet(), urlMapping);
-		registration.setInitParameters(this.properties.getConfig());
-		return registration;
-	}
-
-	@Bean
-	public HasFeatures hystrixStreamFeature() {
-		return HasFeatures.namedFeature("Hystrix Stream Servlet", HystrixMetricsStreamServlet.class);
-	}
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonLoadBalancedRetryPolicy.java

@@ -1,121 +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.ribbon;
-
-import com.netflix.client.config.CommonClientConfigKey;
-import com.netflix.client.config.IClientConfig;
-import com.netflix.client.config.IClientConfigKey;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryContext;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryPolicy;
-import org.springframework.cloud.client.loadbalancer.ServiceInstanceChooser;
-import org.springframework.http.HttpMethod;
-import org.springframework.util.StringUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * {@link LoadBalancedRetryPolicy} for Ribbon clients.
- * @author Ryan Baxter
- */
-public class RibbonLoadBalancedRetryPolicy implements LoadBalancedRetryPolicy {
-
-	public static final IClientConfigKey<String> RETRYABLE_STATUS_CODES = new CommonClientConfigKey<String>("retryableStatusCodes") {};
-	private int sameServerCount = 0;
-	private int nextServerCount = 0;
-	private String serviceId;
-	private RibbonLoadBalancerContext lbContext;
-	private ServiceInstanceChooser loadBalanceChooser;
-	List<Integer> retryableStatusCodes = new ArrayList<>();
-
-	public RibbonLoadBalancedRetryPolicy(String serviceId, RibbonLoadBalancerContext context, ServiceInstanceChooser loadBalanceChooser) {
-		this.serviceId = serviceId;
-		this.lbContext = context;
-		this.loadBalanceChooser = loadBalanceChooser;
-	}
-
-	public RibbonLoadBalancedRetryPolicy(String serviceId, RibbonLoadBalancerContext context, ServiceInstanceChooser loadBalanceChooser,
-										 IClientConfig clientConfig) {
-		this.serviceId = serviceId;
-		this.lbContext = context;
-		this.loadBalanceChooser = loadBalanceChooser;
-		String retryableStatusCodesProp = clientConfig.getPropertyAsString(RETRYABLE_STATUS_CODES, "");
-		String[] retryableStatusCodesArray = retryableStatusCodesProp.split(",");
-		for(String code : retryableStatusCodesArray) {
-			if(!StringUtils.isEmpty(code)) {
-				try {
-					retryableStatusCodes.add(Integer.valueOf(code.trim()));
-				} catch (NumberFormatException e) {
-					//TODO log
-				}
-			}
-		}
-	}
-
-	public boolean canRetry(LoadBalancedRetryContext context) {
-		HttpMethod method = context.getRequest().getMethod();
-		return HttpMethod.GET == method || lbContext.isOkToRetryOnAllOperations();
-	}
-
-	@Override
-	public boolean canRetrySameServer(LoadBalancedRetryContext context) {
-		return sameServerCount < lbContext.getRetryHandler().getMaxRetriesOnSameServer() && canRetry(context);
-	}
-
-	@Override
-	public boolean canRetryNextServer(LoadBalancedRetryContext context) {
-		//this will be called after a failure occurs and we increment the counter
-		//so we check that the count is less than or equals to too make sure
-		//we try the next server the right number of times
-		return nextServerCount <= lbContext.getRetryHandler().getMaxRetriesOnNextServer() && canRetry(context);
-	}
-
-	@Override
-	public void close(LoadBalancedRetryContext context) {
-
-	}
-
-	@Override
-	public void registerThrowable(LoadBalancedRetryContext context, Throwable throwable) {
-		//Check if we need to ask the load balancer for a new server.
-		//Do this before we increment the counters because the first call to this method
-		//is not a retry it is just an initial failure.
-		if(!canRetrySameServer(context)  && canRetryNextServer(context)) {
-			context.setServiceInstance(loadBalanceChooser.choose(serviceId));
-		}
-		//This method is called regardless of whether we are retrying or making the first request.
-		//Since we do not count the initial request in the retry count we don't reset the counter
-		//until we actually equal the same server count limit.  This will allow us to make the initial
-		//request plus the right number of retries.
-		if(sameServerCount >= lbContext.getRetryHandler().getMaxRetriesOnSameServer() && canRetry(context)) {
-			//reset same server since we are moving to a new server
-			sameServerCount = 0;
-			nextServerCount++;
-			if(!canRetryNextServer(context)) {
-				context.setExhaustedOnly();
-			}
-		} else {
-			sameServerCount++;
-		}
-
-	}
-
-	@Override
-	public boolean retryableStatusCode(int statusCode) {
-		return retryableStatusCodes.contains(statusCode);
-	}
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonUtils.java

@@ -1,86 +0,0 @@
-package org.springframework.cloud.netflix.ribbon;
-
-import java.net.URI;
-
-import org.springframework.web.util.UriComponentsBuilder;
-
-import com.netflix.client.config.CommonClientConfigKey;
-import com.netflix.client.config.IClientConfig;
-import com.netflix.config.ConfigurationManager;
-import com.netflix.config.DynamicPropertyFactory;
-import com.netflix.config.DynamicStringProperty;
-import com.netflix.loadbalancer.Server;
-
-/**
- * @author Spencer Gibb
- * @author Jacques-Etienne Beaudet
- */
-public class RibbonUtils {
-
-	public static final String VALUE_NOT_SET = "__not__set__";
-
-	public static final String DEFAULT_NAMESPACE = "ribbon";
-
-	public static void setRibbonProperty(String serviceId, String suffix, String value) {
-		// how to set the namespace properly?
-		String key = getRibbonKey(serviceId, suffix);
-		DynamicStringProperty property = getProperty(key);
-		if (property.get().equals(VALUE_NOT_SET)) {
-			ConfigurationManager.getConfigInstance().setProperty(key, value);
-		}
-	}
-
-	public static String getRibbonKey(String serviceId, String suffix) {
-		return serviceId + "." + DEFAULT_NAMESPACE + "." + suffix;
-	}
-
-	public static DynamicStringProperty getProperty(String key) {
-		return DynamicPropertyFactory.getInstance().getStringProperty(key, VALUE_NOT_SET);
-	}
-
-	/**
-	 * Determine if client is secure. If the supplied {@link IClientConfig} has the {@link CommonClientConfigKey#IsSecure}
-	 * set, return that value. Otherwise, query the supplied {@link ServerIntrospector}.
-	 * @param config the supplied client configuration.
-	 * @param serverIntrospector
-	 * @param server
-	 * @return true if the client is secure
-	 */
-	public static boolean isSecure(IClientConfig config, ServerIntrospector serverIntrospector, Server server) {
-		if (config != null) {
-			Boolean isSecure = config.get(CommonClientConfigKey.IsSecure);
-			if (isSecure != null) {
-				return isSecure;
-			}
-		}
-
-		return serverIntrospector.isSecure(server);
-	}
-
-	/**
-	 * Replace the scheme to https if needed. If the uri doesn't start with https and
-	 * {@link #isSecure(IClientConfig, ServerIntrospector, Server)} is true, update the scheme.
-	 * This assumes the uri is already encoded to avoid double encoding.
-	 *
-	 * @param uri
-	 * @param config
-	 * @param serverIntrospector
-	 * @param server
-	 * @return
-	 */
-	public static URI updateToHttpsIfNeeded(URI uri, IClientConfig config, ServerIntrospector serverIntrospector,
-			Server server) {
-		String scheme = uri.getScheme();
-		if (!"".equals(uri.toString()) && !"https".equals(scheme) && isSecure(config, serverIntrospector, server)) {
-			UriComponentsBuilder uriComponentsBuilder = UriComponentsBuilder.fromUri(uri).scheme("https");
-			if (uri.getRawQuery() != null) {
-				// When building the URI, UriComponentsBuilder verify the allowed characters and does not 
-				// support the '+' so we replace it for its equivalent '%20'.
-				// See issue https://jira.spring.io/browse/SPR-10172
-				uriComponentsBuilder.replaceQuery(uri.getRawQuery().replace("+", "%20"));
-			}
-			return uriComponentsBuilder.build(true).toUri();
-		}
-		return uri;
-	}
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/apache/RetryableRibbonLoadBalancingHttpClient.java

@@ -1,161 +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.ribbon.apache;
-
-import java.io.IOException;
-import java.net.URI;
-import org.apache.commons.lang.BooleanUtils;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryContext;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryPolicy;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryPolicyFactory;
-import org.springframework.cloud.client.loadbalancer.RetryableStatusCodeException;
-import org.springframework.cloud.client.loadbalancer.ServiceInstanceChooser;
-import org.springframework.cloud.netflix.feign.ribbon.FeignRetryPolicy;
-import org.springframework.cloud.netflix.ribbon.RibbonLoadBalancerClient;
-import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
-import org.springframework.http.HttpRequest;
-import org.springframework.retry.RetryCallback;
-import org.springframework.retry.RetryContext;
-import org.springframework.retry.policy.NeverRetryPolicy;
-import org.springframework.retry.support.RetryTemplate;
-import org.springframework.web.util.UriComponentsBuilder;
-import com.netflix.client.RequestSpecificRetryHandler;
-import com.netflix.client.RetryHandler;
-import com.netflix.client.config.CommonClientConfigKey;
-import com.netflix.client.config.IClientConfig;
-import com.netflix.loadbalancer.Server;
-
-/**
- * An Apache HTTP client which leverages Spring Retry to retry failed requests.
- * @author Ryan Baxter
- */
-public class RetryableRibbonLoadBalancingHttpClient extends RibbonLoadBalancingHttpClient
-		implements ServiceInstanceChooser {
-	private LoadBalancedRetryPolicyFactory loadBalancedRetryPolicyFactory = new LoadBalancedRetryPolicyFactory.NeverRetryFactory();
-
-	public RetryableRibbonLoadBalancingHttpClient(IClientConfig config,
-			ServerIntrospector serverIntrospector,
-			LoadBalancedRetryPolicyFactory loadBalancedRetryPolicyFactory) {
-		super(config, serverIntrospector);
-		this.loadBalancedRetryPolicyFactory = loadBalancedRetryPolicyFactory;
-	}
-
-	public RetryableRibbonLoadBalancingHttpClient(CloseableHttpClient delegate,
-			IClientConfig config, ServerIntrospector serverIntrospector,
-			LoadBalancedRetryPolicyFactory loadBalancedRetryPolicyFactory) {
-		super(delegate, config, serverIntrospector);
-		this.loadBalancedRetryPolicyFactory = loadBalancedRetryPolicyFactory;
-	}
-
-	@Override
-	public RibbonApacheHttpResponse execute(final RibbonApacheHttpRequest request,
-			final IClientConfig configOverride) throws Exception {
-		final RequestConfig.Builder builder = RequestConfig.custom();
-		IClientConfig config = configOverride != null ? configOverride : this.config;
-		builder.setConnectTimeout(
-				config.get(CommonClientConfigKey.ConnectTimeout, this.connectTimeout));
-		builder.setSocketTimeout(
-				config.get(CommonClientConfigKey.ReadTimeout, this.readTimeout));
-		builder.setRedirectsEnabled(
-				config.get(CommonClientConfigKey.FollowRedirects, this.followRedirects));
-
-		final RequestConfig requestConfig = builder.build();
-		final LoadBalancedRetryPolicy retryPolicy = loadBalancedRetryPolicyFactory
-				.create(this.getClientName(), this);
-		RetryCallback retryCallback = new RetryCallback() {
-			@Override
-			public RibbonApacheHttpResponse doWithRetry(RetryContext context)
-					throws Exception {
-				// on retries the policy will choose the server and set it in the context
-				// extract the server and update the request being made
-				RibbonApacheHttpRequest newRequest = request;
-				if (context instanceof LoadBalancedRetryContext) {
-					ServiceInstance service = ((LoadBalancedRetryContext) context)
-							.getServiceInstance();
-					if (service != null) {
-						// Reconstruct the request URI using the host and port set in the
-						// retry context
-						newRequest = newRequest.withNewUri(new URI(
-								service.getUri().getScheme(),
-								newRequest.getURI().getUserInfo(), service.getHost(),
-								service.getPort(), newRequest.getURI().getPath(),
-								newRequest.getURI().getQuery(),
-								newRequest.getURI().getFragment()));
-					}
-				}
-				if (isSecure(configOverride)) {
-					final URI secureUri = UriComponentsBuilder
-							.fromUri(newRequest.getUri()).scheme("https").build().toUri();
-					newRequest = newRequest.withNewUri(secureUri);
-				}
-				HttpUriRequest httpUriRequest = newRequest.toRequest(requestConfig);
-				final HttpResponse httpResponse = RetryableRibbonLoadBalancingHttpClient.this.delegate
-						.execute(httpUriRequest);
-				if (retryPolicy.retryableStatusCode(
-						httpResponse.getStatusLine().getStatusCode())) {
-					if (CloseableHttpResponse.class.isInstance(httpResponse)) {
-						((CloseableHttpResponse) httpResponse).close();
-					}
-					throw new RetryableStatusCodeException(
-							RetryableRibbonLoadBalancingHttpClient.this.clientName,
-							httpResponse.getStatusLine().getStatusCode());
-				}
-				return new RibbonApacheHttpResponse(httpResponse,
-						httpUriRequest.getURI());
-			}
-		};
-		return this.executeWithRetry(request, retryPolicy, retryCallback);
-	}
-
-	private RibbonApacheHttpResponse executeWithRetry(RibbonApacheHttpRequest request,
-			LoadBalancedRetryPolicy retryPolicy,
-			RetryCallback<RibbonApacheHttpResponse, IOException> callback)
-			throws Exception {
-		RetryTemplate retryTemplate = new RetryTemplate();
-		boolean retryable = request.getContext() == null ? true
-				: BooleanUtils.toBooleanDefaultIfNull(request.getContext().getRetryable(),
-						true);
-		retryTemplate.setRetryPolicy(retryPolicy == null || !retryable
-				? new NeverRetryPolicy()
-				: new RetryPolicy(request, retryPolicy, this, this.getClientName()));
-		return retryTemplate.execute(callback);
-	}
-
-	@Override
-	public ServiceInstance choose(String serviceId) {
-		Server server = this.getLoadBalancer().chooseServer(serviceId);
-		return new RibbonLoadBalancerClient.RibbonServer(serviceId, server);
-	}
-
-	@Override
-	public RequestSpecificRetryHandler getRequestSpecificRetryHandler(
-			RibbonApacheHttpRequest request, IClientConfig requestConfig) {
-		return new RequestSpecificRetryHandler(false, false, RetryHandler.DEFAULT, null);
-	}
-
-	static class RetryPolicy extends FeignRetryPolicy {
-		public RetryPolicy(HttpRequest request, LoadBalancedRetryPolicy policy,
-				ServiceInstanceChooser serviceInstanceChooser, String serviceName) {
-			super(request, policy, serviceInstanceChooser, serviceName);
-		}
-	}
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/okhttp/RetryableOkHttpLoadBalancingClient.java

@@ -1,125 +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.ribbon.okhttp;
-
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-
-import java.net.URI;
-import org.apache.commons.lang.BooleanUtils;
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryContext;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryPolicy;
-import org.springframework.cloud.client.loadbalancer.LoadBalancedRetryPolicyFactory;
-import org.springframework.cloud.client.loadbalancer.RetryableStatusCodeException;
-import org.springframework.cloud.client.loadbalancer.ServiceInstanceChooser;
-import org.springframework.cloud.netflix.feign.ribbon.FeignRetryPolicy;
-import org.springframework.cloud.netflix.ribbon.RibbonLoadBalancerClient;
-import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
-import org.springframework.http.HttpRequest;
-import org.springframework.retry.RetryCallback;
-import org.springframework.retry.RetryContext;
-import org.springframework.retry.policy.NeverRetryPolicy;
-import org.springframework.retry.support.RetryTemplate;
-import org.springframework.web.util.UriComponentsBuilder;
-import com.netflix.client.RequestSpecificRetryHandler;
-import com.netflix.client.RetryHandler;
-import com.netflix.client.config.IClientConfig;
-import com.netflix.loadbalancer.Server;
-
-/**
- * An OK HTTP client which leverages Spring Retry to retry failed request.
- * @author Ryan Baxter
- */
-public class RetryableOkHttpLoadBalancingClient extends OkHttpLoadBalancingClient implements ServiceInstanceChooser {
-
-	private LoadBalancedRetryPolicyFactory loadBalancedRetryPolicyFactory;
-
-	public RetryableOkHttpLoadBalancingClient(OkHttpClient delegate, IClientConfig config, ServerIntrospector serverIntrospector,
-									 LoadBalancedRetryPolicyFactory loadBalancedRetryPolicyFactory) {
-		super(delegate, config, serverIntrospector);
-		this.loadBalancedRetryPolicyFactory = loadBalancedRetryPolicyFactory;
-	}
-
-	private OkHttpRibbonResponse executeWithRetry(OkHttpRibbonRequest request, LoadBalancedRetryPolicy retryPolicy,
-													RetryCallback<OkHttpRibbonResponse, Exception> callback)
-			throws Exception {
-		RetryTemplate retryTemplate = new RetryTemplate();
-		boolean retryable = request.getContext() == null ? true :
-				BooleanUtils.toBooleanDefaultIfNull(request.getContext().getRetryable(), true);
-		retryTemplate.setRetryPolicy(retryPolicy == null || !retryable ? new NeverRetryPolicy()
-				: new RetryPolicy(request, retryPolicy, this, this.getClientName()));
-		return retryTemplate.execute(callback);
-	}
-
-	@Override
-	public OkHttpRibbonResponse execute(final OkHttpRibbonRequest ribbonRequest,
-										final IClientConfig configOverride) throws Exception {
-		final LoadBalancedRetryPolicy retryPolicy = loadBalancedRetryPolicyFactory.create(this.getClientName(), this);
-		RetryCallback<OkHttpRibbonResponse, Exception> retryCallback  = new RetryCallback<OkHttpRibbonResponse, Exception>() {
-			@Override
-			public OkHttpRibbonResponse doWithRetry(RetryContext context) throws Exception {
-				//on retries the policy will choose the server and set it in the context
-				//extract the server and update the request being made
-				OkHttpRibbonRequest newRequest = ribbonRequest;
-				if(context instanceof LoadBalancedRetryContext) {
-					ServiceInstance service = ((LoadBalancedRetryContext)context).getServiceInstance();
-					if(service != null) {
-						//Reconstruct the request URI using the host and port set in the retry context
-						newRequest = newRequest.withNewUri(new URI(service.getUri().getScheme(),
-								newRequest.getURI().getUserInfo(), service.getHost(), service.getPort(),
-								newRequest.getURI().getPath(), newRequest.getURI().getQuery(),
-								newRequest.getURI().getFragment()));
-					}
-				}
-				if (isSecure(configOverride)) {
-					final URI secureUri = UriComponentsBuilder.fromUri(newRequest.getUri())
-							.scheme("https").build().toUri();
-					newRequest = newRequest.withNewUri(secureUri);
-				}
-				OkHttpClient httpClient = getOkHttpClient(configOverride, secure);
-
-				final Request request = newRequest.toRequest();
-				Response response = httpClient.newCall(request).execute();
-				if(retryPolicy.retryableStatusCode(response.code())) {
-					response.close();
-					throw new RetryableStatusCodeException(RetryableOkHttpLoadBalancingClient.this.clientName, response.code());
-				}
-				return new OkHttpRibbonResponse(response, newRequest.getUri());
-			}
-		};
-		return this.executeWithRetry(ribbonRequest, retryPolicy, retryCallback);
-	}
-
-	@Override
-	public ServiceInstance choose(String serviceId) {
-		Server server = this.getLoadBalancer().chooseServer(serviceId);
-		return new RibbonLoadBalancerClient.RibbonServer(serviceId,
-				server);
-	}
-
-	@Override
-	public RequestSpecificRetryHandler getRequestSpecificRetryHandler(OkHttpRibbonRequest request, IClientConfig requestConfig) {
-		return new RequestSpecificRetryHandler(false, false, RetryHandler.DEFAULT, null);
-	}
-
-	static class RetryPolicy extends FeignRetryPolicy {
-		public RetryPolicy(HttpRequest request, LoadBalancedRetryPolicy policy, ServiceInstanceChooser serviceInstanceChooser, String serviceName) {
-			super(request, policy, serviceInstanceChooser, serviceName);
-		}
-	}
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/support/AbstractLoadBalancingClient.java

@@ -1,143 +0,0 @@
-/*
- * Copyright 2013-2016 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.ribbon.support;
-
-import org.springframework.cloud.netflix.ribbon.DefaultServerIntrospector;
-import org.springframework.cloud.netflix.ribbon.RibbonClientConfiguration;
-import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
-
-import com.netflix.client.AbstractLoadBalancerAwareClient;
-import com.netflix.client.IResponse;
-import com.netflix.client.RequestSpecificRetryHandler;
-import com.netflix.client.RetryHandler;
-import com.netflix.client.config.CommonClientConfigKey;
-import com.netflix.client.config.DefaultClientConfigImpl;
-import com.netflix.client.config.IClientConfig;
-import com.netflix.loadbalancer.ILoadBalancer;
-
-/**
- * @author Spencer Gibb
- */
-public abstract class AbstractLoadBalancingClient<S extends ContextAwareRequest, T extends IResponse, D> extends
-		AbstractLoadBalancerAwareClient<S, T> {
-
-	protected int connectTimeout;
-
-	protected int readTimeout;
-
-	protected boolean secure;
-
-	protected boolean followRedirects;
-
-	protected boolean okToRetryOnAllOperations;
-
-	protected final D delegate;
-	protected final IClientConfig config;
-	protected final ServerIntrospector serverIntrospector;
-
-	@Deprecated
-	public AbstractLoadBalancingClient() {
-		super(null);
-		this.config = new DefaultClientConfigImpl();
-		this.delegate = createDelegate(this.config);
-		this.serverIntrospector = new DefaultServerIntrospector();
-		this.setRetryHandler(RetryHandler.DEFAULT);
-		initWithNiwsConfig(config);
-	}
-
-	@Deprecated
-	public AbstractLoadBalancingClient(final ILoadBalancer lb) {
-		super(lb);
-		this.config = new DefaultClientConfigImpl();
-		this.delegate = createDelegate(config);
-		this.serverIntrospector = new DefaultServerIntrospector();
-		this.setRetryHandler(RetryHandler.DEFAULT);
-		initWithNiwsConfig(config);
-	}
-
-	protected AbstractLoadBalancingClient(IClientConfig config, ServerIntrospector serverIntrospector) {
-		super(null);
-		this.delegate = createDelegate(config);
-		this.config = config;
-		this.serverIntrospector = serverIntrospector;
-		this.setRetryHandler(RetryHandler.DEFAULT);
-		initWithNiwsConfig(config);
-	}
-
-	protected AbstractLoadBalancingClient(D delegate, IClientConfig config, ServerIntrospector serverIntrospector) {
-		super(null);
-		this.delegate = delegate;
-		this.config = config;
-		this.serverIntrospector = serverIntrospector;
-		this.setRetryHandler(RetryHandler.DEFAULT);
-		initWithNiwsConfig(config);
-	}
-
-	@Override
-	public void initWithNiwsConfig(IClientConfig clientConfig) {
-		super.initWithNiwsConfig(clientConfig);
-		this.connectTimeout = clientConfig.getPropertyAsInteger(
-				CommonClientConfigKey.ConnectTimeout,
-				RibbonClientConfiguration.DEFAULT_CONNECT_TIMEOUT);
-		this.readTimeout = clientConfig.getPropertyAsInteger(
-				CommonClientConfigKey.ReadTimeout,
-				RibbonClientConfiguration.DEFAULT_READ_TIMEOUT);
-		this.secure = clientConfig.getPropertyAsBoolean(CommonClientConfigKey.IsSecure,
-				false);
-		this.followRedirects = clientConfig.getPropertyAsBoolean(
-				CommonClientConfigKey.FollowRedirects,
-				DefaultClientConfigImpl.DEFAULT_FOLLOW_REDIRECTS);
-		this.okToRetryOnAllOperations = clientConfig.getPropertyAsBoolean(
-				CommonClientConfigKey.OkToRetryOnAllOperations,
-				DefaultClientConfigImpl.DEFAULT_OK_TO_RETRY_ON_ALL_OPERATIONS);
-	}
-
-	protected abstract D createDelegate(IClientConfig config);
-
-	public D getDelegate() {
-		return this.delegate;
-	}
-
-	@Override
-	public RequestSpecificRetryHandler getRequestSpecificRetryHandler(
-			final S request, final IClientConfig requestConfig) {
-		if (this.okToRetryOnAllOperations) {
-			return new RequestSpecificRetryHandler(true, true, this.getRetryHandler(),
-					requestConfig);
-		}
-
-		if (!request.getContext().getMethod().equals("GET")) {
-			return new RequestSpecificRetryHandler(true, false, this.getRetryHandler(),
-					requestConfig);
-		}
-		else {
-			return new RequestSpecificRetryHandler(true, true, this.getRetryHandler(),
-					requestConfig);
-		}
-	}
-
-	protected boolean isSecure(final IClientConfig config) {
-		if(config != null) {
-			Boolean result = config.get(CommonClientConfigKey.IsSecure);
-			if(result != null) {
-				return result;
-			}
-		}
-		return this.secure;
-	}
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/support/RetryableStatusCodeException.java

@@ -1,37 +0,0 @@
-/*
- *
- *  * Copyright 2013-2016 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.ribbon.support;
-
-import java.io.IOException;
-
-/**
- * Exception to be thrown when the status code is deemed to be retryable.
- * @author Ryan Baxter
- * @deprecated Use {@link org.springframework.cloud.client.loadbalancer.RetryableStatusCodeException} instead
- */
-//TODO Remove in Edgeware
-@Deprecated
-public class RetryableStatusCodeException extends IOException {
-
-	private static final String MESSAGE = "Service %s returned a status code of %d";
-
-	public RetryableStatusCodeException(String serviceId, int statusCode) {
-		super(String.format(MESSAGE, serviceId, statusCode));
-	}
-}

spring-cloud-netflix-core/src/main/resources/META-INF/spring.factories

@@ -1,14 +1,2 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.netflix.feign.ribbon.FeignRibbonClientAutoConfiguration,\
-org.springframework.cloud.netflix.feign.FeignAutoConfiguration,\
-org.springframework.cloud.netflix.feign.encoding.FeignAcceptGzipEncodingAutoConfiguration,\
-org.springframework.cloud.netflix.feign.encoding.FeignContentGzipEncodingAutoConfiguration,\
-org.springframework.cloud.netflix.hystrix.HystrixAutoConfiguration,\
-org.springframework.cloud.netflix.hystrix.security.HystrixSecurityAutoConfiguration,\
-org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration
-
-org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker=\
-org.springframework.cloud.netflix.hystrix.HystrixCircuitBreakerConfiguration
-
-org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration=\
-org.springframework.cloud.netflix.hystrix.HystrixManagementContextConfiguration
+org.springframework.cloud.netflix.core.CoreAutoConfiguration

spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/EnableFeignClientsTests.java

@@ -1,86 +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.feign;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration;
-import org.springframework.cloud.netflix.feign.support.SpringEncoder;
-import org.springframework.cloud.netflix.feign.support.SpringMvcContract;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import feign.Contract;
-import feign.Feign;
-import feign.Logger;
-import feign.codec.Decoder;
-import feign.codec.Encoder;
-import feign.optionals.OptionalDecoder;
-import feign.slf4j.Slf4jLogger;
-
-/**
- * @author Spencer Gibb
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = EnableFeignClientsTests.PlainConfiguration.class)
-@DirtiesContext
-public class EnableFeignClientsTests {
-
-	@Autowired
-	private FeignContext feignContext;
-
-	@Test
-	public void decoderDefaultCorrect() {
-		OptionalDecoder.class
-				.cast(this.feignContext.getInstance("foo", Decoder.class));
-	}
-
-	@Test
-	public void encoderDefaultCorrect() {
-		SpringEncoder.class.cast(this.feignContext.getInstance("foo", Encoder.class));
-	}
-
-	@Test
-	public void loggerDefaultCorrect() {
-		Slf4jLogger.class.cast(this.feignContext.getInstance("foo", Logger.class));
-	}
-
-	@Test
-	public void contractDefaultCorrect() {
-		SpringMvcContract.class
-				.cast(this.feignContext.getInstance("foo", Contract.class));
-	}
-
-	@Test
-	public void builderDefaultCorrect() {
-		Feign.Builder.class
-				.cast(this.feignContext.getInstance("foo", Feign.Builder.class));
-	}
-
-	@Configuration
-	@Import({ PropertyPlaceholderAutoConfiguration.class, ArchaiusAutoConfiguration.class,
-			FeignAutoConfiguration.class })
-	protected static class PlainConfiguration {
-	}
-
-}

spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/feign/FeignClientFactoryTests.java

@@ -1,72 +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.feign;
-
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.context.annotation.Bean;
-
-import java.util.Arrays;
-
-/**
- * @author Spencer Gibb
- */
-public class FeignClientFactoryTests {
-
-	@Test
-	public void testChildContexts() {
-		AnnotationConfigApplicationContext parent = new AnnotationConfigApplicationContext();
-		parent.refresh();
-		FeignContext context = new FeignContext();
-		context.setApplicationContext(parent);
-		context.setConfigurations(Arrays.asList(getSpec("foo", FooConfig.class),
-				getSpec("bar", BarConfig.class)));
-
-		Foo foo = context.getInstance("foo", Foo.class);
-		assertThat("foo was null", foo, is(notNullValue()));
-
-		Bar bar = context.getInstance("bar", Bar.class);
-		assertThat("bar was null", bar, is(notNullValue()));
-
-		Bar foobar = context.getInstance("foo", Bar.class);
-		assertThat("bar was not null", foobar, is(nullValue()));
-	}
-
-	private FeignClientSpecification getSpec(String name, Class<?> configClass) {
-		return new FeignClientSpecification(name, new Class[]{configClass});
-	}
-
-	static class FooConfig {
-		@Bean
-		Foo foo() {
-			return new Foo();
-		}
-
-	}
-	static class Foo{}
-
-	static class BarConfig {
-		@Bean
-		Bar bar() {
-			return new Bar();
-		}
-	}
-	static class Bar{}
-}