Remove use of Config.global() setter. Add @Testing.Test annotation

Author: barchetta

examples/dbclient/jdbc/pom.xml

@@ -162,6 +162,11 @@
             <artifactId>helidon-webclient</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.testing</groupId>
+            <artifactId>helidon-testing-junit5</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>

examples/dbclient/jdbc/src/test/java/io/helidon/examples/dbclient/jdbc/PokemonServiceH2IT.java

@@ -21,6 +21,8 @@
 import io.helidon.config.Config;
 import io.helidon.config.ConfigSources;
 
+import io.helidon.service.registry.Services;
+import io.helidon.testing.junit5.Testing;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.testcontainers.containers.GenericContainer;
@@ -31,6 +33,7 @@
 
 import static io.helidon.config.ConfigSources.classpath;
 
+@Testing.Test
 @Testcontainers(disabledWithoutDocker = true)
 class PokemonServiceH2IT extends AbstractPokemonServiceTest {
     private static final DockerImageName H2_IMAGE = DockerImageName.parse("nemerosa/h2");
@@ -43,7 +46,7 @@ class PokemonServiceH2IT extends AbstractPokemonServiceTest {
     @BeforeAll
     static void start() {
         String url = String.format("jdbc:h2:tcp://localhost:%s/~./test", container.getMappedPort(9082));
-        Config.global(Config.builder()
+        Services.set(Config.class, Config.builder()
                 .addSource(ConfigSources.create(Map.of("db.connection.url", url)))
                 .addSource(classpath("application-h2-test.yaml"))
                 .build());

examples/dbclient/jdbc/src/test/java/io/helidon/examples/dbclient/jdbc/PokemonServiceMySQLIT.java

@@ -21,6 +21,8 @@
 import io.helidon.config.Config;
 import io.helidon.config.ConfigSources;
 
+import io.helidon.service.registry.Services;
+import io.helidon.testing.junit5.Testing;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.testcontainers.containers.MySQLContainer;
@@ -29,6 +31,7 @@
 
 import static io.helidon.config.ConfigSources.classpath;
 
+@Testing.Test
 @Testcontainers(disabledWithoutDocker = true)
 class PokemonServiceMySQLIT extends AbstractPokemonServiceTest {
 
@@ -41,7 +44,7 @@ class PokemonServiceMySQLIT extends AbstractPokemonServiceTest {
 
     @BeforeAll
     static void start() {
-        Config.global(Config.builder()
+        Services.set(Config.class, Config.builder()
                 .addSource(ConfigSources.create(Map.of("db.connection.url", container.getJdbcUrl())))
                 .addSource(classpath("application-mysql-test.yaml"))
                 .build());

examples/dbclient/jdbc/src/test/java/io/helidon/examples/dbclient/jdbc/PokemonServiceOracleIT.java

@@ -20,6 +20,8 @@
 import io.helidon.config.Config;
 import io.helidon.config.ConfigSources;
 
+import io.helidon.service.registry.Services;
+import io.helidon.testing.junit5.Testing;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.testcontainers.containers.OracleContainer;
@@ -30,6 +32,7 @@
 
 import static io.helidon.config.ConfigSources.classpath;
 
+@Testing.Test
 @Testcontainers(disabledWithoutDocker = true)
 public class PokemonServiceOracleIT extends AbstractPokemonServiceTest {
 
@@ -45,7 +48,7 @@ public class PokemonServiceOracleIT extends AbstractPokemonServiceTest {
 
     @BeforeAll
     static void start() {
-        Config.global(Config.builder()
+        Services.set(Config.class, Config.builder()
                 .addSource(ConfigSources.create(Map.of("db.connection.url", container.getJdbcUrl())))
                 .addSource(classpath("application-oracle-test.yaml"))
                 .build());

examples/dbclient/pokemons/src/main/java/io/helidon/examples/dbclient/pokemons/Main.java

@@ -22,6 +22,7 @@
 import io.helidon.dbclient.DbClient;
 import io.helidon.dbclient.health.DbClientHealthCheck;
 import io.helidon.logging.common.LogConfig;
+import io.helidon.service.registry.Services;
 import io.helidon.webserver.WebServer;
 import io.helidon.webserver.WebServerConfig;
 import io.helidon.webserver.http.HttpRouting;
@@ -72,7 +73,7 @@ private static void startServer() {
 
         // By default, this will pick up application.yaml from the classpath
         Config config = mongo ? Config.create(ConfigSources.classpath(MONGO_CFG)) : Config.create();
-        Config.global(config);
+        Services.set(Config.class, config);
 
         WebServer server = setupServer(WebServer.builder())
                 .build()

examples/dbclient/pokemons/src/test/java/io/helidon/examples/dbclient/pokemons/PokemonServiceH2IT.java

@@ -20,6 +20,8 @@
 import io.helidon.config.Config;
 import io.helidon.config.ConfigSources;
 
+import io.helidon.service.registry.Services;
+import io.helidon.testing.junit5.Testing;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.testcontainers.containers.GenericContainer;
@@ -33,6 +35,7 @@
 /**
  * Tests {@link io.helidon.examples.dbclient.pokemons.PokemonService}.
  */
+@Testing.Test
 @Testcontainers(disabledWithoutDocker = true)
 class PokemonServiceH2IT extends AbstractPokemonServiceTest {
     private static final DockerImageName H2_IMAGE = DockerImageName.parse("nemerosa/h2");
@@ -45,7 +48,7 @@ class PokemonServiceH2IT extends AbstractPokemonServiceTest {
     @BeforeAll
     static void start() {
         String url = String.format("jdbc:h2:tcp://localhost:%s/~./test", container.getMappedPort(9082));
-        Config.global(Config.builder()
+        Services.set(Config.class, Config.builder()
                 .addSource(ConfigSources.create(Map.of("db.connection.url", url)))
                 .addSource(classpath("application-h2-test.yaml"))
                 .build());

examples/dbclient/pokemons/src/test/java/io/helidon/examples/dbclient/pokemons/PokemonServiceMongoIT.java

@@ -20,6 +20,8 @@
 import io.helidon.config.Config;
 import io.helidon.config.ConfigSources;
 
+import io.helidon.service.registry.Services;
+import io.helidon.testing.junit5.Testing;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.testcontainers.containers.MongoDBContainer;
@@ -28,6 +30,7 @@
 
 import static io.helidon.config.ConfigSources.classpath;
 
+@Testing.Test
 @Testcontainers(disabledWithoutDocker = true)
 public class PokemonServiceMongoIT extends AbstractPokemonServiceTest {
 
@@ -38,7 +41,7 @@ public class PokemonServiceMongoIT extends AbstractPokemonServiceTest {
     @BeforeAll
     static void start() {
         String url = String.format("mongodb://127.0.0.1:%s/pokemon", container.getMappedPort(27017));
-        Config.global(Config.builder()
+        Services.set(Config.class, Config.builder()
                 .addSource(ConfigSources.create(Map.of("db.connection.url", url)))
                 .addSource(classpath("application-mongo-test.yaml"))
                 .build());

examples/dbclient/pokemons/src/test/java/io/helidon/examples/dbclient/pokemons/PokemonServiceMySQLIT.java

@@ -20,6 +20,8 @@
 import io.helidon.config.Config;
 import io.helidon.config.ConfigSources;
 
+import io.helidon.service.registry.Services;
+import io.helidon.testing.junit5.Testing;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.testcontainers.containers.MySQLContainer;
@@ -28,6 +30,7 @@
 
 import static io.helidon.config.ConfigSources.classpath;
 
+@Testing.Test
 @Testcontainers(disabledWithoutDocker = true)
 public class PokemonServiceMySQLIT extends AbstractPokemonServiceTest {
 
@@ -40,7 +43,7 @@ public class PokemonServiceMySQLIT extends AbstractPokemonServiceTest {
 
     @BeforeAll
     static void start() {
-        Config.global(Config.builder()
+        Services.set(Config.class, Config.builder()
                 .addSource(ConfigSources.create(Map.of("db.connection.url", container.getJdbcUrl())))
                 .addSource(classpath("application-mysql-test.yaml"))
                 .build());

examples/dbclient/pokemons/src/test/java/io/helidon/examples/dbclient/pokemons/PokemonServiceOracleIT.java

@@ -20,6 +20,8 @@
 import io.helidon.config.Config;
 import io.helidon.config.ConfigSources;
 
+import io.helidon.service.registry.Services;
+import io.helidon.testing.junit5.Testing;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.testcontainers.containers.OracleContainer;
@@ -30,6 +32,7 @@
 
 import static io.helidon.config.ConfigSources.classpath;
 
+@Testing.Test
 @Testcontainers(disabledWithoutDocker = true)
 public class PokemonServiceOracleIT extends AbstractPokemonServiceTest {
 
@@ -45,7 +48,7 @@ public class PokemonServiceOracleIT extends AbstractPokemonServiceTest {
 
     @BeforeAll
     static void setup() {
-        Config.global(Config.builder()
+        Services.set(Config.class, Config.builder()
                 .addSource(ConfigSources.create(Map.of("db.connection.url", container.getJdbcUrl())))
                 .addSource(classpath("application-oracle-test.yaml"))
                 .build());