refactoring: combining Module and Provider for non-deprecated modules

bootique-logback-sentry/src/main/java/io/bootique/logback/sentry/LogbackSentryModuleProvider.java

@@ -21,7 +21,7 @@
 
 import io.bootique.BQModuleProvider;
 import io.bootique.bootstrap.BuiltModule;
-import io.bootique.logback.LogbackModuleProvider;
+import io.bootique.logback.LogbackModule;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -42,6 +42,6 @@ public BuiltModule buildModule() {
     @Override
     @Deprecated(since = "3.0", forRemoval = true)
     public Collection<BQModuleProvider> dependencies() {
-        return Collections.singletonList(new LogbackModuleProvider());
+        return Collections.singletonList(new LogbackModule());
     }
 }

bootique-logback/src/main/java/io/bootique/logback/LogbackModule.java

@@ -20,9 +20,11 @@
 package io.bootique.logback;
 
 import ch.qos.logback.classic.Logger;
-import io.bootique.ConfigModule;
+import io.bootique.BQModuleProvider;
 import io.bootique.annotation.LogLevels;
+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.shutdown.ShutdownManager;
@@ -31,11 +33,16 @@
 import javax.inject.Singleton;
 import java.util.Map;
 
-public class LogbackModule extends ConfigModule {
+public class LogbackModule implements BQModule, BQModuleProvider {
+
+    private static final String CONFIG_PREFIX = "log";
 
     @Override
-    protected String defaultConfigPrefix() {
-        return "log";
+    public BuiltModule buildModule() {
+        return BuiltModule.of(this)
+                .description("Integrates Logback logging library")
+                .config(CONFIG_PREFIX, LogbackContextFactory.class)
+                .build();
     }
 
     @Override
@@ -47,11 +54,13 @@ public void configure(Binder binder) {
 
     @Singleton
     @Provides
-    Logger provideRootLogger(ConfigurationFactory configFactory,
-                             ShutdownManager shutdownManager,
-                             @LogLevels Map<String, java.util.logging.Level> defaultLevels) {
+    Logger provideRootLogger(
+            ConfigurationFactory configFactory,
+            ShutdownManager shutdownManager,
+            @LogLevels Map<String, java.util.logging.Level> defaultLevels) {
 
-        return config(LogbackContextFactory.class, configFactory)
+        return configFactory
+                .config(LogbackContextFactory.class, CONFIG_PREFIX)
                 .createRootLogger(shutdownManager, defaultLevels);
     }
 

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

@@ -1,20 +1 @@
-#####################################################################
-#  Licensed to ObjectStyle LLC under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ObjectStyle LLC licenses
-#  this file to you under the Apache License, Version 2.0 (the
-#  “License”); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#####################################################################
-
-io.bootique.logback.LogbackModuleProvider
+io.bootique.logback.LogbackModule

bootique-logback/src/test/java/io/bootique/logback/LogbackModuleProviderIT.java → bootique-logback/src/test/java/io/bootique/logback/LogbackModuleTest.java

@@ -22,15 +22,15 @@
 import io.bootique.junit5.BQModuleProviderChecker;
 import org.junit.jupiter.api.Test;
 
-public class LogbackModuleProviderIT {
+public class LogbackModuleTest {
 
 	@Test
     public void autoLoadable() {
-		BQModuleProviderChecker.testAutoLoadable(LogbackModuleProvider.class);
+		BQModuleProviderChecker.testAutoLoadable(LogbackModule.class);
 	}
 
 	@Test
     public void metadata() {
-		BQModuleProviderChecker.testMetadata(LogbackModuleProvider.class);
+		BQModuleProviderChecker.testMetadata(LogbackModule.class);
 	}
 }