Merge release '2.0.0'

This release increases the required Java compiler version 17. The
project now compatible to Spring Boot 3 and contains a lot of changes
regarding the project setup, like dependency management and source code
linting. The API didn't change at all, besides the mentioned changes.

Author: V1ncNet

.github/workflows/maven.yml

@@ -2,19 +2,19 @@ name: Java CI with Maven
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, develop ]
   pull_request:
-    branches: [ main ]
+    branches: [ main, develop ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up AdoptOpenJDK 8
+      - name: Set up AdoptOpenJDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'adopt'
       - name: Cache local Maven repository
         uses: actions/cache@v2

.idea/misc.xml

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2021 Vincent Nadoll
+   Copyright 2023 Vincent Nadoll
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

LICENSE

@@ -12,7 +12,10 @@ own post-processor, use the API artifact, which is available separately.
 Spring Boot Secrets is ideal for resolving **Docker Secrets** and making them
 accessible to the Spring Boot application.
 
-**Note:** Compatible with Spring Boot > 2.4.4
+**Note:** Compatible with Spring Boot 3. Checkout the [v1.x] releases for a
+Spring Boot 2-compatible version of this project.
+
+[v1.x]: https://github.com/V1ncNet/secrets-spring-boot/tree/v1.1.1
 
 
 Features
@@ -88,8 +91,8 @@ The collection is available under following coordinates:
 ```xml
 <dependency>
     <groupId>de.vinado.boot</groupId>
-    <artifactId>spring-boot-secrets</artifactId>
-    <version>1.1.1</version>
+    <artifactId>secrets</artifactId>
+    <version>2.0.0</version>
 </dependency>
 ```
 
@@ -99,8 +102,8 @@ post-processors:
 ```xml
 <dependency>
     <groupId>de.vinado.boot</groupId>
-    <artifactId>spring-boot-secrets-api</artifactId>
-    <version>1.1.1</version>
+    <artifactId>secrets-api</artifactId>
+    <version>2.0.0</version>
 </dependency>
 ```
 
@@ -177,7 +180,7 @@ Configuration
 -------------
 
 | application.properties  | Data Type  | Default Value  | Example                                                              | Post-Processor                                         |
-| ----------------------- | ---------- | -------------- | -------------------------------------------------------------------- | ------------------------------------------------------ |
+|-------------------------|------------|----------------|----------------------------------------------------------------------|--------------------------------------------------------|
 | secrets.file.properties | _`Map`_    |                | `spring.datasource.username=/run/secrets/spring.datasource.username` | `FilenameConfigDataSecretsEnvironmentPostProcessor`    |
 | secrets.file.base-dir   | _`String`_ | `/run/secrets` | `/some/base/directory`                                               | `FilenameSecretsEnvironmentPostProcessor`              |
 | secrets.file.separator  | _`String`_ | `.`            | Only `.` or `_`                                                      | `FilenameSecretsEnvironmentPostProcessor`              |

README.md

@@ -6,14 +6,14 @@
 
     <parent>
         <groupId>de.vinado.boot</groupId>
-        <artifactId>spring-boot-secrets-parent</artifactId>
-        <version>1.1.1</version>
+        <artifactId>secrets-parent</artifactId>
+        <version>2.0.0</version>
     </parent>
 
-    <artifactId>spring-boot-secrets-api</artifactId>
+    <artifactId>secrets-api</artifactId>
     <name>String Boot Secrets API</name>
     <description>Extensible Secrets Post-Processor components</description>
-    <url>https://github.com/V1ncNet/spring-boot-secrets.git</url>
+    <url>https://github.com/V1ncNet/secrets-spring-boot.git</url>
 
     <dependencies>
         <dependency>

api/pom.xml

@@ -104,8 +104,8 @@ public static Builder overriding() {
 
 
     /**
-     * Creates a new {@link Builder} using the given merge function to handle duplicate keys during {@link #get()
-     * merge}.
+     * Creates a new {@link Builder} using the given merge function to handle duplicate keys during
+     * {@link #get() merge}.
      *
      * @return a new instance of {@link Builder}
      */
@@ -115,8 +115,8 @@ public static Builder using(BinaryOperator<String> mergeFunction) {
     }
 
     /**
-     * Convenience component making use of the Builder Pattern to instantiate a new {@link
-     * CompositePropertyIndexSupplier}.
+     * Convenience component making use of the Builder Pattern to instantiate a new
+     * {@link CompositePropertyIndexSupplier}.
      *
      * @author Vincent Nadoll
      */

api/src/main/java/de/vinado/boot/secrets/CompositePropertyIndexSupplier.java

@@ -53,7 +53,7 @@ default Function<Map.Entry<?, String>, String> substituteValue(PropertyResolver
      * Substitutes the entry's value.
      *
      * @param resolver the component that resolves system property
-     * @return a function which substitutes the its argument
+     * @return a function which substitutes its argument
      */
     default UnaryOperator<String> substitute(PropertyResolver resolver) {
         Assert.notNull(resolver, "Property resolver must not be null");

api/src/main/java/de/vinado/boot/secrets/PropertyIndexSupplier.java

@@ -12,8 +12,8 @@
 import static de.vinado.boot.secrets.Utils.acceptAndLog;
 
 /**
- * A wrapper around {@link ConfigurableEnvironment} which loads secrets and applies them to {@link
- * SecretPropertiesPropertySource}.
+ * A wrapper around {@link ConfigurableEnvironment} which loads secrets and applies them to
+ * {@link SecretPropertiesPropertySource}.
  *
  * @author Vincent Nadoll
  */

api/src/main/java/de/vinado/boot/secrets/SecretsEnvironment.java

@@ -12,8 +12,8 @@
 
 /**
  * <p>
- * An {@link EnvironmentPostProcessor} that loads and applies a {@link SecretsEnvironment} to Spring's {@link
- * org.springframework.core.env.Environment}.
+ * An {@link EnvironmentPostProcessor} that loads and applies a {@link SecretsEnvironment} to Spring's
+ * {@link org.springframework.core.env.Environment}.
  * </p><p>
  * This component implements {@link Ordered} to draw attention to the fact, that {@link SecretsEnvironmentPostProcessor}
  * must be executed after {@link ConfigDataEnvironmentPostProcessor} in order to override configuration properties. I'd

api/src/main/java/de/vinado/boot/secrets/SecretsEnvironmentPostProcessor.java

@@ -14,9 +14,6 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Vincent Nadoll
- */
 class CompositePropertyIndexSupplierTest {
 
     private ConfigurableEnvironment environment;
@@ -89,9 +86,9 @@ void buildThenSubstitute_shouldEqualBuildAndSubstituteResult() {
             .add(PropertyIndexSupplier.from(second));
 
         Map<String, String> buildThenSubstitute = builder.build().substituteValues(environment).get();
-        Map<String, String> BuildAndSubstitute = builder.buildAndSubstitute(environment).get();
+        Map<String, String> buildAndSubstitute = builder.buildAndSubstitute(environment).get();
 
-        assertEquals(buildThenSubstitute, BuildAndSubstitute);
+        assertEquals(buildThenSubstitute, buildAndSubstitute);
     }
 
     @Test