deprecate providers

Author: tomix26

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

@@ -193,19 +193,28 @@ enum DatabaseProvider {
         /**
          * Use Zonky's fork of OpenTable Embedded PostgreSQL Component to create the embedded database
          * (<a href="https://github.com/zonkyio/embedded-postgres">https://github.com/zonkyio/embedded-postgres</a>).
+         *
+         * @deprecated Use the {@link #EMBEDDED} value instead. Zonky provider has been renamed to the Embedded Postgres provider and this enum value is scheduled to be removed in the next major version.
          */
+        @Deprecated
         ZONKY,
 
         /**
          * Use OpenTable Embedded PostgreSQL Component to create the embedded database
          * (<a href="https://github.com/opentable/otj-pg-embedded">https://github.com/opentable/otj-pg-embedded</a>).
+         *
+         * @deprecated Use the {@link #EMBEDDED} value instead. OpenTable provider has been deprecated in favor of Zonky provider and is scheduled to be removed in the next major version.
          */
+        @Deprecated
         OPENTABLE,
 
         /**
          * Use Yandex's Embedded PostgreSQL Server to create the embedded database
          * (<a href="https://github.com/yandex-qatools/postgresql-embedded">https://github.com/yandex-qatools/postgresql-embedded</a>).
+         *
+         * @deprecated Use the {@link #EMBEDDED} value instead. Yandex provider has been deprecated in favor of Zonky provider and is scheduled to be removed in the next major version.
          */
+        @Deprecated
         YANDEX
 
     }

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

@@ -87,6 +87,7 @@ private void captureTestClassPreparers(TestContext testContext, RefreshMode... r
     private void forEachDatabase(TestContext testContext, RefreshMode[] refreshModes, BiConsumer<DatabaseContext, AutoConfigureEmbeddedDatabase> action) {
         Set<AutoConfigureEmbeddedDatabase> annotations = AnnotationUtils.getDatabaseAnnotations(testContext.getTestClass());
 
+        // prevent invocation of testContext.getApplicationContext() if not necessary
         if (annotations.isEmpty()) {
             return;
         }

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

@@ -63,6 +63,15 @@ public DatabaseProvider dockerPostgresDatabaseProvider(DatabaseProviderFactory p
         return postgresDatabaseProviderFactory.createProvider(DockerPostgresDatabaseProvider.class);
     }
 
+    @Bean
+    @Provider(type = "embedded", database = "postgres")
+    @ConditionalOnMissingBean(name = "embeddedPostgresDatabaseProvider")
+    public DatabaseProvider embeddedPostgresDatabaseProvider(DatabaseProviderFactory postgresDatabaseProviderFactory) {
+        checkDependency("io.zonky.test", "embedded-postgres", "io.zonky.test.db.postgres.embedded.EmbeddedPostgres");
+        checkDependency("org.postgresql", "postgresql", "org.postgresql.ds.PGSimpleDataSource");
+        return postgresDatabaseProviderFactory.createProvider(ZonkyPostgresDatabaseProvider.class);
+    }
+
     @Bean
     @Provider(type = "zonky", database = "postgres")
     @ConditionalOnMissingBean(name = "zonkyPostgresDatabaseProvider")

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

@@ -41,17 +41,17 @@
 import java.util.Map;
 
 import static io.zonky.test.db.AutoConfigureEmbeddedDatabase.DatabaseProvider.DOCKER;
-import static io.zonky.test.db.AutoConfigureEmbeddedDatabase.DatabaseProvider.ZONKY;
+import static io.zonky.test.db.AutoConfigureEmbeddedDatabase.DatabaseProvider.EMBEDDED;
 import static io.zonky.test.db.AutoConfigureEmbeddedDatabase.DatabaseType.POSTGRES;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
 import static org.assertj.core.api.Assertions.tuple;
 
 @RunWith(SpringRunner.class)
 @Category(FlywayTestSuite.class)
-@AutoConfigureEmbeddedDatabase(beanName = "dataSource1", type = POSTGRES, provider = ZONKY)
+@AutoConfigureEmbeddedDatabase(beanName = "dataSource1", type = POSTGRES, provider = EMBEDDED)
 @AutoConfigureEmbeddedDatabase(beanName = "dataSource2", type = POSTGRES, provider = DOCKER)
-@AutoConfigureEmbeddedDatabase(beanName = "dataSource3", type = POSTGRES, provider = ZONKY)
+@AutoConfigureEmbeddedDatabase(beanName = "dataSource3", type = POSTGRES, provider = EMBEDDED)
 @ContextConfiguration
 public class MultipleDatabasesIntegrationTest {
 

embedded-database-spring-test/src/test/java/io/zonky/test/db/provider/ZonkyProviderIntegrationTest.java

@@ -29,13 +29,13 @@
 import javax.sql.DataSource;
 import java.sql.SQLException;
 
-import static io.zonky.test.db.AutoConfigureEmbeddedDatabase.DatabaseProvider.ZONKY;
+import static io.zonky.test.db.AutoConfigureEmbeddedDatabase.DatabaseProvider.EMBEDDED;
 import static io.zonky.test.db.AutoConfigureEmbeddedDatabase.DatabaseType.POSTGRES;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(SpringRunner.class)
 @Category(PostgresTestSuite.class)
-@AutoConfigureEmbeddedDatabase(type = POSTGRES, provider = ZONKY)
+@AutoConfigureEmbeddedDatabase(type = POSTGRES, provider = EMBEDDED)
 @ContextConfiguration
 public class ZonkyProviderIntegrationTest {
 

embedded-database-spring-test/src/test/java/io/zonky/test/db/provider/ZonkyProviderWithConfigurationIntegrationTest.java

@@ -34,13 +34,13 @@
 import java.sql.SQLException;
 import java.util.function.Consumer;
 
-import static io.zonky.test.db.AutoConfigureEmbeddedDatabase.DatabaseProvider.ZONKY;
+import static io.zonky.test.db.AutoConfigureEmbeddedDatabase.DatabaseProvider.EMBEDDED;
 import static io.zonky.test.db.AutoConfigureEmbeddedDatabase.DatabaseType.POSTGRES;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(SpringRunner.class)
 @Category(PostgresTestSuite.class)
-@AutoConfigureEmbeddedDatabase(type = POSTGRES, provider = ZONKY)
+@AutoConfigureEmbeddedDatabase(type = POSTGRES, provider = EMBEDDED)
 @ContextConfiguration
 public class ZonkyProviderWithConfigurationIntegrationTest {