Per bootique/bootique#344 BQModuleProvider is deprecated and unneeded

bootique-shiro-jdbc/src/main/java/io/bootique/shiro/jdbc/ShiroJdbcModule.java

@@ -16,35 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package io.bootique.shiro.jdbc;
 
-import io.bootique.BQModuleProvider;
+import io.bootique.BQModule;
 import io.bootique.ModuleCrate;
 import io.bootique.di.Binder;
-import io.bootique.di.BQModule;
-import io.bootique.jdbc.JdbcModule;
-import io.bootique.shiro.ShiroModule;
-
-import java.util.Collection;
-
-import static java.util.Arrays.asList;
 
-public class ShiroJdbcModule implements BQModule, BQModuleProvider {
+public class ShiroJdbcModule implements BQModule {
 
     @Override
-    public ModuleCrate moduleCrate() {
+    public ModuleCrate crate() {
         return ModuleCrate.of(this)
                 .description("Integrates Apache Shiro JDBC extensions")
                 .build();
     }
 
-    @Override
-    @Deprecated(since = "3.0", forRemoval = true)
-    public Collection<BQModuleProvider> dependencies() {
-        return asList(new JdbcModule(), new ShiroModule());
-    }
-
     @Override
     public void configure(Binder binder) {
     }

bootique-shiro-jdbc/src/test/java/io/bootique/shiro/jdbc/ShiroJdbcModuleTest.java

@@ -19,18 +19,13 @@
 
 package io.bootique.shiro.jdbc;
 
-import io.bootique.junit5.BQModuleProviderChecker;
+import io.bootique.junit5.BQModuleTester;
 import org.junit.jupiter.api.Test;
 
 public class ShiroJdbcModuleTest {
 
     @Test
-    public void autoLoadable() {
-        BQModuleProviderChecker.testAutoLoadable(ShiroJdbcModule.class);
-    }
-
-    @Test
-    public void metadata() {
-        BQModuleProviderChecker.testMetadata(ShiroJdbcModule.class);
+    public void check() {
+        BQModuleTester.of(ShiroJdbcModule.class).testAutoLoadable().testConfig();
     }
 }

bootique-shiro-web-jakarta-mdc/src/main/java/io/bootique/shiro/web/mdc/ShiroWebMDCModule.java

@@ -19,9 +19,8 @@
 
 package io.bootique.shiro.web.mdc;
 
-import io.bootique.BQModuleProvider;
+import io.bootique.BQModule;
 import io.bootique.ModuleCrate;
-import io.bootique.di.BQModule;
 import io.bootique.di.Binder;
 import io.bootique.di.Provides;
 import io.bootique.jetty.JettyModule;
@@ -30,25 +29,16 @@
 import io.bootique.shiro.web.ShiroWebModule;
 
 import javax.inject.Singleton;
-import java.util.Collection;
 
-import static java.util.Collections.singletonList;
-
-public class ShiroWebMDCModule implements BQModule, BQModuleProvider {
+public class ShiroWebMDCModule implements BQModule {
 
     @Override
-    public ModuleCrate moduleCrate() {
+    public ModuleCrate crate() {
         return ModuleCrate.of(this)
                 .description("Integrates MDC logging of Apache Shiro subjects")
                 .build();
     }
 
-    @Override
-    @Deprecated(since = "3.0", forRemoval = true)
-    public Collection<BQModuleProvider> dependencies() {
-        return singletonList(new ShiroWebModule());
-    }
-
     @Override
     public void configure(Binder binder) {
         JettyModule.extend(binder).addRequestMDCItem(PrincipalMDC.MDC_KEY, ShiroWebPrincipalMDCItem.class);

bootique-shiro-web-jakarta-mdc/src/test/java/io/bootique/shiro/web/mdc/ShiroWebModuleTest.java

@@ -19,13 +19,13 @@
 
 package io.bootique.shiro.web.mdc;
 
-import io.bootique.junit5.BQModuleProviderChecker;
+import io.bootique.junit5.BQModuleTester;
 import org.junit.jupiter.api.Test;
 
 public class ShiroWebModuleTest {
 
     @Test
-    public void autoLoadable() {
-        BQModuleProviderChecker.testAutoLoadable(ShiroWebMDCModule.class);
+    public void check() {
+        BQModuleTester.of(ShiroWebMDCModule.class).testAutoLoadable().testConfig();
     }
 }

bootique-shiro-web-jakarta/src/main/java/io/bootique/shiro/web/ShiroWebModule.java

@@ -19,10 +19,13 @@
 
 package io.bootique.shiro.web;
 
-import io.bootique.BQModuleProvider;
+import io.bootique.BQModule;
 import io.bootique.ModuleCrate;
 import io.bootique.config.ConfigurationFactory;
-import io.bootique.di.*;
+import io.bootique.di.Binder;
+import io.bootique.di.Injector;
+import io.bootique.di.Provides;
+import io.bootique.di.TypeLiteral;
 import io.bootique.jetty.JettyModule;
 import io.bootique.jetty.MappedFilter;
 import io.bootique.shiro.ShiroConfigurator;
@@ -42,13 +45,10 @@
 import org.apache.shiro.web.session.mgt.ServletContainerSessionManager;
 
 import javax.inject.Singleton;
-import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 
-import static java.util.Arrays.asList;
-
-public class ShiroWebModule implements BQModule, BQModuleProvider {
+public class ShiroWebModule implements BQModule {
 
     private static final String CONFIG_PREFIX = "shiroweb";
 
@@ -57,20 +57,14 @@ public static ShiroWebModuleExtender extend(Binder binder) {
     }
 
     @Override
-    public ModuleCrate moduleCrate() {
+    public ModuleCrate crate() {
         return ModuleCrate.of(this)
                 .description("Integrates Apache Shiro webapp extensions (security filters, etc.)")
                 .config(CONFIG_PREFIX, MappedShiroFilterFactory.class)
                 .overrides(ShiroModule.class)
                 .build();
     }
 
-    @Override
-    @Deprecated(since = "3.0", forRemoval = true)
-    public Collection<BQModuleProvider> dependencies() {
-        return asList(new JettyModule(), new ShiroModule());
-    }
-
     @Override
     public void configure(Binder binder) {
         extend(binder).initAllExtensions();

bootique-shiro-web-jakarta/src/test/java/io/bootique/shiro/web/ShiroWebModuleTest.java

@@ -19,18 +19,13 @@
 
 package io.bootique.shiro.web;
 
-import io.bootique.junit5.BQModuleProviderChecker;
+import io.bootique.junit5.BQModuleTester;
 import org.junit.jupiter.api.Test;
 
 public class ShiroWebModuleTest {
 
     @Test
-    public void autoLoadable() {
-        BQModuleProviderChecker.testAutoLoadable(ShiroWebModule.class);
-    }
-
-    @Test
-    public void metadata() {
-        BQModuleProviderChecker.testMetadata(ShiroWebModule.class);
+    public void check() {
+        BQModuleTester.of(ShiroWebModule.class).testAutoLoadable().testConfig();
     }
 }

bootique-shiro-web-mdc/src/main/java/io/bootique/shiro/web/mdc/ShiroWebMDCModule.java

@@ -19,7 +19,8 @@
 
 package io.bootique.shiro.web.mdc;
 
-import io.bootique.di.BQModule;
+import io.bootique.ModuleCrate;
+import io.bootique.BQModule;
 import io.bootique.di.Binder;
 import io.bootique.di.Provides;
 import io.bootique.jetty.JettyModule;
@@ -35,6 +36,13 @@
 @Deprecated(since = "3.0", forRemoval = true)
 public class ShiroWebMDCModule implements BQModule {
 
+    @Override
+    public ModuleCrate crate() {
+        return ModuleCrate.of(this)
+                .description("Deprecated, can be replaced with 'bootique-shiro-web-jakarta-mdc'.")
+                .build();
+    }
+
     @Override
     public void configure(Binder binder) {
         JettyModule.extend(binder).addRequestMDCItem(PrincipalMDC.MDC_KEY, ShiroWebPrincipalMDCItem.class);

bootique-shiro-web-mdc/src/main/resources/META-INF/services/io.bootique.BQModule

@@ -0,0 +1 @@
+io.bootique.shiro.web.mdc.ShiroWebMDCModule

bootique-shiro-web-mdc/src/test/java/io/bootique/shiro/web/mdc/ShiroWebModuleProviderTest.java → bootique-shiro-web-mdc/src/test/java/io/bootique/shiro/web/mdc/ShiroWebModuleTest.java

@@ -19,13 +19,13 @@
 
 package io.bootique.shiro.web.mdc;
 
-import io.bootique.junit5.BQModuleProviderChecker;
+import io.bootique.junit5.BQModuleTester;
 import org.junit.jupiter.api.Test;
 
-public class ShiroWebModuleProviderTest {
+public class ShiroWebModuleTest {
 
     @Test
     public void autoLoadable() {
-        BQModuleProviderChecker.testAutoLoadable(ShiroWebMDCModuleProvider.class);
+        BQModuleTester.of(ShiroWebMDCModule.class).testAutoLoadable().testConfig();
     }
 }

bootique-shiro-web/src/main/java/io/bootique/shiro/web/ShiroWebModule.java

@@ -20,6 +20,7 @@
 package io.bootique.shiro.web;
 
 import io.bootique.ConfigModule;
+import io.bootique.ModuleCrate;
 import io.bootique.config.ConfigurationFactory;
 import io.bootique.di.Binder;
 import io.bootique.di.Injector;
@@ -28,6 +29,7 @@
 import io.bootique.jetty.JettyModule;
 import io.bootique.jetty.MappedFilter;
 import io.bootique.shiro.ShiroConfigurator;
+import io.bootique.shiro.ShiroModule;
 import org.apache.shiro.authc.AbstractAuthenticator;
 import org.apache.shiro.authc.AuthenticationListener;
 import org.apache.shiro.mgt.SecurityManager;
@@ -54,6 +56,15 @@ public static ShiroWebModuleExtender extend(Binder binder) {
         return new ShiroWebModuleExtender(binder);
     }
 
+    @Override
+    public ModuleCrate crate() {
+        return ModuleCrate.of(this)
+                .description("Deprecated, can be replaced with 'bootique-shiro-web-jakarta'.")
+                .config("shiroweb", MappedShiroFilterFactory.class)
+                .overrides(ShiroModule.class)
+                .build();
+    }
+
     @Override
     public void configure(Binder binder) {
         extend(binder).initAllExtensions();

bootique-shiro-web/src/main/resources/META-INF/services/io.bootique.BQModule

@@ -0,0 +1 @@
+io.bootique.shiro.web.ShiroWebModule