refactoring - combining Module and Provider for non-deprecated modules

src/main/java/io/bootique/curator/CuratorModule.java

@@ -19,16 +19,34 @@
 
 package io.bootique.curator;
 
-import io.bootique.ConfigModule;
+import io.bootique.BQModuleProvider;
+import io.bootique.bootstrap.BuiltModule;
 import io.bootique.config.ConfigurationFactory;
+import io.bootique.di.BQModule;
+import io.bootique.di.Binder;
 import io.bootique.di.Provides;
 import io.bootique.log.BootLogger;
 import io.bootique.shutdown.ShutdownManager;
 import org.apache.curator.framework.CuratorFramework;
 
 import javax.inject.Singleton;
 
-public class CuratorModule extends ConfigModule {
+public class CuratorModule implements BQModule, BQModuleProvider {
+
+    private static final String CONFIG_PREFIX = "curator";
+
+    @Override
+    public BuiltModule buildModule() {
+        return BuiltModule.of(new CuratorModule())
+                .provider(this)
+                .description("Integrates Apache Curator Zookeeper client")
+                .config(CONFIG_PREFIX, CuratorFrameworkFactory.class)
+                .build();
+    }
+
+    @Override
+    public void configure(Binder binder) {
+    }
 
     @Provides
     @Singleton
@@ -37,7 +55,7 @@ public CuratorFramework createCurator(
             BootLogger bootLogger,
             ShutdownManager shutdownManager) {
 
-        CuratorFramework client = config(CuratorFrameworkFactory.class, configFactory).createZkClient();
+        CuratorFramework client = configFactory.config(CuratorFrameworkFactory.class, CONFIG_PREFIX).createZkClient();
 
         shutdownManager.addShutdownHook(() -> {
             bootLogger.trace(() -> "shutting down Curator...");

src/main/resources/META-INF/services/io.bootique.BQModuleProvider

@@ -1 +1 @@
-io.bootique.curator.CuratorModuleProvider
+io.bootique.curator.CuratorModule

src/test/java/io/bootique/curator/CuratorModuleProviderTest.java → src/test/java/io/bootique/curator/CuratorModuleTest.java

@@ -22,10 +22,10 @@
 import io.bootique.junit5.BQModuleProviderChecker;
 import org.junit.jupiter.api.Test;
 
-public class CuratorModuleProviderTest {
+public class CuratorModuleTest {
 
     @Test
     public void autoLoadable() {
-        BQModuleProviderChecker.testAutoLoadable(CuratorModuleProvider.class);
+        BQModuleProviderChecker.testAutoLoadable(CuratorModule.class);
     }
 }