Allow batching the emitted alive instances flux.

.github/dependabot.yml

@@ -1,49 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    target-branch: "3.1.x" # oldest OSS supported branch
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    target-branch: "4.0.x" # oldest OSS supported branch
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    target-branch: "main"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: maven
-    directory: /
-    schedule:
-      interval: daily
-    target-branch: 3.1.x
-    ignore:
-      # only upgrade patch versions for maintenance branch
-      - dependency-name: "*"
-        update-types:
-          - version-update:semver-major
-          - version-update:semver-minor
-  - package-ecosystem: maven
-    directory: /
-    schedule:
-      interval: daily
-    target-branch: 4.0.x
-    ignore:
-      # only upgrade patch versions for maintenance branch
-      - dependency-name: "*"
-        update-types:
-          - version-update:semver-major
-          - version-update:semver-minor
-  - package-ecosystem: maven
-    directory: /
-    schedule:
-      interval: daily
-    target-branch: main
-    ignore:
-      # only upgrade by minor or patch
-      - dependency-name: "*"
-        update-types:
-          - version-update:semver-major

.github/workflows/deploy-docs.yml

@@ -1,33 +0,0 @@
-name: Deploy Docs
-on:
-  push:
-    branches-ignore: [ gh-pages ]
-    tags: '**'
-  repository_dispatch:
-    types: request-build-reference # legacy
-  #schedule:
-  #- cron: '0 10 * * *' # Once per day at 10am UTC
-  workflow_dispatch:
-permissions:
-  actions: write
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    # FIXME: enable when pushed to spring-projects
-    # if: github.repository_owner == 'spring-projects'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: docs-build
-          fetch-depth: 1
-      - name: Dispatch (partial build)
-        if: github.ref_type == 'branch'
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: gh workflow run deploy-docs.yml -r $(git rev-parse --abbrev-ref HEAD) -f build-refname=${{ github.ref_name }}
-      - name: Dispatch (full build)
-        if: github.ref_type == 'tag'
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: gh workflow run deploy-docs.yml -r $(git rev-parse --abbrev-ref HEAD)

.github/workflows/maven.yaml

@@ -0,0 +1,42 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Build
+
+on:
+  push:
+    branches: [ main, 3.1.x ]
+  pull_request:
+    branches: [ main, 3.1.x ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+      - name: Cache local Maven repository
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Build with Maven
+        run: ./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
+      - name: Publish Test Report
+        uses: mikepenz/action-junit-report@v2
+        if: always() # always run even if the previous step fails
+        with:
+          report_paths: '**/surefire-reports/TEST-*.xml'
+      - name: Archive code coverage results
+        uses: actions/upload-artifact@v2
+        with:
+          name: surefire-reports
+          path: '**/surefire-reports/*'

.github/workflows/maven.yml

@@ -5,9 +5,9 @@ name: Build
 
 on:
   push:
-    branches: [ main, 4.0.x, 3.1.x ]
+    branches: [ main, 3.1.x ]
   pull_request:
-    branches: [ main, 4.0.x, 3.1.x ]
+    branches: [ main, 3.1.x ]
 
 jobs:
   build:
@@ -15,14 +15,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
           java-version: '17'
       - name: Cache local Maven repository
-        uses: actions/cache@v3
+        uses: actions/cache@v2
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -31,12 +31,12 @@ jobs:
       - name: Build with Maven
         run: ./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
       - name: Publish Test Report
-        uses: mikepenz/action-junit-report@v4
+        uses: mikepenz/action-junit-report@v2
         if: always() # always run even if the previous step fails
         with:
           report_paths: '**/surefire-reports/TEST-*.xml'
       - name: Archive code coverage results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: surefire-reports
           path: '**/surefire-reports/*'

.gitignore

@@ -21,8 +21,3 @@ _site/
 antrun
 .vscode/
 .flattened-pom.xml
-node
-node_modules
-build
-package.json
-package-lock.json

.java-version

@@ -1 +0,0 @@
-17

README.adoc

@@ -6,14 +6,334 @@ Edit the files in the src/main/asciidoc/ directory instead.
 
 
 
-[[building]]
-= Building
-:page-section-summary-toc: 1
+https://pivotal.io/platform-as-a-service/migrating-to-cloud-native-application-architectures-ebook[Cloud Native] is a style of application development that encourages easy adoption of best practices in the areas of continuous delivery and value-driven development.
+A related discipline is that of building https://12factor.net/[12-factor Applications], in which development practices are aligned with delivery and operations goals -- for instance, by using declarative programming and management and monitoring.
+Spring Cloud facilitates these styles of development in a number of specific ways.
+ The starting point is a set of features to which all components in a distributed system need easy access.
 
-Unresolved directive in <stdin> - include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/src/main/asciidoc/building.adoc[]
+Many of those features are covered by https://projects.spring.io/spring-boot[Spring Boot], on which Spring Cloud builds. Some more features are delivered by Spring Cloud as two libraries: Spring Cloud Context and Spring Cloud Commons.
+Spring Cloud Context provides utilities and special services for the `ApplicationContext` of a Spring Cloud application (bootstrap context, encryption, refresh scope, and environment endpoints). Spring Cloud Commons is a set of abstractions and common classes used in different Spring Cloud implementations (such as Spring Cloud Netflix and Spring Cloud Consul).
 
-[[contributing]]
-= Contributing
-:page-section-summary-toc: 1
+If you get an exception due to "Illegal key size" and you use Sun's JDK, you need to install the Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files.
+See the following links for more information:
+
+* https://www.oracle.com/technetwork/java/javase/downloads/jce-6-download-429243.html[Java 6 JCE]
+* https://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html[Java 7 JCE]
+* https://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html[Java 8 JCE]
+
+Extract the files into the JDK/jre/lib/security folder for whichever version of JRE/JDK x64/x86 you use.
+
+== Building
+
+:jdkversion: 17
+
+=== 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.
+
+The projects that require middleware (i.e. Redis) for testing generally
+require that a local instance of [Docker](https://www.docker.com/get-started) is installed and running.
+
+
+=== 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
+https://www.springsource.com/developer/sts[Spring Tools Suite] or
+https://eclipse.org[Eclipse] when working with the code. We use the
+https://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.
+
+==== Activate the Spring Maven profile
+Spring Cloud projects require the 'spring' Maven profile to be activated to resolve
+the spring milestone and snapshot repositories. Use your preferred IDE to set this
+profile to be active, or you may experience build errors.
+
+==== Importing into eclipse with m2eclipse
+We recommend the https://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
+  https://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 https://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"
+		"https://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.
+The following files can be found in the https://github.com/spring-cloud/spring-cloud-build/tree/master/spring-cloud-build-tools[Spring Cloud Build] project.
+
+.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-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.
+
+=== Duplicate Finder
+
+Spring Cloud Build brings along the  `basepom:duplicate-finder-maven-plugin`, that enables flagging duplicate and conflicting classes and resources on the java classpath.
+
+==== Duplicate Finder configuration
+
+Duplicate finder is *enabled by default* and will run in the `verify` phase of your Maven build, but it will only take effect in your project if you add the `duplicate-finder-maven-plugin` to the `build` section of the projecst's `pom.xml`.
+
+.pom.xml
+[source,xml]
+----
+<build>
+    <plugins>
+        <plugin>
+            <groupId>org.basepom.maven</groupId>
+            <artifactId>duplicate-finder-maven-plugin</artifactId>
+        </plugin>
+    </plugins>
+</build>
+----
+
+For other properties, we have set defaults as listed in the https://github.com/basepom/duplicate-finder-maven-plugin/wiki[plugin documentation].
+
+You can easily override them but setting the value of the selected property prefixed with `duplicate-finder-maven-plugin`. For example, set `duplicate-finder-maven-plugin.skip` to `true` in order to skip duplicates check in your build.
+
+If you need to add `ignoredClassPatterns` or `ignoredResourcePatterns` to your setup, make sure to add them in the plugin configuration section of your project:
+
+[source,xml]
+----
+<build>
+    <plugins>
+        <plugin>
+            <groupId>org.basepom.maven</groupId>
+            <artifactId>duplicate-finder-maven-plugin</artifactId>
+            <configuration>
+                <ignoredClassPatterns>
+                    <ignoredClassPattern>org.joda.time.base.BaseDateTime</ignoredClassPattern>
+                    <ignoredClassPattern>.*module-info</ignoredClassPattern>
+                </ignoredClassPatterns>
+                <ignoredResourcePatterns>
+                    <ignoredResourcePattern>changelog.txt</ignoredResourcePattern>
+                </ignoredResourcePatterns>
+            </configuration>
+        </plugin>
+    </plugins>
+</build>
+
+
+----
 
-Unresolved directive in <stdin> - include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/src/main/asciidoc/contributing.adoc[]

docs/antora-playbook.yml

@@ -1,39 +0,0 @@
-antora:
-  extensions:
-    - '@springio/antora-extensions/partial-build-extension'
-    - require: '@springio/antora-extensions/latest-version-extension'
-    - require: '@springio/antora-extensions/inject-collector-cache-config-extension'
-    - '@antora/collector-extension'
-    - '@antora/atlas-extension'
-    - require: '@springio/antora-extensions/root-component-extension'
-      root_component_name: 'cloud-commons'
-    - '@springio/antora-extensions/static-page-extension'
-site:
-  title: Spring Cloud Commons
-  url: https://docs.spring.io/spring-cloud-commons/reference/
-content:
-  sources:
-    - url: ./..
-      branches: HEAD
-      start_path: docs
-      worktrees: true
-asciidoc:
-  attributes:
-    page-stackoverflow-url: https://stackoverflow.com/tags/spring-cloud
-    page-pagination: ''
-    hide-uri-scheme: '@'
-    tabs-sync-option: '@'
-    chomp: 'all'
-  extensions:
-    - '@asciidoctor/tabs'
-    - '@springio/asciidoctor-extensions'
-  sourcemap: true
-urls:
-  latest_version_segment: ''
-runtime:
-  log:
-    failure_level: warn
-    format: pretty
-ui:
-  bundle:
-    url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.2/ui-bundle.zip

docs/antora.yml

@@ -1,12 +0,0 @@
-name: cloud-commons
-version: true
-title: Spring Cloud Commons
-nav:
-  - modules/ROOT/nav.adoc
-ext:
-  collector:
-    run:
-      command: ./mvnw --no-transfer-progress -B process-resources -Pdocs -pl docs -Dantora-maven-plugin.phase=none -Dgenerate-docs.phase=none -Dgenerate-readme.phase=none -Dgenerate-cloud-resources.phase=none -Dmaven-dependency-plugin-for-docs.phase=none -Dmaven-dependency-plugin-for-docs-classes.phase=none -DskipTests
-      local: true
-    scan:
-      dir: ./target/classes/antora-resources/

docs/modules/ROOT/nav.adoc

@@ -1,11 +0,0 @@
-* xref:index.adoc[]
-** xref:intro.adoc[]
-** xref:spring-cloud-commons/application-context-services.adoc[]
-** xref:spring-cloud-commons/common-abstractions.adoc[]
-** xref:spring-cloud-commons/loadbalancer.adoc[]
-** xref:spring-cloud-commons/cachedrandompropertysource.adoc[]
-** xref:spring-cloud-commons/security.adoc[]
-* xref:spring-cloud-circuitbreaker.adoc[]
-* xref:appendix.adoc[]
-** xref:configprops.adoc[]
-

docs/modules/ROOT/pages/configprops.adoc

@@ -1,6 +0,0 @@
-[[configuration-properties]]
-= Configuration Properties
-
-Below you can find a list of configuration properties.
-
-include::partial$_configprops.adoc[]

docs/modules/ROOT/pages/index.adoc

@@ -1,9 +0,0 @@
-[[cloud-native-applications]]
-= Cloud Native Applications
-
-include::partial$_attributes.adoc[]
-
-// TODO: figure out remote includes in docs and replace pasted text
-// include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing-docs.adoc[]
-NOTE: Spring Cloud is released under the non-restrictive Apache 2.0 license.
-If you would like to contribute to this section of the documentation or if you find an error, you can find the source code and issue trackers for the project at {github-issues}[github].

docs/modules/ROOT/pages/spring-cloud-commons/application-context-services.adoc

@@ -1,261 +0,0 @@
-[[spring-cloud-context-application-context-services]]
-= Spring Cloud Context: Application Context Services
-
-Spring Boot has an opinionated view of how to build an application with Spring.
-For instance, it has conventional locations for common configuration files and has endpoints for common management and monitoring tasks.
-Spring Cloud builds on top of that and adds a few features that many components in a system would use or occasionally need.
-
-[[the-bootstrap-application-context]]
-== The Bootstrap Application Context
-
-A Spring Cloud application operates by creating a "`bootstrap`" context, which is a parent context for the main application.
-This context is responsible for loading configuration properties from the external sources and for decrypting properties in the local external configuration files.
-The two contexts share an `Environment`, which is the source of external properties for any Spring application.
-By default, bootstrap properties (not `bootstrap.properties` but properties that are loaded during the bootstrap phase) are added with high precedence, so they cannot be overridden by local configuration.
-
-The bootstrap context uses a different convention for locating external configuration than the main application context.
-Instead of `application.yml` (or `.properties`), you can use `bootstrap.yml`, keeping the external configuration for bootstrap and main context nicely separate.
-The following listing shows an example:
-
-.bootstrap.yml
-----
-spring:
-  application:
-    name: foo
-  cloud:
-    config:
-      uri: ${SPRING_CONFIG_URI:http://localhost:8888}
-----
-
-If your application needs any application-specific configuration from the server, it is a good idea to set the `spring.application.name` (in `bootstrap.yml` or `application.yml`).
-For the property `spring.application.name` to be used as the application's context ID, you must set it in `bootstrap.[properties | yml]`.
-
-If you want to retrieve specific profile configuration, you should also set `spring.profiles.active` in `bootstrap.[properties | yml]`.
-
-You can disable the bootstrap process completely by setting `spring.cloud.bootstrap.enabled=false` (for example, in system properties).
-
-[[application-context-hierarchies]]
-== Application Context Hierarchies
-
-If you build an application context from `SpringApplication` or `SpringApplicationBuilder`, the Bootstrap context is added as a parent to that context.
-It is a feature of Spring that child contexts inherit property sources and profiles from their parent, so the "`main`" application context contains additional property sources, compared to building the same context without Spring Cloud Config.
-The additional property sources are:
-
-* "`bootstrap`": If any `PropertySourceLocators` are found in the bootstrap context and if they have non-empty properties, an optional `CompositePropertySource` appears with high priority.
-An example would be properties from the Spring Cloud Config Server.
-See "`xref:spring-cloud-commons/application-context-services.adoc#customizing-bootstrap-property-sources[Customizing the Bootstrap Property Sources]`" for how to customize the contents of this property source.
-
-NOTE:  Prior to Spring Cloud 2022.0.3 `PropertySourceLocators` (including the ones for Spring Cloud Config) were run during
-the main application context and not in the Bootstrap context.  You can force `PropertySourceLocators` to be run during the
-Bootstrap context by setting `spring.cloud.config.initialize-on-context-refresh=true` in `bootstrap.[properties | yaml]`.
-
-* "`applicationConfig: [classpath:bootstrap.yml]`" (and related files if Spring profiles are active): If you have a `bootstrap.yml` (or `.properties`), those properties are used to configure the bootstrap context.
-Then they get added to the child context when its parent is set.
-They have lower precedence than the `application.yml` (or `.properties`) and any other property sources that are added to the child as a normal part of the process of creating a Spring Boot application.
-See "`xref:spring-cloud-commons/application-context-services.adoc#customizing-bootstrap-properties[Changing the Location of Bootstrap Properties]`" for how to customize the contents of these property sources.
-
-Because of the ordering rules of property sources, the "`bootstrap`" entries take precedence.
-However, note that these do not contain any data from `bootstrap.yml`, which has very low precedence but can be used to set defaults.
-
-You can extend the context hierarchy by setting the parent context of any `ApplicationContext` you create -- for example, by using its own interface or with the `SpringApplicationBuilder` convenience methods (`parent()`, `child()` and `sibling()`).
-The bootstrap context is the parent of the most senior ancestor that you create yourself.
-Every context in the hierarchy has its own "`bootstrap`" (possibly empty) property source to avoid promoting values inadvertently from parents down to their descendants.
-If there is a config server, every context in the hierarchy can also (in principle) have a different `spring.application.name` and, hence, a different remote property source.
-Normal Spring application context behavior rules apply to property resolution: properties from a child context override those in
-the parent, by name and also by property source name.
-(If the child has a property source with the same name as the parent, the value from the parent is not included in the child).
-
-Note that the `SpringApplicationBuilder` lets you share an `Environment` amongst the whole hierarchy, but that is not the default.
-Thus, sibling contexts (in particular) do not need to have the same profiles or property sources, even though they may share common values with their parent.
-
-[[customizing-bootstrap-properties]]
-== Changing the Location of Bootstrap Properties
-
-The `bootstrap.yml` (or `.properties`) location can be specified by setting `spring.cloud.bootstrap.name` (default: `bootstrap`), `spring.cloud.bootstrap.location` (default: empty) or `spring.cloud.bootstrap.additional-location` (default: empty) -- for example, in System properties.
-
-Those properties behave like the `spring.config.*` variants with the same name.
-With `spring.cloud.bootstrap.location` the default locations are replaced and only the specified ones are used.
-To add locations to the list of default ones, `spring.cloud.bootstrap.additional-location` can be used.
-In fact, they are used to set up the bootstrap `ApplicationContext` by setting those properties in its `Environment`.
-If there is an active profile (from `spring.profiles.active` or through the `Environment` API in the context you are building), properties in that profile get loaded as well, the same as in a regular Spring Boot app -- for example, from `bootstrap-development.properties` for a `development` profile.
-
-[[overriding-bootstrap-properties]]
-== Overriding the Values of Remote Properties
-
-The property sources that are added to your application by the bootstrap context are often "`remote`" (from example, from Spring Cloud Config Server).
-By default, they cannot be overridden locally.
-If you want to let your applications override the remote properties with their own system properties or config files, the remote property source has to grant it permission by setting `spring.cloud.config.allowOverride=true` (it does not work to set this locally).
-Once that flag is set, two finer-grained settings control the location of the remote properties in relation to system properties and the application's local configuration:
-
-* `spring.cloud.config.overrideNone=true`: Override from any local property source.
-* `spring.cloud.config.overrideSystemProperties=false`: Only system properties, command line arguments, and environment variables (but not the local config files) should override the remote settings.
-
-[[customizing-the-bootstrap-configuration]]
-== Customizing the Bootstrap Configuration
-
-The bootstrap context can be set to do anything you like by adding entries to `/META-INF/spring.factories` under a key named `org.springframework.cloud.bootstrap.BootstrapConfiguration`.
-This holds a comma-separated list of Spring `@Configuration` classes that are used to create the context.
-Any beans that you want to be available to the main application context for autowiring can be created here.
-There is a special contract for `@Beans` of type `ApplicationContextInitializer`.
-If you want to control the startup sequence, you can mark classes with the `@Order` annotation (the default order is `last`).
-
-WARNING: When adding custom `BootstrapConfiguration`, be careful that the classes you add are not `@ComponentScanned` by mistake into your "`main`" application context, where they might not be needed.
-Use a separate package name for boot configuration classes and make sure that name is not already covered by your `@ComponentScan` or `@SpringBootApplication` annotated configuration classes.
-
-The bootstrap process ends by injecting initializers into the main `SpringApplication` instance (which is the normal Spring Boot startup sequence, whether it runs as a standalone application or is deployed in an application server).
-First, a bootstrap context is created from the classes found in `spring.factories`.
-Then, all `@Beans` of type `ApplicationContextInitializer` are added to the main `SpringApplication` before it is started.
-
-[[customizing-bootstrap-property-sources]]
-== Customizing the Bootstrap Property Sources
-
-The default property source for external configuration added by the bootstrap process is the Spring Cloud Config Server, but you can add additional sources by adding beans of type `PropertySourceLocator` to the bootstrap context (through `spring.factories`).
-For instance, you can insert additional properties from a different server or from a database.
-
-As an example, consider the following custom locator:
-
-[source,java]
-----
-@Configuration
-public class CustomPropertySourceLocator implements PropertySourceLocator {
-
-    @Override
-    public PropertySource<?> locate(Environment environment) {
-        return new MapPropertySource("customProperty",
-                Collections.<String, Object>singletonMap("property.from.sample.custom.source", "worked as intended"));
-    }
-
-}
-----
-
-The `Environment` that is passed in is the one for the `ApplicationContext` about to be created -- in other words, the one for which we supply additional property sources.
-It already has its normal Spring Boot-provided property sources, so you can use those to locate a property source specific to this `Environment` (for example, by keying it on `spring.application.name`, as is done in the default Spring Cloud Config Server property source locator).
-
-If you create a jar with this class in it and then add a `META-INF/spring.factories` containing the following setting, the `customProperty` `PropertySource` appears in any application that includes that jar on its classpath:
-
-[source]
-----
-org.springframework.cloud.bootstrap.BootstrapConfiguration=sample.custom.CustomPropertySourceLocator
-----
-
-As of Spring Cloud 2022.0.3, Spring Cloud will now call `PropertySourceLocators` twice.  The first fetch
-will retrieve any property sources without any profiles.  These property sources will have the opportunity to
-activate profiles using `spring.profiles.active`.  After the main application context starts `PropertySourceLocators`
-will be called a second time, this time with any active profiles allowing `PropertySourceLocators` to locate
-any additional `PropertySources` with profiles.
-
-[[logging-configuration]]
-== Logging Configuration
-
-If you use Spring Boot to configure log settings, you should place this configuration in `bootstrap.[yml | properties]` if you would like it to apply to all events.
-
-NOTE: For Spring Cloud to initialize logging configuration properly, you cannot use a custom prefix.
-For example, using `custom.loggin.logpath` is not recognized by Spring Cloud when initializing the logging system.
-
-[[environment-changes]]
-== Environment Changes
-
-The application listens for an `EnvironmentChangeEvent` and reacts to the change in a couple of standard ways (additional `ApplicationListeners` can be added as `@Beans` in the normal way).
-When an `EnvironmentChangeEvent` is observed, it has a list of key values that have changed, and the application uses those to:
-
-* Re-bind any `@ConfigurationProperties` beans in the context.
-* Set the logger levels for any properties in `logging.level.*`.
-
-Note that the Spring Cloud Config Client does not, by default, poll for changes in the `Environment`.
-Generally, we would not recommend that approach for detecting changes (although you can set it up with a
-`@Scheduled` annotation).
-If you have a scaled-out client application, it is better to broadcast the `EnvironmentChangeEvent` to all the instances instead of having them polling for changes (for example, by using the https://github.com/spring-cloud/spring-cloud-bus[Spring Cloud Bus]).
-
-The `EnvironmentChangeEvent` covers a large class of refresh use cases, as long as you can actually make a change to the `Environment` and publish the event.
-Note that those APIs are public and part of core Spring).
-You can verify that the changes are bound to `@ConfigurationProperties` beans by visiting the `/configprops` endpoint (a standard Spring Boot Actuator feature).
-For instance, a `DataSource` can have its `maxPoolSize` changed at runtime (the default `DataSource` created by Spring Boot is a `@ConfigurationProperties` bean) and grow capacity dynamically.
-Re-binding `@ConfigurationProperties` does not cover another large class of use cases, where you need more control over the refresh and where you need a change to be atomic over the whole `ApplicationContext`.
-To address those concerns, we have `@RefreshScope`.
-
-[[refresh-scope]]
-== Refresh Scope
-
-When there is a configuration change, a Spring `@Bean` that is marked as `@RefreshScope` gets special treatment.
-This feature addresses the problem of stateful beans that get their configuration injected only when they are initialized.
-For instance, if a `DataSource` has open connections when the database URL is changed through the `Environment`, you probably want the holders of those connections to be able to complete what they are doing.
-Then, the next time something borrows a connection from the pool, it gets one with the new URL.
-
-Sometimes, it might even be mandatory to apply the `@RefreshScope` annotation on some beans that can be only initialized once.
-If a bean is "`immutable`", you have to either annotate the bean with `@RefreshScope` or specify the classname under the property key: `spring.cloud.refresh.extra-refreshable`.
-
-WARNING: If you hava a `DataSource` bean that is a `HikariDataSource`, it can not be
-refreshed. It is the default value for `spring.cloud.refresh.never-refreshable`. Choose a
-different `DataSource` implementation if you need it to be refreshed.
-
-Refresh scope beans are lazy proxies that initialize when they are used (that is, when a method is called), and the scope acts as a cache of initialized values.
-To force a bean to re-initialize on the next method call, you must invalidate its cache entry.
-
-The `RefreshScope` is a bean in the context and has a public `refreshAll()` method to refresh all beans in the scope by clearing the target cache.
-The `/refresh` endpoint exposes this functionality (over HTTP or JMX).
-To refresh an individual bean by name, there is also a `refresh(String)` method.
-
-To expose the `/refresh` endpoint, you need to add following configuration to your application:
-
-[source,yaml]
-----
-management:
-  endpoints:
-    web:
-      exposure:
-        include: refresh
-----
-
-NOTE: `@RefreshScope` works (technically) on a `@Configuration` class, but it might lead to surprising behavior.
-For example, it does not mean that all the `@Beans` defined in that class are themselves in `@RefreshScope`.
-Specifically, anything that depends on those beans cannot rely on them being updated when a refresh is initiated, unless it is itself in `@RefreshScope`.
-In that case, it is rebuilt on a refresh and its dependencies are re-injected.
-At that point, they are re-initialized from the refreshed `@Configuration`).
-
-NOTE:  Removing a configuration value and then performing a refresh will not update the presence of the configuration value.
-The configuration property must be present in order to update the value after a refresh.  If you are relying on the presence of
-a value in your application you might want to switch your logic to rely on its absence instead.  Another option would be to rely
-on the value changing rather than not being present in the application's configuration.
-
-WARNING: Context Refresh is not supported for Spring AOT transformations and native images. For AOT and native images, `spring.cloud.refresh.enabled` needs to be set to `false`.
-
-[refresh-scope-on-restart]
-=== Refresh Scope on Restart
-
-Seamlessly refreshing beans on restart is especially useful for applications that run with JVM Checkpoint Restore (such as https://github.com/CRaC[Project CRaC]). To allow this ability, we now instantiate a `RefreshScopeLifecycle` bean that triggers Context Refresh on restart, resulting in rebinding configuration properties and refreshing any beans annotated with `@RefreshScope`. You can disable this behavior by setting `spring.cloud.refresh.on-restart.enabled` to `false`.
-
-[[encryption-and-decryption]]
-== Encryption and Decryption
-
-Spring Cloud has an `Environment` pre-processor for decrypting property values locally.
-It follows the same rules as the Spring Cloud Config Server and has the same external configuration through `encrypt.\*`.
-Thus, you can use encrypted values in the form of `\{cipher}*`, and, as long as there is a valid key, they are decrypted before the main application context gets the `Environment` settings.
-To use the encryption features in an application, you need to include Spring Security RSA in your classpath (Maven co-ordinates: `org.springframework.security:spring-security-rsa`), and you also need the full strength JCE extensions in your JVM.
-
-If you get an exception due to "Illegal key size" and you use Sun's JDK, you need to install the Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files.
-See the following links for more information:
-
-* https://www.oracle.com/technetwork/java/javase/downloads/jce-6-download-429243.html[Java 6 JCE]
-* https://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html[Java 7 JCE]
-* https://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html[Java 8 JCE]
-
-Extract the files into the JDK/jre/lib/security folder for whichever version of JRE/JDK x64/x86 you use.
-
-[[endpoints]]
-== Endpoints
-
-For a Spring Boot Actuator application, some additional management endpoints are available. You can use:
-
-* `POST` to `/actuator/env` to update the `Environment` and rebind `@ConfigurationProperties` and log levels.
-  To enabled this endpoint you must set `management.endpoint.env.post.enabled=true`.
-* `/actuator/refresh` to re-load the boot strap context and refresh the `@RefreshScope` beans.
-* `/actuator/restart` to close the `ApplicationContext` and restart it (disabled by default).
-* `/actuator/pause` and `/actuator/resume` for calling the `Lifecycle` methods (`stop()` and `start()` on the `ApplicationContext`).
-
-NOTE: While enabling the `POST` method for `/actuator/env` endpoint can provide flexibility and convenience in managing your application environment variables,
-it's critical to ensure that the endpoint is secured and monitored to prevent potential security risks.
-Add a `spring-boot-starter-security` dependency to configure access control for the actuator’s endpoint.
-
-NOTE: If you disable the `/actuator/restart` endpoint then the `/actuator/pause` and `/actuator/resume` endpoints
-will also be disabled since they are just a special case of `/actuator/restart`.
-

docs/modules/ROOT/pages/spring-cloud-commons/cachedrandompropertysource.adoc

@@ -1,15 +0,0 @@
-[[cachedrandompropertysource]]
-= CachedRandomPropertySource
-:page-section-summary-toc: 1
-
-Spring Cloud Context provides a `PropertySource` that caches random values based on a key.  Outside of the caching
-functionality it works the same as Spring Boot's https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/RandomValuePropertySource.java[`RandomValuePropertySource`].
-This random value might be useful in the case where you want a random value that is consistent even after the Spring Application
-context restarts.  The property value takes the form of `cachedrandom.[yourkey].[type]` where `yourkey` is the key in the cache.  The `type` value can
-be any type supported by Spring Boot's `RandomValuePropertySource`.
-
-[source,properties,indent=0]
-----
-myrandom=${cachedrandom.appname.value}
-----
-

docs/modules/ROOT/pages/spring-cloud-commons/common-abstractions.adoc

@@ -1,595 +0,0 @@
-[[spring-cloud-common-abstractions]]
-= Spring Cloud Commons: Common Abstractions
-
-Patterns such as service discovery, load balancing, and circuit breakers lend themselves to a common abstraction layer that can be consumed by all Spring Cloud clients, independent of the implementation (for example, discovery with Eureka or Consul).
-
-[[discovery-client]]
-== The `@EnableDiscoveryClient` Annotation
-
-Spring Cloud Commons provides the `@EnableDiscoveryClient` annotation.
-This looks for implementations of the `DiscoveryClient` and `ReactiveDiscoveryClient` interfaces with `META-INF/spring.factories`.
-Implementations of the discovery client add a configuration class to `spring.factories` under the `org.springframework.cloud.client.discovery.EnableDiscoveryClient` key.
-Examples of `DiscoveryClient` implementations include https://cloud.spring.io/spring-cloud-netflix/[Spring Cloud Netflix Eureka], https://cloud.spring.io/spring-cloud-consul/[Spring Cloud Consul Discovery], and https://cloud.spring.io/spring-cloud-zookeeper/[Spring Cloud Zookeeper Discovery].
-
-Spring Cloud will provide both the blocking and reactive service discovery clients by default.
-You can disable the blocking and/or reactive clients easily by setting `spring.cloud.discovery.blocking.enabled=false` or `spring.cloud.discovery.reactive.enabled=false`.
-To completely disable service discovery you just need to set `spring.cloud.discovery.enabled=false`.
-
-By default, implementations of `DiscoveryClient` auto-register the local Spring Boot server with the remote discovery server.
-This behavior can be disabled by setting `autoRegister=false` in `@EnableDiscoveryClient`.
-
-NOTE: `@EnableDiscoveryClient` is no longer required.
-You can put a `DiscoveryClient` implementation on the classpath to cause the Spring Boot application to register with the service discovery server.
-
-[[health-indicators]]
-=== Health Indicators
-
-Commons auto-configures the following Spring Boot health indicators.
-
-[[discoveryclienthealthindicator]]
-==== DiscoveryClientHealthIndicator
-This health indicator is based on the currently registered `DiscoveryClient` implementation.
-
-* To disable entirely, set `spring.cloud.discovery.client.health-indicator.enabled=false`.
-* To disable the description field, set `spring.cloud.discovery.client.health-indicator.include-description=false`.
-Otherwise, it can bubble up as the `description` of the rolled up `HealthIndicator`.
-* To disable service retrieval, set `spring.cloud.discovery.client.health-indicator.use-services-query=false`.
-By default, the indicator invokes the client's `getServices` method. In deployments with many registered services it may too
-costly to retrieve all services during every check. This will skip the service retrieval and instead use the client's `probe` method.
-
-[[discoverycompositehealthcontributor]]
-==== DiscoveryCompositeHealthContributor
-This composite health indicator is based on all registered `DiscoveryHealthIndicator` beans. To disable,
-set `spring.cloud.discovery.client.composite-indicator.enabled=false`.
-
-[[ordering-discoveryclient-instances]]
-=== Ordering `DiscoveryClient` instances
-`DiscoveryClient` interface extends `Ordered`. This is useful when using multiple discovery
- clients, as it allows you to define the order of the returned discovery clients, similar to
-how you can order the beans loaded by a Spring application. By default, the order of any `DiscoveryClient` is set to
-`0`. If you want to set a different order for your custom `DiscoveryClient` implementations, you just need to override
-the `getOrder()` method so that it returns the value that is suitable for your setup. Apart from this, you can use
-properties to set the order of the `DiscoveryClient`
-implementations provided by Spring Cloud, among others  `ConsulDiscoveryClient`, `EurekaDiscoveryClient` and
-`ZookeeperDiscoveryClient`. In order to do it, you just need to set the
-`spring.cloud.\{clientIdentifier}.discovery.order` (or `eureka.client.order` for Eureka) property to the desired value.
-
-[[simplediscoveryclient]]
-=== SimpleDiscoveryClient
-
-If there is no Service-Registry-backed `DiscoveryClient` in the classpath, `SimpleDiscoveryClient`
-instance, that uses properties to get information on service and instances, will be used.
-
-The information about the available instances should be passed to via properties in the following format:
-`spring.cloud.discovery.client.simple.instances.service1[0].uri=http://s11:8080`, where
-`spring.cloud.discovery.client.simple.instances` is the common prefix, then `service1` stands
-for the ID of the service in question, while `[0]` indicates the index number of the instance
-(as visible in the example, indexes start with `0`), and then the value of `uri` is
-the actual URI under which the instance is available.
-
-[[serviceregistry]]
-== ServiceRegistry
-
-Commons now provides a `ServiceRegistry` interface that provides methods such as `register(Registration)` and `deregister(Registration)`, which let you provide custom registered services.
-`Registration` is a marker interface.
-
-The following example shows the `ServiceRegistry` in use:
-
-[source,java,indent=0]
-----
-@Configuration
-@EnableDiscoveryClient(autoRegister=false)
-public class MyConfiguration {
-    private ServiceRegistry registry;
-
-    public MyConfiguration(ServiceRegistry registry) {
-        this.registry = registry;
-    }
-
-    // called through some external process, such as an event or a custom actuator endpoint
-    public void register() {
-        Registration registration = constructRegistration();
-        this.registry.register(registration);
-    }
-}
-----
-
-Each `ServiceRegistry` implementation has its own `Registry` implementation.
-
-* `ZookeeperRegistration` used with `ZookeeperServiceRegistry`
-* `EurekaRegistration` used with `EurekaServiceRegistry`
-* `ConsulRegistration` used with `ConsulServiceRegistry`
-
-If you are using the `ServiceRegistry` interface, you are going to need to pass the
-correct `Registry` implementation for the `ServiceRegistry` implementation you
-are using.
-
-
-[[serviceregistry-auto-registration]]
-=== ServiceRegistry Auto-Registration
-
-By default, the `ServiceRegistry` implementation auto-registers the running service.
-To disable that behavior, you can set:
-* `@EnableDiscoveryClient(autoRegister=false)` to permanently disable auto-registration.
-* `spring.cloud.service-registry.auto-registration.enabled=false` to disable the behavior through configuration.
-
-[[serviceregistry-auto-registration-events]]
-==== ServiceRegistry Auto-Registration Events
-
-There are two events that will be fired when a service auto-registers.  The first event, called
-`InstancePreRegisteredEvent`, is fired before the service is registered.  The second
-event, called `InstanceRegisteredEvent`, is fired after the service is registered.  You can register an
-`ApplicationListener`(s) to listen to and react to these events.
-
-NOTE: These events will not be fired if the `spring.cloud.service-registry.auto-registration.enabled` property is set to `false`.
-
-[[service-registry-actuator-endpoint]]
-=== Service Registry Actuator Endpoint
-
-Spring Cloud Commons provides a `/serviceregistry` actuator endpoint.
-This endpoint relies on a `Registration` bean in the Spring Application Context.
-Calling `/serviceregistry` with GET returns the status of the `Registration`.
-Using POST to the same endpoint with a JSON body changes the status of the current `Registration` to the new value.
-The JSON body has to include the `status` field with the preferred value.
-Please see the documentation of the `ServiceRegistry` implementation you use for the allowed values when updating the status and the values returned for the status.
-For instance, Eureka's supported statuses are `UP`, `DOWN`, `OUT_OF_SERVICE`, and `UNKNOWN`.
-
-[[rest-template-loadbalancer-client]]
-== Spring RestTemplate as a Load Balancer Client
-
-You can configure a `RestTemplate` to use a Load-balancer client.
-To create a load-balanced `RestTemplate`, create a `RestTemplate` `@Bean` and use the `@LoadBalanced` qualifier, as the following example shows:
-
-[source,java,indent=0]
-----
-@Configuration
-public class MyConfiguration {
-
-    @LoadBalanced
-    @Bean
-    RestTemplate restTemplate() {
-        return new RestTemplate();
-    }
-}
-
-public class MyClass {
-    @Autowired
-    private RestTemplate restTemplate;
-
-    public String doOtherStuff() {
-        String results = restTemplate.getForObject("http://stores/stores", String.class);
-        return results;
-    }
-}
-----
-
-CAUTION: A `RestTemplate` bean is no longer created through auto-configuration.
-Individual applications must create it.
-
-The URI needs to use a virtual host name (that is, a service name, not a host name).
-The BlockingLoadBalancerClient is used to create a full physical address.
-
-IMPORTANT: To use a load-balanced `RestTemplate`, you need to have a load-balancer implementation in your classpath.
-Add xref:spring-cloud-commons/loadbalancer.adoc#spring-cloud-loadbalancer-starter[Spring Cloud LoadBalancer starter] to your project in order to use it.
-
-[[webclinet-loadbalancer-client]]
-== Spring WebClient as a Load Balancer Client
-
-You can configure `WebClient` to automatically use a load-balancer client.
-To create a load-balanced `WebClient`, create a `WebClient.Builder` `@Bean` and use the `@LoadBalanced` qualifier, as follows:
-
-[source,java,indent=0]
-----
-@Configuration
-public class MyConfiguration {
-
-	@Bean
-	@LoadBalanced
-	public WebClient.Builder loadBalancedWebClientBuilder() {
-		return WebClient.builder();
-	}
-}
-
-public class MyClass {
-    @Autowired
-    private WebClient.Builder webClientBuilder;
-
-    public Mono<String> doOtherStuff() {
-        return webClientBuilder.build().get().uri("http://stores/stores")
-        				.retrieve().bodyToMono(String.class);
-    }
-}
-----
-
-The URI needs to use a virtual host name (that is, a service name, not a host name).
-The Spring Cloud LoadBalancer is used to create a full physical address.
-
-IMPORTANT: If you want to use a `@LoadBalanced WebClient.Builder`, you need to have a load balancer
-implementation in the classpath. We recommend that you add the
-xref:spring-cloud-commons/loadbalancer.adoc#spring-cloud-loadbalancer-starter[Spring Cloud LoadBalancer starter] to your project.
-Then, `ReactiveLoadBalancer` is used underneath.
-
-[[retrying-failed-requests]]
-=== Retrying Failed Requests
-
-A load-balanced `RestTemplate` can be configured to retry failed requests.
-By default, this logic is disabled.
-For the non-reactive version (with `RestTemplate`), you can enable it by adding link:https://github.com/spring-projects/spring-retry[Spring Retry] to your application's classpath. For the reactive version (with `WebTestClient`), you need to set `spring.cloud.loadbalancer.retry.enabled=true`.
-
-If you would like to disable the retry logic with Spring Retry or Reactive Retry on the classpath, you can set `spring.cloud.loadbalancer.retry.enabled=false`.
-
-For the non-reactive implementation, if you would like to implement a `BackOffPolicy` in your retries, you need to create a bean of type `LoadBalancedRetryFactory` and override the `createBackOffPolicy()` method.
-
-For the reactive implementation, you just need to enable it by setting `spring.cloud.loadbalancer.retry.backoff.enabled` to `false`.
-
-You can set:
-
-- `spring.cloud.loadbalancer.retry.maxRetriesOnSameServiceInstance` - indicates how many times a request should be retried on the same `ServiceInstance` (counted separately for every selected instance)
-- `spring.cloud.loadbalancer.retry.maxRetriesOnNextServiceInstance` - indicates how many times a request should be retried a newly selected `ServiceInstance`
-- `spring.cloud.loadbalancer.retry.retryableStatusCodes` - the status codes on which to always retry a failed request.
-
-For the reactive implementation, you can additionally set:
- - `spring.cloud.loadbalancer.retry.backoff.minBackoff` - Sets the minimum backoff duration (by default, 5 milliseconds)
- - `spring.cloud.loadbalancer.retry.backoff.maxBackoff` - Sets the maximum backoff duration (by default, max long value of milliseconds)
- - `spring.cloud.loadbalancer.retry.backoff.jitter` - Sets the jitter used for calculating the actual backoff duration for each call (by default, 0.5).
-
-For the reactive implementation, you can also implement your own `LoadBalancerRetryPolicy` to have more detailed control over the load-balanced call retries.
-
-For both implementations, you can also set the exceptions that trigger the replies by adding a list of values under the `spring.cloud.loadbalancer.[serviceId].retry.retryable-exceptions` property. If you do, we make sure to add `RetryableStatusCodeExceptions` to the list of exceptions provided by you, so that we also retry on retryable status codes. If you do not specify any exceptions via properties, the exceptions we use by default are `IOException`, `TimeoutException` and `RetryableStatusCodeException`. You can also enable retrying on all exceptions by setting `spring.cloud.loadbalancer.[serviceId].retry.retry-on-all-exceptions` to `true`.
-
-WARNING: If you use the blocking implementation with Spring Retries, if you want to keep the behaviour from previous releases, set `spring.cloud.loadbalancer.[serviceId].retry.retry-on-all-exceptions` to `true` as that used to be the default mode for the blocking implementation.
-
-NOTE: Individual Loadbalancer clients may be configured individually with the same properties as above except the prefix is `spring.cloud.loadbalancer.clients.<clientId>.*` where `clientId` is the name of the loadbalancer.
-
-NOTE: For load-balanced retries, by default, we wrap the `ServiceInstanceListSupplier` bean with `RetryAwareServiceInstanceListSupplier` to select a different instance from the one previously chosen, if available. You can disable this behavior by setting the value of `spring.cloud.loadbalancer.retry.avoidPreviousInstance` to `false`.
-
-[source,java,indent=0]
-----
-@Configuration
-public class MyConfiguration {
-    @Bean
-    LoadBalancedRetryFactory retryFactory() {
-        return new LoadBalancedRetryFactory() {
-            @Override
-            public BackOffPolicy createBackOffPolicy(String service) {
-        		return new ExponentialBackOffPolicy();
-        	}
-        };
-    }
-}
-----
-
-If you want to add one or more `RetryListener` implementations to your retry functionality, you need to
-create a bean of type `LoadBalancedRetryListenerFactory` and return the `RetryListener` array
-you would like to use for a given service, as the following example shows:
-
-[source,java,indent=0]
-----
-@Configuration
-public class MyConfiguration {
-    @Bean
-    LoadBalancedRetryListenerFactory retryListenerFactory() {
-        return new LoadBalancedRetryListenerFactory() {
-            @Override
-            public RetryListener[] createRetryListeners(String service) {
-                return new RetryListener[]{new RetryListener() {
-                    @Override
-                    public <T, E extends Throwable> boolean open(RetryContext context, RetryCallback<T, E> callback) {
-                        //TODO Do you business...
-                        return true;
-                    }
-
-                    @Override
-                     public <T, E extends Throwable> void close(RetryContext context, RetryCallback<T, E> callback, Throwable throwable) {
-                        //TODO Do you business...
-                    }
-
-                    @Override
-                    public <T, E extends Throwable> void onError(RetryContext context, RetryCallback<T, E> callback, Throwable throwable) {
-                        //TODO Do you business...
-                    }
-                }};
-            }
-        };
-    }
-}
-----
-
-[[multiple-resttemplate-objects]]
-== Multiple `RestTemplate` Objects
-
-If you want a `RestTemplate` that is not load-balanced, create a `RestTemplate` bean and inject it.
-To access the load-balanced `RestTemplate`, use the `@LoadBalanced` qualifier when you create your `@Bean`, as the following example shows:
-
-[source,java,indent=0]
-----
-@Configuration
-public class MyConfiguration {
-
-    @LoadBalanced
-    @Bean
-    RestTemplate loadBalanced() {
-        return new RestTemplate();
-    }
-
-    @Primary
-    @Bean
-    RestTemplate restTemplate() {
-        return new RestTemplate();
-    }
-}
-
-public class MyClass {
-    @Autowired
-    private RestTemplate restTemplate;
-
-    @Autowired
-    @LoadBalanced
-    private RestTemplate loadBalanced;
-
-    public String doOtherStuff() {
-        return loadBalanced.getForObject("http://stores/stores", String.class);
-    }
-
-    public String doStuff() {
-        return restTemplate.getForObject("http://example.com", String.class);
-    }
-}
-----
-
-IMPORTANT: Notice the use of the `@Primary` annotation on the plain `RestTemplate` declaration in the preceding example to disambiguate the unqualified `@Autowired` injection.
-
-TIP: If you see errors such as `java.lang.IllegalArgumentException: Can not set org.springframework.web.client.RestTemplate field com.my.app.Foo.restTemplate to com.sun.proxy.$Proxy89`, try injecting `RestOperations` or setting `spring.aop.proxyTargetClass=true`.
-
-[[multiple-webclient-objects]]
-== Multiple WebClient Objects
-
-If you want a `WebClient` that is not load-balanced, create a `WebClient` bean and inject it.
-To access the load-balanced `WebClient`, use the `@LoadBalanced` qualifier when you create your `@Bean`, as the following example shows:
-
-[source,java,indent=0]
-----
-@Configuration
-public class MyConfiguration {
-
-    @LoadBalanced
-    @Bean
-    WebClient.Builder loadBalanced() {
-        return WebClient.builder();
-    }
-
-    @Primary
-    @Bean
-    WebClient.Builder webClient() {
-        return WebClient.builder();
-    }
-}
-
-public class MyClass {
-    @Autowired
-    private WebClient.Builder webClientBuilder;
-
-    @Autowired
-    @LoadBalanced
-    private WebClient.Builder loadBalanced;
-
-    public Mono<String> doOtherStuff() {
-        return loadBalanced.build().get().uri("http://stores/stores")
-        				.retrieve().bodyToMono(String.class);
-    }
-
-    public Mono<String> doStuff() {
-        return webClientBuilder.build().get().uri("http://example.com")
-        				.retrieve().bodyToMono(String.class);
-    }
-}
-----
-
-[[loadbalanced-webclient]]
-== Spring WebFlux `WebClient` as a Load Balancer Client
-
-The Spring WebFlux can work with both reactive and non-reactive `WebClient` configurations, as the topics describe:
-
-* xref:spring-cloud-commons/common-abstractions.adoc#webflux-with-reactive-loadbalancer[Spring WebFlux `WebClient` with `ReactorLoadBalancerExchangeFilterFunction`]
-* xref:spring-cloud-commons/common-abstractions.adoc#load-balancer-exchange-filter-function[Spring WebFlux `WebClient` with a Non-reactive Load Balancer Client]
-
-[[webflux-with-reactive-loadbalancer]]
-=== Spring WebFlux `WebClient` with `ReactorLoadBalancerExchangeFilterFunction`
-
-You can configure `WebClient` to use the `ReactiveLoadBalancer`.
-If you add xref:spring-cloud-commons/loadbalancer.adoc#spring-cloud-loadbalancer-starter[Spring Cloud LoadBalancer starter] to your project
-and if `spring-webflux` is on the classpath, `ReactorLoadBalancerExchangeFilterFunction` is auto-configured.
-The following example shows how to configure a `WebClient` to use reactive load-balancer:
-
-[source,java,indent=0]
-----
-public class MyClass {
-    @Autowired
-    private ReactorLoadBalancerExchangeFilterFunction lbFunction;
-
-    public Mono<String> doOtherStuff() {
-        return WebClient.builder().baseUrl("http://stores")
-            .filter(lbFunction)
-            .build()
-            .get()
-            .uri("/stores")
-            .retrieve()
-            .bodyToMono(String.class);
-    }
-}
-----
-
-The URI needs to use a virtual host name (that is, a service name, not a host name).
-The `ReactorLoadBalancer` is used to create a full physical address.
-
-[[load-balancer-exchange-filter-function]]
-=== Spring WebFlux `WebClient` with a Non-reactive Load Balancer Client
-
-If `spring-webflux` is on the classpath, `LoadBalancerExchangeFilterFunction`
-is auto-configured. Note, however, that this
-uses a non-reactive client under the hood.
-The following example shows how to configure a `WebClient` to use load-balancer:
-
-[source,java,indent=0]
-----
-public class MyClass {
-    @Autowired
-    private LoadBalancerExchangeFilterFunction lbFunction;
-
-    public Mono<String> doOtherStuff() {
-        return WebClient.builder().baseUrl("http://stores")
-            .filter(lbFunction)
-            .build()
-            .get()
-            .uri("/stores")
-            .retrieve()
-            .bodyToMono(String.class);
-    }
-}
-----
-
-The URI needs to use a virtual host name (that is, a service name, not a host name).
-The `LoadBalancerClient` is used to create a full physical address.
-
-WARN: This approach is now deprecated.
-We suggest that you use xref:spring-cloud-commons/common-abstractions.adoc#webflux-with-reactive-loadbalancer[WebFlux with reactive Load-Balancer]
-instead.
-
-[[ignore-network-interfaces]]
-== Ignore Network Interfaces
-
-Sometimes, it is useful to ignore certain named network interfaces so that they can be excluded from Service Discovery registration (for example, when running in a Docker container).
-A list of regular expressions can be set to cause the desired network interfaces to be ignored.
-The following configuration ignores the `docker0` interface and all interfaces that start with `veth`:
-
-.application.yml
-----
-spring:
-  cloud:
-    inetutils:
-      ignoredInterfaces:
-        - docker0
-        - veth.*
-----
-
-You can also force the use of only specified network addresses by using a list of regular expressions, as the following example shows:
-
-.bootstrap.yml
-----
-spring:
-  cloud:
-    inetutils:
-      preferredNetworks:
-        - 192.168
-        - 10.0
-----
-
-You can also force the use of only site-local addresses, as the following example shows:
-
-.application.yml
-----
-spring:
-  cloud:
-    inetutils:
-      useOnlySiteLocalInterfaces: true
-----
-
-See https://docs.oracle.com/javase/8/docs/api/java/net/Inet4Address.html#isSiteLocalAddress--[Inet4Address.html.isSiteLocalAddress()] for more details about what constitutes a site-local address.
-
-[[http-clients]]
-== HTTP Client Factories
-
-Spring Cloud Commons provides beans for creating both Apache HTTP clients (`ApacheHttpClientFactory`) and OK HTTP clients (`OkHttpClientFactory`).
-The `OkHttpClientFactory` bean is created only if the OK HTTP jar is on the classpath.
-In addition, Spring Cloud Commons provides beans for creating the connection managers used by both clients: `ApacheHttpClientConnectionManagerFactory` for the Apache HTTP client and `OkHttpClientConnectionPoolFactory` for the OK HTTP client.
-If you would like to customize how the HTTP clients are created in downstream projects, you can provide your own implementation of these beans.
-In addition, if you provide a bean of type `HttpClientBuilder` or `OkHttpClient.Builder`, the default factories use these builders as the basis for the builders returned to downstream projects.
-You can also disable the creation of these beans by setting `spring.cloud.httpclientfactories.apache.enabled` or `spring.cloud.httpclientfactories.ok.enabled` to `false`.
-
-[[enabled-features]]
-== Enabled Features
-
-Spring Cloud Commons provides a `/features` actuator endpoint.
-This endpoint returns features available on the classpath and whether they are enabled.
-The information returned includes the feature type, name, version, and vendor.
-
-[[feature-types]]
-=== Feature types
-
-There are two types of 'features': abstract and named.
-
-Abstract features are features where an interface or abstract class is defined and that an implementation the creates, such as `DiscoveryClient`, `LoadBalancerClient`, or `LockService`.
-The abstract class or interface is used to find a bean of that type in the context.
-The version displayed is `bean.getClass().getPackage().getImplementationVersion()`.
-
-Named features are features that do not have a particular class they implement. These features include "`Circuit Breaker`", "`API Gateway`", "`Spring Cloud Bus`", and others. These features require a name and a bean type.
-
-[[declaring-features]]
-=== Declaring features
-
-Any module can declare any number of `HasFeature` beans, as the following examples show:
-
-[source,java,indent=0]
-----
-@Bean
-public HasFeatures commonsFeatures() {
-  return HasFeatures.abstractFeatures(DiscoveryClient.class, LoadBalancerClient.class);
-}
-
-@Bean
-public HasFeatures consulFeatures() {
-  return HasFeatures.namedFeatures(
-    new NamedFeature("Spring Cloud Bus", ConsulBusAutoConfiguration.class),
-    new NamedFeature("Circuit Breaker", HystrixCommandAspect.class));
-}
-
-@Bean
-HasFeatures localFeatures() {
-  return HasFeatures.builder()
-      .abstractFeature(Something.class)
-      .namedFeature(new NamedFeature("Some Other Feature", Someother.class))
-      .abstractFeature(Somethingelse.class)
-      .build();
-}
-----
-
-Each of these beans should go in an appropriately guarded `@Configuration`.
-
-
-[[spring-cloud-compatibility-verification]]
-== Spring Cloud Compatibility Verification
-
-Due to the fact that some users have problem with setting up Spring Cloud application, we've decided
-to add a compatibility verification mechanism. It will break if your current setup is not compatible
-with Spring Cloud requirements, together with a report, showing what exactly went wrong.
-
-At the moment we verify which version of Spring Boot is added to your classpath.
-
-Example of a report
-
-----
-***************************
-APPLICATION FAILED TO START
-***************************
-
-Description:
-
-Your project setup is incompatible with our requirements due to following reasons:
-
-- Spring Boot [2.1.0.RELEASE] is not compatible with this Spring Cloud release train
-
-
-Action:
-
-Consider applying the following actions:
-
-- Change Spring Boot version to one of the following versions [1.2.x, 1.3.x] .
-You can find the latest Spring Boot versions here [https://spring.io/projects/spring-boot#learn].
-If you want to learn more about the Spring Cloud Release train compatibility, you can visit this page [https://spring.io/projects/spring-cloud#overview] and check the [Release Trains] section.
-----
-
-In order to disable this feature, set `spring.cloud.compatibility-verifier.enabled` to `false`.
-If you want to override the compatible Spring Boot versions, just set the
-`spring.cloud.compatibility-verifier.compatible-boot-versions` property with a comma separated list
-of compatible Spring Boot versions.
-

docs/modules/ROOT/pages/spring-cloud-commons/loadbalancer.adoc

@@ -1,515 +0,0 @@
-[[spring-cloud-loadbalancer]]
-= Spring Cloud LoadBalancer
-
-Spring Cloud provides its own client-side load-balancer abstraction and implementation. For the load-balancing
-mechanism, `ReactiveLoadBalancer` interface has been added and a *Round-Robin-based* and *Random* implementations
-have been provided for it. In order to get instances to select from reactive `ServiceInstanceListSupplier`
-is used. Currently we support a service-discovery-based implementation of `ServiceInstanceListSupplier`
-that retrieves available instances from Service Discovery using a xref:spring-cloud-commons/common-abstractions.adoc#discovery-client[Discovery Client] available in the classpath.
-
-TIP: It is possible to disable Spring Cloud LoadBalancer by setting the value of `spring.cloud.loadbalancer.enabled` to `false`.
-
-[[eager-loading-of-loadbalancer-contexts]]
-== Eager loading of LoadBalancer contexts
-
-Spring Cloud LoadBalancer creates a separate Spring child context for each service id. By default, these contexts are initialised lazily, whenever the first request for a service id is being load-balanced.
-
-You can choose to load those contexts eagerly. In order to do that, specify the service ids for which you want to do eager load using the `spring.cloud-loadbalancer.eager-load.clients` property.
-
-[[switching-between-the-load-balancing-algorithms]]
-== Switching between the load-balancing algorithms
-
-The `ReactiveLoadBalancer` implementation that is used by default is `RoundRobinLoadBalancer`. To switch to a different implementation, either for selected services or all of them, you can use the xref:spring-cloud-commons/loadbalancer.adoc#custom-loadbalancer-configuration[custom LoadBalancer configurations mechanism].
-
-For example, the following configuration can be passed via `@LoadBalancerClient` annotation to switch to using the `RandomLoadBalancer`:
-
-[[random-loadbalancer-configuration]]
-[source,java,indent=0]
-----
-public class CustomLoadBalancerConfiguration {
-
-	@Bean
-	ReactorLoadBalancer<ServiceInstance> randomLoadBalancer(Environment environment,
-			LoadBalancerClientFactory loadBalancerClientFactory) {
-		String name = environment.getProperty(LoadBalancerClientFactory.PROPERTY_NAME);
-		return new RandomLoadBalancer(loadBalancerClientFactory
-				.getLazyProvider(name, ServiceInstanceListSupplier.class),
-				name);
-	}
-}
-----
-
-NOTE: The classes you pass as `@LoadBalancerClient` or `@LoadBalancerClients` configuration arguments should either not be annotated with `@Configuration` or be outside component scan scope.
-
-[[spring-cloud-loadbalancer-integrations]]
-== Spring Cloud LoadBalancer integrations
-
-In order to make it easy to use Spring Cloud LoadBalancer, we provide `ReactorLoadBalancerExchangeFilterFunction` that can be used with `WebClient` and `BlockingLoadBalancerClient` that works with `RestTemplate`.
-You can see more information and examples of usage in the following sections:
-
-* xref:spring-cloud-commons/common-abstractions.adoc#rest-template-loadbalancer-client[Spring RestTemplate as a Load Balancer Client]
-* xref:spring-cloud-commons/common-abstractions.adoc#webclinet-loadbalancer-client[Spring WebClient as a Load Balancer Client]
-* xref:spring-cloud-commons/common-abstractions.adoc#webflux-with-reactive-loadbalancer[Spring WebFlux WebClient with `ReactorLoadBalancerExchangeFilterFunction`]
-
-[[loadbalancer-caching]]
-== Spring Cloud LoadBalancer Caching
-
-Apart from the basic `ServiceInstanceListSupplier` implementation that retrieves instances via `DiscoveryClient` each time it has to choose an instance, we provide two caching implementations.
-
-[[https://github-com/ben-manes/caffeine[caffeine]-backed-loadbalancer-cache-implementation]]
-=== https://github.com/ben-manes/caffeine[Caffeine]-backed LoadBalancer Cache Implementation
-
-If you have `com.github.ben-manes.caffeine:caffeine` in the classpath, Caffeine-based implementation will be used.
-See the xref:spring-cloud-commons/loadbalancer.adoc#loadbalancer-cache-configuration[LoadBalancerCacheConfiguration] section for information on how to configure it.
-
-If you are using Caffeine, you can also override the default Caffeine Cache setup for the LoadBalancer by passing your own https://static.javadoc.io/com.github.ben-manes.caffeine/caffeine/2.2.2/com/github/benmanes/caffeine/cache/CaffeineSpec.html[Caffeine Specification]
-in the `spring.cloud.loadbalancer.cache.caffeine.spec` property.
-
-WARN: Passing your own Caffeine specification will override any other LoadBalancerCache settings, including xref:spring-cloud-commons/loadbalancer.adoc#loadbalancer-cache-configuration[General LoadBalancer Cache Configuration] fields, such as `ttl` and `capacity`.
-
-[[default-loadbalancer-cache-implementation]]
-=== Default LoadBalancer Cache Implementation
-
-If you do not have Caffeine in the classpath, the `DefaultLoadBalancerCache`, which comes automatically with `spring-cloud-starter-loadbalancer`, will be used.
-See the xref:spring-cloud-commons/loadbalancer.adoc#loadbalancer-cache-configuration[LoadBalancerCacheConfiguration] section for information on how to configure it.
-
-TIP: To use Caffeine instead of the default cache, add the `com.github.ben-manes.caffeine:caffeine` dependency to classpath.
-
-[[loadbalancer-cache-configuration]]
-=== LoadBalancer Cache Configuration
-
-You can set your own `ttl` value (the time after write after which entries should be expired), expressed as `Duration`, by passing a `String` compliant with the https://docs.spring.io/spring-boot/docs/current/reference/html/spring-boot-features.html#boot-features-external-config-conversion-duration[Spring Boot `String` to `Duration` converter syntax].
-as the value of the `spring.cloud.loadbalancer.cache.ttl` property.
-You can also set your own LoadBalancer cache initial capacity by setting the value of the `spring.cloud.loadbalancer.cache.capacity` property.
-
-The default setup includes `ttl` set to 35 seconds and the default `initialCapacity` is `256`.
-
-You can also altogether disable loadBalancer caching by setting the value of `spring.cloud.loadbalancer.cache.enabled`
-to `false`.
-
-WARNING: Although the basic, non-cached, implementation is useful for prototyping and testing, it's much less efficient than the cached versions, so we recommend always using the cached version in production. If the caching is already done by the `DiscoveryClient` implementation, for example `EurekaDiscoveryClient`, the load-balancer caching should be disabled to prevent double caching.
-
-NOTE: When you create your own configuration, if you use `CachingServiceInstanceListSupplier` make sure to place it in the hierarchy directly after the supplier that retrieves the instances over the network, for example, `DiscoveryClientServiceInstanceListSupplier`, before any other filtering suppliers.
-
-[[weighted-load-balancing]]
-== Weighted Load-Balancing
-
-To enable weighted load-balancing, we provide the `WeightedServiceInstanceListSupplier`. We use `WeightFunction` to calculate the weight of each instance.
-By default, we try to read and parse the weight from the metadata map (the key is `weight`).
-
-If the weight is not specified in the metadata map, we default the weight of this instance to be 1.
-
-You can configure it either by setting the value of `spring.cloud.loadbalancer.configurations` to `weighted` or by providing your own `ServiceInstanceListSupplier` bean, for example:
-
-[[weighted-custom-loadbalancer-configuration]]
-[source,java,indent=0]
-----
-public class CustomLoadBalancerConfiguration {
-
-	@Bean
-	public ServiceInstanceListSupplier discoveryClientServiceInstanceListSupplier(
-			ConfigurableApplicationContext context) {
-		return ServiceInstanceListSupplier.builder()
-					.withDiscoveryClient()
-					.withWeighted()
-					.withCaching()
-					.build(context);
-	}
-}
-----
-
-NOTE: You can also customize the weight calculation logic by providing `WeightFunction`.
-
-You can use this sample configuration to make all instances have a random weight:
-
-[[random-weight-weighted-custom-loadbalancer-configuration]]
-[source,java,indent=0]
-----
-public class CustomLoadBalancerConfiguration {
-
-	@Bean
-	public ServiceInstanceListSupplier discoveryClientServiceInstanceListSupplier(
-			ConfigurableApplicationContext context) {
-		return ServiceInstanceListSupplier.builder()
-					.withDiscoveryClient()
-					.withWeighted(instance -> ThreadLocalRandom.current().nextInt(1, 101))
-					.withCaching()
-					.build(context);
-	}
-}
-----
-
-[[zone-based-load-balancing]]
-== Zone-Based Load-Balancing
-
-To enable zone-based load-balancing, we provide the `ZonePreferenceServiceInstanceListSupplier`.
-We use `DiscoveryClient`-specific `zone` configuration (for example, `eureka.instance.metadata-map.zone`) to pick the zone that the client tries to filter available service instances for.
-
-NOTE: You can also override `DiscoveryClient`-specific zone setup by setting the value of `spring.cloud.loadbalancer.zone` property.
-
-WARNING: For the time being, only Eureka Discovery Client is instrumented to set the LoadBalancer zone. For other discovery client, set the `spring.cloud.loadbalancer.zone` property. More instrumentations coming shortly.
-
-NOTE: To determine the zone of a retrieved `ServiceInstance`, we check the value under the `"zone"` key in its metadata map.
-
-The `ZonePreferenceServiceInstanceListSupplier` filters retrieved instances and only returns the ones within the same zone.
-If the zone is `null` or there are no instances within the same zone, it returns all the retrieved instances.
-
-In order to use the zone-based load-balancing approach, you will have to instantiate a `ZonePreferenceServiceInstanceListSupplier` bean in a xref:spring-cloud-commons/loadbalancer.adoc#custom-loadbalancer-configuration[custom configuration].
-
-We use delegates to work with `ServiceInstanceListSupplier` beans.
-We suggest using a `DiscoveryClientServiceInstanceListSupplier` delegate, wrapping it with a `CachingServiceInstanceListSupplier` to leverage xref:spring-cloud-commons/loadbalancer.adoc#loadbalancer-caching[LoadBalancer caching mechanism], and then passing the resulting bean in the constructor of `ZonePreferenceServiceInstanceListSupplier`.
-
-You can use this sample configuration to set it up:
-
-[[zoned-based-custom-loadbalancer-configuration]]
-[source,java,indent=0]
-----
-public class CustomLoadBalancerConfiguration {
-
-	@Bean
-	public ServiceInstanceListSupplier discoveryClientServiceInstanceListSupplier(
-			ConfigurableApplicationContext context) {
-		return ServiceInstanceListSupplier.builder()
-					.withDiscoveryClient()
-                    .withCaching()
-					.withZonePreference()
-					.build(context);
-	}
-}
-----
-
-[[instance-health-check-for-loadbalancer]]
-== Instance Health-Check for LoadBalancer
-
-It is possible to enable a scheduled HealthCheck for the LoadBalancer. The `HealthCheckServiceInstanceListSupplier`
-is provided for that. It regularly verifies if the instances provided by a delegate
-`ServiceInstanceListSupplier` are still alive and only returns the healthy instances,
-unless there are none - then it returns all the retrieved instances.
-
-TIP: This mechanism is particularly helpful while using the `SimpleDiscoveryClient`. For the
-clients backed by an actual Service Registry, it's not necessary to use, as we already get
-healthy instances after querying the external ServiceDiscovery.
-
-TIP: This supplier is also recommended for setups with a small number of instances per service
-in order to avoid retrying calls on a failing instance.
-
-WARNING: If using any of the Service Discovery-backed suppliers, adding this health-check mechanism is usually not necessary, as we retrieve the health state of the instances directly
-from the Service Registry.
-
-TIP: The `HealthCheckServiceInstanceListSupplier` relies on having updated instances provided by a delegate flux. In the rare cases when you want to use a delegate that does not refresh the instances, even though the list of instances may change (such as the `DiscoveryClientServiceInstanceListSupplier` provided by us), you can set `spring.cloud.loadbalancer.health-check.refetch-instances` to `true` to have the instance list refreshed by the `HealthCheckServiceInstanceListSupplier`. You can then also adjust the refretch intervals by modifying the value of `spring.cloud.loadbalancer.health-check.refetch-instances-interval` and opt to disable the additional healthcheck repetitions by setting `spring.cloud.loadbalancer.health-check.repeat-health-check` to `false` as every instances refetch
-  will also trigger a healthcheck.
-
-`HealthCheckServiceInstanceListSupplier` uses properties prefixed with
-`spring.cloud.loadbalancer.health-check`. You can set the `initialDelay` and `interval`
-for the scheduler. You can set the default path for the healthcheck URL by setting
-the value of the `spring.cloud.loadbalancer.health-check.path.default` property. You can also set a specific value for any given service by setting the value of the `spring.cloud.loadbalancer.health-check.path.[SERVICE_ID]` property, substituting `[SERVICE_ID]` with the correct ID of your service. If the `[SERVICE_ID]` is not specified, `/actuator/health` is used by default.  If the `[SERVICE_ID]` is set to `null` or empty as a value, then the health check will not be executed. You can also set a custom port for health-check requests by setting the value of `spring.cloud.loadbalancer.health-check.port`. If none is set, the port under which the requested service is available at the service instance.
-
-TIP: If you rely on the default path (`/actuator/health`), make sure you add `spring-boot-starter-actuator` to your collaborator's dependencies, unless you are planning to add such an endpoint on your own.
-
-TIP: By default, the `healthCheckFlux` will emit on each alive `ServiceInstance` that has been retrieved. You can modify this behaviour by setting the value of `spring.cloud.loadbalancer.health-check.update-results-list` to `false`. If this property is set to `false`, the entire alive instances sequence is first collected into a list and only then emitted, which ensures the flux does not emit values in between the health-check intervals set in properties.
-
-In order to use the health-check scheduler approach, you will have to instantiate a `HealthCheckServiceInstanceListSupplier` bean in a xref:spring-cloud-commons/loadbalancer.adoc#custom-loadbalancer-configuration[custom configuration].
-
-We use delegates to work with `ServiceInstanceListSupplier` beans.
-We suggest passing a `DiscoveryClientServiceInstanceListSupplier` delegate in the constructor of `HealthCheckServiceInstanceListSupplier`.
-
-You can use this sample configuration to set it up:
-
-[[health-check-based-custom-loadbalancer-configuration]]
-[source,java,indent=0]
-----
-public class CustomLoadBalancerConfiguration {
-
-	@Bean
-	public ServiceInstanceListSupplier discoveryClientServiceInstanceListSupplier(
-			ConfigurableApplicationContext context) {
-		return ServiceInstanceListSupplier.builder()
-					.withDiscoveryClient()
-					.withHealthChecks()
-					.build(context);
-	    }
-	}
-----
-
-TIP: For the non-reactive stack, create this supplier with the `withBlockingHealthChecks()`.
-You can also pass your own `WebClient` or `RestTemplate` instance to be used for the checks.
-
-WARNING: `HealthCheckServiceInstanceListSupplier` has its own caching mechanism based on Reactor Flux `replay()`. Therefore, if it's being used, you may want to skip wrapping that supplier with `CachingServiceInstanceListSupplier`.
-
-NOTE: When you create your own configuration, `HealthCheckServiceInstanceListSupplier`, make sure to place it in the hierarchy directly after the supplier that retrieves the instances over the network, for example, `DiscoveryClientServiceInstanceListSupplier`, before any other filtering suppliers.
-
-[[same-instance-preference-for-loadbalancer]]
-== Same instance preference for LoadBalancer
-
-You can set up the LoadBalancer in such a way that it prefers the instance that was previously selected, if that instance is available.
-
-For that, you need to use `SameInstancePreferenceServiceInstanceListSupplier`. You can configure it either by setting the value of `spring.cloud.loadbalancer.configurations` to `same-instance-preference` or by providing your own `ServiceInstanceListSupplier` bean -- for example:
-
-[source,java,indent=0]
-----
-public class CustomLoadBalancerConfiguration {
-
-	@Bean
-	public ServiceInstanceListSupplier discoveryClientServiceInstanceListSupplier(
-			ConfigurableApplicationContext context) {
-		return ServiceInstanceListSupplier.builder()
-					.withDiscoveryClient()
-					.withSameInstancePreference()
-					.build(context);
-	    }
-	}
-----
-
-TIP: This is also a replacement for Zookeeper `StickyRule`.
-
-[[request-based-sticky-session-for-loadbalancer]]
-== Request-based Sticky Session for LoadBalancer
-
-You can set up the LoadBalancer in such a way that it prefers the instance with `instanceId` provided in a request cookie. We currently support this if the request is being passed to the LoadBalancer through either `ClientRequestContext` or `ServerHttpRequestContext`, which are used by the SC LoadBalancer exchange filter functions and filters.
-
-For that, you need to use the `RequestBasedStickySessionServiceInstanceListSupplier`. You can configure it either by setting the value of `spring.cloud.loadbalancer.configurations` to `request-based-sticky-session` or by providing your own `ServiceInstanceListSupplier` bean -- for example:
-
-[[health-check-based-custom-loadbalancer-configuration-example]]
-[source,java,indent=0]
-----
-public class CustomLoadBalancerConfiguration {
-
-	@Bean
-	public ServiceInstanceListSupplier discoveryClientServiceInstanceListSupplier(
-			ConfigurableApplicationContext context) {
-		return ServiceInstanceListSupplier.builder()
-					.withDiscoveryClient()
-					.withRequestBasedStickySession()
-					.build(context);
-	    }
-	}
-----
-
-For that functionality, it is useful to have the selected service instance (which can be different from the one in the original request cookie if that one is not available) to be updated before sending the request forward. To do that, set the value of `spring.cloud.loadbalancer.sticky-session.add-service-instance-cookie` to `true`.
-
-By default, the name of the cookie is `sc-lb-instance-id`. You can modify it by changing the value of the `spring.cloud.loadbalancer.instance-id-cookie-name` property.
-
-NOTE: This feature is currently supported for WebClient-backed load-balancing.
-
-[[spring-cloud-loadbalancer-hints]]
-== Spring Cloud LoadBalancer Hints
-
-Spring Cloud LoadBalancer lets you set `String` hints that are passed to the LoadBalancer within the `Request` object and that can later be used in `ReactiveLoadBalancer` implementations that can handle them.
-
-You can set a default hint for all services by setting the value of the `spring.cloud.loadbalancer.hint.default` property. You can also set a specific value
-for any given service by setting the value of the `spring.cloud.loadbalancer.hint.[SERVICE_ID]` property, substituting `[SERVICE_ID]` with the correct ID of your service. If the hint is not set by the user, `default` is used.
-
-[[hints-based-loadbalancing]]
-== Hint-Based Load-Balancing
-
-We also provide a `HintBasedServiceInstanceListSupplier`, which is a `ServiceInstanceListSupplier` implementation for hint-based instance selection.
-
-`HintBasedServiceInstanceListSupplier` checks for a hint request header (the default header-name is `X-SC-LB-Hint`, but you can modify it by changing the value of the `spring.cloud.loadbalancer.hint-header-name` property) and, if it finds a hint request header, uses the hint value passed in the header  to filter service instances.
-
-If no hint header has been added, `HintBasedServiceInstanceListSupplier` uses xref:spring-cloud-commons/loadbalancer.adoc#spring-cloud-loadbalancer-hints[hint values from properties] to filter service instances.
-
-If no hint is set, either by the header or by properties, all service instances provided by the delegate are returned.
-
-While filtering, `HintBasedServiceInstanceListSupplier` looks for service instances that have a matching value set under the `hint` key in their `metadataMap`. If no matching instances are found, all instances provided by the delegate are returned.
-
-You can use the following sample configuration to set it up:
-
-[[hints-based-custom-loadbalancer-configuration]]
-[source,java,indent=0]
-----
-public class CustomLoadBalancerConfiguration {
-
-	@Bean
-	public ServiceInstanceListSupplier discoveryClientServiceInstanceListSupplier(
-			ConfigurableApplicationContext context) {
-		return ServiceInstanceListSupplier.builder()
-					.withDiscoveryClient()
-                    .withCaching()
-					.withHints()
-					.build(context);
-	}
-}
-----
-
-[[transform-the-load-balanced-http-request]]
-== Transform the load-balanced HTTP request
-
-You can use the selected `ServiceInstance` to transform the load-balanced HTTP Request.
-
-For `RestTemplate`, you need to implement and define `LoadBalancerRequestTransformer` as follows:
-
-[source,java,indent=0]
-----
-	@Bean
-	public LoadBalancerRequestTransformer transformer() {
-		return new LoadBalancerRequestTransformer() {
-			@Override
-			public HttpRequest transformRequest(HttpRequest request, ServiceInstance instance) {
-				return new HttpRequestWrapper(request) {
-					@Override
-					public HttpHeaders getHeaders() {
-						HttpHeaders headers = new HttpHeaders();
-						headers.putAll(super.getHeaders());
-						headers.add("X-InstanceId", instance.getInstanceId());
-						return headers;
-					}
-				};
-			}
-		};
-	}
-----
-
-For `WebClient`, you need to implement and define `LoadBalancerClientRequestTransformer` as follows:
-
-[source,java,indent=0]
-----
-	@Bean
-	public LoadBalancerClientRequestTransformer transformer() {
-		return new LoadBalancerClientRequestTransformer() {
-			@Override
-			public ClientRequest transformRequest(ClientRequest request, ServiceInstance instance) {
-				return ClientRequest.from(request)
-						.header("X-InstanceId", instance.getInstanceId())
-						.build();
-			}
-		};
-	}
-----
-
-If multiple transformers are defined, they are applied in the order in which Beans are defined.
-Alternatively, you can use `LoadBalancerRequestTransformer.DEFAULT_ORDER` or `LoadBalancerClientRequestTransformer.DEFAULT_ORDER` to specify the order.
-
-[[spring-cloud-loadbalancer-starter]]
-== Spring Cloud LoadBalancer Starter
-
-We also provide a starter that allows you to easily add Spring Cloud LoadBalancer in a Spring Boot app.
-In order to use it, just add `org.springframework.cloud:spring-cloud-starter-loadbalancer` to your Spring Cloud dependencies in your build file.
-
-NOTE: Spring Cloud LoadBalancer starter includes
-https://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-caching.html[Spring Boot Caching]
-and https://github.com/stoyanr/Evictor[Evictor].
-
-[[custom-loadbalancer-configuration]]
-== Passing Your Own Spring Cloud LoadBalancer Configuration
-
-You can also use the `@LoadBalancerClient` annotation to pass your own load-balancer client configuration, passing the name of the load-balancer client and the configuration class, as follows:
-
-[source,java,indent=0]
-----
-@Configuration
-@LoadBalancerClient(value = "stores", configuration = CustomLoadBalancerConfiguration.class)
-public class MyConfiguration {
-
-	@Bean
-	@LoadBalanced
-	public WebClient.Builder loadBalancedWebClientBuilder() {
-		return WebClient.builder();
-	}
-}
-----
-
-TIP: In order to make working on your own LoadBalancer configuration easier, we have added a `builder()` method to the `ServiceInstanceListSupplier` class.
-
-TIP: You can also use our alternative predefined configurations in place of the default ones by setting the value of `spring.cloud.loadbalancer.configurations` property to `zone-preference` to use `ZonePreferenceServiceInstanceListSupplier` with caching or to `health-check` to use `HealthCheckServiceInstanceListSupplier` with caching.
-
-
-You can use this feature to instantiate different implementations of `ServiceInstanceListSupplier` or `ReactorLoadBalancer`, either written by you, or provided by us as alternatives (for example `ZonePreferenceServiceInstanceListSupplier`) to override the default setup.
-
-You can see an example of a custom configuration xref:spring-cloud-commons/loadbalancer.adoc#zoned-based-custom-loadbalancer-configuration[here].
-
-NOTE: The annotation `value` arguments (`stores` in the example above) specifies the service id of the service that we should send the requests to with the given custom configuration.
-
-You can also pass multiple configurations (for more than one load-balancer client) through the `@LoadBalancerClients` annotation, as the following example shows:
-
-[source,java,indent=0]
-----
-@Configuration
-@LoadBalancerClients({@LoadBalancerClient(value = "stores", configuration = StoresLoadBalancerClientConfiguration.class), @LoadBalancerClient(value = "customers", configuration = CustomersLoadBalancerClientConfiguration.class)})
-public class MyConfiguration {
-
-	@Bean
-	@LoadBalanced
-	public WebClient.Builder loadBalancedWebClientBuilder() {
-		return WebClient.builder();
-	}
-}
-----
-
-NOTE: The classes you pass as `@LoadBalancerClient` or `@LoadBalancerClients` configuration arguments should either not be annotated with `@Configuration` or be outside component scan scope.
-
-NOTE: When you create your own configuration, if you use `CachingServiceInstanceListSupplier` or `HealthCheckServiceInstanceListSupplier`, makes sure to use one of them, not both, and make sure to place it in the hierarchy directly after the supplier that retrieves the instances over the network, for example, `DiscoveryClientServiceInstanceListSupplier`, before any other filtering suppliers.
-
-
-[[loadbalancer-lifecycle]]
-== Spring Cloud LoadBalancer Lifecycle
-
-One type of bean that it may be useful to register using xref:spring-cloud-commons/loadbalancer.adoc#custom-loadbalancer-configuration[Custom LoadBalancer configuration] is `LoadBalancerLifecycle`.
-
-The `LoadBalancerLifecycle` beans provide callback methods, named `onStart(Request<RC> request)`, `onStartRequest(Request<RC> request, Response<T> lbResponse)` and `onComplete(CompletionContext<RES, T, RC> completionContext)`, that you should implement to specify what actions should take place before and after load-balancing.
-
-`onStart(Request<RC> request)` takes a `Request` object as a parameter. It contains data that is used to select an appropriate instance, including the downstream client request and xref:spring-cloud-commons/loadbalancer.adoc#spring-cloud-loadbalancer-hints[hint]. `onStartRequest` also takes the `Request` object and, additionally, the `Response<T>` object as parameters.  On the other hand, a `CompletionContext` object is provided to the `onComplete(CompletionContext<RES, T, RC> completionContext)` method. It contains the LoadBalancer `Response`, including the selected service instance, the `Status` of the request executed against that service instance and (if available) the response returned to the downstream client, and (if an exception has occurred) the corresponding `Throwable`.
-
-The `supports(Class requestContextClass, Class responseClass,
-Class serverTypeClass)` method can be used to determine whether the processor in question handles objects of provided types. If not overridden by the user, it returns `true`.
-
-NOTE: In the preceding method calls, `RC` means `RequestContext` type, `RES` means client response type, and `T` means returned server type.
-
-[[loadbalancer-micrometer-stats-lifecycle]]
-== Spring Cloud LoadBalancer Statistics
-
-We provide a `LoadBalancerLifecycle` bean called `MicrometerStatsLoadBalancerLifecycle`, which uses Micrometer to provide statistics for load-balanced calls.
-
-In order to get this bean added to your application context,
-set the value of the `spring.cloud.loadbalancer.stats.micrometer.enabled` to `true` and have a `MeterRegistry` available (for example, by adding https://docs.spring.io/spring-boot/docs/current/reference/html/production-ready-features.html[Spring Boot Actuator] to your project).
-
-`MicrometerStatsLoadBalancerLifecycle` registers the following meters in `MeterRegistry`:
-
-* `loadbalancer.requests.active`: A gauge that allows you to monitor the number of currently active requests for any service instance (service instance data available via tags);
-* `loadbalancer.requests.success`: A timer that measures the time of execution of any load-balanced requests that have ended in passing a response on to the underlying client;
-* `loadbalancer.requests.failed`: A timer that measures the time of execution of any load-balanced requests that have ended with an exception;
-* `loadbalancer.requests.discard`: A counter that measures the number of discarded load-balanced requests, i.e. requests where a service instance to run the request on has not been retrieved by the LoadBalancer.
-
-Additional information regarding the service instances, request data, and response data is added to metrics via tags whenever available.
-
-NOTE: For some implementations, such as `BlockingLoadBalancerClient`, request and response data might not be available, as we establish generic types from arguments and might not be able to determine the types and read the data.
-
-NOTE: The meters are registered in the registry when at least one record is added for a given meter.
-
-TIP: You can further configure the behavior of those metrics (for example, add https://micrometer.io/docs/concepts#_histograms_and_percentiles[publishing percentiles and histograms]) by https://docs.spring.io/spring-boot/docs/current/reference/html/production-ready-features.html#production-ready-metrics-per-meter-properties[adding `MeterFilters`].
-
-[[configuring-individual-loadbalancerclients]]
-== Configuring Individual LoadBalancerClients
-
-Individual Loadbalancer clients may be configured individually with a different prefix `spring.cloud.loadbalancer.clients.<clientId>.*` where `clientId` is the name of the loadbalancer. Default configuration values may be set in the `spring.cloud.loadbalancer.*` namespace and will be merged with the client specific values taking precedence
-
-.application.yml
-----
-spring:
-  cloud:
-    loadbalancer:
-      health-check:
-        initial-delay: 1s
-      clients:
-        myclient:
-          health-check:
-            interval: 30s
-----
-
-The above example will result in a merged health-check `@ConfigurationProperties` object with `initial-delay=1s` and `interval=30s`.
-
-The per-client configuration properties work for most of the properties, apart from the following global ones:
-
-- `spring.cloud.loadbalancer.enabled` - globally enables or disables load-balancing
-- `spring.cloud.loadbalancer.retry.enabled` - globally enables or disables load-balanced retries. If you enable it globally, you can still disable retries for specific clients using the `client`-prefixed properties, but not the other way round
-- `spring.cloud.loadbalancer.cache.enabled` - globally enables or disables LoadBalancer caching. If you enable it globally, you can still disable caching for specific clients by creating a xref:spring-cloud-commons/loadbalancer.adoc#custom-loadbalancer-configuration[custom configuration] that does not include the `CachingServiceInstanceListSupplier` in the `ServiceInstanceListSupplier` delegates hierarchy, but not the other way round.
-- `spring.cloud.loadbalancer.stats.micrometer.enabled` - globally enables or disables LoadBalancer Micrometer metrics
-
-NOTE: For the properties where maps where already used, where you can specify a different value per-client without using the `clients` keyword (for example, `hints`, `health-check.path`), we have kept that behaviour in order to keep the library backwards compatible. It will be modified in the next major release.
-
-NOTE: Starting with `4.1.0`, we have introduced the `callGetWithRequestOnDelegates` flag in `LoadBalancerProperties`. If this flag is set to `true`, `ServiceInstanceListSupplier#get(Request request)` method will be implemented to call `delegate.get(request)` in classes assignable from `DelegatingServiceInstanceListSupplier` that don't already implement that method, with the exclusion of `CachingServiceInstanceListSupplier` and `HealthCheckServiceInstanceListSupplier`, which should be placed in the instance supplier hierarchy directly after the supplier performing instance retrieval over the network, before any request-based filtering is done. It is set to `true` by default.
-
-[[-aot-and-native-image-support]]
-==  AOT and Native Image Support
-
-Since `4.0.0`, Spring Cloud LoadBalancer supports Spring AOT transformations and native images. However, to use this feature, you need to explicitly define your `LoadBalancerClient` service IDs. You can do so by using the `value` or `name` attributes of the `@LoadBalancerClient` annotation or as values of the `spring.cloud.loadbalancer.eager-load.clients` property.
-

docs/modules/ROOT/pages/spring-cloud-commons/security.adoc

@@ -1,89 +0,0 @@
-[[spring-cloud-security]]
-= Security
-
-[[spring-cloud-security-single-sign-on]]
-== Single Sign On
-
-NOTE: All of the OAuth2 SSO and resource server features moved to Spring Boot
-in version 1.3. You can find documentation in the
-https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/[Spring Boot user guide].
-
-[[spring-cloud-security-client-token-relay]]
-=== Client Token Relay
-
-If your app is a user facing OAuth2 client (i.e. has declared
-`@EnableOAuth2Sso` or `@EnableOAuth2Client`) then it has an
-`OAuth2ClientContext` in request scope from Spring Boot. You can
-create your own `OAuth2RestTemplate` from this context and an
-autowired `OAuth2ProtectedResourceDetails`, and then the context will
-always forward the access token downstream, also refreshing the access
-token automatically if it expires. (These are features of Spring
-Security and Spring Boot.)
-
-[[spring-cloud-security-resource-server-token-relay]]
-=== Resource Server Token Relay
-
-If your app has `@EnableResourceServer` you might want to relay the
-incoming token downstream to other services. If you use a
-`RestTemplate` to contact the downstream services then this is just a
-matter of how to create the template with the right context.
-
-If your service uses `UserInfoTokenServices` to authenticate incoming
-tokens (i.e. it is using the `security.oauth2.user-info-uri`
-configuration), then you can simply create an `OAuth2RestTemplate`
-using an autowired `OAuth2ClientContext` (it will be populated by the
-authentication process before it hits the backend code). Equivalently
-(with Spring Boot 1.4), you can inject a
-`UserInfoRestTemplateFactory` and grab its `OAuth2RestTemplate` in
-your configuration. For example:
-
-.MyConfiguration.java
-[source,java]
-----
-@Bean
-public OAuth2RestTemplate restTemplate(UserInfoRestTemplateFactory factory) {
-    return factory.getUserInfoRestTemplate();
-}
-----
-
-This rest template will then have the same `OAuth2ClientContext`
-(request-scoped) that is used by the authentication filter, so you can
-use it to send requests with the same access token.
-
-If your app is not using `UserInfoTokenServices` but is still a client
-(i.e. it declares `@EnableOAuth2Client` or `@EnableOAuth2Sso`), then
-with Spring Security Cloud any `OAuth2RestOperations` that the user
-creates from an `@Autowired` `OAuth2Context` will also forward
-tokens. This feature is implemented by default as an MVC handler
-interceptor, so it only works in Spring MVC. If you are not using MVC
-you can use a custom filter or AOP interceptor wrapping an
-`AccessTokenContextRelay` to provide the same feature.
-
-Here's a basic
-example showing the use of an autowired rest template created
-elsewhere ("foo.com" is a Resource Server accepting the same tokens as
-the surrounding app):
-
-.MyController.java
-[source,java]
-----
-@Autowired
-private OAuth2RestOperations restTemplate;
-
-@RequestMapping("/relay")
-public String relay() {
-    ResponseEntity<String> response =
-      restTemplate.getForEntity("https://foo.com/bar", String.class);
-    return "Success! (" + response.getBody() + ")";
-}
-----
-
-If you don't want to forward tokens (and that is a valid
-choice, since you might want to act as yourself, rather than the
-client that sent you the token), then you only need to create your own
-`OAuth2Context` instead of autowiring the default one.
-
-Feign clients will also pick up an interceptor that uses the
-`OAuth2ClientContext` if it is available, so they should also do a
-token relay anywhere where a `RestTemplate` would.
-

docs/modules/ROOT/partials/_attributes.adoc

@@ -1,3 +0,0 @@
-:sc-ext: java
-:project-full-name: Spring Cloud Commons
-:all: {asterisk}{asterisk}

docs/modules/ROOT/partials/_conventions.adoc

@@ -1,11 +0,0 @@
-[[observability-conventions]]
-=== Observability - Conventions
-
-Below you can find a list of all `GlobalObservationConvention` and `ObservationConvention` declared by this project.
-
-.ObservationConvention implementations
-|===
-|ObservationConvention Class Name | Applicable ObservationContext Class Name
-|`org.springframework.cloud.client.circuitbreaker.observation.CircuitBreakerObservationConvention`|`CircuitBreakerObservationContext`
-|`org.springframework.cloud.client.circuitbreaker.observation.DefaultCircuitBreakerObservationConvention`|`CircuitBreakerObservationContext`
-|===

docs/modules/ROOT/partials/_metrics.adoc

@@ -1,70 +0,0 @@
-[[observability-metrics]]
-=== Observability - Metrics
-
-Below you can find a list of all metrics declared by this project.
-
-[[observability-metrics-circuit-breaker-function-observation]]
-==== Circuit Breaker Function Observation
-
-____
-Observation created when we wrap a Function passed to the CircuitBreaker as fallback.
-____
-
-
-**Metric name** `spring.cloud.circuitbreaker` (defined by convention class `org.springframework.cloud.client.circuitbreaker.observation.DefaultCircuitBreakerObservationConvention`). **Type** `timer`.
-
-**Metric name** `spring.cloud.circuitbreaker.active` (defined by convention class `org.springframework.cloud.client.circuitbreaker.observation.DefaultCircuitBreakerObservationConvention`). **Type** `long task timer`.
-
-
-IMPORTANT: KeyValues that are added after starting the Observation might be missing from the *.active metrics.
-
-
-IMPORTANT: Micrometer internally uses `nanoseconds` for the baseunit. However, each backend determines the actual baseunit. (i.e. Prometheus uses seconds)
-
-
-Fully qualified name of the enclosing class `org.springframework.cloud.client.circuitbreaker.observation.CircuitBreakerObservationDocumentation`.
-
-IMPORTANT: All tags must be prefixed with `spring.cloud.circuitbreaker` prefix!
-
-.Low cardinality Keys
-[cols="a,a"]
-|===
-|Name | Description
-|`spring.cloud.circuitbreaker.type` _(required)_|Defines the type of wrapped lambda.
-|===
-
-
-
-[[observability-metrics-circuit-breaker-supplier-observation]]
-==== Circuit Breaker Supplier Observation
-
-____
-Observation created when we wrap a Supplier passed to the CircuitBreaker.
-____
-
-
-**Metric name** `spring.cloud.circuitbreaker` (defined by convention class `org.springframework.cloud.client.circuitbreaker.observation.DefaultCircuitBreakerObservationConvention`). **Type** `timer`.
-
-**Metric name** `spring.cloud.circuitbreaker.active` (defined by convention class `org.springframework.cloud.client.circuitbreaker.observation.DefaultCircuitBreakerObservationConvention`). **Type** `long task timer`.
-
-
-IMPORTANT: KeyValues that are added after starting the Observation might be missing from the *.active metrics.
-
-
-IMPORTANT: Micrometer internally uses `nanoseconds` for the baseunit. However, each backend determines the actual baseunit. (i.e. Prometheus uses seconds)
-
-
-Fully qualified name of the enclosing class `org.springframework.cloud.client.circuitbreaker.observation.CircuitBreakerObservationDocumentation`.
-
-IMPORTANT: All tags must be prefixed with `spring.cloud.circuitbreaker` prefix!
-
-.Low cardinality Keys
-[cols="a,a"]
-|===
-|Name | Description
-|`spring.cloud.circuitbreaker.type` _(required)_|Defines the type of wrapped lambda.
-|===
-
-
-
-

docs/modules/ROOT/partials/_spans.adoc

@@ -1,44 +0,0 @@
-[[observability-spans]]
-=== Observability - Spans
-
-Below you can find a list of all spans declared by this project.
-
-[[observability-spans-circuit-breaker-function-observation]]
-==== Circuit Breaker Function Observation Span
-
-> Observation created when we wrap a Function passed to the CircuitBreaker as fallback.
-
-**Span name** `spring.cloud.circuitbreaker` (defined by convention class `org.springframework.cloud.client.circuitbreaker.observation.DefaultCircuitBreakerObservationConvention`).
-
-Fully qualified name of the enclosing class `org.springframework.cloud.client.circuitbreaker.observation.CircuitBreakerObservationDocumentation`.
-
-IMPORTANT: All tags must be prefixed with `spring.cloud.circuitbreaker` prefix!
-
-.Tag Keys
-|===
-|Name | Description
-|`spring.cloud.circuitbreaker.type` _(required)_|Defines the type of wrapped lambda.
-|===
-
-
-
-[[observability-spans-circuit-breaker-supplier-observation]]
-==== Circuit Breaker Supplier Observation Span
-
-> Observation created when we wrap a Supplier passed to the CircuitBreaker.
-
-**Span name** `spring.cloud.circuitbreaker` (defined by convention class `org.springframework.cloud.client.circuitbreaker.observation.DefaultCircuitBreakerObservationConvention`).
-
-Fully qualified name of the enclosing class `org.springframework.cloud.client.circuitbreaker.observation.CircuitBreakerObservationDocumentation`.
-
-IMPORTANT: All tags must be prefixed with `spring.cloud.circuitbreaker` prefix!
-
-.Tag Keys
-|===
-|Name | Description
-|`spring.cloud.circuitbreaker.type` _(required)_|Defines the type of wrapped lambda.
-|===
-
-
-
-

docs/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-commons-parent</artifactId>
-		<version>4.1.0-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 	</parent>
 	<packaging>jar</packaging>
 	<name>Spring Cloud Commons Docs</name>
@@ -17,14 +17,15 @@
 		<docs.main>spring-cloud-commons</docs.main>
 		<main.basedir>${basedir}/..</main.basedir>
 		<configprops.inclusionPattern>spring.cloud.*</configprops.inclusionPattern>
+		<upload-docs-zip.phase>deploy</upload-docs-zip.phase>
 		<!-- Don't upload docs jar to central / repo.spring.io -->
 		<maven-deploy-plugin-default.phase>none</maven-deploy-plugin-default.phase>
 
 		<!-- Observability -->
-		<micrometer-docs-generator.version>1.0.2</micrometer-docs-generator.version>
+		<micrometer-docs-generator.version>1.0.0</micrometer-docs-generator.version>
 		<micrometer-docs-generator.inputPath>${maven.multiModuleProjectDirectory}/spring-cloud-commons/</micrometer-docs-generator.inputPath>
 		<micrometer-docs-generator.inclusionPattern>.*</micrometer-docs-generator.inclusionPattern>
-		<micrometer-docs-generator.outputPath>${maven.multiModuleProjectDirectory}/docs/modules/ROOT/partials/</micrometer-docs-generator.outputPath>
+		<micrometer-docs-generator.outputPath>${maven.multiModuleProjectDirectory}/target/</micrometer-docs-generator.outputPath>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -43,28 +44,18 @@
 		<profile>
 			<id>docs</id>
 			<build>
-				<resources>
-					<resource>
-						<directory>src/main/antora/resources/antora-resources</directory>
-						<filtering>true</filtering>
-					</resource>
-				</resources>
 				<plugins>
 					<plugin>
 						<groupId>pl.project13.maven</groupId>
 						<artifactId>git-commit-id-plugin</artifactId>
 					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-dependency-plugin</artifactId>
-					</plugin>
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>exec-maven-plugin</artifactId>
 						<executions>
 							<execution>
-								<id>generate-observability-docs</id>
-								<phase>${generate-docs.phase}</phase>
+								<id>generate-docs</id>
+								<phase>prepare-package</phase>
 								<goals>
 									<goal>java</goal>
 								</goals>
@@ -89,12 +80,16 @@
 						</dependencies>
 					</plugin>
 					<plugin>
-						<groupId>io.spring.maven.antora</groupId>
-						<artifactId>antora-component-version-maven-plugin</artifactId>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-dependency-plugin</artifactId>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-resources-plugin</artifactId>
 					</plugin>
 					<plugin>
-						<groupId>io.spring.maven.antora</groupId>
-						<artifactId>antora-maven-plugin</artifactId>
+						<groupId>org.asciidoctor</groupId>
+						<artifactId>asciidoctor-maven-plugin</artifactId>
 					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>

docs/src/main/antora/resources/antora-resources/antora.yml

@@ -1,20 +0,0 @@
-version: @antora-component.version@
-prerelease: @antora-component.prerelease@
-
-asciidoc:
-  attributes:
-    attribute-missing: 'warn'
-    chomp: 'all'
-    project-root: @maven.multiModuleProjectDirectory@
-    github-repo: @docs.main@
-    github-raw: https://raw.githubusercontent.com/spring-cloud/@docs.main@/@github-tag@
-    github-code: https://github.com/spring-cloud/@docs.main@/tree/@github-tag@
-    github-issues: https://github.com/spring-cloud/@docs.main@/issues/
-    github-wiki: https://github.com/spring-cloud/@docs.main@/wiki
-    spring-cloud-version: @project.version@
-    github-tag: @github-tag@
-    version-type: @version-type@
-    docs-url: https://docs.spring.io/@docs.main@/docs/@project.version@
-    raw-docs-url: https://raw.githubusercontent.com/spring-cloud/@docs.main@/@github-tag@
-    project-version: @project.version@
-    project-name: @docs.main@

docs/src/main/asciidoc/README.adoc

@@ -1,12 +1,9 @@
+include::intro.adoc[]
 
-[[building]]
-= Building
-:page-section-summary-toc: 1
+== Building
 
 include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/src/main/asciidoc/building.adoc[]
 
-[[contributing]]
-= Contributing
-:page-section-summary-toc: 1
+== Contributing
 
 include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/src/main/asciidoc/contributing.adoc[]

docs/src/main/asciidoc/_attributes.adoc

@@ -0,0 +1,16 @@
+:doctype: book
+:idprefix:
+:idseparator: -
+:toc: left
+:toclevels: 4
+:tabsize: 4
+:numbered:
+:sectanchors:
+:sectnums:
+:icons: font
+:hide-uri-scheme:
+:docinfo: shared,private
+
+:sc-ext: java
+:project-full-name: Spring Cloud Commons
+:all: {asterisk}{asterisk}

docs/src/main/asciidoc/_configprops.adoc

@@ -1,11 +1,10 @@
 |===
 |Name | Default | Description
 
-|spring.cloud.compatibility-verifier.compatible-boot-versions | `+++3.2.x+++` | Default accepted versions for the Spring Boot dependency. You can set {@code x} for the patch version if you don't want to specify a concrete value. Example: {@code 3.4.x}
+|spring.cloud.compatibility-verifier.compatible-boot-versions |  | Default accepted versions for the Spring Boot dependency. You can set {@code x} for the patch version if you don't want to specify a concrete value. Example: {@code 3.4.x}
 |spring.cloud.compatibility-verifier.enabled | `+++false+++` | Enables creation of Spring Cloud compatibility verification.
 |spring.cloud.config.allow-override | `+++true+++` | Flag to indicate that {@link #isOverrideSystemProperties() systemPropertiesOverride} can be used. Set to false to prevent users from changing the default accidentally. Default true.
-|spring.cloud.config.initialize-on-context-refresh | `+++false+++` | Flag to initialize bootstrap configuration on context refresh event. Default false.
-|spring.cloud.config.override-none | `+++false+++` | Flag to indicate that when {@link #setAllowOverride(boolean) allowOverride} is true, external properties should take lowest priority and should not override any existing property sources (including local config files). Default false. This will only have an effect when using config first bootstrap.
+|spring.cloud.config.override-none | `+++false+++` | Flag to indicate that when {@link #setAllowOverride(boolean) allowOverride} is true, external properties should take lowest priority and should not override any existing property sources (including local config files). Default false.
 |spring.cloud.config.override-system-properties | `+++true+++` | Flag to indicate that the external properties should override system properties. Default true.
 |spring.cloud.decrypt-environment-post-processor.enabled | `+++true+++` | Enable the DecryptEnvironmentPostProcessor.
 |spring.cloud.discovery.client.composite-indicator.enabled | `+++true+++` | Enables discovery client composite health indicator.
@@ -37,7 +36,6 @@
 |spring.cloud.loadbalancer.cache.capacity | `+++256+++` | Initial cache capacity expressed as int.
 |spring.cloud.loadbalancer.cache.enabled | `+++true+++` | Enables Spring Cloud LoadBalancer caching mechanism.
 |spring.cloud.loadbalancer.cache.ttl | `+++35s+++` | Time To Live - time counted from writing of the record, after which cache entries are expired, expressed as a {@link Duration}. The property {@link String} has to be in keeping with the appropriate syntax as specified in Spring Boot <code>StringToDurationConverter</code>. @see <a href= "https://github.com/spring-projects/spring-boot/blob/master/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/convert/StringToDurationConverter.java">StringToDurationConverter.java</a>
-|spring.cloud.loadbalancer.call-get-with-request-on-delegates | `+++true+++` | If this flag is set to {@code true}, {@code ServiceInstanceListSupplier#get(Request request)} method will be implemented to call {@code delegate.get(request)} in classes assignable from {@code DelegatingServiceInstanceListSupplier} that don't already implement that method, with the exclusion of {@code CachingServiceInstanceListSupplier} and {@code HealthCheckServiceInstanceListSupplier}, which should be placed in the instance supplier hierarchy directly after the supplier performing instance retrieval over the network, before any request-based filtering is done, {@code true} by default.
 |spring.cloud.loadbalancer.clients |  | 
 |spring.cloud.loadbalancer.configurations | `+++default+++` | Enables a predefined LoadBalancer configuration.
 |spring.cloud.loadbalancer.eager-load.clients |  | Names of the clients.
@@ -62,7 +60,7 @@
 |spring.cloud.loadbalancer.retry.max-retries-on-next-service-instance | `+++1+++` | Number of retries to be executed on the next `ServiceInstance`. A `ServiceInstance` is chosen before each retry call.
 |spring.cloud.loadbalancer.retry.max-retries-on-same-service-instance | `+++0+++` | Number of retries to be executed on the same `ServiceInstance`.
 |spring.cloud.loadbalancer.retry.retry-on-all-exceptions | `+++false+++` | Indicates retries should be attempted for all exceptions, not only those specified in `retryableExceptions`.
-|spring.cloud.loadbalancer.retry.retry-on-all-operations | `+++false+++` | Indicates retries should be attempted on operations other than `HttpMethod.GET`.
+|spring.cloud.loadbalancer.retry.retry-on-all-operations | `+++false+++` | Indicates retries should be attempted on operations other than `HttpMethod.GET`}.
 |spring.cloud.loadbalancer.retry.retryable-exceptions | `+++{}+++` | A `Set` of `Throwable` classes that should trigger a retry.
 |spring.cloud.loadbalancer.retry.retryable-status-codes | `+++{}+++` | A `Set` of status codes that should trigger a retry.
 |spring.cloud.loadbalancer.service-discovery.timeout |  | String representation of Duration of the timeout for calls to service discovery.
@@ -75,7 +73,6 @@
 |spring.cloud.refresh.enabled | `+++true+++` | Enables autoconfiguration for the refresh scope and associated features.
 |spring.cloud.refresh.extra-refreshable | `+++true+++` | Additional class names for beans to post process into refresh scope.
 |spring.cloud.refresh.never-refreshable | `+++true+++` | Comma separated list of class names for beans to never be refreshed or rebound.
-|spring.cloud.refresh.on-restart.enabled | `+++true+++` | Enable refreshing context on start.
 |spring.cloud.service-registry.auto-registration.enabled | `+++true+++` | Whether service auto-registration is enabled. Defaults to true.
 |spring.cloud.service-registry.auto-registration.fail-fast | `+++false+++` | Whether startup fails if there is no AutoServiceRegistration. Defaults to false.
 |spring.cloud.service-registry.auto-registration.register-management | `+++true+++` | Whether to register the management as a service. Defaults to true.

docs/src/main/asciidoc/_observability.adoc

@@ -0,0 +1,8 @@
+:root-target: ../../../target/
+
+[[observability]]
+== Observability metadata
+
+include::{root-target}_metrics.adoc[]
+
+include::{root-target}_spans.adoc[]

docs/src/main/asciidoc/appendix.adoc

@@ -1,8 +1,9 @@
+:numbered!:
 [appendix]
 [[common-application-properties]]
-= Common application properties
+== Common application properties
 
-include::partial$_attributes.adoc[]
+include::_attributes.adoc[]
 
 Various properties can be specified inside your `application.properties` file, inside your `application.yml` file, or as command line switches.
 This appendix provides a list of common {project-full-name} properties and references to the underlying classes that consume them.
@@ -10,9 +11,6 @@ This appendix provides a list of common {project-full-name} properties and refer
 NOTE: Property contributions can come from additional jar files on your classpath, so you should not consider this an exhaustive list.
 Also, you can define your own properties.
 
-[[observability]]
-== Observability metadata
+include::_configprops.adoc[]
 
-include::partial$_metrics.adoc[]
-
-include::partial$_spans.adoc[]
+include::_observability.adoc[]

docs/src/main/asciidoc/ghpages.sh

@@ -0,0 +1,330 @@
+#!/bin/bash -x
+
+set -e
+
+# Set default props like MAVEN_PATH, ROOT_FOLDER etc.
+function set_default_props() {
+    # The script should be run from the root folder
+    ROOT_FOLDER=`pwd`
+    echo "Current folder is ${ROOT_FOLDER}"
+
+    if [[ ! -e "${ROOT_FOLDER}/.git" ]]; then
+        echo "You're not in the root folder of the project!"
+        exit 1
+    fi
+
+    # Prop that will let commit the changes
+    COMMIT_CHANGES="no"
+    MAVEN_PATH=${MAVEN_PATH:-}
+    echo "Path to Maven is [${MAVEN_PATH}]"
+    REPO_NAME=${PWD##*/}
+    echo "Repo name is [${REPO_NAME}]"
+    SPRING_CLOUD_STATIC_REPO=${SPRING_CLOUD_STATIC_REPO:-git@github.com:spring-cloud/spring-cloud-static.git}
+    echo "Spring Cloud Static repo is [${SPRING_CLOUD_STATIC_REPO}"
+}
+
+# Check if gh-pages exists and docs have been built
+function check_if_anything_to_sync() {
+    git remote set-url --push origin `git config remote.origin.url | sed -e 's/^git:/https:/'`
+
+    if ! (git remote set-branches --add origin gh-pages && git fetch -q); then
+        echo "No gh-pages, so not syncing"
+        exit 0
+    fi
+
+    if ! [ -d docs/target/generated-docs ] && ! [ "${BUILD}" == "yes" ]; then
+        echo "No gh-pages sources in docs/target/generated-docs, so not syncing"
+        exit 0
+    fi
+}
+
+function retrieve_current_branch() {
+    # Code getting the name of the current branch. For master we want to publish as we did until now
+    # https://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch
+    # If there is a branch already passed will reuse it - otherwise will try to find it
+    CURRENT_BRANCH=${BRANCH}
+    if [[ -z "${CURRENT_BRANCH}" ]] ; then
+      CURRENT_BRANCH=$(git symbolic-ref -q HEAD)
+      CURRENT_BRANCH=${CURRENT_BRANCH##refs/heads/}
+      CURRENT_BRANCH=${CURRENT_BRANCH:-HEAD}
+    fi
+    echo "Current branch is [${CURRENT_BRANCH}]"
+    git checkout ${CURRENT_BRANCH} || echo "Failed to check the branch... continuing with the script"
+}
+
+# Switches to the provided value of the release version. We always prefix it with `v`
+function switch_to_tag() {
+    git checkout v${VERSION}
+}
+
+# Build the docs if switch is on
+function build_docs_if_applicable() {
+    if [[ "${BUILD}" == "yes" ]] ; then
+        ./mvnw clean install -P docs -pl docs -DskipTests
+    fi
+}
+
+# Get the name of the `docs.main` property
+# Get allowed branches - assumes that a `docs` module is available under `docs` profile
+function retrieve_doc_properties() {
+    MAIN_ADOC_VALUE=$("${MAVEN_PATH}"mvn -q \
+        -Dexec.executable="echo" \
+        -Dexec.args='${docs.main}' \
+        --non-recursive \
+        org.codehaus.mojo:exec-maven-plugin:1.3.1:exec)
+    echo "Extracted 'main.adoc' from Maven build [${MAIN_ADOC_VALUE}]"
+
+
+    ALLOW_PROPERTY=${ALLOW_PROPERTY:-"docs.allowed.branches"}
+    ALLOWED_BRANCHES_VALUE=$("${MAVEN_PATH}"mvn -q \
+        -Dexec.executable="echo" \
+        -Dexec.args="\${${ALLOW_PROPERTY}}" \
+        org.codehaus.mojo:exec-maven-plugin:1.3.1:exec \
+        -P docs \
+        -pl docs)
+    echo "Extracted '${ALLOW_PROPERTY}' from Maven build [${ALLOWED_BRANCHES_VALUE}]"
+}
+
+# Stash any outstanding changes
+function stash_changes() {
+    git diff-index --quiet HEAD && dirty=$? || (echo "Failed to check if the current repo is dirty. Assuming that it is." && dirty="1")
+    if [ "$dirty" != "0" ]; then git stash; fi
+}
+
+# Switch to gh-pages branch to sync it with current branch
+function add_docs_from_target() {
+    local DESTINATION_REPO_FOLDER
+    if [[ -z "${DESTINATION}" && -z "${CLONE}" ]] ; then
+        DESTINATION_REPO_FOLDER=${ROOT_FOLDER}
+    elif [[ "${CLONE}" == "yes" ]]; then
+        mkdir -p ${ROOT_FOLDER}/target
+        local clonedStatic=${ROOT_FOLDER}/target/spring-cloud-static
+        if [[ ! -e "${clonedStatic}/.git" ]]; then
+            echo "Cloning Spring Cloud Static to target"
+            git clone ${SPRING_CLOUD_STATIC_REPO} ${clonedStatic} && git checkout gh-pages
+        else
+            echo "Spring Cloud Static already cloned - will pull changes"
+            cd ${clonedStatic} && git checkout gh-pages && git pull origin gh-pages
+        fi
+        DESTINATION_REPO_FOLDER=${clonedStatic}/${REPO_NAME}
+        mkdir -p ${DESTINATION_REPO_FOLDER}
+    else
+        if [[ ! -e "${DESTINATION}/.git" ]]; then
+            echo "[${DESTINATION}] is not a git repository"
+            exit 1
+        fi
+        DESTINATION_REPO_FOLDER=${DESTINATION}/${REPO_NAME}
+        mkdir -p ${DESTINATION_REPO_FOLDER}
+        echo "Destination was provided [${DESTINATION}]"
+    fi
+    cd ${DESTINATION_REPO_FOLDER}
+    git checkout gh-pages
+    git pull origin gh-pages
+
+    # Add git branches
+    ###################################################################
+    if [[ -z "${VERSION}" ]] ; then
+        copy_docs_for_current_version
+    else
+        copy_docs_for_provided_version
+    fi
+    commit_changes_if_applicable
+}
+
+
+# Copies the docs by using the retrieved properties from Maven build
+function copy_docs_for_current_version() {
+    if [[ "${CURRENT_BRANCH}" == "main" ]] ; then
+        echo -e "Current branch is main - will copy the current docs only to the root folder"
+        for f in docs/target/generated-docs/*; do
+            file=${f#docs/target/generated-docs/*}
+            if ! git ls-files -i -o --exclude-standard --directory | grep -q ^$file$; then
+                # Not ignored...
+                cp -rf $f ${ROOT_FOLDER}/
+                git add -A ${ROOT_FOLDER}/$file
+            fi
+        done
+        COMMIT_CHANGES="yes"
+    else
+        echo -e "Current branch is [${CURRENT_BRANCH}]"
+        # https://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin
+        if [[ ",${ALLOWED_BRANCHES_VALUE}," = *",${CURRENT_BRANCH},"* ]] ; then
+            mkdir -p ${ROOT_FOLDER}/${CURRENT_BRANCH}
+            echo -e "Branch [${CURRENT_BRANCH}] is allowed! Will copy the current docs to the [${CURRENT_BRANCH}] folder"
+            for f in docs/target/generated-docs/*; do
+                file=${f#docs/target/generated-docs/*}
+                if ! git ls-files -i -o --exclude-standard --directory | grep -q ^$file$; then
+                    # Not ignored...
+                    # We want users to access 1.0.0.RELEASE/ instead of 1.0.0.RELEASE/spring-cloud.sleuth.html
+                    if [[ "${file}" == "${MAIN_ADOC_VALUE}.html" ]] ; then
+                        # We don't want to copy the spring-cloud-sleuth.html
+                        # we want it to be converted to index.html
+                        cp -rf $f ${ROOT_FOLDER}/${CURRENT_BRANCH}/index.html
+                        git add -A ${ROOT_FOLDER}/${CURRENT_BRANCH}/index.html
+                    else
+                        cp -rf $f ${ROOT_FOLDER}/${CURRENT_BRANCH}
+                        git add -A ${ROOT_FOLDER}/${CURRENT_BRANCH}/$file
+                    fi
+                fi
+            done
+            COMMIT_CHANGES="yes"
+        else
+            echo -e "Branch [${CURRENT_BRANCH}] is not on the allow list! Check out the Maven [${ALLOW_PROPERTY}] property in
+             [docs] module available under [docs] profile. Won't commit any changes to gh-pages for this branch."
+        fi
+    fi
+}
+
+# Copies the docs by using the explicitly provided version
+function copy_docs_for_provided_version() {
+    local FOLDER=${DESTINATION_REPO_FOLDER}/${VERSION}
+    mkdir -p ${FOLDER}
+    echo -e "Current tag is [v${VERSION}] Will copy the current docs to the [${FOLDER}] folder"
+    for f in ${ROOT_FOLDER}/docs/target/generated-docs/*; do
+        file=${f#${ROOT_FOLDER}/docs/target/generated-docs/*}
+        copy_docs_for_branch ${file} ${FOLDER}
+    done
+    COMMIT_CHANGES="yes"
+    CURRENT_BRANCH="v${VERSION}"
+}
+
+# Copies the docs from target to the provided destination
+# Params:
+# $1 - file from target
+# $2 - destination to which copy the files
+function copy_docs_for_branch() {
+    local file=$1
+    local destination=$2
+    if ! git ls-files -i -o --exclude-standard --directory | grep -q ^${file}$; then
+        # Not ignored...
+        # We want users to access 1.0.0.RELEASE/ instead of 1.0.0.RELEASE/spring-cloud.sleuth.html
+        if [[ ("${file}" == "${MAIN_ADOC_VALUE}.html") || ("${file}" == "${REPO_NAME}.html") ]] ; then
+            # We don't want to copy the spring-cloud-sleuth.html
+            # we want it to be converted to index.html
+            cp -rf $f ${destination}/index.html
+            git add -A ${destination}/index.html
+        else
+            cp -rf $f ${destination}
+            git add -A ${destination}/$file
+        fi
+    fi
+}
+
+function commit_changes_if_applicable() {
+    if [[ "${COMMIT_CHANGES}" == "yes" ]] ; then
+        COMMIT_SUCCESSFUL="no"
+        git commit -a -m "Sync docs from ${CURRENT_BRANCH} to gh-pages" && COMMIT_SUCCESSFUL="yes" || echo "Failed to commit changes"
+
+        # Uncomment the following push if you want to auto push to
+        # the gh-pages branch whenever you commit to master locally.
+        # This is a little extreme. Use with care!
+        ###################################################################
+        if [[ "${COMMIT_SUCCESSFUL}" == "yes" ]] ; then
+            git push origin gh-pages
+        fi
+    fi
+}
+
+# Switch back to the previous branch and exit block
+function checkout_previous_branch() {
+    # If -version was provided we need to come back to root project
+    cd ${ROOT_FOLDER}
+    git checkout ${CURRENT_BRANCH} || echo "Failed to check the branch... continuing with the script"
+    if [ "$dirty" != "0" ]; then git stash pop; fi
+    exit 0
+}
+
+# Assert if properties have been properly passed
+function assert_properties() {
+echo "VERSION [${VERSION}], DESTINATION [${DESTINATION}], CLONE [${CLONE}]"
+if [[ "${VERSION}" != "" && (-z "${DESTINATION}" && -z "${CLONE}") ]] ; then echo "Version was set but destination / clone was not!"; exit 1;fi
+if [[ ("${DESTINATION}" != "" && "${CLONE}" != "") && -z "${VERSION}" ]] ; then echo "Destination / clone was set but version was not!"; exit 1;fi
+if [[ "${DESTINATION}" != "" && "${CLONE}" == "yes" ]] ; then echo "Destination and clone was set. Pick one!"; exit 1;fi
+}
+
+# Prints the usage
+function print_usage() {
+cat <<EOF
+The idea of this script is to update gh-pages branch with the generated docs. Without any options
+the script will work in the following manner:
+
+- if there's no gh-pages / target for docs module then the script ends
+- for main branch the generated docs are copied to the root of gh-pages branch
+- for any other branch (if that branch is allowed) a subfolder with branch name is created
+    and docs are copied there
+- if the version switch is passed (-v) then a tag with (v) prefix will be retrieved and a folder
+    with that version number will be created in the gh-pages branch. WARNING! No allow verification will take place
+- if the destination switch is passed (-d) then the script will check if the provided dir is a git repo and then will
+    switch to gh-pages of that repo and copy the generated docs to `docs/<project-name>/<version>`
+- if the destination switch is passed (-d) then the script will check if the provided dir is a git repo and then will
+    switch to gh-pages of that repo and copy the generated docs to `docs/<project-name>/<version>`
+
+USAGE:
+
+You can use the following options:
+
+-v|--version        - the script will apply the whole procedure for a particular library version
+-d|--destination    - the root of destination folder where the docs should be copied. You have to use the full path.
+                        E.g. point to spring-cloud-static folder. Can't be used with (-c)
+-b|--build          - will run the standard build process after checking out the branch
+-c|--clone          - will automatically clone the spring-cloud-static repo instead of providing the destination.
+                        Obviously can't be used with (-d)
+
+EOF
+}
+
+
+# ==========================================
+#    ____   ____ _____  _____ _____ _______
+#  / ____|/ ____|  __ \|_   _|  __ \__   __|
+# | (___ | |    | |__) | | | | |__) | | |
+#  \___ \| |    |  _  /  | | |  ___/  | |
+#  ____) | |____| | \ \ _| |_| |      | |
+# |_____/ \_____|_|  \_\_____|_|      |_|
+#
+# ==========================================
+
+while [[ $# > 0 ]]
+do
+key="$1"
+case ${key} in
+    -v|--version)
+    VERSION="$2"
+    shift # past argument
+    ;;
+    -d|--destination)
+    DESTINATION="$2"
+    shift # past argument
+    ;;
+    -b|--build)
+    BUILD="yes"
+    ;;
+    -c|--clone)
+    CLONE="yes"
+    ;;
+    -h|--help)
+    print_usage
+    exit 0
+    ;;
+    *)
+    echo "Invalid option: [$1]"
+    print_usage
+    exit 1
+    ;;
+esac
+shift # past argument or value
+done
+
+assert_properties
+set_default_props
+check_if_anything_to_sync
+if [[ -z "${VERSION}" ]] ; then
+    retrieve_current_branch
+else
+    switch_to_tag
+fi
+build_docs_if_applicable
+retrieve_doc_properties
+stash_changes
+add_docs_from_target
+checkout_previous_branch

docs/src/main/asciidoc/index.adoc

@@ -0,0 +1 @@
+include::spring-cloud-commons.adoc[]

docs/src/main/asciidoc/intro.adoc

@@ -1,5 +1,3 @@
-[[introduction]]
-= Introduction
 
 https://pivotal.io/platform-as-a-service/migrating-to-cloud-native-application-architectures-ebook[Cloud Native] is a style of application development that encourages easy adoption of best practices in the areas of continuous delivery and value-driven development.
 A related discipline is that of building https://12factor.net/[12-factor Applications], in which development practices are aligned with delivery and operations goals -- for instance, by using declarative programming and management and monitoring.
@@ -9,3 +7,4 @@ Spring Cloud facilitates these styles of development in a number of specific way
 Many of those features are covered by https://projects.spring.io/spring-boot[Spring Boot], on which Spring Cloud builds. Some more features are delivered by Spring Cloud as two libraries: Spring Cloud Context and Spring Cloud Commons.
 Spring Cloud Context provides utilities and special services for the `ApplicationContext` of a Spring Cloud application (bootstrap context, encryption, refresh scope, and environment endpoints). Spring Cloud Commons is a set of abstractions and common classes used in different Spring Cloud implementations (such as Spring Cloud Netflix and Spring Cloud Consul).
 
+include::jce.adoc[]

docs/src/main/asciidoc/jce.adoc

@@ -0,0 +1,8 @@
+If you get an exception due to "Illegal key size" and you use Sun's JDK, you need to install the Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files.
+See the following links for more information:
+
+* https://www.oracle.com/technetwork/java/javase/downloads/jce-6-download-429243.html[Java 6 JCE]
+* https://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html[Java 7 JCE]
+* https://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html[Java 8 JCE]
+
+Extract the files into the JDK/jre/lib/security folder for whichever version of JRE/JDK x64/x86 you use.

docs/src/main/asciidoc/spring-cloud-circuitbreaker.adoc

@@ -1,11 +1,9 @@
-[[introduction]]
-= Spring Cloud Circuit Breaker
+== Introduction
 
 Spring Cloud Circuit breaker provides an abstraction across different circuit breaker implementations.
 It provides a consistent API to use in your applications, letting you, the developer, choose the circuit breaker implementation that best fits your needs for your application.
 
-[[supported-implementations]]
-== Supported Implementations
+=== Supported Implementations
 
 Spring Cloud supports the following circuit-breaker implementations:
 
@@ -13,12 +11,12 @@ Spring Cloud supports the following circuit-breaker implementations:
 * https://github.com/alibaba/Sentinel[Sentinel]
 * https://github.com/spring-projects/spring-retry[Spring Retry]
 
-[[core-concepts]]
 == Core Concepts
 
 To create a circuit breaker in your code, you can use the `CircuitBreakerFactory` API. When you include a Spring Cloud Circuit Breaker starter on your classpath, a bean that implements this API is automatically created for you.
 The following example shows a simple example of how to use this API:
 
+====
 [source,java]
 ----
 @Service
@@ -37,6 +35,7 @@ public static class DemoControllerService {
 
 }
 ----
+====
 
 The `CircuitBreakerFactory.create` API creates an instance of a class called `CircuitBreaker`.
 The `run` method takes a `Supplier` and a `Function`.
@@ -45,12 +44,12 @@ The `Function` is the fallback that is run if the circuit breaker is tripped.
 The function is passed the `Throwable` that caused the fallback to be triggered.
 You can optionally exclude the fallback if you do not want to provide one.
 
-[[circuit-breakers-in-reactive-code]]
 === Circuit Breakers In Reactive Code
 
 If Project Reactor is on the class path, you can also use `ReactiveCircuitBreakerFactory` for your reactive code.
 The following example shows how to do so:
 
+====
 [source,java]
 ----
 @Service
@@ -70,13 +69,13 @@ public static class DemoControllerService {
 	}
 }
 ----
+====
 
 The `ReactiveCircuitBreakerFactory.create` API creates an instance of a class called `ReactiveCircuitBreaker`.
 The `run` method takes a `Mono` or a `Flux` and wraps it in a circuit breaker.
 You can optionally profile a fallback `Function`, which will be called if the circuit breaker is tripped and is passed the `Throwable`
 that caused the failure.
 
-[[configuration]]
 == Configuration
 
 You can configure your circuit breakers by creating beans of type `Customizer`.
@@ -95,6 +94,7 @@ for example, in case of https://resilience4j.readme.io/docs/circuitbreaker#secti
 
 The following example shows the way for each `io.github.resilience4j.circuitbreaker.CircuitBreaker` to consume events.
 
+====
 [source,java]
 ----
 Customizer.once(circuitBreaker -> {
@@ -102,3 +102,4 @@ Customizer.once(circuitBreaker -> {
     .onStateTransition(event -> log.info("{}: {}", event.getCircuitBreakerName(), event.getStateTransition()));
 }, CircuitBreaker::getName)
 ----
+====

pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-commons-parent</artifactId>
-	<version>4.1.0-SNAPSHOT</version>
+	<version>4.0.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Commons Parent</name>
 	<description>Spring Cloud Commons Parent</description>
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>4.1.0-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<scm>

spring-cloud-commons-dependencies/pom.xml

@@ -6,16 +6,16 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>4.1.0-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-commons-dependencies</artifactId>
-	<version>4.1.0-SNAPSHOT</version>
+	<version>4.0.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-commons-dependencies</name>
 	<description>Spring Cloud Commons Dependencies</description>
 	<properties>
-		<spring-security-rsa.version>1.1.1</spring-security-rsa.version>
+		<spring-security-rsa.version>1.0.11.RELEASE</spring-security-rsa.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>

spring-cloud-commons/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-commons-parent</artifactId>
-		<version>4.1.0-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-commons</artifactId>
@@ -33,44 +33,6 @@
 					</excludes>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.basepom.maven</groupId>
-				<artifactId>duplicate-finder-maven-plugin</artifactId>
-				<configuration>
-					<ignoredDependencies>
-						<dependency>
-							<groupId>org.bouncycastle</groupId>
-							<artifactId>bcprov-jdk18on</artifactId>
-							<version>1.73</version>
-						</dependency>
-						<dependency>
-							<groupId>org.bouncycastle</groupId>
-							<artifactId>bcprov-jdk15on</artifactId>
-							<version>1.64</version>
-						</dependency>
-						<dependency>
-							<groupId>org.bouncycastle</groupId>
-							<artifactId>bcpkix-jdk18on</artifactId>
-							<version>1.73</version>
-						</dependency>
-						<dependency>
-							<groupId>org.bouncycastle</groupId>
-							<artifactId>bcpkix-jdk15on</artifactId>
-							<version>1.64</version>
-						</dependency>
-						<dependency>
-							<groupId>org.apache.httpcomponents.client5</groupId>
-							<artifactId>httpclient5</artifactId>
-							<version>5.1.4</version>
-						</dependency>
-						<dependency>
-							<groupId>org.apache.httpcomponents</groupId>
-							<artifactId>httpclient</artifactId>
-							<version>4.5.14</version>
-						</dependency>
-					</ignoredDependencies>
-				</configuration>
-			</plugin>
 		</plugins>
 		<pluginManagement>
 			<plugins>

spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java

@@ -46,7 +46,6 @@ import org.springframework.context.annotation.Configuration;
  * @author Spencer Gibb
  * @author Olga Maciaszek-Sharma
  * @author Tim Ysewyn
- * @author Omer Naci Soydemir
  */
 @Configuration(proxyBeanMethods = false)
 public class CommonsClientAutoConfiguration {
@@ -76,7 +75,7 @@ public class CommonsClientAutoConfiguration {
 		}
 
 		@Bean
-		public HasFeatures springCloudCommonsFeatures() {
+		public HasFeatures commonsFeatures() {
 			return HasFeatures.abstractFeatures(DiscoveryClient.class, LoadBalancerClient.class);
 		}
 

spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -31,7 +31,6 @@ import org.springframework.core.annotation.AnnotationAwareOrderComparator;
  *
  * @author Biju Kunjummen
  * @author Olga Maciaszek-Sharma
- * @author Sean Ruffatti
  */
 public class CompositeDiscoveryClient implements DiscoveryClient {
 
@@ -74,15 +73,6 @@ public class CompositeDiscoveryClient implements DiscoveryClient {
 		return new ArrayList<>(services);
 	}
 
-	@Override
-	public void probe() {
-		if (this.discoveryClients != null) {
-			for (DiscoveryClient discoveryClient : this.discoveryClients) {
-				discoveryClient.probe();
-			}
-		}
-	}
-
 	public List<DiscoveryClient> getDiscoveryClients() {
 		return this.discoveryClients;
 	}

spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -72,19 +72,6 @@ public class LoadBalancerProperties {
 	 */
 	private StickySession stickySession = new StickySession();
 
-	/**
-	 * If this flag is set to {@code true},
-	 * {@code ServiceInstanceListSupplier#get(Request request)} method will be implemented
-	 * to call {@code delegate.get(request)} in classes assignable from
-	 * {@code DelegatingServiceInstanceListSupplier} that don't already implement that
-	 * method, with the exclusion of {@code CachingServiceInstanceListSupplier} and
-	 * {@code HealthCheckServiceInstanceListSupplier}, which should be placed in the
-	 * instance supplier hierarchy directly after the supplier performing instance
-	 * retrieval over the network, before any request-based filtering is done,
-	 * {@code true} by default.
-	 */
-	private boolean callGetWithRequestOnDelegates = true;
-
 	public HealthCheck getHealthCheck() {
 		return healthCheck;
 	}
@@ -138,14 +125,6 @@ public class LoadBalancerProperties {
 		return xForwarded;
 	}
 
-	public boolean isCallGetWithRequestOnDelegates() {
-		return callGetWithRequestOnDelegates;
-	}
-
-	public void setCallGetWithRequestOnDelegates(boolean callGetWithRequestOnDelegates) {
-		this.callGetWithRequestOnDelegates = callGetWithRequestOnDelegates;
-	}
-
 	public static class StickySession {
 
 		/**

spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/CompatibilityVerifierProperties.java

@@ -36,7 +36,7 @@ public class CompatibilityVerifierProperties {
 	 * the patch version if you don't want to specify a concrete value. Example:
 	 * {@code 3.4.x}
 	 */
-	private List<String> compatibleBootVersions = List.of("3.2.x");
+	private List<String> compatibleBootVersions = List.of("3.0.x", "3.1.x");
 
 	public boolean isEnabled() {
 		return this.enabled;

spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/SpringBootVersionVerifier.java

@@ -36,7 +36,8 @@ class SpringBootVersionVerifier implements CompatibilityVerifier {
 
 	final Map<String, CompatibilityPredicate> ACCEPTED_VERSIONS = new HashMap<>() {
 		{
-			this.put("3.2", is3_2());
+			this.put("3.0", is3_0());
+			this.put("3.1", is3_1());
 		}
 	};
 
@@ -71,19 +72,22 @@ class SpringBootVersionVerifier implements CompatibilityVerifier {
 		return SpringBootVersion.getVersion();
 	}
 
-	CompatibilityPredicate is3_2() {
+	CompatibilityPredicate is3_0() {
 		return new CompatibilityPredicate() {
 
 			@Override
 			public String toString() {
-				return "Predicate for Boot 3.2";
+				return "Predicate for Boot 3.0";
 			}
 
 			@Override
 			public boolean isCompatible() {
 				try {
-					Class.forName("org.springframework.boot.autoconfigure.web.client.RestClientSsl");
+					// since 3.0
+					Class.forName(
+							"org.springframework.boot.autoconfigure.validation.ValidationConfigurationCustomizer");
 					return true;
+
 				}
 				catch (ClassNotFoundException e) {
 					return false;

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

@@ -132,7 +132,7 @@
 		{
 			"name": "spring.cloud.loadbalancer.retry.retry-on-all-operations",
 			"defaultValue": false,
-			"description": "Indicates retries should be attempted on operations other than `HttpMethod.GET`.",
+			"description": "Indicates retries should be attempted on operations other than `HttpMethod.GET`}.",
 			"type": "java.lang.Boolean"
 		},
 		{

spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClientUnitTests.java

@@ -1,101 +0,0 @@
-/*
- * Copyright 2012-2023 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
- *
- *      https://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.client.discovery.composite;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import org.springframework.cloud.client.DefaultServiceInstance;
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.client.discovery.DiscoveryClient;
-
-import static org.assertj.core.api.BDDAssertions.then;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * Mockito tests for Composite Discovery Client
- *
- * @author Sean Ruffatti
- */
-@ExtendWith(MockitoExtension.class)
-public class CompositeDiscoveryClientUnitTests {
-
-	private CompositeDiscoveryClient underTest;
-
-	@Mock
-	private DiscoveryClient client1;
-
-	@Mock
-	private DiscoveryClient client2;
-
-	@BeforeEach
-	void setUp() {
-		underTest = new CompositeDiscoveryClient(Arrays.asList(client1, client2));
-	}
-
-	@Test
-	void shouldRetrieveInstancesByServiceId() {
-		ServiceInstance serviceInstance1 = new DefaultServiceInstance("instance1", "serviceId", "https://s1", 8443,
-				true);
-		when(client1.getInstances("serviceId")).thenReturn(Collections.singletonList(serviceInstance1));
-
-		List<ServiceInstance> serviceInstances = underTest.getInstances("serviceId");
-
-		then(serviceInstances.get(0).getInstanceId()).isEqualTo("instance1");
-		then(serviceInstances.get(0).getServiceId()).isEqualTo("serviceId");
-		then(serviceInstances.get(0).getHost()).isEqualTo("https://s1");
-		then(serviceInstances.get(0).getPort()).isEqualTo(8443);
-	}
-
-	@Test
-	void shouldReturnServiceIds() {
-		when(client1.getServices()).thenReturn(Collections.singletonList("serviceId1"));
-		when(client2.getServices()).thenReturn(Collections.singletonList("serviceId2"));
-
-		List<String> services = underTest.getServices();
-
-		then(services.size()).isEqualTo(2);
-		then(services).containsOnlyOnce("serviceId1", "serviceId2");
-	}
-
-	@Test
-	void shouldReturnAllDiscoveryClients() {
-		then(underTest.getDiscoveryClients()).containsOnlyOnce(client1, client2);
-	}
-
-	@Test
-	void shouldCallProbeOnAllDiscoveryClients() {
-		underTest.probe();
-
-		// Every DiscoveryClient bean should invoke DiscoveryClient.probe() when
-		// CompositeDiscoveryClient.probe() is invoked.
-		verify(client1, times(1)).probe();
-		verify(client1, times(0)).getServices();
-		verify(client2, times(1)).probe();
-		verify(client2, times(0)).getServices();
-	}
-
-}

spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/endpoint/ServiceRegistryEndpointNoRegistrationTests.java

@@ -48,12 +48,12 @@ public class ServiceRegistryEndpointNoRegistrationTests {
 
 	@Test
 	public void testGet() throws Exception {
-		this.mvc.perform(get("/serviceregistry/instance-status")).andExpect(status().isNotFound());
+		this.mvc.perform(get("/service-registry/instance-status")).andExpect(status().isNotFound());
 	}
 
 	@Test
 	public void testPost() throws Exception {
-		this.mvc.perform(post("/serviceregistry/instance-status").content("newstatus"))
+		this.mvc.perform(post("/service-registry/instance-status").content("newstatus"))
 				.andExpect(status().isNotFound());
 	}
 

spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/KeyAndCert.java

@@ -0,0 +1,93 @@
+/*
+ * 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
+ *
+ *      https://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.configuration;
+
+import java.security.KeyPair;
+import java.security.KeyStore;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.cert.Certificate;
+import java.security.cert.X509Certificate;
+
+public class KeyAndCert {
+
+	private KeyPair keyPair;
+
+	private X509Certificate certificate;
+
+	public KeyAndCert(KeyPair keyPair, X509Certificate certificate) {
+		this.keyPair = keyPair;
+		this.certificate = certificate;
+	}
+
+	public KeyPair keyPair() {
+		return keyPair;
+	}
+
+	public PublicKey publicKey() {
+		return keyPair.getPublic();
+	}
+
+	public PrivateKey privateKey() {
+		return keyPair.getPrivate();
+	}
+
+	public X509Certificate certificate() {
+		return certificate;
+	}
+
+	public String subject() {
+		String dn = certificate.getSubjectX500Principal().getName();
+		int index = dn.indexOf('=');
+		return dn.substring(index + 1);
+	}
+
+	public KeyAndCert sign(String subject) throws Exception {
+		KeyTool tool = new KeyTool();
+		return tool.signCertificate(subject, this);
+	}
+
+	public KeyAndCert sign(KeyPair keyPair, String subject) throws Exception {
+		KeyTool tool = new KeyTool();
+		return tool.signCertificate(keyPair, subject, this);
+	}
+
+	public KeyStore storeKeyAndCert(String keyPassword) throws Exception {
+		KeyStore result = KeyStore.getInstance("PKCS12");
+		result.load(null);
+
+		result.setKeyEntry(subject(), keyPair.getPrivate(), keyPassword.toCharArray(), certChain());
+		return result;
+	}
+
+	private Certificate[] certChain() {
+		return new Certificate[] { certificate() };
+	}
+
+	public KeyStore storeCert() throws Exception {
+		return storeCert("PKCS12");
+	}
+
+	public KeyStore storeCert(String storeType) throws Exception {
+		KeyStore result = KeyStore.getInstance(storeType);
+		result.load(null);
+
+		result.setCertificateEntry(subject(), certificate());
+		return result;
+	}
+
+}

spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/KeyTool.java

@@ -0,0 +1,113 @@
+/*
+ * 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
+ *
+ *      https://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.configuration;
+
+import java.math.BigInteger;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.SecureRandom;
+import java.security.cert.X509Certificate;
+import java.util.Date;
+
+import org.bouncycastle.asn1.DERSequence;
+import org.bouncycastle.asn1.x500.X500Name;
+import org.bouncycastle.asn1.x509.BasicConstraints;
+import org.bouncycastle.asn1.x509.Extension;
+import org.bouncycastle.asn1.x509.GeneralName;
+import org.bouncycastle.asn1.x509.GeneralNames;
+import org.bouncycastle.asn1.x509.KeyUsage;
+import org.bouncycastle.cert.X509CertificateHolder;
+import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
+import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder;
+import org.bouncycastle.operator.ContentSigner;
+import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
+
+public class KeyTool {
+
+	private static final long ONE_DAY = 1000L * 60L * 60L * 24L;
+
+	private static final long TEN_YEARS = ONE_DAY * 365L * 10L;
+
+	public KeyAndCert createCA(String ca) throws Exception {
+		KeyPair keyPair = createKeyPair();
+		X509Certificate certificate = createCert(keyPair, ca);
+		return new KeyAndCert(keyPair, certificate);
+	}
+
+	public KeyAndCert signCertificate(String subject, KeyAndCert signer) throws Exception {
+		return signCertificate(createKeyPair(), subject, signer);
+	}
+
+	public KeyAndCert signCertificate(KeyPair keyPair, String subject, KeyAndCert signer) throws Exception {
+		X509Certificate certificate = createCert(keyPair.getPublic(), signer.privateKey(), signer.subject(), subject);
+		KeyAndCert result = new KeyAndCert(keyPair, certificate);
+
+		return result;
+	}
+
+	public KeyPair createKeyPair() throws Exception {
+		return createKeyPair(1024);
+	}
+
+	public KeyPair createKeyPair(int keySize) throws Exception {
+		KeyPairGenerator gen = KeyPairGenerator.getInstance("RSA");
+		gen.initialize(keySize, new SecureRandom());
+		return gen.generateKeyPair();
+	}
+
+	public X509Certificate createCert(KeyPair keyPair, String ca) throws Exception {
+		JcaX509v3CertificateBuilder builder = certBuilder(keyPair.getPublic(), ca, ca);
+		builder.addExtension(Extension.keyUsage, true, new KeyUsage(KeyUsage.keyCertSign));
+		builder.addExtension(Extension.basicConstraints, false, new BasicConstraints(true));
+
+		return signCert(builder, keyPair.getPrivate());
+	}
+
+	public X509Certificate createCert(PublicKey publicKey, PrivateKey privateKey, String issuer, String subject)
+			throws Exception {
+		JcaX509v3CertificateBuilder builder = certBuilder(publicKey, issuer, subject);
+		builder.addExtension(Extension.keyUsage, true, new KeyUsage(KeyUsage.digitalSignature));
+		builder.addExtension(Extension.basicConstraints, false, new BasicConstraints(false));
+
+		GeneralName[] names = new GeneralName[] { new GeneralName(GeneralName.dNSName, "localhost") };
+		builder.addExtension(Extension.subjectAlternativeName, false, GeneralNames.getInstance(new DERSequence(names)));
+
+		return signCert(builder, privateKey);
+	}
+
+	private JcaX509v3CertificateBuilder certBuilder(PublicKey publicKey, String issuer, String subject) {
+		X500Name issuerName = new X500Name(String.format("dc=%s", issuer));
+		X500Name subjectName = new X500Name(String.format("dc=%s", subject));
+
+		long now = System.currentTimeMillis();
+		BigInteger serialNum = BigInteger.valueOf(now);
+		Date notBefore = new Date(now - ONE_DAY);
+		Date notAfter = new Date(now + TEN_YEARS);
+
+		return new JcaX509v3CertificateBuilder(issuerName, serialNum, notBefore, notAfter, subjectName, publicKey);
+	}
+
+	private X509Certificate signCert(JcaX509v3CertificateBuilder builder, PrivateKey privateKey) throws Exception {
+		ContentSigner signer = new JcaContentSignerBuilder("SHA256WithRSA").build(privateKey);
+		X509CertificateHolder holder = builder.build(signer);
+
+		return new JcaX509CertificateConverter().getCertificate(holder);
+	}
+
+}

spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/SSHContextFactoryTests.java

@@ -16,7 +16,10 @@
 
 package org.springframework.cloud.configuration;
 
+import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.security.GeneralSecurityException;
 import java.security.Key;
 import java.security.KeyStore;
@@ -24,10 +27,11 @@ import java.security.cert.Certificate;
 
 import javax.net.ssl.SSLContext;
 
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -38,22 +42,60 @@ public class SSHContextFactoryTests {
 
 	private static final String KEY_PASSWORD = "test-key-password";
 
+	private static KeyAndCert ca;
+
+	private static KeyAndCert cert;
+
+	private static File keyStore;
+
+	private static File trustStore;
+
 	private TlsProperties properties;
 
+	@BeforeAll
+	public static void createKeyStoreAndTrustStore() throws Exception {
+		KeyTool tool = new KeyTool();
+
+		ca = tool.createCA("MyCA");
+		cert = ca.sign("MyCert");
+
+		keyStore = saveKeyAndCert(cert);
+		trustStore = saveCert(ca);
+	}
+
+	private static File saveKeyAndCert(KeyAndCert keyCert) throws Exception {
+		return saveKeyStore(keyCert.subject(), () -> keyCert.storeKeyAndCert(KEY_PASSWORD));
+	}
+
+	private static File saveCert(KeyAndCert keyCert) throws Exception {
+		return saveKeyStore(keyCert.subject(), keyCert::storeCert);
+	}
+
+	private static File saveKeyStore(String prefix, KeyStoreSupplier func) throws Exception {
+		File result = File.createTempFile(prefix, ".p12");
+		result.deleteOnExit();
+
+		try (OutputStream output = new FileOutputStream(result)) {
+			KeyStore store = func.createKeyStore();
+			store.store(output, KEY_STORE_PASSWORD.toCharArray());
+		}
+		return result;
+	}
+
 	@BeforeEach
 	public void createProperties() {
 		properties = new TlsProperties();
 
 		properties.setEnabled(true);
-		properties.setKeyStore(resourceOf("MyCert.p12"));
+		properties.setKeyStore(resourceOf(keyStore));
 		properties.setKeyStorePassword(KEY_STORE_PASSWORD);
 		properties.setKeyPassword(KEY_PASSWORD);
-		properties.setTrustStore(resourceOf("MyCA.p12"));
+		properties.setTrustStore(resourceOf(trustStore));
 		properties.setTrustStorePassword(KEY_STORE_PASSWORD);
 	}
 
-	private Resource resourceOf(String path) {
-		return new ClassPathResource(path);
+	private Resource resourceOf(File file) {
+		return new FileSystemResource(file);
 	}
 
 	@Test
@@ -62,10 +104,10 @@ public class SSHContextFactoryTests {
 		KeyStore store = factory.createKeyStore();
 
 		Certificate c = store.getCertificate("MyCert");
-		assertThat(c).isNotNull();
+		assertThat(c).isEqualTo(cert.certificate());
 
 		Key key = store.getKey("MyCert", KEY_PASSWORD.toCharArray());
-		assertThat(key).isNotNull();
+		assertThat(key).isEqualTo(cert.privateKey());
 	}
 
 	@Test
@@ -74,7 +116,7 @@ public class SSHContextFactoryTests {
 		KeyStore store = factory.createTrustStore();
 
 		Certificate c = store.getCertificate("MyCA");
-		assertThat(c).isNotNull();
+		assertThat(c).isEqualTo(ca.certificate());
 	}
 
 	@Test

spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/SpringBootDependencyTests.java

@@ -176,18 +176,18 @@ public class SpringBootDependencyTests {
 	@Test
 	public void should_match_against_current_manifest() {
 		try {
-			verifyCurrentVersionFromManifest("3.2");
-			verifyCurrentVersionFromManifest("3.2.x");
+			verifyCurrentVersionFromManifest("3.0");
+			verifyCurrentVersionFromManifest("3.0.x");
 		}
 		catch (AssertionError e) {
-			// if (e.getMessage() != null && e.getMessage().contains("3.3.")) {
-			// we're likely running a boot 3.3 compatibility test, try 3.3
-			// verifyCurrentVersionFromManifest("3.3");
-			// verifyCurrentVersionFromManifest("3.3.x");
-			// }
-			// else {
-			throw e;
-			// }
+			if (e.getMessage() != null && e.getMessage().contains("3.1.")) {
+				// we're likely running a boot 3.1 compatibility test, try 3.1
+				verifyCurrentVersionFromManifest("3.1");
+				verifyCurrentVersionFromManifest("3.1.x");
+			}
+			else {
+				throw e;
+			}
 		}
 	}
 
@@ -212,7 +212,7 @@ public class SpringBootDependencyTests {
 			}
 		};
 		versionVerifier.ACCEPTED_VERSIONS.clear();
-		versionVerifier.ACCEPTED_VERSIONS.put("3.0", versionVerifier.is3_2());
+		versionVerifier.ACCEPTED_VERSIONS.put("3.0", versionVerifier.is3_0());
 
 		VerificationResult verificationResult = versionVerifier.verify();
 
@@ -230,7 +230,7 @@ public class SpringBootDependencyTests {
 			}
 		};
 		versionVerifier.ACCEPTED_VERSIONS.clear();
-		versionVerifier.ACCEPTED_VERSIONS.put("3.0", versionVerifier.is3_2());
+		versionVerifier.ACCEPTED_VERSIONS.put("3.0", versionVerifier.is3_0());
 
 		VerificationResult verificationResult = versionVerifier.verify();
 

spring-cloud-context-integration-tests/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-commons-parent</artifactId>
-		<version>4.1.0-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-context-integration-tests</artifactId>

spring-cloud-context-webflux-integration-tests/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-commons-parent</artifactId>
-		<version>4.1.0-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-context-webflux-integration-tests</artifactId>

spring-cloud-context/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-commons-parent</artifactId>
-		<version>4.1.0-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-context</artifactId>

spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java

@@ -43,7 +43,6 @@ import org.springframework.boot.context.properties.bind.Binder;
 import org.springframework.cloud.context.refresh.ConfigDataContextRefresher;
 import org.springframework.cloud.context.refresh.ContextRefresher;
 import org.springframework.cloud.context.refresh.LegacyContextRefresher;
-import org.springframework.cloud.context.refresh.RefreshScopeLifecycle;
 import org.springframework.cloud.context.scope.refresh.RefreshScope;
 import org.springframework.cloud.endpoint.event.RefreshEventListener;
 import org.springframework.cloud.logging.LoggingRebinder;
@@ -67,7 +66,6 @@ import org.springframework.util.StringUtils;
  *
  * @author Dave Syer
  * @author Venil Noronha
- * @author Olga Maciaszek-Sharma
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(RefreshScope.class)
@@ -119,12 +117,6 @@ public class RefreshAutoConfiguration {
 		return new ConfigDataContextRefresher(context, scope, properties);
 	}
 
-	@ConditionalOnProperty(value = "spring.cloud.refresh.on-restart.enabled", matchIfMissing = true)
-	@Bean
-	RefreshScopeLifecycle refreshScopeLifecycle(ContextRefresher contextRefresher) {
-		return new RefreshScopeLifecycle(contextRefresher);
-	}
-
 	@Bean
 	public RefreshEventListener refreshEventListener(ContextRefresher contextRefresher) {
 		return new RefreshEventListener(contextRefresher);

spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapApplicationListener.java

@@ -294,13 +294,6 @@ public class BootstrapApplicationListener implements ApplicationListener<Applica
 		target.addAll(getOrderedBeansOfType(context, ApplicationContextInitializer.class));
 		application.setInitializers(target);
 		addBootstrapDecryptInitializer(application);
-
-		// Get the active profiles from the bootstrap context and set them in main
-		// application
-		// environment. This allows any profiles activated during bootstrap to be
-		// activated when
-		// config data runs in the main application context.
-		environment.setActiveProfiles(context.getEnvironment().getActiveProfiles());
 	}
 
 	@SuppressWarnings("unchecked")

spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapConfigFileApplicationListener.java

@@ -166,11 +166,7 @@ public class BootstrapConfigFileApplicationListener
 	/**
 	 * The default order for the processor.
 	 */
-	public static final int DEFAULT_ORDER =
-			// This listener needs to run after the `ConfigDataEnvironmentPostProcessor`
-			// to
-			// make sure the `Environment.activeProfiles` are correctly set
-			Math.addExact(ConfigDataEnvironmentPostProcessor.ORDER, 1);
+	public static final int DEFAULT_ORDER = Ordered.HIGHEST_PRECEDENCE + 10;
 
 	private final Log logger;
 

spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java

@@ -17,20 +17,17 @@
 package org.springframework.cloud.bootstrap.config;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
-import java.util.stream.Collectors;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.config.Profiles;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.context.properties.bind.Bindable;
 import org.springframework.boot.context.properties.bind.Binder;
@@ -38,13 +35,12 @@ import org.springframework.boot.logging.LogFile;
 import org.springframework.boot.logging.LoggingInitializationContext;
 import org.springframework.boot.logging.LoggingSystem;
 import org.springframework.cloud.bootstrap.BootstrapApplicationListener;
+import org.springframework.cloud.bootstrap.BootstrapConfigFileApplicationListener;
 import org.springframework.cloud.context.environment.EnvironmentChangeEvent;
 import org.springframework.cloud.logging.LoggingRebinder;
 import org.springframework.context.ApplicationContextInitializer;
-import org.springframework.context.ApplicationListener;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 import org.springframework.core.env.AbstractEnvironment;
@@ -56,7 +52,6 @@ import org.springframework.core.env.MutablePropertySources;
 import org.springframework.core.env.PropertySource;
 import org.springframework.util.StringUtils;
 
-import static org.springframework.cloud.bootstrap.encrypt.AbstractEnvironmentDecrypt.DECRYPTED_PROPERTY_SOURCE_NAME;
 import static org.springframework.core.env.StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME;
 
 /**
@@ -65,8 +60,8 @@ import static org.springframework.core.env.StandardEnvironment.SYSTEM_ENVIRONMEN
  */
 @Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties(PropertySourceBootstrapProperties.class)
-public class PropertySourceBootstrapConfiguration implements ApplicationListener<ContextRefreshedEvent>,
-		ApplicationContextInitializer<ConfigurableApplicationContext>, Ordered {
+public class PropertySourceBootstrapConfiguration
+		implements ApplicationContextInitializer<ConfigurableApplicationContext>, Ordered {
 
 	/**
 	 * Bootstrap property source name.
@@ -81,9 +76,6 @@ public class PropertySourceBootstrapConfiguration implements ApplicationListener
 	@Autowired(required = false)
 	private List<PropertySourceLocator> propertySourceLocators = new ArrayList<>();
 
-	@Autowired
-	private PropertySourceBootstrapProperties bootstrapProperties;
-
 	@Override
 	public int getOrder() {
 		return this.order;
@@ -93,25 +85,8 @@ public class PropertySourceBootstrapConfiguration implements ApplicationListener
 		this.propertySourceLocators = new ArrayList<>(propertySourceLocators);
 	}
 
-	/*
-	 * The ApplicationListener is called when the main application context is initialized.
-	 * This will be called after the ApplicationListener ContextRefreshedEvent is fired
-	 * during the bootstrap phase. This method is also what added PropertySources prior to
-	 * Spring Cloud 2021.0.7, this is why it will be called when
-	 * spring.cloud.config.initialize-on-context-refresh is false. When
-	 * spring.cloud.config.initialize-on-context-refresh is true this method provides a
-	 * "second fetch" of configuration data to fetch any additional configuration data
-	 * from profiles that have been activated.
-	 */
 	@Override
 	public void initialize(ConfigurableApplicationContext applicationContext) {
-		if (!bootstrapProperties.isInitializeOnContextRefresh() || !applicationContext.getEnvironment()
-				.getPropertySources().contains(BootstrapApplicationListener.BOOTSTRAP_PROPERTY_SOURCE_NAME)) {
-			doInitialize(applicationContext);
-		}
-	}
-
-	private void doInitialize(ConfigurableApplicationContext applicationContext) {
 		List<PropertySource<?>> composite = new ArrayList<>();
 		AnnotationAwareOrderComparator.sort(this.propertySourceLocators);
 		boolean empty = true;
@@ -146,7 +121,7 @@ public class PropertySourceBootstrapConfiguration implements ApplicationListener
 			insertPropertySources(propertySources, composite);
 			reinitializeLoggingSystem(environment);
 			setLogLevels(applicationContext, environment);
-			handleProfiles(environment);
+			handleIncludedProfiles(environment);
 		}
 	}
 
@@ -195,12 +170,7 @@ public class PropertySourceBootstrapConfiguration implements ApplicationListener
 		if (!remoteProperties.isAllowOverride()
 				|| (!remoteProperties.isOverrideNone() && remoteProperties.isOverrideSystemProperties())) {
 			for (PropertySource<?> p : reversedComposite) {
-				if (propertySources.contains(DECRYPTED_PROPERTY_SOURCE_NAME)) {
-					propertySources.addAfter(DECRYPTED_PROPERTY_SOURCE_NAME, p);
-				}
-				else {
-					propertySources.addFirst(p);
-				}
+				propertySources.addFirst(p);
 			}
 			return;
 		}
@@ -238,104 +208,43 @@ public class PropertySourceBootstrapConfiguration implements ApplicationListener
 		return environment;
 	}
 
-	private void handleProfiles(ConfigurableEnvironment environment) {
-		if (bootstrapProperties.isInitializeOnContextRefresh() && !environment.getPropertySources()
-				.contains(BootstrapApplicationListener.BOOTSTRAP_PROPERTY_SOURCE_NAME)) {
-			// In the case that spring.cloud.config.initialize-on-context-refresh is true
-			// this method will
-			// be called during the bootstrap phase and the main application startup. We
-			// only manipulate the environment profiles in the bootstrap phase as we are
-			// fetching
-			// any additional profile specific configuration when this method would be
-			// called during the
-			// main application startup, and it is not valid to activate profiles in
-			// profile specific
-			// configuration properties, so we should not run this method then.
-			return;
-		}
+	private void handleIncludedProfiles(ConfigurableEnvironment environment) {
 		Set<String> includeProfiles = new TreeSet<>();
-		List<String> activeProfiles = new ArrayList<>();
-
 		for (PropertySource<?> propertySource : environment.getPropertySources()) {
-			addIncludedProfilesTo(includeProfiles, propertySource, environment);
-			addActiveProfilesTo(activeProfiles, propertySource, environment);
+			addIncludedProfilesTo(includeProfiles, propertySource);
 		}
+		List<String> activeProfiles = new ArrayList<>();
+		Collections.addAll(activeProfiles, environment.getActiveProfiles());
 
 		// If it's already accepted we assume the order was set intentionally
 		includeProfiles.removeAll(activeProfiles);
+		if (includeProfiles.isEmpty()) {
+			return;
+		}
 		// Prepend each added profile (last wins in a property key clash)
 		for (String profile : includeProfiles) {
 			activeProfiles.add(0, profile);
 		}
-		List<String> activeProfilesFromEnvironment = Arrays.stream(environment.getActiveProfiles())
-				.collect(Collectors.toList());
-		if (!activeProfiles.containsAll(activeProfilesFromEnvironment)) {
-			activeProfiles.addAll(activeProfilesFromEnvironment);
-
-		}
 		environment.setActiveProfiles(activeProfiles.toArray(new String[activeProfiles.size()]));
 	}
 
-	private Set<String> addIncludedProfilesTo(Set<String> profiles, PropertySource<?> propertySource,
-			ConfigurableEnvironment environment) {
-		return addProfilesTo(profiles, propertySource, Profiles.INCLUDE_PROFILES_PROPERTY_NAME, environment);
-	}
-
-	private List<String> addActiveProfilesTo(List<String> profiles, PropertySource<?> propertySource,
-			ConfigurableEnvironment environment) {
-		// According to Spring Boot, "spring.profiles.active" should have priority,
-		// only value from property source with the highest priority wins.
-		// Once settled, ignore others
-		if (!profiles.isEmpty()) {
-			return profiles;
-		}
-		return addProfilesTo(profiles, propertySource, AbstractEnvironment.ACTIVE_PROFILES_PROPERTY_NAME, environment);
-	}
-
-	private <T extends Collection<String>> T addProfilesTo(T profiles, PropertySource<?> propertySource,
-			String property, ConfigurableEnvironment environment) {
+	private Set<String> addIncludedProfilesTo(Set<String> profiles, PropertySource<?> propertySource) {
 		if (propertySource instanceof CompositePropertySource) {
 			for (PropertySource<?> nestedPropertySource : ((CompositePropertySource) propertySource)
 					.getPropertySources()) {
-				addProfilesTo(profiles, nestedPropertySource, property, environment);
+				addIncludedProfilesTo(profiles, nestedPropertySource);
 			}
 		}
 		else {
-			Collections.addAll(profiles, getProfilesForValue(propertySource.getProperty(property), environment));
+			Collections.addAll(profiles, getProfilesForValue(
+					propertySource.getProperty(BootstrapConfigFileApplicationListener.INCLUDE_PROFILES_PROPERTY)));
 		}
 		return profiles;
 	}
 
-	private String[] getProfilesForValue(Object property, ConfigurableEnvironment environment) {
+	private String[] getProfilesForValue(Object property) {
 		final String value = (property == null ? null : property.toString());
-		return property == null ? new String[0] : resolvePlaceholdersInProfiles(value, environment);
-	}
-
-	private String[] resolvePlaceholdersInProfiles(String profiles, ConfigurableEnvironment environment) {
-		return Arrays.stream(StringUtils.tokenizeToStringArray(profiles, ",")).map(s -> {
-			if (s.startsWith("${") && s.endsWith("}")) {
-				return environment.resolvePlaceholders(s);
-			}
-			else {
-				return s;
-			}
-		}).toArray(String[]::new);
-	}
-
-	/*
-	 * The ConextRefreshedEvent gets called at the end of the boostrap phase after config
-	 * data is loaded during bootstrap. This will run and do an "initial fetch" of
-	 * configuration data during bootstrap but before the main applicaiton context starts.
-	 */
-	@Override
-	public void onApplicationEvent(ContextRefreshedEvent event) {
-		if (bootstrapProperties.isInitializeOnContextRefresh()
-				&& event.getApplicationContext() instanceof ConfigurableApplicationContext) {
-			if (((ConfigurableApplicationContext) event.getApplicationContext()).getEnvironment().getPropertySources()
-					.contains(BootstrapApplicationListener.BOOTSTRAP_PROPERTY_SOURCE_NAME)) {
-				doInitialize((ConfigurableApplicationContext) event.getApplicationContext());
-			}
-		}
+		return property == null ? new String[0] : StringUtils.tokenizeToStringArray(value, ",");
 	}
 
 }

spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapProperties.java

@@ -42,24 +42,10 @@ public class PropertySourceBootstrapProperties {
 	/**
 	 * Flag to indicate that when {@link #setAllowOverride(boolean) allowOverride} is
 	 * true, external properties should take lowest priority and should not override any
-	 * existing property sources (including local config files). Default false. This will
-	 * only have an effect when using config first bootstrap.
+	 * existing property sources (including local config files). Default false.
 	 */
 	private boolean overrideNone = false;
 
-	/**
-	 * Flag to initialize bootstrap configuration on context refresh event. Default false.
-	 */
-	private boolean initializeOnContextRefresh = false;
-
-	public boolean isInitializeOnContextRefresh() {
-		return initializeOnContextRefresh;
-	}
-
-	public void setInitializeOnContextRefresh(boolean initializeOnContextRefresh) {
-		this.initializeOnContextRefresh = initializeOnContextRefresh;
-	}
-
 	public boolean isOverrideNone() {
 		return this.overrideNone;
 	}

spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/encrypt/EncryptionBootstrapConfiguration.java

@@ -16,9 +16,6 @@
 
 package org.springframework.cloud.bootstrap.encrypt;
 
-import org.springframework.aot.hint.MemberCategory;
-import org.springframework.aot.hint.RuntimeHints;
-import org.springframework.aot.hint.RuntimeHintsRegistrar;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
@@ -145,15 +142,4 @@ public class EncryptionBootstrapConfiguration {
 
 	}
 
-	class EncryptionHints implements RuntimeHintsRegistrar {
-
-		@Override
-		public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
-			hints.reflection().registerTypeIfPresent(classLoader,
-					"org.springframework.security.rsa.crypto.RsaSecretEncryptor",
-					MemberCategory.INVOKE_DECLARED_CONSTRUCTORS);
-		}
-
-	}
-
 }

spring-cloud-context/src/main/java/org/springframework/cloud/context/config/ContextRefreshedWithApplicationEvent.java

@@ -1,52 +0,0 @@
-/*
- * Copyright 2012-2023 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
- *
- *      https://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.context.config;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.context.event.SpringApplicationEvent;
-import org.springframework.context.ConfigurableApplicationContext;
-
-/**
- * A custom event for spring cloud context use cases that need the saved Spring
- * Application. This prevents a duplicated ApplicationPreparedEvent from being
- * republished.
- */
-public class ContextRefreshedWithApplicationEvent extends SpringApplicationEvent {
-
-	private final ConfigurableApplicationContext context;
-
-	/**
-	 * Create a new {@link ContextRefreshedWithApplicationEvent} instance.
-	 * @param application the current application
-	 * @param args the arguments the application is running with
-	 * @param context the ApplicationContext about to be refreshed
-	 */
-	public ContextRefreshedWithApplicationEvent(SpringApplication application, String[] args,
-			ConfigurableApplicationContext context) {
-		super(application, args);
-		this.context = context;
-	}
-
-	/**
-	 * Return the application context.
-	 * @return the context
-	 */
-	public ConfigurableApplicationContext getApplicationContext() {
-		return this.context;
-	}
-
-}

spring-cloud-context/src/main/java/org/springframework/cloud/context/encrypt/EncryptorFactory.java

@@ -16,6 +16,18 @@
 
 package org.springframework.cloud.context.encrypt;
 
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.regex.Pattern;
+
+import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
+import org.bouncycastle.openssl.MiscPEMGenerator;
+import org.bouncycastle.openssl.PEMKeyPair;
+import org.bouncycastle.openssl.PEMParser;
+import org.bouncycastle.util.io.pem.PemObjectGenerator;
+import org.bouncycastle.util.io.pem.PemWriter;
+
 import org.springframework.security.crypto.encrypt.Encryptors;
 import org.springframework.security.crypto.encrypt.TextEncryptor;
 import org.springframework.security.rsa.crypto.RsaSecretEncryptor;
@@ -26,6 +38,8 @@ import org.springframework.security.rsa.crypto.RsaSecretEncryptor;
  */
 public class EncryptorFactory {
 
+	private static final Pattern NEWLINE_ESCAPE_PATTERN = Pattern.compile("\\r|\\n");
+
 	private String salt = "deadbeef";
 
 	public EncryptorFactory() {
@@ -39,7 +53,15 @@ public class EncryptorFactory {
 
 		TextEncryptor encryptor;
 		if (data.contains("RSA PRIVATE KEY")) {
-			encryptor = new RsaSecretEncryptor(data.replaceAll("\\n *", ""));
+
+			try {
+				String normalizedPemData = normalizePem(data);
+				encryptor = new RsaSecretEncryptor(NEWLINE_ESCAPE_PATTERN.matcher(normalizedPemData).replaceAll(""));
+			}
+			catch (IllegalArgumentException e) {
+				throw new KeyFormatException(e);
+			}
+
 		}
 		else if (data.startsWith("ssh-rsa") || data.contains("RSA PUBLIC KEY")) {
 			throw new KeyFormatException();
@@ -51,4 +73,24 @@ public class EncryptorFactory {
 		return encryptor;
 	}
 
+	private String normalizePem(String data) {
+		PEMKeyPair pemKeyPair = null;
+		try (PEMParser pemParser = new PEMParser(new StringReader(data))) {
+			pemKeyPair = (PEMKeyPair) pemParser.readObject();
+			PrivateKeyInfo privateKeyInfo = pemKeyPair.getPrivateKeyInfo();
+
+			StringWriter textWriter = new StringWriter();
+			try (PemWriter pemWriter = new PemWriter(textWriter)) {
+				PemObjectGenerator pemObjectGenerator = new MiscPEMGenerator(privateKeyInfo);
+
+				pemWriter.writeObject(pemObjectGenerator);
+				pemWriter.flush();
+				return textWriter.toString();
+			}
+		}
+		catch (IOException e) {
+			throw new RuntimeException(e.getMessage(), e);
+		}
+	}
+
 }

spring-cloud-context/src/main/java/org/springframework/cloud/context/named/NamedContextFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -158,27 +158,27 @@ public abstract class NamedContextFactory<C extends NamedContextFactory.Specific
 	}
 
 	public GenericApplicationContext buildContext(String name) {
-		// https://github.com/spring-cloud/spring-cloud-netflix/issues/3101
-		// https://github.com/spring-cloud/spring-cloud-openfeign/issues/475
-		ClassLoader classLoader = getClass().getClassLoader();
 		GenericApplicationContext context;
 		if (this.parent != null) {
+			// jdk11 issue
+			// https://github.com/spring-cloud/spring-cloud-netflix/issues/3101
+			// https://github.com/spring-cloud/spring-cloud-openfeign/issues/475
 			DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
 			if (parent instanceof ConfigurableApplicationContext) {
 				beanFactory.setBeanClassLoader(
 						((ConfigurableApplicationContext) parent).getBeanFactory().getBeanClassLoader());
 			}
 			else {
-				beanFactory.setBeanClassLoader(classLoader);
+				beanFactory.setBeanClassLoader(parent.getClassLoader());
 			}
 			context = AotDetector.useGeneratedArtifacts() ? new GenericApplicationContext(beanFactory)
 					: new AnnotationConfigApplicationContext(beanFactory);
+			context.setClassLoader(parent.getClassLoader());
 		}
 		else {
 			context = AotDetector.useGeneratedArtifacts() ? new GenericApplicationContext()
 					: new AnnotationConfigApplicationContext();
 		}
-		context.setClassLoader(classLoader);
 		context.getEnvironment().getPropertySources().addFirst(
 				new MapPropertySource(this.propertySourceName, Collections.singletonMap(this.propertyName, name)));
 		if (this.parent != null) {

spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ConfigDataContextRefresher.java

@@ -27,11 +27,11 @@ import org.springframework.boot.BootstrapRegistry;
 import org.springframework.boot.ConfigurableBootstrapContext;
 import org.springframework.boot.DefaultBootstrapContext;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.context.event.ApplicationPreparedEvent;
 import org.springframework.boot.env.EnvironmentPostProcessor;
 import org.springframework.boot.logging.DeferredLogFactory;
 import org.springframework.boot.util.Instantiator;
 import org.springframework.cloud.autoconfigure.RefreshAutoConfiguration;
-import org.springframework.cloud.context.config.ContextRefreshedWithApplicationEvent;
 import org.springframework.cloud.context.scope.refresh.RefreshScope;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -45,7 +45,7 @@ import org.springframework.core.io.support.SpringFactoriesLoader;
  * @author Venil Noronha
  */
 public class ConfigDataContextRefresher extends ContextRefresher
-		implements ApplicationListener<ContextRefreshedWithApplicationEvent> {
+		implements ApplicationListener<ApplicationPreparedEvent> {
 
 	private SpringApplication application;
 
@@ -60,7 +60,7 @@ public class ConfigDataContextRefresher extends ContextRefresher
 	}
 
 	@Override
-	public void onApplicationEvent(ContextRefreshedWithApplicationEvent event) {
+	public void onApplicationEvent(ApplicationPreparedEvent event) {
 		application = event.getSpringApplication();
 	}
 

spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/RefreshScopeLifecycle.java

@@ -1,77 +0,0 @@
-/*
- * Copyright 2012-2023 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
- *
- *      https://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.context.refresh;
-
-import java.util.Set;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.context.Lifecycle;
-
-/**
- * A {@link Lifecycle} implementation that triggers {@link ContextRefresher#refresh()} to
- * be called on restart.
- *
- * @author Olga Maciaszek-Sharma
- * @since 4.1.0
- */
-public class RefreshScopeLifecycle implements Lifecycle {
-
-	private static final Log LOG = LogFactory.getLog(RefreshScopeLifecycle.class);
-
-	private final ContextRefresher contextRefresher;
-
-	private final Object lifecycleMonitor = new Object();
-
-	private volatile boolean running = true;
-
-	public RefreshScopeLifecycle(ContextRefresher contextRefresher) {
-		this.contextRefresher = contextRefresher;
-	}
-
-	@Override
-	public void start() {
-		synchronized (lifecycleMonitor) {
-			if (!isRunning()) {
-				if (LOG.isInfoEnabled()) {
-					LOG.info("Refreshing context on restart.");
-				}
-				Set<String> keys = contextRefresher.refresh();
-				if (LOG.isInfoEnabled()) {
-					LOG.info("Refreshed keys: " + keys);
-				}
-				running = true;
-			}
-		}
-	}
-
-	@Override
-	public void stop() {
-		synchronized (lifecycleMonitor) {
-			if (isRunning()) {
-				running = false;
-			}
-		}
-	}
-
-	@Override
-	public boolean isRunning() {
-		return running;
-	}
-
-}

spring-cloud-context/src/main/java/org/springframework/cloud/context/restart/RestartEndpoint.java

@@ -30,8 +30,8 @@ import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
 import org.springframework.boot.actuate.endpoint.annotation.WriteOperation;
+import org.springframework.boot.context.event.ApplicationPreparedEvent;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.cloud.context.config.ContextRefreshedWithApplicationEvent;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ApplicationEvent;
@@ -51,7 +51,7 @@ import org.springframework.util.ClassUtils;
  *
  */
 @Endpoint(id = "restart", enableByDefault = false)
-public class RestartEndpoint implements ApplicationListener<ContextRefreshedWithApplicationEvent> {
+public class RestartEndpoint implements ApplicationListener<ApplicationPreparedEvent> {
 
 	private static Log logger = LogFactory.getLog(RestartEndpoint.class);
 
@@ -61,7 +61,7 @@ public class RestartEndpoint implements ApplicationListener<ContextRefreshedWith
 
 	private String[] args;
 
-	private ContextRefreshedWithApplicationEvent event;
+	private ApplicationPreparedEvent event;
 
 	private IntegrationShutdown integrationShutdown;
 
@@ -85,7 +85,7 @@ public class RestartEndpoint implements ApplicationListener<ContextRefreshedWith
 	}
 
 	@Override
-	public void onApplicationEvent(ContextRefreshedWithApplicationEvent input) {
+	public void onApplicationEvent(ApplicationPreparedEvent input) {
 		this.event = input;
 		if (this.context == null) {
 			this.context = this.event.getApplicationContext();

spring-cloud-context/src/main/java/org/springframework/cloud/context/restart/RestartListener.java

@@ -17,7 +17,6 @@
 package org.springframework.cloud.context.restart;
 
 import org.springframework.boot.context.event.ApplicationPreparedEvent;
-import org.springframework.cloud.context.config.ContextRefreshedWithApplicationEvent;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.event.ContextClosedEvent;
@@ -35,7 +34,7 @@ public class RestartListener implements SmartApplicationListener {
 
 	private ConfigurableApplicationContext context;
 
-	private ContextRefreshedWithApplicationEvent event;
+	private ApplicationPreparedEvent event;
 
 	@Override
 	public int getOrder() {
@@ -57,9 +56,8 @@ public class RestartListener implements SmartApplicationListener {
 
 	@Override
 	public void onApplicationEvent(ApplicationEvent input) {
-		if (input instanceof ApplicationPreparedEvent applicationPreparedEvent) {
-			this.event = new ContextRefreshedWithApplicationEvent(applicationPreparedEvent.getSpringApplication(),
-					applicationPreparedEvent.getArgs(), applicationPreparedEvent.getApplicationContext());
+		if (input instanceof ApplicationPreparedEvent) {
+			this.event = (ApplicationPreparedEvent) input;
 			if (this.context == null) {
 				this.context = this.event.getApplicationContext();
 			}

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

@@ -53,12 +53,6 @@
 			"type": "java.lang.Boolean",
 			"description": "Enable the DecryptEnvironmentPostProcessor.",
 			"defaultValue": true
-		},
-		{
-			"name": "spring.cloud.refresh.on-restart.enabled",
-			"type": "java.lang.Boolean",
-			"description": "Enable refreshing context on start.",
-			"defaultValue": true
 		}
 	]
 }

spring-cloud-context/src/main/resources/META-INF/spring/aot.factories

@@ -1,2 +0,0 @@
-org.springframework.aot.hint.RuntimeHintsRegistrar=\
-org.springframework.cloud.bootstrap.encrypt.EncryptionBootstrapConfiguration.EncryptionHints

spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationTests.java

@@ -22,13 +22,11 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.boot.test.system.CapturedOutput;
 import org.springframework.boot.test.system.OutputCaptureExtension;
 import org.springframework.cloud.context.refresh.ContextRefresher;
@@ -40,10 +38,9 @@ import static org.assertj.core.api.BDDAssertions.then;
 
 /**
  * @author Dave Syer
- * @author Olga Maciaszek-Sharma
  */
 @ExtendWith(OutputCaptureExtension.class)
-class RefreshAutoConfigurationTests {
+public class RefreshAutoConfigurationTests {
 
 	private static ConfigurableApplicationContext getApplicationContext(WebApplicationType type, Class<?> configuration,
 			String... properties) {
@@ -52,7 +49,7 @@ class RefreshAutoConfigurationTests {
 	}
 
 	@Test
-	void noWarnings(CapturedOutput output) {
+	public void noWarnings(CapturedOutput output) {
 		try (ConfigurableApplicationContext context = getApplicationContext(WebApplicationType.NONE, Config.class)) {
 			then(context.containsBean("refreshScope")).isTrue();
 			then(output.toString()).doesNotContain("WARN");
@@ -60,7 +57,7 @@ class RefreshAutoConfigurationTests {
 	}
 
 	@Test
-	void disabled() {
+	public void disabled() {
 		try (ConfigurableApplicationContext context = getApplicationContext(WebApplicationType.SERVLET, Config.class,
 				"spring.cloud.refresh.enabled:false")) {
 			then(context.containsBean("refreshScope")).isFalse();
@@ -68,7 +65,7 @@ class RefreshAutoConfigurationTests {
 	}
 
 	@Test
-	void refreshables() {
+	public void refreshables() {
 		try (ConfigurableApplicationContext context = getApplicationContext(WebApplicationType.NONE, Config.class,
 				"config.foo=bar", "spring.cloud.refresh.refreshable:" + SealedConfigProps.class.getName())) {
 			context.getBean(SealedConfigProps.class);
@@ -87,7 +84,7 @@ class RefreshAutoConfigurationTests {
 	}
 
 	@Test
-	void neverRefreshable() {
+	public void neverRefreshable() {
 		try (ConfigurableApplicationContext context = getApplicationContext(WebApplicationType.NONE, Config.class,
 				"countingconfig.foo=bar",
 				"spring.cloud.refresh.never-refreshable:" + CountingConfigProps.class.getName())) {
@@ -97,19 +94,6 @@ class RefreshAutoConfigurationTests {
 		}
 	}
 
-	@Test
-	void refreshScopeLifecylePresentByDefault() {
-		new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(RefreshAutoConfiguration.class))
-				.run(context -> assertThat(context).hasBean("refreshScopeLifecycle"));
-	}
-
-	@Test
-	void refreshScopeLifecyleDisabledWithProp() {
-		new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(RefreshAutoConfiguration.class))
-				.withPropertyValues("spring.cloud.refresh.on-restart.enabled=false")
-				.run(context -> assertThat(context).doesNotHaveBean("refreshScopeLifecycle"));
-	}
-
 	@Configuration(proxyBeanMethods = false)
 	@EnableAutoConfiguration(exclude = DataSourceAutoConfiguration.class)
 	@EnableConfigurationProperties({ SealedConfigProps.class, CountingConfigProps.class })

spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java

@@ -32,11 +32,9 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.context.properties.bind.Bindable;
 import org.springframework.boot.context.properties.bind.Binder;
-import org.springframework.cloud.bootstrap.BootstrapApplicationListener;
 import org.springframework.cloud.bootstrap.TestHigherPriorityBootstrapConfiguration;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.AbstractEnvironment;
 import org.springframework.core.env.CompositePropertySource;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.Environment;
@@ -78,20 +76,11 @@ public class BootstrapConfigurationTests {
 	@Test
 	public void pickupOnlyExternalBootstrapProperties() {
 		String externalPropertiesPath = getExternalProperties();
-		pickupOnlyExternalBootstrapProperties("spring.cloud.bootstrap.location=" + externalPropertiesPath,
-				"spring.config.use-legacy-processing=true");
-	}
-
-	@Test
-	public void pickupOnlyExternalBootstrapPropertiesWithAppListener() {
-		String externalPropertiesPath = getExternalProperties();
-		pickupOnlyExternalBootstrapProperties("spring.cloud.bootstrap.location=" + externalPropertiesPath,
-				"spring.config.use-legacy-processing=true", "spring.cloud.config.initialize-on-context-refresh=true");
-	}
 
-	private void pickupOnlyExternalBootstrapProperties(String... properties) {
 		this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE).sources(BareConfiguration.class)
-				.properties(properties).run();
+				.properties("spring.cloud.bootstrap.location=" + externalPropertiesPath,
+						"spring.cloud.bootstrap.enabled=true")
+				.run();
 		then(this.context.getEnvironment().getProperty("info.name")).isEqualTo("externalPropertiesInfoName");
 		then(this.context.getEnvironment().getProperty("info.desc")).isNull();
 		then(this.context.getEnvironment().getPropertySources()
@@ -102,22 +91,11 @@ public class BootstrapConfigurationTests {
 	@Test
 	public void pickupAdditionalExternalBootstrapProperties() {
 		String externalPropertiesPath = getExternalProperties();
-		pickupAdditionalExternalBootstrapProperties(
-				"spring.cloud.bootstrap.additional-location=" + externalPropertiesPath,
-				"spring.config.use-legacy-processing=true");
-	}
-
-	@Test
-	public void pickupAdditionalExternalBootstrapPropertiesWithAppListener() {
-		String externalPropertiesPath = getExternalProperties();
-		pickupAdditionalExternalBootstrapProperties(
-				"spring.cloud.bootstrap.additional-location=" + externalPropertiesPath,
-				"spring.config.use-legacy-processing=true", "spring.cloud.config.initialize-on-context-refresh=true");
-	}
 
-	private void pickupAdditionalExternalBootstrapProperties(String... properties) {
 		this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE).sources(BareConfiguration.class)
-				.properties(properties).run();
+				.properties("spring.cloud.bootstrap.additional-location=" + externalPropertiesPath,
+						"spring.cloud.bootstrap.enabled=true")
+				.run();
 		then(this.context.getEnvironment().getProperty("info.name")).isEqualTo("externalPropertiesInfoName");
 		then(this.context.getEnvironment().getProperty("info.desc")).isEqualTo("defaultPropertiesInfoDesc");
 		then(this.context.getEnvironment().getPropertySources()
@@ -127,18 +105,9 @@ public class BootstrapConfigurationTests {
 
 	@Test
 	public void bootstrapPropertiesAvailableInInitializer() {
-		bootstrapPropertiesAvailableInInitializer("spring.config.use-legacy-processing=true");
-	}
-
-	@Test
-	public void bootstrapPropertiesAvailableInInitializerWithAppContext() {
-		bootstrapPropertiesAvailableInInitializer("spring.config.use-legacy-processing=true",
-				"spring.cloud.config.initialize-on-context-refresh=true");
-	}
-
-	private void bootstrapPropertiesAvailableInInitializer(String... properties) {
-		this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE).properties(properties)
-				.sources(BareConfiguration.class).initializers(applicationContext -> {
+		this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE)
+				.properties("spring.cloud.bootstrap.enabled=true").sources(BareConfiguration.class)
+				.initializers(applicationContext -> {
 					// This property is defined in bootstrap.properties
 					then(applicationContext.getEnvironment().getProperty("info.name")).isEqualTo("child");
 				}).run();
@@ -159,19 +128,9 @@ public class BootstrapConfigurationTests {
 
 	@Test
 	public void picksUpAdditionalPropertySource() {
-		picksUpAdditionalPropertySource("spring.config.use-legacy-processing=true");
-	}
-
-	@Test
-	public void picksUpAdditionalPropertySourceWithAppContext() {
-		picksUpAdditionalPropertySource("spring.config.use-legacy-processing=true",
-				"spring.cloud.config.initialize-on-context-refresh=true");
-	}
-
-	private void picksUpAdditionalPropertySource(String... properties) {
 		PropertySourceConfiguration.MAP.put("bootstrap.foo", "bar");
-		this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE).properties(properties)
-				.sources(BareConfiguration.class).run();
+		this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE)
+				.properties("spring.cloud.bootstrap.enabled=true").sources(BareConfiguration.class).run();
 		then(this.context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("bar");
 		then(this.context.getEnvironment().getPropertySources()
 				.contains(PropertySourceBootstrapConfiguration.BOOTSTRAP_PROPERTY_SOURCE_NAME + "-testBootstrap"))
@@ -180,77 +139,34 @@ public class BootstrapConfigurationTests {
 
 	@Test
 	public void failsOnPropertySource() {
-		failsOnPropertySource("spring.config.use-legacy-processing=true");
-	}
-
-	@Test
-	public void failsOnPropertySourceWithAppContext() {
-		failsOnPropertySource("spring.config.use-legacy-processing=true",
-				"spring.cloud.config.initialize-on-context-refresh=true");
-	}
-
-	private void failsOnPropertySource(String... properties) {
 		System.setProperty("expected.fail", "true");
-		Throwable throwable = Assertions.assertThrows(RuntimeException.class, () -> {
-			this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE).properties(properties)
-					.sources(BareConfiguration.class).run();
-		});
+		Throwable throwable = Assertions.assertThrows(RuntimeException.class,
+				() -> this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE)
+						.properties("spring.cloud.bootstrap.enabled=true").sources(BareConfiguration.class).run());
 		then(throwable.getMessage().equals("Planned"));
 	}
 
 	@Test
 	public void overrideSystemPropertySourceByDefault() {
-		overrideSystemPropertySourceByDefault("spring.config.use-legacy-processing=true");
-
-	}
-
-	@Test
-	public void overrideSystemPropertySourceByDefaultWithAppContext() {
-		overrideSystemPropertySourceByDefault("spring.config.use-legacy-processing=true",
-				"spring.cloud.config.initialize-on-context-refresh=true");
-
-	}
-
-	private void overrideSystemPropertySourceByDefault(String... properties) {
 		PropertySourceConfiguration.MAP.put("bootstrap.foo", "bar");
 		System.setProperty("bootstrap.foo", "system");
-		this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE).properties(properties)
-				.sources(BareConfiguration.class).run();
+		this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE)
+				.properties("spring.cloud.bootstrap.enabled=true").sources(BareConfiguration.class).run();
 		then(this.context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("bar");
 	}
 
 	@Test
 	public void systemPropertyOverrideFalse() {
-		systemPropertyOverrideFalse("spring.config.use-legacy-processing=true");
-	}
-
-	@Test
-	public void systemPropertyOverrideFalseWithAppContext() {
-		systemPropertyOverrideFalse("spring.config.use-legacy-processing=true",
-				"spring.cloud.config.initialize-on-context-refresh=true");
-	}
-
-	private void systemPropertyOverrideFalse(String... properties) {
 		PropertySourceConfiguration.MAP.put("bootstrap.foo", "bar");
 		PropertySourceConfiguration.MAP.put("spring.cloud.config.overrideSystemProperties", "false");
 		System.setProperty("bootstrap.foo", "system");
-		this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE).properties(properties)
-				.sources(BareConfiguration.class).run();
+		this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE)
+				.properties("spring.cloud.bootstrap.enabled=true").sources(BareConfiguration.class).run();
 		then(this.context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("system");
 	}
 
 	@Test
 	public void systemPropertyOverrideWhenOverrideDisallowed() {
-		systemPropertyOverrideWhenOverrideDisallowed("spring.config.use-legacy-processing=true");
-	}
-
-	@Test
-	public void systemPropertyOverrideWhenOverrideDisallowedWithAppContext() {
-		systemPropertyOverrideWhenOverrideDisallowed("spring.config.use-legacy-processing=true",
-				"spring.cloud.config.initialize-on-context-refresh=true");
-	}
-
-	private void systemPropertyOverrideWhenOverrideDisallowed(String... properties) {
 		PropertySourceConfiguration.MAP.put("bootstrap.foo", "bar");
 		PropertySourceConfiguration.MAP.put("spring.cloud.config.overrideSystemProperties", "false");
 		// If spring.cloud.config.allowOverride=false is in the remote property sources
@@ -258,71 +174,42 @@ public class BootstrapConfigurationTests {
 		// their own remote property source.
 		PropertySourceConfiguration.MAP.put("spring.cloud.config.allowOverride", "false");
 		System.setProperty("bootstrap.foo", "system");
-		this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE).properties(properties)
-				.sources(BareConfiguration.class).run();
+		this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE)
+				.properties("spring.cloud.bootstrap.enabled=true").sources(BareConfiguration.class).run();
 		then(this.context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("bar");
 	}
 
 	@Test
 	public void systemPropertyOverrideFalseWhenOverrideAllowed() {
-		systemPropertyOverrideFalseWhenOverrideAllowed("spring.config.use-legacy-processing=true");
-	}
-
-	@Test
-	public void systemPropertyOverrideFalseWhenOverrideAllowedWithAppContext() {
-		systemPropertyOverrideFalseWhenOverrideAllowed("spring.config.use-legacy-processing=true",
-				"spring.cloud.config.initialize-on-context-refresh=true");
-	}
-
-	private void systemPropertyOverrideFalseWhenOverrideAllowed(String... properties) {
 		PropertySourceConfiguration.MAP.put("bootstrap.foo", "bar");
 		PropertySourceConfiguration.MAP.put("spring.cloud.config.overrideSystemProperties", "false");
 		PropertySourceConfiguration.MAP.put("spring.cloud.config.allowOverride", "true");
 		System.setProperty("bootstrap.foo", "system");
-		this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE).properties(properties)
-				.sources(BareConfiguration.class).run();
+		this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE)
+				.properties("spring.cloud.bootstrap.enabled=true").sources(BareConfiguration.class).run();
 		then(this.context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("system");
 	}
 
 	@Test
 	public void overrideAllWhenOverrideAllowed() {
-		overrideAllWhenOverrideAllowed("spring.config.use-legacy-processing=true");
-	}
-
-	@Test
-	public void overrideAllWhenOverrideAllowedWithAppContext() {
-		overrideAllWhenOverrideAllowed("spring.config.use-legacy-processing=true",
-				"spring.cloud.config.initialize-on-context-refresh=true");
-	}
-
-	private void overrideAllWhenOverrideAllowed(String... properties) {
 		PropertySourceConfiguration.MAP.put("bootstrap.foo", "bar");
 		PropertySourceConfiguration.MAP.put("spring.cloud.config.overrideNone", "true");
 		PropertySourceConfiguration.MAP.put("spring.cloud.config.allowOverride", "true");
 		ConfigurableEnvironment environment = new StandardEnvironment();
-		environment.getPropertySources().addLast(
-				new MapPropertySource("last", Collections.<String, Object>singletonMap("bootstrap.foo", "splat")));
-		this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE).properties(properties)
-				.environment(environment).sources(BareConfiguration.class).run();
+		environment.getPropertySources()
+				.addLast(new MapPropertySource("last", Collections.singletonMap("bootstrap.foo", "splat")));
+		this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE)
+				.properties("spring.cloud.bootstrap.enabled=true").environment(environment)
+				.sources(BareConfiguration.class).run();
 		then(this.context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("splat");
 	}
 
 	@Test
 	public void applicationNameInBootstrapAndMain() {
-		applicationNameInBootstrapAndMain("spring.cloud.bootstrap.name:other",
-				"spring.config.use-legacy-processing=true", "spring.config.name:plain");
-	}
-
-	@Test
-	public void applicationNameInBootstrapAndMainWithAppContext() {
-		applicationNameInBootstrapAndMain("spring.cloud.bootstrap.name:other",
-				"spring.config.use-legacy-processing=true", "spring.config.name:plain",
-				"spring.cloud.config.initialize-on-context-refresh=true");
-	}
-
-	private void applicationNameInBootstrapAndMain(String... properties) {
 		System.setProperty("expected.name", "main");
-		this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE).properties(properties)
+		this.context = new SpringApplicationBuilder()
+				.web(WebApplicationType.NONE).properties("spring.cloud.bootstrap.name:other",
+						"spring.cloud.bootstrap.enabled=true", "spring.config.name:plain")
 				.sources(BareConfiguration.class).run();
 		then(this.context.getEnvironment().getProperty("spring.application.name")).isEqualTo("app");
 		// The parent is called "main" because spring.application.name is specified in
@@ -336,20 +223,10 @@ public class BootstrapConfigurationTests {
 
 	@Test
 	public void applicationNameNotInBootstrap() {
-		applicationNameNotInBootstrap("spring.cloud.bootstrap.name:application",
-				"spring.config.use-legacy-processing=true", "spring.config.name:other");
-	}
-
-	@Test
-	public void applicationNameNotInBootstrapWithAppContext() {
-		applicationNameNotInBootstrap("spring.cloud.bootstrap.name:application",
-				"spring.config.use-legacy-processing=true", "spring.config.name:other",
-				"spring.cloud.config.initialize-on-context-refresh=true");
-	}
-
-	private void applicationNameNotInBootstrap(String... properties) {
 		System.setProperty("expected.name", "main");
-		this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE).properties(properties)
+		this.context = new SpringApplicationBuilder()
+				.web(WebApplicationType.NONE).properties("spring.cloud.bootstrap.name:application",
+						"spring.cloud.bootstrap.enabled=true", "spring.config.name:other")
 				.sources(BareConfiguration.class).run();
 		then(this.context.getEnvironment().getProperty("spring.application.name")).isEqualTo("main");
 		// The parent has no name because spring.application.name is not
@@ -359,18 +236,9 @@ public class BootstrapConfigurationTests {
 
 	@Test
 	public void applicationNameOnlyInBootstrap() {
-		applicationNameOnlyInBootstrap("spring.cloud.bootstrap.name:other", "spring.config.use-legacy-processing=true");
-	}
-
-	@Test
-	public void applicationNameOnlyInBootstrapWithAppContext() {
-		applicationNameOnlyInBootstrap("spring.cloud.bootstrap.name:other", "spring.config.use-legacy-processing=true",
-				"spring.cloud.config.initialize-on-context-refresh=true");
-	}
-
-	private void applicationNameOnlyInBootstrap(String... properties) {
 		System.setProperty("expected.name", "main");
-		this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE).properties(properties)
+		this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE)
+				.properties("spring.cloud.bootstrap.name:other", "spring.cloud.bootstrap.enabled=true")
 				.sources(BareConfiguration.class).run();
 		// The main context is called "main" because spring.application.name is specified
 		// in other.properties (and not in the main config file)
@@ -383,20 +251,10 @@ public class BootstrapConfigurationTests {
 
 	@Test
 	public void environmentEnrichedOnceWhenSharedWithChildContext() {
-		environmentEnrichedOnceWhenSharedWithChildContext("spring.config.use-legacy-processing=true");
-	}
-
-	@Test
-	public void environmentEnrichedOnceWhenSharedWithChildContextWithAppContext() {
-		environmentEnrichedOnceWhenSharedWithChildContext("spring.config.use-legacy-processing=true",
-				"spring.cloud.config.initialize-on-context-refresh=true");
-	}
-
-	private void environmentEnrichedOnceWhenSharedWithChildContext(String... properties) {
 		PropertySourceConfiguration.MAP.put("bootstrap.foo", "bar");
-		this.context = new SpringApplicationBuilder().sources(BareConfiguration.class).properties(properties)
-				.environment(new StandardEnvironment()).child(BareConfiguration.class).web(WebApplicationType.NONE)
-				.run();
+		this.context = new SpringApplicationBuilder().sources(BareConfiguration.class)
+				.properties("spring.cloud.bootstrap.enabled=true").environment(new StandardEnvironment())
+				.child(BareConfiguration.class).web(WebApplicationType.NONE).run();
 		then(this.context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("bar");
 		then(this.context.getParent().getEnvironment()).isEqualTo(this.context.getEnvironment());
 		MutablePropertySources sources = this.context.getEnvironment().getPropertySources();
@@ -408,20 +266,11 @@ public class BootstrapConfigurationTests {
 
 	@Test
 	public void onlyOneBootstrapContext() {
-		onlyOneBootstrapContext("spring.config.use-legacy-processing=true");
-	}
-
-	@Test
-	public void onlyOneBootstrapContextWithAppContext() {
-		onlyOneBootstrapContext("spring.config.use-legacy-processing=true",
-				"spring.cloud.config.initialize-on-context-refresh=true");
-	}
-
-	private void onlyOneBootstrapContext(String... properties) {
 		TestHigherPriorityBootstrapConfiguration.count.set(0);
 		PropertySourceConfiguration.MAP.put("bootstrap.foo", "bar");
-		this.context = new SpringApplicationBuilder().sources(BareConfiguration.class).properties(properties)
-				.child(BareConfiguration.class).web(WebApplicationType.NONE).run();
+		this.context = new SpringApplicationBuilder().sources(BareConfiguration.class)
+				.properties("spring.cloud.bootstrap.enabled=true").child(BareConfiguration.class)
+				.web(WebApplicationType.NONE).run();
 		then(TestHigherPriorityBootstrapConfiguration.count.get()).isEqualTo(1);
 		then(this.context.getParent()).isNotNull();
 		then(this.context.getParent().getParent().getId()).isEqualTo("bootstrap");
@@ -431,18 +280,9 @@ public class BootstrapConfigurationTests {
 
 	@Test
 	public void listOverride() {
-		listOverride("spring.config.use-legacy-processing=true");
-	}
-
-	@Test
-	public void listOverrideWithAppContext() {
-		listOverride("spring.config.use-legacy-processing=true",
-				"spring.cloud.config.initialize-on-context-refresh=true");
-	}
-
-	private void listOverride(String... properties) {
-		this.context = new SpringApplicationBuilder().sources(BareConfiguration.class).properties(properties)
-				.child(BareConfiguration.class).web(WebApplicationType.NONE).run();
+		this.context = new SpringApplicationBuilder().sources(BareConfiguration.class)
+				.properties("spring.cloud.bootstrap.enabled=true").child(BareConfiguration.class)
+				.web(WebApplicationType.NONE).run();
 		ListProperties listProperties = new ListProperties();
 		Binder.get(this.context.getEnvironment()).bind("list", Bindable.ofInstance(listProperties));
 		then(listProperties.getFoo().size()).isEqualTo(1);
@@ -451,20 +291,10 @@ public class BootstrapConfigurationTests {
 
 	@Test
 	public void bootstrapContextSharedBySiblings() {
-		bootstrapContextSharedBySiblings("spring.config.use-legacy-processing=true");
-	}
-
-	@Test
-	public void bootstrapContextSharedBySiblingsWithAppContext() {
-		bootstrapContextSharedBySiblings("spring.config.use-legacy-processing=true",
-				"spring.cloud.config.initialize-on-context-refresh=true");
-	}
-
-	private void bootstrapContextSharedBySiblings(String... properties) {
 		TestHigherPriorityBootstrapConfiguration.count.set(0);
 		PropertySourceConfiguration.MAP.put("bootstrap.foo", "bar");
-		SpringApplicationBuilder builder = new SpringApplicationBuilder().properties(properties)
-				.sources(BareConfiguration.class);
+		SpringApplicationBuilder builder = new SpringApplicationBuilder()
+				.properties("spring.cloud.bootstrap.enabled=true").sources(BareConfiguration.class);
 		this.sibling = builder.child(BareConfiguration.class).properties("spring.application.name=sibling")
 				.web(WebApplicationType.NONE).run();
 		this.context = builder.child(BareConfiguration.class).properties("spring.application.name=context")
@@ -484,19 +314,10 @@ public class BootstrapConfigurationTests {
 
 	@Test
 	public void environmentEnrichedInParentContext() {
-		environmentEnrichedInParentContext("spring.config.use-legacy-processing=true");
-	}
-
-	@Test
-	public void environmentEnrichedInParentContextWithAppContext() {
-		environmentEnrichedInParentContext("spring.config.use-legacy-processing=true",
-				"spring.cloud.config.initialize-on-context-refresh=true");
-	}
-
-	private void environmentEnrichedInParentContext(String... properties) {
 		PropertySourceConfiguration.MAP.put("bootstrap.foo", "bar");
-		this.context = new SpringApplicationBuilder().sources(BareConfiguration.class).properties(properties)
-				.child(BareConfiguration.class).web(WebApplicationType.NONE).run();
+		this.context = new SpringApplicationBuilder().sources(BareConfiguration.class)
+				.properties("spring.cloud.bootstrap.enabled=true").child(BareConfiguration.class)
+				.web(WebApplicationType.NONE).run();
 		then(this.context.getEnvironment().getProperty("bootstrap.foo")).isEqualTo("bar");
 		then(this.context.getParent().getEnvironment()).isNotSameAs(this.context.getEnvironment());
 		then(this.context.getEnvironment().getPropertySources()
@@ -515,7 +336,7 @@ public class BootstrapConfigurationTests {
 		ConfigurableApplicationContext parent = new SpringApplicationBuilder().sources(BareConfiguration.class)
 				.profiles("parent").web(WebApplicationType.NONE).run();
 		this.context = new SpringApplicationBuilder(BareConfiguration.class)
-				.properties("spring.config.use-legacy-processing=true").profiles("child").parent(parent)
+				.properties("spring.cloud.bootstrap.enabled=true").profiles("child").parent(parent)
 				.web(WebApplicationType.NONE).run();
 		then(this.context.getParent().getEnvironment()).isNotSameAs(this.context.getEnvironment());
 		// The ApplicationContext merges profiles (profiles and property sources), see
@@ -539,140 +360,29 @@ public class BootstrapConfigurationTests {
 
 	@Test
 	public void includeProfileFromBootstrapPropertySource() {
-		includeProfileFromBootstrapPropertySource("spring.config.use-legacy-processing=true");
-	}
-
-	@Test
-	public void includeProfileFromBootstrapPropertySourceWithAppContext() {
-		includeProfileFromBootstrapPropertySource("spring.config.use-legacy-processing=true",
-				"spring.cloud.config.initialize-on-context-refresh=true");
-	}
-
-	private void includeProfileFromBootstrapPropertySource(String... properties) {
 		PropertySourceConfiguration.MAP.put("spring.profiles.include", "bar,baz");
-		this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE).properties(properties)
-				.profiles("foo").sources(BareConfiguration.class).run();
+		this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE)
+				.properties("spring.cloud.bootstrap.enabled=true").profiles("foo").sources(BareConfiguration.class)
+				.run();
 		then(this.context.getEnvironment().acceptsProfiles("baz")).isTrue();
 		then(this.context.getEnvironment().acceptsProfiles("bar")).isTrue();
 	}
 
-	@Test
-	public void activeProfileFromBootstrapPropertySource() {
-		activeProfileFromBootstrapPropertySource("spring.config.use-legacy-processing=true");
-		then(this.context.getEnvironment().getActiveProfiles()).contains("foo");
-	}
-
-	@Test
-	public void activeProfileFromBootstrapPropertySourceWithAppContext() {
-		activeProfileFromBootstrapPropertySource("spring.config.use-legacy-processing=true",
-				"spring.cloud.config.initialize-on-context-refresh=true");
-		then(this.context.getEnvironment().getActiveProfiles()).doesNotContain("after");
-		then(this.context.getEnvironment().getActiveProfiles()).contains("baz", "bar", "foo");
-	}
-
-	private void activeProfileFromBootstrapPropertySource(String... properties) {
-		PropertySourceConfiguration.MAP.put("spring.profiles.active", "bar,baz");
-		this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE).properties(properties)
-				.profiles("foo").sources(BareConfiguration.class).run();
-		then(this.context.getEnvironment().acceptsProfiles("baz", "bar", "foo")).isTrue();
-
-	}
-
-	@Test
-	public void activeAndIncludeProfileFromBootstrapPropertySource() {
-		activeAndIncludeProfileFromBootstrapPropertySource("spring.config.use-legacy-processing=true");
-	}
-
-	@Test
-	public void activeAndIncludeProfileFromBootstrapPropertySourceWithAppContext() {
-		activeAndIncludeProfileFromBootstrapPropertySource("spring.config.use-legacy-processing=true",
-				"spring.cloud.config.initialize-on-context-refresh=true");
-	}
-
-	private void activeAndIncludeProfileFromBootstrapPropertySource(String... properties) {
-		PropertySourceConfiguration.MAP.put("spring.profiles.active", "bar,baz");
-		PropertySourceConfiguration.MAP.put("spring.profiles.include", "bar,baz,hello");
-		this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE).properties(properties)
-				.profiles("foo").sources(BareConfiguration.class).run();
-		then(this.context.getEnvironment().acceptsProfiles("baz", "bar", "hello", "foo")).isTrue();
-		then(this.context.getEnvironment().getActiveProfiles()).contains("baz", "bar", "foo", "hello");
-	}
-
-	@Test
-	public void activeAndIncludeProfileFromBootstrapPropertySourceWithReplacement() {
-		activeAndIncludeProfileFromBootstrapPropertySourceWithReplacement("spring.config.use-legacy-processing=true",
-				"barreplacement=bar");
-	}
-
-	@Test
-	public void activeAndIncludeProfileFromBootstrapPropertySourceWithReplacementWithAppContext() {
-		activeAndIncludeProfileFromBootstrapPropertySourceWithReplacement("spring.config.use-legacy-processing=true",
-				"barreplacement=bar", "spring.cloud.config.initialize-on-context-refresh=true");
-	}
-
-	private void activeAndIncludeProfileFromBootstrapPropertySourceWithReplacement(String... properties) {
-		PropertySourceConfiguration.MAP.put("spring.profiles.active", "${barreplacement},baz");
-		PropertySourceConfiguration.MAP.put("spring.profiles.include", "${barreplacement},baz,hello");
-		this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE).properties(properties)
-				.profiles("foo").sources(BareConfiguration.class).run();
-		then(this.context.getEnvironment().acceptsProfiles("baz", "bar", "hello", "foo")).isTrue();
-		then(this.context.getEnvironment().getActiveProfiles()).contains("baz", "bar", "foo", "hello");
-	}
-
 	@Test
 	public void includeProfileFromBootstrapProperties() {
-		includeProfileFromBootstrapProperties("spring.config.use-legacy-processing=true",
-				"spring.cloud.bootstrap.name=local");
-	}
-
-	@Test
-	public void includeProfileFromBootstrapPropertiesWithAppContext() {
-		includeProfileFromBootstrapProperties("spring.config.use-legacy-processing=true",
-				"spring.cloud.bootstrap.name=local", "spring.cloud.config.initialize-on-context-refresh=true");
-	}
-
-	private void includeProfileFromBootstrapProperties(String... properties) {
 		this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE).sources(BareConfiguration.class)
-				.properties(properties).run();
+				.properties("spring.cloud.bootstrap.enabled=true", "spring.cloud.bootstrap.name=local").run();
 		then(this.context.getEnvironment().acceptsProfiles("local")).isTrue();
 		then(this.context.getEnvironment().getProperty("added")).isEqualTo("Hello added!");
 	}
 
 	@Test
 	public void nonEnumerablePropertySourceWorks() {
-		nonEnumerablePropertySourceWorks("spring.config.use-legacy-processing=true",
-				"spring.cloud.bootstrap.name=nonenumerable");
-	}
-
-	@Test
-	public void nonEnumerablePropertySourceWorksWithAppContext() {
-		nonEnumerablePropertySourceWorks("spring.config.use-legacy-processing=true",
-				"spring.cloud.bootstrap.name=nonenumerable", "spring.cloud.config.initialize-on-context-refresh=true");
-	}
-
-	private void nonEnumerablePropertySourceWorks(String... properties) {
 		this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE).sources(BareConfiguration.class)
-				.properties(properties).run();
+				.properties("spring.cloud.bootstrap.enabled=true", "spring.cloud.bootstrap.name=nonenumerable").run();
 		then(this.context.getEnvironment().getProperty("foo")).isEqualTo("bar");
 	}
 
-	@Test
-	void activeAndIncludeProfileFromBootstrapPropertySource_WhenMultiplePlacesHaveActiveProfileProperties_ShouldOnlyAcceptTheTopPriority() {
-		String[] properties = new String[] { "spring.config.use-legacy-processing=true" };
-		this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE).properties(properties)
-				.sources(BareConfiguration.class).run("--spring.profiles.active=prod,secure");
-		then(this.context.getEnvironment().acceptsProfiles("prod", "secure")).isTrue();
-		// active profile from property sources with lower priority should not be included
-		then(this.context.getEnvironment().acceptsProfiles("local")).isFalse();
-		then(this.context.getEnvironment().getActiveProfiles()).contains("prod", "secure");
-		then(this.context.getEnvironment().getActiveProfiles()).doesNotContain("local");
-		// check if active profile value could possibly exist in other property sources
-		// with lower priority
-		then(this.context.getEnvironment().getPropertySources().stream()
-				.map(p -> p.getProperty(AbstractEnvironment.ACTIVE_PROFILES_PROPERTY_NAME)).anyMatch("local"::equals))
-						.isTrue();
-	}
-
 	@Configuration(proxyBeanMethods = false)
 	@EnableConfigurationProperties
 	protected static class BareConfiguration {
@@ -709,24 +419,12 @@ public class BootstrapConfigurationTests {
 
 		@Override
 		public PropertySource<?> locate(Environment environment) {
-			if (environment instanceof ConfigurableEnvironment) {
-				if (!((ConfigurableEnvironment) environment).getPropertySources()
-						.contains(BootstrapApplicationListener.BOOTSTRAP_PROPERTY_SOURCE_NAME)) {
-					if (MAP.containsKey(AbstractEnvironment.ACTIVE_PROFILES_PROPERTY_NAME)) {
-						// This additional profile, after, should not be added when
-						// initialize-on-context-refresh=true
-						MAP.put(AbstractEnvironment.ACTIVE_PROFILES_PROPERTY_NAME,
-								MAP.get(AbstractEnvironment.ACTIVE_PROFILES_PROPERTY_NAME) + ",after");
-					}
-				}
-			}
 			if (this.name != null) {
 				then(this.name).isEqualTo(environment.getProperty("spring.application.name"));
 			}
 			if (this.fail) {
 				throw new RuntimeException("Planned");
 			}
-
 			return new MapPropertySource("testBootstrap", MAP);
 		}
 

spring-cloud-context/src/test/java/org/springframework/cloud/context/properties/ConfigurationPropertiesRebinderIntegrationTests.java

@@ -17,7 +17,6 @@
 package org.springframework.cloud.context.properties;
 
 import org.aopalliance.intercept.MethodInterceptor;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.framework.ProxyFactory;
@@ -43,8 +42,6 @@ import static org.assertj.core.api.BDDAssertions.then;
 
 @SpringBootTest(classes = TestConfiguration.class, properties = "spring.cloud.bootstrap.enabled=true")
 @ActiveProfiles("config")
-// TODO: fix and enable back
-@Disabled
 public class ConfigurationPropertiesRebinderIntegrationTests {
 
 	@Autowired
@@ -180,18 +177,8 @@ public class ConfigurationPropertiesRebinderIntegrationTests {
 
 	}
 
-	@Configuration
-	public static class ConfigPropertiesConfig {
-
-		@Bean
-		@ConditionalOnMissingBean(ConfigProperties.class)
-		public ConfigProperties configProperties() {
-			return new ConfigProperties();
-		}
-
-	}
-
 	@ConfigurationProperties("config")
+	@ConditionalOnMissingBean(ConfigProperties.class)
 	public static class ConfigProperties {
 
 		private String name;

spring-cloud-context/src/test/java/org/springframework/cloud/context/refresh/RefreshScopeLifecycleTests.java

@@ -1,51 +0,0 @@
-/*
- * Copyright 2012-2023 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
- *
- *      https://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.context.refresh;
-
-import org.junit.jupiter.api.Test;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
-
-/**
- * Tests for {@link RefreshScopeLifecycle}.
- *
- * @author Olga Maciaszek-Sharma
- */
-class RefreshScopeLifecycleTests {
-
-	ContextRefresher contextRefresher = mock();
-
-	private final RefreshScopeLifecycle lifecycle = new RefreshScopeLifecycle(contextRefresher);
-
-	@Test
-	void shouldRefreshContextOnRestart() {
-		lifecycle.stop();
-		lifecycle.start();
-
-		verify(contextRefresher).refresh();
-	}
-
-	@Test
-	void shouldNotRefreshContextOnStart() {
-		lifecycle.start();
-
-		verifyNoInteractions(contextRefresher);
-	}
-
-}

spring-cloud-context/src/test/java/org/springframework/cloud/context/restart/RestartIntegrationTests.java

@@ -30,6 +30,10 @@ public class RestartIntegrationTests {
 
 	private ConfigurableApplicationContext context;
 
+	public static void main(String[] args) {
+		SpringApplication.run(TestConfiguration.class, args);
+	}
+
 	@AfterEach
 	public void close() {
 		if (this.context != null) {

spring-cloud-context/src/test/resources/application.properties

@@ -8,4 +8,3 @@ debug:true
 logging.level.org.hibernate=ERROR
 logging.level.com.zaxxer.hikari=ERROR
 myplaceholder=${vcap.services.myvcap.myvar}
-spring.profiles.active=local

spring-cloud-context/src/test/resources/bootstrap-config.properties

@@ -1,2 +1,2 @@
-spring.main.sources:org.springframework.cloud.context.properties.ConfigurationPropertiesRebinderIntegrationTests.ConfigPropertiesConfig
+spring.main.sources:org.springframework.cloud.context.properties.ConfigurationPropertiesRebinderIntegrationTests.ConfigProperties
 config.name:parent

spring-cloud-loadbalancer/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-commons-parent</artifactId>
-		<version>4.1.0-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-loadbalancer</artifactId>

spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -94,7 +94,7 @@ public class LoadBalancerClientConfiguration {
 		@Conditional(ZonePreferenceConfigurationCondition.class)
 		public ServiceInstanceListSupplier zonePreferenceDiscoveryClientServiceInstanceListSupplier(
 				ConfigurableApplicationContext context) {
-			return ServiceInstanceListSupplier.builder().withDiscoveryClient().withCaching().withZonePreference()
+			return ServiceInstanceListSupplier.builder().withDiscoveryClient().withZonePreference().withCaching()
 					.build(context);
 		}
 
@@ -120,8 +120,8 @@ public class LoadBalancerClientConfiguration {
 		@Conditional(RequestBasedStickySessionConfigurationCondition.class)
 		public ServiceInstanceListSupplier requestBasedStickySessionDiscoveryClientServiceInstanceListSupplier(
 				ConfigurableApplicationContext context) {
-			return ServiceInstanceListSupplier.builder().withDiscoveryClient().withCaching()
-					.withRequestBasedStickySession().build(context);
+			return ServiceInstanceListSupplier.builder().withDiscoveryClient().withRequestBasedStickySession()
+					.build(context);
 		}
 
 		@Bean
@@ -130,8 +130,8 @@ public class LoadBalancerClientConfiguration {
 		@Conditional(SameInstancePreferenceConfigurationCondition.class)
 		public ServiceInstanceListSupplier sameInstancePreferenceServiceInstanceListSupplier(
 				ConfigurableApplicationContext context) {
-			return ServiceInstanceListSupplier.builder().withDiscoveryClient().withCaching()
-					.withSameInstancePreference().build(context);
+			return ServiceInstanceListSupplier.builder().withDiscoveryClient().withSameInstancePreference()
+					.build(context);
 		}
 
 		@Bean
@@ -139,8 +139,7 @@ public class LoadBalancerClientConfiguration {
 		@ConditionalOnMissingBean
 		@Conditional(WeightedConfigurationCondition.class)
 		public ServiceInstanceListSupplier weightedServiceInstanceListSupplier(ConfigurableApplicationContext context) {
-			return ServiceInstanceListSupplier.builder().withDiscoveryClient().withCaching().withWeighted()
-					.build(context);
+			return ServiceInstanceListSupplier.builder().withDiscoveryClient().withWeighted().build(context);
 		}
 
 	}
@@ -165,8 +164,8 @@ public class LoadBalancerClientConfiguration {
 		@Conditional(ZonePreferenceConfigurationCondition.class)
 		public ServiceInstanceListSupplier zonePreferenceDiscoveryClientServiceInstanceListSupplier(
 				ConfigurableApplicationContext context) {
-			return ServiceInstanceListSupplier.builder().withBlockingDiscoveryClient().withCaching()
-					.withZonePreference().build(context);
+			return ServiceInstanceListSupplier.builder().withBlockingDiscoveryClient().withZonePreference()
+					.withCaching().build(context);
 		}
 
 		@Bean
@@ -185,8 +184,8 @@ public class LoadBalancerClientConfiguration {
 		@Conditional(RequestBasedStickySessionConfigurationCondition.class)
 		public ServiceInstanceListSupplier requestBasedStickySessionDiscoveryClientServiceInstanceListSupplier(
 				ConfigurableApplicationContext context) {
-			return ServiceInstanceListSupplier.builder().withBlockingDiscoveryClient().withCaching()
-					.withRequestBasedStickySession().build(context);
+			return ServiceInstanceListSupplier.builder().withBlockingDiscoveryClient().withRequestBasedStickySession()
+					.build(context);
 		}
 
 		@Bean
@@ -195,8 +194,8 @@ public class LoadBalancerClientConfiguration {
 		@Conditional(SameInstancePreferenceConfigurationCondition.class)
 		public ServiceInstanceListSupplier sameInstancePreferenceServiceInstanceListSupplier(
 				ConfigurableApplicationContext context) {
-			return ServiceInstanceListSupplier.builder().withBlockingDiscoveryClient().withCaching()
-					.withSameInstancePreference().build(context);
+			return ServiceInstanceListSupplier.builder().withBlockingDiscoveryClient().withSameInstancePreference()
+					.build(context);
 		}
 
 		@Bean
@@ -204,8 +203,7 @@ public class LoadBalancerClientConfiguration {
 		@ConditionalOnMissingBean
 		@Conditional(WeightedConfigurationCondition.class)
 		public ServiceInstanceListSupplier weightedServiceInstanceListSupplier(ConfigurableApplicationContext context) {
-			return ServiceInstanceListSupplier.builder().withBlockingDiscoveryClient().withCaching().withWeighted()
-					.build(context);
+			return ServiceInstanceListSupplier.builder().withBlockingDiscoveryClient().withWeighted().build(context);
 		}
 
 	}

spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/DelegatingServiceInstanceListSupplier.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-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,7 +18,6 @@ package org.springframework.cloud.loadbalancer.core;
 
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.util.Assert;
 
 /**
@@ -27,10 +26,9 @@ import org.springframework.util.Assert;
  *
  * @author Spencer Gibb
  * @author Olga Maciaszek-Sharma
- * @author Jürgen Kreitler
  */
 public abstract class DelegatingServiceInstanceListSupplier
-		implements ServiceInstanceListSupplier, SelectedInstanceCallback, InitializingBean, DisposableBean {
+		implements ServiceInstanceListSupplier, InitializingBean, DisposableBean {
 
 	protected final ServiceInstanceListSupplier delegate;
 
@@ -40,19 +38,12 @@ public abstract class DelegatingServiceInstanceListSupplier
 	}
 
 	public ServiceInstanceListSupplier getDelegate() {
-		return delegate;
+		return this.delegate;
 	}
 
 	@Override
 	public String getServiceId() {
-		return delegate.getServiceId();
-	}
-
-	@Override
-	public void selectedServiceInstance(ServiceInstance serviceInstance) {
-		if (delegate instanceof SelectedInstanceCallback selectedInstanceCallbackDelegate) {
-			selectedInstanceCallbackDelegate.selectedServiceInstance(serviceInstance);
-		}
+		return this.delegate.getServiceId();
 	}
 
 	@Override

spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/SameInstancePreferenceServiceInstanceListSupplier.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2020 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,15 +24,12 @@ import org.apache.commons.logging.LogFactory;
 import reactor.core.publisher.Flux;
 
 import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.client.loadbalancer.Request;
-import org.springframework.cloud.client.loadbalancer.reactive.ReactiveLoadBalancer;
 
 /**
  * An implementation of {@link ServiceInstanceListSupplier} that selects the previously
  * chosen instance if it's available.
  *
  * @author Olga Maciaszek-Sharma
- * @author Jürgen Kreitler
  * @since 2.2.7
  */
 public class SameInstancePreferenceServiceInstanceListSupplier extends DelegatingServiceInstanceListSupplier
@@ -42,19 +39,10 @@ public class SameInstancePreferenceServiceInstanceListSupplier extends Delegatin
 
 	private ServiceInstance previouslyReturnedInstance;
 
-	private boolean callGetWithRequestOnDelegates;
-
 	public SameInstancePreferenceServiceInstanceListSupplier(ServiceInstanceListSupplier delegate) {
 		super(delegate);
 	}
 
-	public SameInstancePreferenceServiceInstanceListSupplier(ServiceInstanceListSupplier delegate,
-			ReactiveLoadBalancer.Factory<ServiceInstance> loadBalancerClientFactory) {
-		super(delegate);
-		callGetWithRequestOnDelegates = loadBalancerClientFactory.getProperties(getServiceId())
-				.isCallGetWithRequestOnDelegates();
-	}
-
 	@Override
 	public String getServiceId() {
 		return delegate.getServiceId();
@@ -65,14 +53,6 @@ public class SameInstancePreferenceServiceInstanceListSupplier extends Delegatin
 		return delegate.get().map(this::filteredBySameInstancePreference);
 	}
 
-	@Override
-	public Flux<List<ServiceInstance>> get(Request request) {
-		if (callGetWithRequestOnDelegates) {
-			return delegate.get(request).map(this::filteredBySameInstancePreference);
-		}
-		return get();
-	}
-
 	private List<ServiceInstance> filteredBySameInstancePreference(List<ServiceInstance> serviceInstances) {
 		if (previouslyReturnedInstance != null && serviceInstances.contains(previouslyReturnedInstance)) {
 			if (LOG.isDebugEnabled()) {
@@ -92,7 +72,6 @@ public class SameInstancePreferenceServiceInstanceListSupplier extends Delegatin
 
 	@Override
 	public void selectedServiceInstance(ServiceInstance serviceInstance) {
-		super.selectedServiceInstance(serviceInstance);
 		if (previouslyReturnedInstance == null || !previouslyReturnedInstance.equals(serviceInstance)) {
 			previouslyReturnedInstance = serviceInstance;
 		}

spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/ServiceInstanceListSupplierBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-2020 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.
@@ -58,6 +58,8 @@ public final class ServiceInstanceListSupplierBuilder {
 
 	private Creator baseCreator;
 
+	private DelegateCreator cachingCreator;
+
 	private final List<DelegateCreator> creators = new ArrayList<>();
 
 	ServiceInstanceListSupplierBuilder() {
@@ -116,11 +118,7 @@ public final class ServiceInstanceListSupplierBuilder {
 	 * @return the {@link ServiceInstanceListSupplierBuilder} object
 	 */
 	public ServiceInstanceListSupplierBuilder withWeighted() {
-		DelegateCreator creator = (context, delegate) -> {
-			ReactiveLoadBalancer.Factory<ServiceInstance> loadBalancerClientFactory = context
-					.getBean(LoadBalancerClientFactory.class);
-			return new WeightedServiceInstanceListSupplier(delegate, loadBalancerClientFactory);
-		};
+		DelegateCreator creator = (context, delegate) -> new WeightedServiceInstanceListSupplier(delegate);
 		this.creators.add(creator);
 		return this;
 	}
@@ -133,11 +131,8 @@ public final class ServiceInstanceListSupplierBuilder {
 	 * @return the {@link ServiceInstanceListSupplierBuilder} object
 	 */
 	public ServiceInstanceListSupplierBuilder withWeighted(WeightFunction weightFunction) {
-		DelegateCreator creator = (context, delegate) -> {
-			ReactiveLoadBalancer.Factory<ServiceInstance> loadBalancerClientFactory = context
-					.getBean(LoadBalancerClientFactory.class);
-			return new WeightedServiceInstanceListSupplier(delegate, weightFunction, loadBalancerClientFactory);
-		};
+		DelegateCreator creator = (context, delegate) -> new WeightedServiceInstanceListSupplier(delegate,
+				weightFunction);
 		this.creators.add(creator);
 		return this;
 	}
@@ -179,10 +174,8 @@ public final class ServiceInstanceListSupplierBuilder {
 	 * @return the {@link ServiceInstanceListSupplierBuilder} object
 	 */
 	public ServiceInstanceListSupplierBuilder withSameInstancePreference() {
-		DelegateCreator creator = (context, delegate) -> {
-			LoadBalancerClientFactory loadBalancerClientFactory = context.getBean(LoadBalancerClientFactory.class);
-			return new SameInstancePreferenceServiceInstanceListSupplier(delegate, loadBalancerClientFactory);
-		};
+		DelegateCreator creator = (context,
+				delegate) -> new SameInstancePreferenceServiceInstanceListSupplier(delegate);
 		this.creators.add(creator);
 		return this;
 	}
@@ -224,9 +217,8 @@ public final class ServiceInstanceListSupplierBuilder {
 	 */
 	public ServiceInstanceListSupplierBuilder withZonePreference() {
 		DelegateCreator creator = (context, delegate) -> {
-			LoadBalancerClientFactory loadBalancerClientFactory = context.getBean(LoadBalancerClientFactory.class);
 			LoadBalancerZoneConfig zoneConfig = context.getBean(LoadBalancerZoneConfig.class);
-			return new ZonePreferenceServiceInstanceListSupplier(delegate, zoneConfig, loadBalancerClientFactory);
+			return new ZonePreferenceServiceInstanceListSupplier(delegate, zoneConfig);
 		};
 		this.creators.add(creator);
 		return this;
@@ -240,9 +232,8 @@ public final class ServiceInstanceListSupplierBuilder {
 	 */
 	public ServiceInstanceListSupplierBuilder withZonePreference(String zoneName) {
 		DelegateCreator creator = (context, delegate) -> {
-			LoadBalancerClientFactory loadBalancerClientFactory = context.getBean(LoadBalancerClientFactory.class);
 			LoadBalancerZoneConfig zoneConfig = new LoadBalancerZoneConfig(zoneName);
-			return new ZonePreferenceServiceInstanceListSupplier(delegate, zoneConfig, loadBalancerClientFactory);
+			return new ZonePreferenceServiceInstanceListSupplier(delegate, zoneConfig);
 		};
 		this.creators.add(creator);
 		return this;
@@ -263,15 +254,19 @@ public final class ServiceInstanceListSupplierBuilder {
 	}
 
 	/**
-	 * If {@link LoadBalancerCacheManager} is available in the context, adds a
-	 * {@link CachingServiceInstanceListSupplier} instance to the
-	 * {@link ServiceInstanceListSupplier} hierarchy to provide a caching mechanism for
-	 * service instances. Uses {@link ObjectProvider} to lazily resolve
+	 * If {@link LoadBalancerCacheManager} is available in the context, wraps created
+	 * {@link ServiceInstanceListSupplier} hierarchy with a
+	 * {@link CachingServiceInstanceListSupplier} instance to provide a caching mechanism
+	 * for service instances. Uses {@link ObjectProvider} to lazily resolve
 	 * {@link LoadBalancerCacheManager}.
 	 * @return the {@link ServiceInstanceListSupplierBuilder} object
 	 */
 	public ServiceInstanceListSupplierBuilder withCaching() {
-		DelegateCreator creator = (context, delegate) -> {
+		if (cachingCreator != null && LOG.isWarnEnabled()) {
+			LOG.warn(
+					"Overriding a previously set cachingCreator with a CachingServiceInstanceListSupplier-based cachingCreator.");
+		}
+		this.cachingCreator = (context, delegate) -> {
 			ObjectProvider<LoadBalancerCacheManager> cacheManagerProvider = context
 					.getBeanProvider(LoadBalancerCacheManager.class);
 			if (cacheManagerProvider.getIfAvailable() != null) {
@@ -282,7 +277,6 @@ public final class ServiceInstanceListSupplierBuilder {
 			}
 			return delegate;
 		};
-		creators.add(creator);
 		return this;
 	}
 
@@ -329,6 +323,9 @@ public final class ServiceInstanceListSupplierBuilder {
 			supplier = creator.apply(context, supplier);
 		}
 
+		if (this.cachingCreator != null) {
+			supplier = this.cachingCreator.apply(context, supplier);
+		}
 		return supplier;
 	}
 
@@ -340,7 +337,7 @@ public final class ServiceInstanceListSupplierBuilder {
 						.uri(UriComponentsBuilder.fromUriString(getUri(serviceInstance, healthCheckPath)).build()
 								.toUri())
 						.exchange().flatMap(clientResponse -> clientResponse.releaseBody()
-								.thenReturn(HttpStatus.OK.equals(clientResponse.statusCode()))));
+								.thenReturn(HttpStatus.OK.value() == clientResponse.rawStatusCode())));
 	}
 
 	private ServiceInstanceListSupplier blockingHealthCheckServiceInstanceListSupplier(RestTemplate restTemplate,

spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/WeightedServiceInstanceListSupplier.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2022 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,15 +24,12 @@ import org.apache.commons.logging.LogFactory;
 import reactor.core.publisher.Flux;
 
 import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.client.loadbalancer.Request;
-import org.springframework.cloud.client.loadbalancer.reactive.ReactiveLoadBalancer;
 
 /**
  * A {@link ServiceInstanceListSupplier} implementation that uses weights to expand the
  * instances provided by delegate.
  *
  * @author Zhuozhi Ji
- * @author Olga Maciaszek-Sharma
  */
 public class WeightedServiceInstanceListSupplier extends DelegatingServiceInstanceListSupplier {
 
@@ -44,28 +41,14 @@ public class WeightedServiceInstanceListSupplier extends DelegatingServiceInstan
 
 	private final WeightFunction weightFunction;
 
-	private boolean callGetWithRequestOnDelegates;
-
 	public WeightedServiceInstanceListSupplier(ServiceInstanceListSupplier delegate) {
-		this(delegate, WeightedServiceInstanceListSupplier::metadataWeightFunction);
-	}
-
-	public WeightedServiceInstanceListSupplier(ServiceInstanceListSupplier delegate, WeightFunction weightFunction) {
 		super(delegate);
-		this.weightFunction = weightFunction;
-	}
-
-	public WeightedServiceInstanceListSupplier(ServiceInstanceListSupplier delegate,
-			ReactiveLoadBalancer.Factory<ServiceInstance> loadBalancerClientFactory) {
-		this(delegate, WeightedServiceInstanceListSupplier::metadataWeightFunction, loadBalancerClientFactory);
+		this.weightFunction = WeightedServiceInstanceListSupplier::metadataWeightFunction;
 	}
 
-	public WeightedServiceInstanceListSupplier(ServiceInstanceListSupplier delegate, WeightFunction weightFunction,
-			ReactiveLoadBalancer.Factory<ServiceInstance> loadBalancerClientFactory) {
+	public WeightedServiceInstanceListSupplier(ServiceInstanceListSupplier delegate, WeightFunction weightFunction) {
 		super(delegate);
 		this.weightFunction = weightFunction;
-		callGetWithRequestOnDelegates = loadBalancerClientFactory.getProperties(getServiceId())
-				.isCallGetWithRequestOnDelegates();
 	}
 
 	@Override
@@ -73,14 +56,6 @@ public class WeightedServiceInstanceListSupplier extends DelegatingServiceInstan
 		return delegate.get().map(this::expandByWeight);
 	}
 
-	@Override
-	public Flux<List<ServiceInstance>> get(Request request) {
-		if (callGetWithRequestOnDelegates) {
-			return delegate.get(request).map(this::expandByWeight);
-		}
-		return get();
-	}
-
 	private List<ServiceInstance> expandByWeight(List<ServiceInstance> instances) {
 		if (instances.size() == 0) {
 			return instances;

spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/ZonePreferenceServiceInstanceListSupplier.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2020 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,8 +23,6 @@ import java.util.Map;
 import reactor.core.publisher.Flux;
 
 import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.client.loadbalancer.Request;
-import org.springframework.cloud.client.loadbalancer.reactive.ReactiveLoadBalancer;
 import org.springframework.cloud.loadbalancer.config.LoadBalancerZoneConfig;
 
 /**
@@ -45,36 +43,17 @@ public class ZonePreferenceServiceInstanceListSupplier extends DelegatingService
 
 	private String zone;
 
-	private boolean callGetWithRequestOnDelegates;
-
 	public ZonePreferenceServiceInstanceListSupplier(ServiceInstanceListSupplier delegate,
 			LoadBalancerZoneConfig zoneConfig) {
 		super(delegate);
 		this.zoneConfig = zoneConfig;
 	}
 
-	public ZonePreferenceServiceInstanceListSupplier(ServiceInstanceListSupplier delegate,
-			LoadBalancerZoneConfig zoneConfig,
-			ReactiveLoadBalancer.Factory<ServiceInstance> loadBalancerClientFactory) {
-		super(delegate);
-		this.zoneConfig = zoneConfig;
-		callGetWithRequestOnDelegates = loadBalancerClientFactory.getProperties(getServiceId())
-				.isCallGetWithRequestOnDelegates();
-	}
-
 	@Override
 	public Flux<List<ServiceInstance>> get() {
 		return getDelegate().get().map(this::filteredByZone);
 	}
 
-	@Override
-	public Flux<List<ServiceInstance>> get(Request request) {
-		if (callGetWithRequestOnDelegates) {
-			return getDelegate().get(request).map(this::filteredByZone);
-		}
-		return get();
-	}
-
 	private List<ServiceInstance> filteredByZone(List<ServiceInstance> serviceInstances) {
 		if (zone == null) {
 			zone = zoneConfig.getZone();

spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -93,10 +93,10 @@ class LoadBalancerClientConfigurationTests {
 		reactiveDiscoveryClientRunner.withPropertyValues("spring.cloud.loadbalancer.configurations=zone-preference")
 				.run(context -> {
 					ServiceInstanceListSupplier supplier = context.getBean(ServiceInstanceListSupplier.class);
-					then(supplier).isInstanceOf(ZonePreferenceServiceInstanceListSupplier.class);
+					then(supplier).isInstanceOf(CachingServiceInstanceListSupplier.class);
 					ServiceInstanceListSupplier delegate = ((DelegatingServiceInstanceListSupplier) supplier)
 							.getDelegate();
-					then(delegate).isInstanceOf(CachingServiceInstanceListSupplier.class);
+					then(delegate).isInstanceOf(ZonePreferenceServiceInstanceListSupplier.class);
 					ServiceInstanceListSupplier secondDelegate = ((DelegatingServiceInstanceListSupplier) delegate)
 							.getDelegate();
 					then(secondDelegate).isInstanceOf(DiscoveryClientServiceInstanceListSupplier.class);
@@ -123,10 +123,7 @@ class LoadBalancerClientConfigurationTests {
 					then(supplier).isInstanceOf(WeightedServiceInstanceListSupplier.class);
 					ServiceInstanceListSupplier delegate = ((DelegatingServiceInstanceListSupplier) supplier)
 							.getDelegate();
-					then(delegate).isInstanceOf(CachingServiceInstanceListSupplier.class);
-					ServiceInstanceListSupplier secondDelegate = ((DelegatingServiceInstanceListSupplier) delegate)
-							.getDelegate();
-					then(secondDelegate).isInstanceOf(DiscoveryClientServiceInstanceListSupplier.class);
+					then(delegate).isInstanceOf(DiscoveryClientServiceInstanceListSupplier.class);
 				});
 	}
 
@@ -139,10 +136,7 @@ class LoadBalancerClientConfigurationTests {
 					then(supplier).isInstanceOf(RequestBasedStickySessionServiceInstanceListSupplier.class);
 					ServiceInstanceListSupplier delegate = ((DelegatingServiceInstanceListSupplier) supplier)
 							.getDelegate();
-					then(delegate).isInstanceOf(CachingServiceInstanceListSupplier.class);
-					ServiceInstanceListSupplier secondDelegate = ((DelegatingServiceInstanceListSupplier) delegate)
-							.getDelegate();
-					then(secondDelegate).isInstanceOf(DiscoveryClientServiceInstanceListSupplier.class);
+					then(delegate).isInstanceOf(DiscoveryClientServiceInstanceListSupplier.class);
 				});
 	}
 
@@ -208,10 +202,7 @@ class LoadBalancerClientConfigurationTests {
 				.withPropertyValues("spring.cloud.loadbalancer.configurations=weighted").run(context -> {
 					ServiceInstanceListSupplier supplier = context.getBean(ServiceInstanceListSupplier.class);
 					then(supplier).isInstanceOf(WeightedServiceInstanceListSupplier.class);
-					ServiceInstanceListSupplier delegate = ((DelegatingServiceInstanceListSupplier) supplier)
-							.getDelegate();
-					then(delegate).isInstanceOf(CachingServiceInstanceListSupplier.class);
-					then(((DelegatingServiceInstanceListSupplier) delegate).getDelegate())
+					then(((DelegatingServiceInstanceListSupplier) supplier).getDelegate())
 							.isInstanceOf(DiscoveryClientServiceInstanceListSupplier.class);
 				});
 	}

spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/RetryAwareServiceInstanceListSupplierTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -27,16 +27,11 @@ import org.springframework.cloud.client.loadbalancer.RetryableRequestContext;
 import org.springframework.cloud.loadbalancer.support.ServiceInstanceListSuppliers;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
 
 /**
  * Tests for {@link RetryAwareServiceInstanceListSupplier}.
  *
  * @author Olga Maciaszek-Sharma
- * @author Jürgen Kreitler
  */
 class RetryAwareServiceInstanceListSupplierTests {
 
@@ -83,13 +78,4 @@ class RetryAwareServiceInstanceListSupplierTests {
 		assertThat(returnedInstances).containsExactly(firstInstance);
 	}
 
-	@Test
-	void shouldCallSelectedServiceInstanceOnItsDelegate() {
-		ServiceInstance firstInstance = instance(serviceId, "1host", false);
-		TestSelectedServiceInstanceSupplier delegate = mock(TestSelectedServiceInstanceSupplier.class);
-		DelegatingServiceInstanceListSupplier supplier = new RetryAwareServiceInstanceListSupplier(delegate);
-		supplier.selectedServiceInstance(firstInstance);
-		verify(delegate, times(1)).selectedServiceInstance(any(ServiceInstance.class));
-	}
-
 }

spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/RoundRobinLoadBalancerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -32,13 +32,10 @@ import static java.lang.Integer.MIN_VALUE;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 /**
  * @author Zhuozhi JI
- * @author Jürgen Kreitler
  */
 class RoundRobinLoadBalancerTests {
 
@@ -71,18 +68,6 @@ class RoundRobinLoadBalancerTests {
 		assertThat(loadBalancer.position).hasValue(0);
 	}
 
-	@Test
-	void shouldCallSelectedServiceInstanceIfSupplierOrItsDelegateIsInstanceOf() {
-		TestSelectedServiceInstanceSupplier delegate = mock(TestSelectedServiceInstanceSupplier.class);
-		DelegatingServiceInstanceListSupplier supplier = new RetryAwareServiceInstanceListSupplier(delegate);
-		when(delegate.get(any())).thenReturn(Flux.just(Collections.singletonList(new DefaultServiceInstance())));
-		RoundRobinLoadBalancer loadBalancer = new RoundRobinLoadBalancer(new SimpleObjectProvider<>(supplier),
-				"shouldNotMovePositionIfOnlyOneInstance", 0);
-
-		loadBalancer.choose().block();
-		verify(delegate, times(1)).selectedServiceInstance(any(ServiceInstance.class));
-	}
-
 	@SuppressWarnings("all")
 	void assertOrderEnforced(int seed) {
 		List<ServiceInstance> instances = new ArrayList<>();

spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/SameInstancePreferenceServiceInstanceListSupplierTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -19,39 +19,28 @@ package org.springframework.cloud.loadbalancer.core;
 import java.util.Arrays;
 import java.util.List;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Flux;
 
 import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.client.loadbalancer.DefaultRequest;
-import org.springframework.cloud.client.loadbalancer.DefaultRequestContext;
-import org.springframework.cloud.client.loadbalancer.LoadBalancerProperties;
-import org.springframework.cloud.client.loadbalancer.Request;
-import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 /**
  * Tests for {@link SameInstancePreferenceServiceInstanceListSupplier}.
  *
  * @author Olga Maciaszek-Sharma
- * @author Jürgen Kreitler
  */
 class SameInstancePreferenceServiceInstanceListSupplierTests {
 
 	private final DiscoveryClientServiceInstanceListSupplier delegate = mock(
 			DiscoveryClientServiceInstanceListSupplier.class);
 
-	private final LoadBalancerClientFactory loadBalancerClientFactory = mock(LoadBalancerClientFactory.class);
-
-	private SameInstancePreferenceServiceInstanceListSupplier supplier;
+	private final SameInstancePreferenceServiceInstanceListSupplier supplier = new SameInstancePreferenceServiceInstanceListSupplier(
+			delegate);
 
 	private final ServiceInstance first = serviceInstance("test-1");
 
@@ -59,13 +48,6 @@ class SameInstancePreferenceServiceInstanceListSupplierTests {
 
 	private final ServiceInstance third = serviceInstance("test-3");
 
-	@BeforeEach
-	void setUp() {
-		LoadBalancerProperties properties = new LoadBalancerProperties();
-		when(loadBalancerClientFactory.getProperties(any())).thenReturn(properties);
-		supplier = new SameInstancePreferenceServiceInstanceListSupplier(delegate, loadBalancerClientFactory);
-	}
-
 	@Test
 	void shouldReturnPreviouslySelectedInstanceIfAvailable() {
 		when(delegate.get()).thenReturn(Flux.just(Arrays.asList(first, second, third)));
@@ -87,7 +69,7 @@ class SameInstancePreferenceServiceInstanceListSupplierTests {
 	}
 
 	@Test
-	void shouldReturnAllInstancesFromDelegateIfPreviouslySelectedInstanceIsNotAvailable() {
+	void shouldReturnAllInstancesFromDelegateIfPreviouslySelectedInstanceIfAvailable() {
 		when(delegate.get()).thenReturn(Flux.just(Arrays.asList(second, third)));
 		supplier.selectedServiceInstance(first);
 
@@ -96,27 +78,6 @@ class SameInstancePreferenceServiceInstanceListSupplierTests {
 		assertThat(instances).hasSize(2);
 	}
 
-	@Test
-	void shouldCallGetRequestOnDelegate() {
-		Request<DefaultRequestContext> request = new DefaultRequest<>(new DefaultRequestContext());
-		when(delegate.get()).thenReturn(Flux.just(Arrays.asList(first, second, third)));
-		when(delegate.get(request)).thenReturn(Flux.just(Arrays.asList(first, second)));
-
-		List<ServiceInstance> instances = supplier.get(request).blockFirst();
-
-		assertThat(instances).hasSize(2);
-	}
-
-	@Test
-	void shouldCallSelectedServiceInstanceOnItsDelegate() {
-		ServiceInstance firstInstance = serviceInstance("test-4");
-		TestSelectedServiceInstanceSupplier delegate = mock(TestSelectedServiceInstanceSupplier.class);
-		DelegatingServiceInstanceListSupplier supplier = new SameInstancePreferenceServiceInstanceListSupplier(
-				delegate);
-		supplier.selectedServiceInstance(firstInstance);
-		verify(delegate, times(1)).selectedServiceInstance(any(ServiceInstance.class));
-	}
-
 	private DefaultServiceInstance serviceInstance(String instanceId) {
 		return new DefaultServiceInstance(instanceId, "test", "http://test.test", 9080, false);
 	}

spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/ServiceInstanceListSupplierBuilderTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-2020 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.
@@ -37,9 +37,11 @@ public class ServiceInstanceListSupplierBuilderTests {
 	public void testBuilder() {
 		new ApplicationContextRunner().withUserConfiguration(CacheTestConfig.class).run(context -> {
 			ServiceInstanceListSupplier supplier = ServiceInstanceListSupplier.builder().withDiscoveryClient()
-					.withHealthChecks().withWeighted().build(context);
-			assertThat(supplier).isInstanceOf(WeightedServiceInstanceListSupplier.class);
+					.withHealthChecks().withWeighted().withCaching().build(context);
+			assertThat(supplier).isInstanceOf(CachingServiceInstanceListSupplier.class);
 			DelegatingServiceInstanceListSupplier delegating = (DelegatingServiceInstanceListSupplier) supplier;
+			assertThat(delegating.getDelegate()).isInstanceOf(WeightedServiceInstanceListSupplier.class);
+			delegating = (DelegatingServiceInstanceListSupplier) delegating.getDelegate();
 			assertThat(delegating.getDelegate()).isInstanceOf(HealthCheckServiceInstanceListSupplier.class);
 			delegating = (DelegatingServiceInstanceListSupplier) delegating.getDelegate();
 			assertThat(delegating.getDelegate()).isInstanceOf(DiscoveryClientServiceInstanceListSupplier.class);

spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/ServiceInstanceListSuppliersTestUtils.java

@@ -46,7 +46,7 @@ final class ServiceInstanceListSuppliersTestUtils {
 		return (serviceInstance, healthCheckPath) -> webClient.get()
 				.uri(UriComponentsBuilder.fromUriString(getUri(serviceInstance, healthCheckPath)).build().toUri())
 				.exchange().flatMap(clientResponse -> clientResponse.releaseBody()
-						.thenReturn(HttpStatus.OK.equals(clientResponse.statusCode())));
+						.thenReturn(HttpStatus.OK.value() == clientResponse.rawStatusCode()));
 	}
 
 	static BiFunction<ServiceInstance, String, Mono<Boolean>> healthCheckFunction(RestTemplate restTemplate) {

spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/TestSelectedServiceInstanceSupplier.java

@@ -1,28 +0,0 @@
-/*
- * Copyright 2012-2023 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
- *
- *      https://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.loadbalancer.core;
-
-/**
- * Test supplier interface extending {@link ServiceInstanceListSupplier} and
- * {@link SelectedInstanceCallback}. Useful if you need to verify certain behavior
- * happened on a mock for example.
- *
- * @author Jürgen Kreitler
- */
-public interface TestSelectedServiceInstanceSupplier extends ServiceInstanceListSupplier, SelectedInstanceCallback {
-
-}

spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/WeightedServiceInstanceListSupplierTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -29,15 +29,9 @@ import reactor.core.publisher.Flux;
 
 import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.client.loadbalancer.DefaultRequest;
-import org.springframework.cloud.client.loadbalancer.DefaultRequestContext;
-import org.springframework.cloud.client.loadbalancer.LoadBalancerProperties;
-import org.springframework.cloud.client.loadbalancer.Request;
-import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
 
 import static java.util.stream.Collectors.summingInt;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.springframework.cloud.loadbalancer.core.WeightedServiceInstanceListSupplier.DEFAULT_WEIGHT;
@@ -46,7 +40,6 @@ import static org.springframework.cloud.loadbalancer.core.WeightedServiceInstanc
  * Tests for {@link WeightedServiceInstanceListSupplier}.
  *
  * @author Zhuozhi Ji
- * @author Olga Maciaszek-Sharma
  */
 class WeightedServiceInstanceListSupplierTests {
 
@@ -184,29 +177,6 @@ class WeightedServiceInstanceListSupplierTests {
 		assertThat(counter).containsEntry("test-3", DEFAULT_WEIGHT);
 	}
 
-	@Test
-	void shouldCallGetRequestOnDelegate() {
-		LoadBalancerClientFactory loadBalancerClientFactory = mock(LoadBalancerClientFactory.class);
-		LoadBalancerProperties properties = new LoadBalancerProperties();
-		when(loadBalancerClientFactory.getProperties(any())).thenReturn(properties);
-		ServiceInstance one = serviceInstance("test-1", Collections.emptyMap());
-		ServiceInstance two = serviceInstance("test-2", Collections.emptyMap());
-		ServiceInstance three = serviceInstance("test-3", buildWeightMetadata(3));
-		Request<DefaultRequestContext> request = new DefaultRequest<>(new DefaultRequestContext());
-
-		when(delegate.get()).thenReturn(Flux.just(Arrays.asList(one, two, three)));
-		when(delegate.get(request)).thenReturn(Flux.just(Arrays.asList(one, two)));
-		WeightedServiceInstanceListSupplier supplier = new WeightedServiceInstanceListSupplier(delegate,
-				loadBalancerClientFactory);
-
-		List<ServiceInstance> serviceInstances = Objects.requireNonNull(supplier.get(request).blockFirst());
-		Map<String, Integer> counter = serviceInstances.stream()
-				.collect(Collectors.groupingBy(ServiceInstance::getInstanceId, summingInt(e -> 1)));
-		assertThat(counter).containsEntry("test-1", DEFAULT_WEIGHT);
-		assertThat(counter).containsEntry("test-2", DEFAULT_WEIGHT);
-		assertThat(counter).doesNotContainEntry("test-3", 3);
-	}
-
 	private ServiceInstance serviceInstance(String instanceId, Map<String, String> metadata) {
 		return new DefaultServiceInstance(instanceId, "test", "localhost", 8080, false, metadata);
 	}

spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/ZonePreferenceServiceInstanceListSupplierTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -22,22 +22,15 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Flux;
 
 import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.client.loadbalancer.DefaultRequest;
-import org.springframework.cloud.client.loadbalancer.DefaultRequestContext;
-import org.springframework.cloud.client.loadbalancer.LoadBalancerProperties;
-import org.springframework.cloud.client.loadbalancer.Request;
 import org.springframework.cloud.loadbalancer.config.LoadBalancerZoneConfig;
-import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -53,9 +46,8 @@ class ZonePreferenceServiceInstanceListSupplierTests {
 
 	private final LoadBalancerZoneConfig zoneConfig = new LoadBalancerZoneConfig(null);
 
-	private ZonePreferenceServiceInstanceListSupplier supplier;
-
-	private final LoadBalancerClientFactory loadBalancerClientFactory = mock(LoadBalancerClientFactory.class);
+	private final ZonePreferenceServiceInstanceListSupplier supplier = new ZonePreferenceServiceInstanceListSupplier(
+			delegate, zoneConfig);
 
 	private final ServiceInstance first = serviceInstance("test-1", buildZoneMetadata("zone1"));
 
@@ -67,13 +59,6 @@ class ZonePreferenceServiceInstanceListSupplierTests {
 
 	private final ServiceInstance fifth = serviceInstance("test-5", buildZoneMetadata(null));
 
-	@BeforeEach
-	void setUp() {
-		LoadBalancerProperties properties = new LoadBalancerProperties();
-		when(loadBalancerClientFactory.getProperties(any())).thenReturn(properties);
-		supplier = new ZonePreferenceServiceInstanceListSupplier(delegate, zoneConfig, loadBalancerClientFactory);
-	}
-
 	@Test
 	void shouldFilterInstancesByZone() {
 		zoneConfig.setZone("zone1");
@@ -88,19 +73,6 @@ class ZonePreferenceServiceInstanceListSupplierTests {
 		assertThat(filtered).doesNotContain(fifth);
 	}
 
-	@Test
-	void shouldCallGetRequestOnDelegate() {
-		zoneConfig.setZone("zone1");
-		Request<DefaultRequestContext> request = new DefaultRequest<>(new DefaultRequestContext());
-		when(delegate.get()).thenReturn(Flux.just(Arrays.asList(first, second, third, fourth, fifth)));
-		when(delegate.get(request)).thenReturn(Flux.just(Arrays.asList(first, third, fourth, fifth)));
-
-		List<ServiceInstance> filtered = supplier.get(request).blockFirst();
-
-		assertThat(filtered).hasSize(1);
-		assertThat(filtered).containsOnly(first);
-	}
-
 	@Test
 	void shouldReturnAllInstancesIfNoZoneInstances() {
 		zoneConfig.setZone("zone1");

spring-cloud-loadbalancer/src/test/resources/logback-test.xml

@@ -1,11 +0,0 @@
-<configuration>
-	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
-			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-		</encoder>
-	</appender>
-
-	<root level="debug">
-		<appender-ref ref="STDOUT" />
-	</root>
-</configuration>

spring-cloud-starter-bootstrap/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-commons-parent</artifactId>
-		<version>4.1.0-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<packaging>jar</packaging>

spring-cloud-starter-loadbalancer/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-commons-parent</artifactId>
-		<version>4.1.0-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

spring-cloud-starter/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-commons-parent</artifactId>
-		<version>4.1.0-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-starter</artifactId>
 	<name>spring-cloud-starter</name>

spring-cloud-test-support/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-commons-parent</artifactId>
-		<version>4.1.0-SNAPSHOT</version>
+		<version>4.0.2-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-test-support</artifactId>
@@ -16,7 +16,7 @@
 	<description>Spring Cloud Test Support</description>
 	<properties>
 		<maven.version>3.5.4</maven.version>
-		<maven-resolver.version>1.9.16</maven-resolver.version>
+		<maven-resolver.version>1.1.1</maven-resolver.version>
 	</properties>
 	<dependencies>
 		<dependency>