#22 some minor improvements

Author: tomix26

README.md

@@ -207,7 +207,7 @@ Docker provides the greatest flexibility, but it can be slightly slower than the
 However, the change of database providers is really easy, so you can try them all.
 
 You can either configure a provider for each class separately by `@AutoConfigureEmbeddedDatabase(provider = ...)` annotation,
-or through `embedded-database.provider` property globally.
+or through `zonky.test.database.provider` property globally.
 
 |                                   |       [Docker][docker-provider]      |             [Zonky][zonky-provider]             | [OpenTable][opentable-provider] | [Yandex][yandex-provider] |
 |:---------------------------------:|:------------------------------------:|:-----------------------------------------------:|:-------------------------------:|:-------------------------:|
@@ -231,22 +231,22 @@ The `@AutoConfigureEmbeddedDatabase` annotation can be used for some basic confi
 The following configuration keys are used by all providers:
 
 ```properties
-embedded-database.provider=zonky # Provider used to create the underlying embedded database, see the documentation for the comparision matrix.
-embedded-database.postgres.client.properties.*= # Additional properties used to configure the test data source.
-embedded-database.postgres.initdb.properties.*= # Additional properties to pass to initdb command during the database initialization.
-embedded-database.postgres.server.properties.*= # Additional properties used to configure the embedded PostgreSQL server.
+zonky.test.database.provider=zonky # Provider used to create the underlying embedded database, see the documentation for the comparision matrix.
+zonky.test.database.postgres.client.properties.*= # Additional properties used to configure the test data source.
+zonky.test.database.postgres.initdb.properties.*= # Additional properties to pass to initdb command during the database initialization.
+zonky.test.database.postgres.server.properties.*= # Additional properties used to configure the embedded PostgreSQL server.
 ```
 
 Note that the library includes [configuration metadata](embedded-database-spring-test/src/main/resources/META-INF/spring-configuration-metadata.json) that offer contextual help and code completion as users are working with Spring Boot's `application.properties` or `application.yml` files.
 
 **Example configuration:**
 ```properties
-embedded-database.postgres.client.properties.stringtype=unspecified
-embedded-database.postgres.initdb.properties.lc-collate=cs_CZ.UTF-8
-embedded-database.postgres.initdb.properties.lc-monetary=cs_CZ.UTF-8
-embedded-database.postgres.initdb.properties.lc-numeric=cs_CZ.UTF-8
-embedded-database.postgres.server.properties.shared_buffers=512MB
-embedded-database.postgres.server.properties.max_connections=100
+zonky.test.database.postgres.client.properties.stringtype=unspecified
+zonky.test.database.postgres.initdb.properties.lc-collate=cs_CZ.UTF-8
+zonky.test.database.postgres.initdb.properties.lc-monetary=cs_CZ.UTF-8
+zonky.test.database.postgres.initdb.properties.lc-numeric=cs_CZ.UTF-8
+zonky.test.database.postgres.server.properties.shared_buffers=512MB
+zonky.test.database.postgres.server.properties.max_connections=100
 ```
 
 ### Using Zonky Provider (default)
@@ -394,12 +394,12 @@ public class DockerProviderIntegrationTest {
 
 #### Docker-specific provider configuration
 
-The provider configuration can be controlled by properties in the `embedded-database.postgres.docker` group.
+The provider configuration can be controlled by properties in the `zonky.test.database.postgres.docker` group.
 
 ```properties
-embedded-database.postgres.docker.image=postgres:10.6-alpine # Docker image containing PostgreSQL database.
-embedded-database.postgres.docker.tmpfs.enabled=false # Whether to mount postgres data directory as tmpfs.
-embedded-database.postgres.docker.tmpfs.options=rw,noexec,nosuid # Mount options used to configure the tmpfs filesystem.
+zonky.test.database.postgres.docker.image=postgres:10.6-alpine # Docker image containing PostgreSQL database.
+zonky.test.database.postgres.docker.tmpfs.enabled=false # Whether to mount postgres data directory as tmpfs.
+zonky.test.database.postgres.docker.tmpfs.options=rw,noexec,nosuid # Mount options used to configure the tmpfs filesystem.
 ``` 
 
 ### Using OpenTable Provider
@@ -477,20 +477,20 @@ public class YandexProviderIntegrationTest {
 
 #### Yandex-specific provider configuration
 
-The provider configuration can be controlled by properties in the `embedded-database.postgres.yandex-provider` group.
+The provider configuration can be controlled by properties in the `zonky.test.database.postgres.yandex-provider` group.
 
 ```properties
-embedded-database.postgres.yandex-provider.postgres-version=10.6-1 # Version of EnterpriseDB PostgreSQL binaries (https://www.enterprisedb.com/download-postgresql-binaries).
+zonky.test.database.postgres.yandex-provider.postgres-version=10.6-1 # Version of EnterpriseDB PostgreSQL binaries (https://www.enterprisedb.com/download-postgresql-binaries).
 ```
 
 ### Database Prefetching
 
-Database prefetching is used to speed up the database initialization. It can be customized by properties in the `embedded-database.prefetching` group.
+Database prefetching is used to speed up the database initialization. It can be customized by properties in the `zonky.test.database.prefetching` group.
 
 ```properties
-embedded-database.prefetching.thread-name-prefix=prefetching- # Prefix to use for the names of database prefetching threads.
-embedded-database.prefetching.concurrency=3 # Maximum number of concurrently running database prefetching threads.
-embedded-database.prefetching.pipeline-cache-size=3 # Maximum number of prepared databases per pipeline.
+zonky.test.database.prefetching.thread-name-prefix=prefetching- # Prefix to use for the names of database prefetching threads.
+zonky.test.database.prefetching.concurrency=3 # Maximum number of concurrently running database prefetching threads.
+zonky.test.database.prefetching.pipeline-cache-size=3 # Maximum number of prepared databases per pipeline.
 ```
 
 ### Disabling auto-configuration
@@ -620,7 +620,7 @@ Since version 1.4.0, database prefetching has been improved. All databases are s
 It speeds up the preparation of databases, but in some rare cases, if your database scripts use some global objects inappropriately, this change can cause problems. If necessary, you can change this behavior back by setting the following property:
 
 ```properties
-embedded-database.postgres.zonky-provider.preparer-isolation=cluster
+zonky.test.database.postgres.zonky-provider.preparer-isolation=cluster
 ```
 
 ## Building from Source

build.gradle

@@ -29,7 +29,8 @@ ext {
 
             [core: '5.0.7', test: '5.0.0'] // default version
     ]
-    embeddedPostgresVersions = ['9.3.25', '9.4.20', '9.5.15', '9.6.11', '10.6.0', '11.1.0']
+//    embeddedPostgresVersions = ['9.3.25', '9.4.20', '9.5.15', '9.6.11', '10.6.0', '11.1.0']
+    embeddedPostgresVersions = ['9.3.25', '9.4.20', '9.5.15', '9.6.11', '10.6.0'] // TODO: OpenTable and Yandex providers don't support Postgres11+ on Linux Platform
 
     flywayCoreVersion = flywayVersions.last().core
     flywayTestVersion = flywayVersions.last().test

embedded-database-spring-test/src/main/java/io/zonky/test/db/AutoConfigureEmbeddedDatabase.java

@@ -69,7 +69,7 @@
      * Provider used to create the underlying embedded database,
      * see the documentation for the comparision matrix.
      * Note that the provider can also be configured
-     * through {@code embedded-database.provider} property.
+     * through {@code zonky.test.database.provider} property.
      *
      * @return the provider of an embedded database
      */

embedded-database-spring-test/src/main/java/io/zonky/test/db/postgres/EmbeddedPostgresContextCustomizerFactory.java

@@ -61,6 +61,7 @@
 
 import javax.sql.DataSource;
 import java.lang.reflect.AnnotatedElement;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -94,7 +95,7 @@ public ContextCustomizer createContextCustomizer(Class<?> testClass, List<Contex
                 .filter(distinctByKey(AutoConfigureEmbeddedDatabase::beanName))
                 .filter(databaseAnnotation -> databaseAnnotation.type() == EmbeddedDatabaseType.POSTGRES)
                 .filter(databaseAnnotation -> databaseAnnotation.replace() != Replace.NONE)
-                .collect(Collectors.toSet());
+                .collect(Collectors.toCollection(LinkedHashSet::new));
 
         if (!databaseAnnotations.isEmpty()) {
             return new PreloadableEmbeddedPostgresContextCustomizer(databaseAnnotations);
@@ -253,7 +254,7 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
 
         protected DatabaseDescriptor resolveDatabaseDescriptor(Environment environment, AutoConfigureEmbeddedDatabase databaseAnnotation) {
             String providerName = databaseAnnotation.provider() != DEFAULT ? databaseAnnotation.provider().name() :
-                    environment.getProperty("embedded-database.provider", ProviderType.ZONKY.toString());
+                    environment.getProperty("zonky.test.database.provider", ProviderType.ZONKY.toString());
             return new DatabaseDescriptor(DatabaseType.POSTGRES, ProviderType.valueOf(providerName));
         }
     }

embedded-database-spring-test/src/main/java/io/zonky/test/db/provider/impl/DockerPostgresDatabaseProvider.java

@@ -65,13 +65,13 @@ public DatabaseInstance load(DatabaseConfig config) {
     private final ClientConfig clientConfig;
 
     public DockerPostgresDatabaseProvider(Environment environment) {
-        String dockerImage = environment.getProperty("embedded-database.postgres.docker.image", "postgres:10.6-alpine");
-        String tmpfsOptions = environment.getProperty("embedded-database.postgres.docker.tmpfs.options", "rw,noexec,nosuid");
-        boolean tmpfsEnabled = environment.getProperty("embedded-database.postgres.docker.tmpfs.enabled", boolean.class, false);
+        String dockerImage = environment.getProperty("zonky.test.database.postgres.docker.image", "postgres:10.6-alpine");
+        String tmpfsOptions = environment.getProperty("zonky.test.database.postgres.docker.tmpfs.options", "rw,noexec,nosuid");
+        boolean tmpfsEnabled = environment.getProperty("zonky.test.database.postgres.docker.tmpfs.enabled", boolean.class, false);
 
-        Map<String, String> initdbProperties = PropertyUtils.extractAll(environment, "embedded-database.postgres.initdb.properties");
-        Map<String, String> configProperties = PropertyUtils.extractAll(environment, "embedded-database.postgres.server.properties");
-        Map<String, String> connectProperties = PropertyUtils.extractAll(environment, "embedded-database.postgres.client.properties");
+        Map<String, String> initdbProperties = PropertyUtils.extractAll(environment, "zonky.test.database.postgres.initdb.properties");
+        Map<String, String> configProperties = PropertyUtils.extractAll(environment, "zonky.test.database.postgres.server.properties");
+        Map<String, String> connectProperties = PropertyUtils.extractAll(environment, "zonky.test.database.postgres.client.properties");
 
         this.databaseConfig = new DatabaseConfig(dockerImage, tmpfsOptions, tmpfsEnabled, initdbProperties, configProperties);
         this.clientConfig = new ClientConfig(connectProperties);

embedded-database-spring-test/src/main/java/io/zonky/test/db/provider/impl/OpenTablePostgresDatabaseProvider.java

@@ -64,9 +64,9 @@ public DatabaseInstance load(DatabaseConfig config) throws IOException {
     private final ClientConfig clientConfig;
 
     public OpenTablePostgresDatabaseProvider(Environment environment, ObjectProvider<List<Consumer<EmbeddedPostgres.Builder>>> databaseCustomizers) {
-        Map<String, String> initdbProperties = PropertyUtils.extractAll(environment, "embedded-database.postgres.initdb.properties");
-        Map<String, String> configProperties = PropertyUtils.extractAll(environment, "embedded-database.postgres.server.properties");
-        Map<String, String> connectProperties = PropertyUtils.extractAll(environment, "embedded-database.postgres.client.properties");
+        Map<String, String> initdbProperties = PropertyUtils.extractAll(environment, "zonky.test.database.postgres.initdb.properties");
+        Map<String, String> configProperties = PropertyUtils.extractAll(environment, "zonky.test.database.postgres.server.properties");
+        Map<String, String> connectProperties = PropertyUtils.extractAll(environment, "zonky.test.database.postgres.client.properties");
         List<Consumer<EmbeddedPostgres.Builder>> customizers = Optional.ofNullable(databaseCustomizers.getIfAvailable()).orElse(emptyList());
 
         this.databaseConfig = new DatabaseConfig(initdbProperties, configProperties, customizers);

embedded-database-spring-test/src/main/java/io/zonky/test/db/provider/impl/PrefetchingDatabaseProvider.java

@@ -79,9 +79,9 @@ public PrefetchingDatabaseProvider(ObjectProvider<List<DatabaseProvider>> databa
         this.databaseProviders = Optional.ofNullable(databaseProviders.getIfAvailable()).orElse(emptyList()).stream()
                 .collect(Collectors.toMap(p -> new DatabaseDescriptor(p.getDatabaseType(), p.getProviderType()), identity()));
 
-        String threadNamePrefix = environment.getProperty("embedded-database.prefetching.thread-name-prefix", "prefetching-");
-        int concurrency = environment.getProperty("embedded-database.prefetching.concurrency", int.class, 3);
-        pipelineCacheSize = environment.getProperty("embedded-database.prefetching.pipeline-cache-size", int.class, 3);
+        String threadNamePrefix = environment.getProperty("zonky.test.database.prefetching.thread-name-prefix", "prefetching-");
+        int concurrency = environment.getProperty("zonky.test.database.prefetching.concurrency", int.class, 3);
+        pipelineCacheSize = environment.getProperty("zonky.test.database.prefetching.pipeline-cache-size", int.class, 3);
 
         taskExecutor.setThreadNamePrefix(threadNamePrefix);
         taskExecutor.setCorePoolSize(concurrency);

embedded-database-spring-test/src/main/java/io/zonky/test/db/provider/impl/YandexPostgresDatabaseProvider.java

@@ -68,11 +68,11 @@ public DatabaseInstance load(DatabaseConfig config) throws IOException {
     private final ClientConfig clientConfig;
 
     public YandexPostgresDatabaseProvider(Environment environment) {
-        String postgresVersion = environment.getProperty("embedded-database.postgres.yandex-provider.postgres-version", "10.6-1");
+        String postgresVersion = environment.getProperty("zonky.test.database.postgres.yandex-provider.postgres-version", "10.6-1");
 
-        Map<String, String> initdbProperties = PropertyUtils.extractAll(environment, "embedded-database.postgres.initdb.properties");
-        Map<String, String> configProperties = PropertyUtils.extractAll(environment, "embedded-database.postgres.server.properties");
-        Map<String, String> connectProperties = PropertyUtils.extractAll(environment, "embedded-database.postgres.client.properties");
+        Map<String, String> initdbProperties = PropertyUtils.extractAll(environment, "zonky.test.database.postgres.initdb.properties");
+        Map<String, String> configProperties = PropertyUtils.extractAll(environment, "zonky.test.database.postgres.server.properties");
+        Map<String, String> connectProperties = PropertyUtils.extractAll(environment, "zonky.test.database.postgres.client.properties");
 
         this.databaseConfig = new DatabaseConfig(new GenericVersion(postgresVersion), initdbProperties, configProperties);
         this.clientConfig = new ClientConfig(connectProperties);

embedded-database-spring-test/src/main/java/io/zonky/test/db/provider/impl/ZonkyPostgresDatabaseProvider.java

@@ -64,12 +64,12 @@ public DatabaseInstance load(ClusterKey key) throws IOException {
     private final ClientConfig clientConfig;
 
     public ZonkyPostgresDatabaseProvider(Environment environment, ObjectProvider<List<Consumer<EmbeddedPostgres.Builder>>> databaseCustomizers) {
-        String preparerIsolation = environment.getProperty("embedded-database.postgres.zonky-provider.preparer-isolation", "database");
+        String preparerIsolation = environment.getProperty("zonky.test.database.postgres.zonky-provider.preparer-isolation", "database");
         PreparerIsolation isolation = PreparerIsolation.valueOf(preparerIsolation.toUpperCase());
 
-        Map<String, String> initdbProperties = PropertyUtils.extractAll(environment, "embedded-database.postgres.initdb.properties");
-        Map<String, String> configProperties = PropertyUtils.extractAll(environment, "embedded-database.postgres.server.properties");
-        Map<String, String> connectProperties = PropertyUtils.extractAll(environment, "embedded-database.postgres.client.properties");
+        Map<String, String> initdbProperties = PropertyUtils.extractAll(environment, "zonky.test.database.postgres.initdb.properties");
+        Map<String, String> configProperties = PropertyUtils.extractAll(environment, "zonky.test.database.postgres.server.properties");
+        Map<String, String> connectProperties = PropertyUtils.extractAll(environment, "zonky.test.database.postgres.client.properties");
         List<Consumer<EmbeddedPostgres.Builder>> customizers = Optional.ofNullable(databaseCustomizers.getIfAvailable()).orElse(emptyList());
 
         this.databaseConfig = new DatabaseConfig(initdbProperties, configProperties, customizers, isolation);