From 30b1a8864497e01f1ca43cdbd7382acda09a9378 Mon Sep 17 00:00:00 2001 From: Ben Hale Date: Mon, 11 May 2020 07:35:45 -0700 Subject: [PATCH] Isolate Boot-specific Processors Previously, the Boot-specific processors were in the same package as the core types. This minimzed the visibility of some constructors used for testing, but as the list of processors has grown (and will continue to grow), the core types were being overwhelmed. This change moves the Boot-specific processors out to an additional package where they can be easily identified. Signed-off-by: Ben Hale --- .../cloud/bindings/Bindings.java | 7 ++++++- .../BindingsEnvironmentPostProcessor.java | 3 ++- .../BindingsPropertiesProcessor.java | 3 ++- .../CassandraBindingsPropertiesProcessor.java | 4 +++- .../Db2BindingsPropertiesProcessor.java | 4 +++- .../MongoDbBindingsPropertiesProcessor.java | 4 +++- .../MySqlBindingsPropertiesProcessor.java | 4 +++- .../OracleBindingsPropertiesProcessor.java | 4 +++- ...PostgreSqlBindingsPropertiesProcessor.java | 4 +++- .../RedisBindingsPropertiesProcessor.java | 4 +++- .../SqlServerBindingsPropertiesProcessor.java | 4 +++- src/main/resources/META-INF/spring.factories | 20 +++++++++---------- .../cloud/bindings/FluentMap.java | 4 ++-- .../BindingsEnvironmentPostProcessorTest.java | 6 ++++-- ...sandraBindingsPropertiesProcessorTest.java | 7 +++++-- .../Db2BindingsPropertiesProcessorTest.java | 7 +++++-- ...ongoDbBindingsPropertiesProcessorTest.java | 7 +++++-- .../MySqlBindingsPropertiesProcessorTest.java | 7 +++++-- ...OracleBindingsPropertiesProcessorTest.java | 7 +++++-- ...greSqlBindingsPropertiesProcessorTest.java | 7 +++++-- .../RedisBindingsPropertiesProcessorTest.java | 7 +++++-- ...ServerBindingsPropertiesProcessorTest.java | 7 +++++-- 22 files changed, 90 insertions(+), 41 deletions(-) rename src/main/java/org/springframework/cloud/bindings/{ => boot}/BindingsEnvironmentPostProcessor.java (97%) rename src/main/java/org/springframework/cloud/bindings/{ => boot}/BindingsPropertiesProcessor.java (92%) rename src/main/java/org/springframework/cloud/bindings/{ => boot}/CassandraBindingsPropertiesProcessor.java (91%) rename src/main/java/org/springframework/cloud/bindings/{ => boot}/Db2BindingsPropertiesProcessor.java (92%) rename src/main/java/org/springframework/cloud/bindings/{ => boot}/MongoDbBindingsPropertiesProcessor.java (90%) rename src/main/java/org/springframework/cloud/bindings/{ => boot}/MySqlBindingsPropertiesProcessor.java (93%) rename src/main/java/org/springframework/cloud/bindings/{ => boot}/OracleBindingsPropertiesProcessor.java (92%) rename src/main/java/org/springframework/cloud/bindings/{ => boot}/PostgreSqlBindingsPropertiesProcessor.java (92%) rename src/main/java/org/springframework/cloud/bindings/{ => boot}/RedisBindingsPropertiesProcessor.java (91%) rename src/main/java/org/springframework/cloud/bindings/{ => boot}/SqlServerBindingsPropertiesProcessor.java (92%) rename src/test/java/org/springframework/cloud/bindings/{ => boot}/BindingsEnvironmentPostProcessorTest.java (94%) rename src/test/java/org/springframework/cloud/bindings/{ => boot}/CassandraBindingsPropertiesProcessorTest.java (86%) rename src/test/java/org/springframework/cloud/bindings/{ => boot}/Db2BindingsPropertiesProcessorTest.java (87%) rename src/test/java/org/springframework/cloud/bindings/{ => boot}/MongoDbBindingsPropertiesProcessorTest.java (83%) rename src/test/java/org/springframework/cloud/bindings/{ => boot}/MySqlBindingsPropertiesProcessorTest.java (87%) rename src/test/java/org/springframework/cloud/bindings/{ => boot}/OracleBindingsPropertiesProcessorTest.java (87%) rename src/test/java/org/springframework/cloud/bindings/{ => boot}/PostgreSqlBindingsPropertiesProcessorTest.java (87%) rename src/test/java/org/springframework/cloud/bindings/{ => boot}/RedisBindingsPropertiesProcessorTest.java (85%) rename src/test/java/org/springframework/cloud/bindings/{ => boot}/SqlServerBindingsPropertiesProcessorTest.java (87%) diff --git a/src/main/java/org/springframework/cloud/bindings/Bindings.java b/src/main/java/org/springframework/cloud/bindings/Bindings.java index f3b0066..da79c43 100644 --- a/src/main/java/org/springframework/cloud/bindings/Bindings.java +++ b/src/main/java/org/springframework/cloud/bindings/Bindings.java @@ -84,7 +84,12 @@ public final class Bindings { } } - Bindings(@NotNull Binding... bindings) { + /** + * Creates a new {@code Bindings} instance using the specified content. + * + * @param bindings the {@code Binding}s. + */ + public Bindings(@NotNull Binding... bindings) { this.bindings = Arrays.asList(bindings); } diff --git a/src/main/java/org/springframework/cloud/bindings/BindingsEnvironmentPostProcessor.java b/src/main/java/org/springframework/cloud/bindings/boot/BindingsEnvironmentPostProcessor.java similarity index 97% rename from src/main/java/org/springframework/cloud/bindings/BindingsEnvironmentPostProcessor.java rename to src/main/java/org/springframework/cloud/bindings/boot/BindingsEnvironmentPostProcessor.java index 5497405..eff5d2e 100644 --- a/src/main/java/org/springframework/cloud/bindings/BindingsEnvironmentPostProcessor.java +++ b/src/main/java/org/springframework/cloud/bindings/boot/BindingsEnvironmentPostProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.bindings; +package org.springframework.cloud.bindings.boot; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -22,6 +22,7 @@ import org.jetbrains.annotations.NotNull; import org.springframework.boot.SpringApplication; import org.springframework.boot.context.config.ConfigFileApplicationListener; import org.springframework.boot.env.EnvironmentPostProcessor; +import org.springframework.cloud.bindings.Bindings; import org.springframework.core.Ordered; import org.springframework.core.annotation.AnnotationAwareOrderComparator; import org.springframework.core.env.ConfigurableEnvironment; diff --git a/src/main/java/org/springframework/cloud/bindings/BindingsPropertiesProcessor.java b/src/main/java/org/springframework/cloud/bindings/boot/BindingsPropertiesProcessor.java similarity index 92% rename from src/main/java/org/springframework/cloud/bindings/BindingsPropertiesProcessor.java rename to src/main/java/org/springframework/cloud/bindings/boot/BindingsPropertiesProcessor.java index 4c12807..c4a6e6b 100644 --- a/src/main/java/org/springframework/cloud/bindings/BindingsPropertiesProcessor.java +++ b/src/main/java/org/springframework/cloud/bindings/boot/BindingsPropertiesProcessor.java @@ -14,8 +14,9 @@ * limitations under the License. */ -package org.springframework.cloud.bindings; +package org.springframework.cloud.bindings.boot; +import org.springframework.cloud.bindings.Bindings; import org.springframework.lang.NonNull; import java.util.Map; diff --git a/src/main/java/org/springframework/cloud/bindings/CassandraBindingsPropertiesProcessor.java b/src/main/java/org/springframework/cloud/bindings/boot/CassandraBindingsPropertiesProcessor.java similarity index 91% rename from src/main/java/org/springframework/cloud/bindings/CassandraBindingsPropertiesProcessor.java rename to src/main/java/org/springframework/cloud/bindings/boot/CassandraBindingsPropertiesProcessor.java index c0a662b..9a2322c 100644 --- a/src/main/java/org/springframework/cloud/bindings/CassandraBindingsPropertiesProcessor.java +++ b/src/main/java/org/springframework/cloud/bindings/boot/CassandraBindingsPropertiesProcessor.java @@ -14,9 +14,11 @@ * limitations under the License. */ -package org.springframework.cloud.bindings; +package org.springframework.cloud.bindings.boot; import org.jetbrains.annotations.NotNull; +import org.springframework.cloud.bindings.Binding; +import org.springframework.cloud.bindings.Bindings; import org.springframework.lang.NonNull; import java.util.Map; diff --git a/src/main/java/org/springframework/cloud/bindings/Db2BindingsPropertiesProcessor.java b/src/main/java/org/springframework/cloud/bindings/boot/Db2BindingsPropertiesProcessor.java similarity index 92% rename from src/main/java/org/springframework/cloud/bindings/Db2BindingsPropertiesProcessor.java rename to src/main/java/org/springframework/cloud/bindings/boot/Db2BindingsPropertiesProcessor.java index 6ea9ee2..99102a5 100644 --- a/src/main/java/org/springframework/cloud/bindings/Db2BindingsPropertiesProcessor.java +++ b/src/main/java/org/springframework/cloud/bindings/boot/Db2BindingsPropertiesProcessor.java @@ -14,9 +14,11 @@ * limitations under the License. */ -package org.springframework.cloud.bindings; +package org.springframework.cloud.bindings.boot; import org.jetbrains.annotations.NotNull; +import org.springframework.cloud.bindings.Binding; +import org.springframework.cloud.bindings.Bindings; import org.springframework.lang.NonNull; import java.util.Map; diff --git a/src/main/java/org/springframework/cloud/bindings/MongoDbBindingsPropertiesProcessor.java b/src/main/java/org/springframework/cloud/bindings/boot/MongoDbBindingsPropertiesProcessor.java similarity index 90% rename from src/main/java/org/springframework/cloud/bindings/MongoDbBindingsPropertiesProcessor.java rename to src/main/java/org/springframework/cloud/bindings/boot/MongoDbBindingsPropertiesProcessor.java index f1a73e5..fc375c5 100644 --- a/src/main/java/org/springframework/cloud/bindings/MongoDbBindingsPropertiesProcessor.java +++ b/src/main/java/org/springframework/cloud/bindings/boot/MongoDbBindingsPropertiesProcessor.java @@ -14,8 +14,10 @@ * limitations under the License. */ -package org.springframework.cloud.bindings; +package org.springframework.cloud.bindings.boot; +import org.springframework.cloud.bindings.Binding; +import org.springframework.cloud.bindings.Bindings; import org.springframework.lang.NonNull; import java.util.Map; diff --git a/src/main/java/org/springframework/cloud/bindings/MySqlBindingsPropertiesProcessor.java b/src/main/java/org/springframework/cloud/bindings/boot/MySqlBindingsPropertiesProcessor.java similarity index 93% rename from src/main/java/org/springframework/cloud/bindings/MySqlBindingsPropertiesProcessor.java rename to src/main/java/org/springframework/cloud/bindings/boot/MySqlBindingsPropertiesProcessor.java index e5c77d4..4e35d71 100644 --- a/src/main/java/org/springframework/cloud/bindings/MySqlBindingsPropertiesProcessor.java +++ b/src/main/java/org/springframework/cloud/bindings/boot/MySqlBindingsPropertiesProcessor.java @@ -14,9 +14,11 @@ * limitations under the License. */ -package org.springframework.cloud.bindings; +package org.springframework.cloud.bindings.boot; import org.jetbrains.annotations.NotNull; +import org.springframework.cloud.bindings.Binding; +import org.springframework.cloud.bindings.Bindings; import org.springframework.lang.NonNull; import java.util.Map; diff --git a/src/main/java/org/springframework/cloud/bindings/OracleBindingsPropertiesProcessor.java b/src/main/java/org/springframework/cloud/bindings/boot/OracleBindingsPropertiesProcessor.java similarity index 92% rename from src/main/java/org/springframework/cloud/bindings/OracleBindingsPropertiesProcessor.java rename to src/main/java/org/springframework/cloud/bindings/boot/OracleBindingsPropertiesProcessor.java index af388c3..b4f829c 100644 --- a/src/main/java/org/springframework/cloud/bindings/OracleBindingsPropertiesProcessor.java +++ b/src/main/java/org/springframework/cloud/bindings/boot/OracleBindingsPropertiesProcessor.java @@ -14,9 +14,11 @@ * limitations under the License. */ -package org.springframework.cloud.bindings; +package org.springframework.cloud.bindings.boot; import org.jetbrains.annotations.NotNull; +import org.springframework.cloud.bindings.Binding; +import org.springframework.cloud.bindings.Bindings; import org.springframework.lang.NonNull; import java.util.Map; diff --git a/src/main/java/org/springframework/cloud/bindings/PostgreSqlBindingsPropertiesProcessor.java b/src/main/java/org/springframework/cloud/bindings/boot/PostgreSqlBindingsPropertiesProcessor.java similarity index 92% rename from src/main/java/org/springframework/cloud/bindings/PostgreSqlBindingsPropertiesProcessor.java rename to src/main/java/org/springframework/cloud/bindings/boot/PostgreSqlBindingsPropertiesProcessor.java index bb992e9..b1c7ce7 100644 --- a/src/main/java/org/springframework/cloud/bindings/PostgreSqlBindingsPropertiesProcessor.java +++ b/src/main/java/org/springframework/cloud/bindings/boot/PostgreSqlBindingsPropertiesProcessor.java @@ -14,9 +14,11 @@ * limitations under the License. */ -package org.springframework.cloud.bindings; +package org.springframework.cloud.bindings.boot; import org.jetbrains.annotations.NotNull; +import org.springframework.cloud.bindings.Binding; +import org.springframework.cloud.bindings.Bindings; import org.springframework.lang.NonNull; import java.util.Map; diff --git a/src/main/java/org/springframework/cloud/bindings/RedisBindingsPropertiesProcessor.java b/src/main/java/org/springframework/cloud/bindings/boot/RedisBindingsPropertiesProcessor.java similarity index 91% rename from src/main/java/org/springframework/cloud/bindings/RedisBindingsPropertiesProcessor.java rename to src/main/java/org/springframework/cloud/bindings/boot/RedisBindingsPropertiesProcessor.java index 147bb25..6f019b8 100644 --- a/src/main/java/org/springframework/cloud/bindings/RedisBindingsPropertiesProcessor.java +++ b/src/main/java/org/springframework/cloud/bindings/boot/RedisBindingsPropertiesProcessor.java @@ -14,9 +14,11 @@ * limitations under the License. */ -package org.springframework.cloud.bindings; +package org.springframework.cloud.bindings.boot; import org.jetbrains.annotations.NotNull; +import org.springframework.cloud.bindings.Binding; +import org.springframework.cloud.bindings.Bindings; import org.springframework.lang.NonNull; import java.util.Map; diff --git a/src/main/java/org/springframework/cloud/bindings/SqlServerBindingsPropertiesProcessor.java b/src/main/java/org/springframework/cloud/bindings/boot/SqlServerBindingsPropertiesProcessor.java similarity index 92% rename from src/main/java/org/springframework/cloud/bindings/SqlServerBindingsPropertiesProcessor.java rename to src/main/java/org/springframework/cloud/bindings/boot/SqlServerBindingsPropertiesProcessor.java index e8db6aa..7234ac6 100644 --- a/src/main/java/org/springframework/cloud/bindings/SqlServerBindingsPropertiesProcessor.java +++ b/src/main/java/org/springframework/cloud/bindings/boot/SqlServerBindingsPropertiesProcessor.java @@ -14,9 +14,11 @@ * limitations under the License. */ -package org.springframework.cloud.bindings; +package org.springframework.cloud.bindings.boot; import org.jetbrains.annotations.NotNull; +import org.springframework.cloud.bindings.Binding; +import org.springframework.cloud.bindings.Bindings; import org.springframework.lang.NonNull; import java.util.Map; diff --git a/src/main/resources/META-INF/spring.factories b/src/main/resources/META-INF/spring.factories index fb08309..7d0a8b6 100644 --- a/src/main/resources/META-INF/spring.factories +++ b/src/main/resources/META-INF/spring.factories @@ -1,12 +1,12 @@ org.springframework.boot.env.EnvironmentPostProcessor=\ - org.springframework.cloud.bindings.BindingsEnvironmentPostProcessor + org.springframework.cloud.bindings.boot.BindingsEnvironmentPostProcessor # Included implementations -org.springframework.cloud.bindings.BindingsPropertiesProcessor=\ - org.springframework.cloud.bindings.CassandraBindingsPropertiesProcessor, \ - org.springframework.cloud.bindings.Db2BindingsPropertiesProcessor, \ - org.springframework.cloud.bindings.MongoDbBindingsPropertiesProcessor, \ - org.springframework.cloud.bindings.MySqlBindingsPropertiesProcessor, \ - org.springframework.cloud.bindings.OracleBindingsPropertiesProcessor, \ - org.springframework.cloud.bindings.PostgreSqlBindingsPropertiesProcessor, \ - org.springframework.cloud.bindings.RedisBindingsPropertiesProcessor, \ - org.springframework.cloud.bindings.SqlServerBindingsPropertiesProcessor +org.springframework.cloud.bindings.boot.BindingsPropertiesProcessor=\ + org.springframework.cloud.bindings.boot.CassandraBindingsPropertiesProcessor, \ + org.springframework.cloud.bindings.boot.Db2BindingsPropertiesProcessor, \ + org.springframework.cloud.bindings.boot.MongoDbBindingsPropertiesProcessor, \ + org.springframework.cloud.bindings.boot.MySqlBindingsPropertiesProcessor, \ + org.springframework.cloud.bindings.boot.OracleBindingsPropertiesProcessor, \ + org.springframework.cloud.bindings.boot.PostgreSqlBindingsPropertiesProcessor, \ + org.springframework.cloud.bindings.boot.RedisBindingsPropertiesProcessor, \ + org.springframework.cloud.bindings.boot.SqlServerBindingsPropertiesProcessor diff --git a/src/test/java/org/springframework/cloud/bindings/FluentMap.java b/src/test/java/org/springframework/cloud/bindings/FluentMap.java index 60b08fd..76bce79 100644 --- a/src/test/java/org/springframework/cloud/bindings/FluentMap.java +++ b/src/test/java/org/springframework/cloud/bindings/FluentMap.java @@ -18,9 +18,9 @@ package org.springframework.cloud.bindings; import java.util.HashMap; -final class FluentMap extends HashMap { +public final class FluentMap extends HashMap { - FluentMap withEntry(String key, String value) { + public FluentMap withEntry(String key, String value) { put(key, value); return this; } diff --git a/src/test/java/org/springframework/cloud/bindings/BindingsEnvironmentPostProcessorTest.java b/src/test/java/org/springframework/cloud/bindings/boot/BindingsEnvironmentPostProcessorTest.java similarity index 94% rename from src/test/java/org/springframework/cloud/bindings/BindingsEnvironmentPostProcessorTest.java rename to src/test/java/org/springframework/cloud/bindings/boot/BindingsEnvironmentPostProcessorTest.java index bc84e16..f1d6c98 100644 --- a/src/test/java/org/springframework/cloud/bindings/BindingsEnvironmentPostProcessorTest.java +++ b/src/test/java/org/springframework/cloud/bindings/boot/BindingsEnvironmentPostProcessorTest.java @@ -14,12 +14,14 @@ * limitations under the License. */ -package org.springframework.cloud.bindings; +package org.springframework.cloud.bindings.boot; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.boot.SpringApplication; import org.springframework.boot.context.config.ConfigFileApplicationListener; +import org.springframework.cloud.bindings.Binding; +import org.springframework.cloud.bindings.Bindings; import org.springframework.core.env.PropertySource; import org.springframework.core.env.SimpleCommandLinePropertySource; import org.springframework.mock.env.MockEnvironment; @@ -28,7 +30,7 @@ import java.nio.file.Paths; import java.util.Collections; import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.cloud.bindings.BindingsEnvironmentPostProcessor.BINDINGS_PROPERTY_SOURCE_NAME; +import static org.springframework.cloud.bindings.boot.BindingsEnvironmentPostProcessor.BINDINGS_PROPERTY_SOURCE_NAME; @DisplayName("Bindings EnvironmentPostProcessor") final class BindingsEnvironmentPostProcessorTest { diff --git a/src/test/java/org/springframework/cloud/bindings/CassandraBindingsPropertiesProcessorTest.java b/src/test/java/org/springframework/cloud/bindings/boot/CassandraBindingsPropertiesProcessorTest.java similarity index 86% rename from src/test/java/org/springframework/cloud/bindings/CassandraBindingsPropertiesProcessorTest.java rename to src/test/java/org/springframework/cloud/bindings/boot/CassandraBindingsPropertiesProcessorTest.java index aeca6bd..8590f3c 100644 --- a/src/test/java/org/springframework/cloud/bindings/CassandraBindingsPropertiesProcessorTest.java +++ b/src/test/java/org/springframework/cloud/bindings/boot/CassandraBindingsPropertiesProcessorTest.java @@ -14,17 +14,20 @@ * limitations under the License. */ -package org.springframework.cloud.bindings; +package org.springframework.cloud.bindings.boot; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.springframework.cloud.bindings.Binding; +import org.springframework.cloud.bindings.Bindings; +import org.springframework.cloud.bindings.FluentMap; import java.nio.file.Paths; import java.util.Collections; import java.util.HashMap; import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.cloud.bindings.CassandraBindingsPropertiesProcessor.KIND; +import static org.springframework.cloud.bindings.boot.CassandraBindingsPropertiesProcessor.KIND; @DisplayName("Cassandra BindingsPropertiesProcessor") final class CassandraBindingsPropertiesProcessorTest { diff --git a/src/test/java/org/springframework/cloud/bindings/Db2BindingsPropertiesProcessorTest.java b/src/test/java/org/springframework/cloud/bindings/boot/Db2BindingsPropertiesProcessorTest.java similarity index 87% rename from src/test/java/org/springframework/cloud/bindings/Db2BindingsPropertiesProcessorTest.java rename to src/test/java/org/springframework/cloud/bindings/boot/Db2BindingsPropertiesProcessorTest.java index 59ab609..7ff1fb7 100644 --- a/src/test/java/org/springframework/cloud/bindings/Db2BindingsPropertiesProcessorTest.java +++ b/src/test/java/org/springframework/cloud/bindings/boot/Db2BindingsPropertiesProcessorTest.java @@ -14,17 +14,20 @@ * limitations under the License. */ -package org.springframework.cloud.bindings; +package org.springframework.cloud.bindings.boot; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.springframework.cloud.bindings.Binding; +import org.springframework.cloud.bindings.Bindings; +import org.springframework.cloud.bindings.FluentMap; import java.nio.file.Paths; import java.util.Collections; import java.util.HashMap; import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.cloud.bindings.Db2BindingsPropertiesProcessor.KIND; +import static org.springframework.cloud.bindings.boot.Db2BindingsPropertiesProcessor.KIND; @DisplayName("DB2 BindingsPropertiesProcessor") final class Db2BindingsPropertiesProcessorTest { diff --git a/src/test/java/org/springframework/cloud/bindings/MongoDbBindingsPropertiesProcessorTest.java b/src/test/java/org/springframework/cloud/bindings/boot/MongoDbBindingsPropertiesProcessorTest.java similarity index 83% rename from src/test/java/org/springframework/cloud/bindings/MongoDbBindingsPropertiesProcessorTest.java rename to src/test/java/org/springframework/cloud/bindings/boot/MongoDbBindingsPropertiesProcessorTest.java index 3bf3c69..3d04c73 100644 --- a/src/test/java/org/springframework/cloud/bindings/MongoDbBindingsPropertiesProcessorTest.java +++ b/src/test/java/org/springframework/cloud/bindings/boot/MongoDbBindingsPropertiesProcessorTest.java @@ -14,17 +14,20 @@ * limitations under the License. */ -package org.springframework.cloud.bindings; +package org.springframework.cloud.bindings.boot; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.springframework.cloud.bindings.Binding; +import org.springframework.cloud.bindings.Bindings; +import org.springframework.cloud.bindings.FluentMap; import java.nio.file.Paths; import java.util.Collections; import java.util.HashMap; import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.cloud.bindings.MongoDbBindingsPropertiesProcessor.KIND; +import static org.springframework.cloud.bindings.boot.MongoDbBindingsPropertiesProcessor.KIND; @DisplayName("MongoDB BindingsPropertiesProcessor") final class MongoDbBindingsPropertiesProcessorTest { diff --git a/src/test/java/org/springframework/cloud/bindings/MySqlBindingsPropertiesProcessorTest.java b/src/test/java/org/springframework/cloud/bindings/boot/MySqlBindingsPropertiesProcessorTest.java similarity index 87% rename from src/test/java/org/springframework/cloud/bindings/MySqlBindingsPropertiesProcessorTest.java rename to src/test/java/org/springframework/cloud/bindings/boot/MySqlBindingsPropertiesProcessorTest.java index 01594e7..c8e484a 100644 --- a/src/test/java/org/springframework/cloud/bindings/MySqlBindingsPropertiesProcessorTest.java +++ b/src/test/java/org/springframework/cloud/bindings/boot/MySqlBindingsPropertiesProcessorTest.java @@ -14,17 +14,20 @@ * limitations under the License. */ -package org.springframework.cloud.bindings; +package org.springframework.cloud.bindings.boot; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.springframework.cloud.bindings.Binding; +import org.springframework.cloud.bindings.Bindings; +import org.springframework.cloud.bindings.FluentMap; import java.nio.file.Paths; import java.util.Collections; import java.util.HashMap; import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.cloud.bindings.MySqlBindingsPropertiesProcessor.KIND; +import static org.springframework.cloud.bindings.boot.MySqlBindingsPropertiesProcessor.KIND; @DisplayName("MySQL BindingsPropertiesProcessor") final class MySqlBindingsPropertiesProcessorTest { diff --git a/src/test/java/org/springframework/cloud/bindings/OracleBindingsPropertiesProcessorTest.java b/src/test/java/org/springframework/cloud/bindings/boot/OracleBindingsPropertiesProcessorTest.java similarity index 87% rename from src/test/java/org/springframework/cloud/bindings/OracleBindingsPropertiesProcessorTest.java rename to src/test/java/org/springframework/cloud/bindings/boot/OracleBindingsPropertiesProcessorTest.java index 0a6d723..262fdb6 100644 --- a/src/test/java/org/springframework/cloud/bindings/OracleBindingsPropertiesProcessorTest.java +++ b/src/test/java/org/springframework/cloud/bindings/boot/OracleBindingsPropertiesProcessorTest.java @@ -14,17 +14,20 @@ * limitations under the License. */ -package org.springframework.cloud.bindings; +package org.springframework.cloud.bindings.boot; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.springframework.cloud.bindings.Binding; +import org.springframework.cloud.bindings.Bindings; +import org.springframework.cloud.bindings.FluentMap; import java.nio.file.Paths; import java.util.Collections; import java.util.HashMap; import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.cloud.bindings.OracleBindingsPropertiesProcessor.KIND; +import static org.springframework.cloud.bindings.boot.OracleBindingsPropertiesProcessor.KIND; @DisplayName("Oracle BindingsPropertiesProcessor") final class OracleBindingsPropertiesProcessorTest { diff --git a/src/test/java/org/springframework/cloud/bindings/PostgreSqlBindingsPropertiesProcessorTest.java b/src/test/java/org/springframework/cloud/bindings/boot/PostgreSqlBindingsPropertiesProcessorTest.java similarity index 87% rename from src/test/java/org/springframework/cloud/bindings/PostgreSqlBindingsPropertiesProcessorTest.java rename to src/test/java/org/springframework/cloud/bindings/boot/PostgreSqlBindingsPropertiesProcessorTest.java index 1e7f413..2fb7914 100644 --- a/src/test/java/org/springframework/cloud/bindings/PostgreSqlBindingsPropertiesProcessorTest.java +++ b/src/test/java/org/springframework/cloud/bindings/boot/PostgreSqlBindingsPropertiesProcessorTest.java @@ -14,17 +14,20 @@ * limitations under the License. */ -package org.springframework.cloud.bindings; +package org.springframework.cloud.bindings.boot; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.springframework.cloud.bindings.Binding; +import org.springframework.cloud.bindings.Bindings; +import org.springframework.cloud.bindings.FluentMap; import java.nio.file.Paths; import java.util.Collections; import java.util.HashMap; import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.cloud.bindings.PostgreSqlBindingsPropertiesProcessor.KIND; +import static org.springframework.cloud.bindings.boot.PostgreSqlBindingsPropertiesProcessor.KIND; @DisplayName("PostgreSQL BindingsPropertiesProcessor") final class PostgreSqlBindingsPropertiesProcessorTest { diff --git a/src/test/java/org/springframework/cloud/bindings/RedisBindingsPropertiesProcessorTest.java b/src/test/java/org/springframework/cloud/bindings/boot/RedisBindingsPropertiesProcessorTest.java similarity index 85% rename from src/test/java/org/springframework/cloud/bindings/RedisBindingsPropertiesProcessorTest.java rename to src/test/java/org/springframework/cloud/bindings/boot/RedisBindingsPropertiesProcessorTest.java index 16bc5af..b41b000 100644 --- a/src/test/java/org/springframework/cloud/bindings/RedisBindingsPropertiesProcessorTest.java +++ b/src/test/java/org/springframework/cloud/bindings/boot/RedisBindingsPropertiesProcessorTest.java @@ -14,17 +14,20 @@ * limitations under the License. */ -package org.springframework.cloud.bindings; +package org.springframework.cloud.bindings.boot; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.springframework.cloud.bindings.Binding; +import org.springframework.cloud.bindings.Bindings; +import org.springframework.cloud.bindings.FluentMap; import java.nio.file.Paths; import java.util.Collections; import java.util.HashMap; import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.cloud.bindings.RedisBindingsPropertiesProcessor.KIND; +import static org.springframework.cloud.bindings.boot.RedisBindingsPropertiesProcessor.KIND; @DisplayName("Redis BindingsPropertiesProcessor") final class RedisBindingsPropertiesProcessorTest { diff --git a/src/test/java/org/springframework/cloud/bindings/SqlServerBindingsPropertiesProcessorTest.java b/src/test/java/org/springframework/cloud/bindings/boot/SqlServerBindingsPropertiesProcessorTest.java similarity index 87% rename from src/test/java/org/springframework/cloud/bindings/SqlServerBindingsPropertiesProcessorTest.java rename to src/test/java/org/springframework/cloud/bindings/boot/SqlServerBindingsPropertiesProcessorTest.java index 2d302ab..1f3b256 100644 --- a/src/test/java/org/springframework/cloud/bindings/SqlServerBindingsPropertiesProcessorTest.java +++ b/src/test/java/org/springframework/cloud/bindings/boot/SqlServerBindingsPropertiesProcessorTest.java @@ -14,17 +14,20 @@ * limitations under the License. */ -package org.springframework.cloud.bindings; +package org.springframework.cloud.bindings.boot; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.springframework.cloud.bindings.Binding; +import org.springframework.cloud.bindings.Bindings; +import org.springframework.cloud.bindings.FluentMap; import java.nio.file.Paths; import java.util.Collections; import java.util.HashMap; import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.cloud.bindings.SqlServerBindingsPropertiesProcessor.KIND; +import static org.springframework.cloud.bindings.boot.SqlServerBindingsPropertiesProcessor.KIND; @DisplayName("SQLServer BindingsPropertiesProcessor") final class SqlServerBindingsPropertiesProcessorTest {