Declare module dependencies bootique/bootique#203

bootique · Feb 9, 2018 · d92034e · d92034e
1 parent bff47d7
commit d92034e
Show file tree

Hide file tree

Showing 6 changed files with 95 additions and 0 deletions.
diff --git a/bootique-shiro-jdbc/src/main/java/io/bootique/shiro/jdbc/ShiroJdbcModuleProvider.java b/bootique-shiro-jdbc/src/main/java/io/bootique/shiro/jdbc/ShiroJdbcModuleProvider.java
@@ -3,6 +3,12 @@
 import com.google.inject.Module;
 import io.bootique.BQModule;
 import io.bootique.BQModuleProvider;
+import io.bootique.jdbc.JdbcModuleProvider;
+import io.bootique.shiro.ShiroModuleProvider;
+
+import java.util.Collection;
+
+import static java.util.Arrays.asList;
 
 public class ShiroJdbcModuleProvider implements BQModuleProvider {
 
@@ -17,4 +23,12 @@ public BQModule.Builder moduleBuilder() {
                 .moduleBuilder()
                 .description("Provides a factory to create JDBC Realms based on a set of configurable SQL queries.");
     }
+
+    @Override
+    public Collection<BQModuleProvider> dependencies() {
+        return asList(
+                new JdbcModuleProvider(),
+                new ShiroModuleProvider()
+        );
+    }
 }
diff --git a/bootique-shiro-jdbc/src/test/java/io/bootique/shiro/jdbc/ShiroJdbcModuleProviderTest.java b/bootique-shiro-jdbc/src/test/java/io/bootique/shiro/jdbc/ShiroJdbcModuleProviderTest.java
@@ -1,10 +1,19 @@
 package io.bootique.shiro.jdbc;
 
+import io.bootique.BQRuntime;
+import io.bootique.jdbc.JdbcModule;
+import io.bootique.shiro.ShiroModule;
 import io.bootique.test.junit.BQModuleProviderChecker;
+import io.bootique.test.junit.BQTestFactory;
+import org.junit.Rule;
 import org.junit.Test;
 
+import static com.google.common.collect.ImmutableList.of;
+
 public class ShiroJdbcModuleProviderTest {
 
+    @Rule
+    public BQTestFactory testFactory = new BQTestFactory();
 
     @Test
     public void testAutoLoading() {
@@ -15,4 +24,14 @@ public void testAutoLoading() {
     public void testMetadata() {
         BQModuleProviderChecker.testMetadata(ShiroJdbcModuleProvider.class);
     }
+
+    @Test
+    public void testModuleDeclaresDependencies() {
+        final BQRuntime bqRuntime = testFactory.app().module(new ShiroJdbcModuleProvider()).createRuntime();
+        BQModuleProviderChecker.testModulesLoaded(bqRuntime, of(
+                JdbcModule.class,
+                ShiroModule.class,
+                ShiroJdbcModule.class
+        ));
+    }
 }
diff --git a/...ique-shiro-web-mdc/src/main/java/io/bootique/shiro/web/mdc/ShiroWebMDCModuleProvider.java b/...ique-shiro-web-mdc/src/main/java/io/bootique/shiro/web/mdc/ShiroWebMDCModuleProvider.java
@@ -2,11 +2,23 @@
 
 import com.google.inject.Module;
 import io.bootique.BQModuleProvider;
+import io.bootique.shiro.web.ShiroWebModuleProvider;
+
+import java.util.Collection;
+
+import static java.util.Collections.singletonList;
 
 public class ShiroWebMDCModuleProvider implements BQModuleProvider {
 
     @Override
     public Module module() {
         return new ShiroWebMDCModule();
     }
+
+    @Override
+    public Collection<BQModuleProvider> dependencies() {
+        return singletonList(
+                new ShiroWebModuleProvider()
+        );
+    }
 }
diff --git a/...que-shiro-web-mdc/src/test/java/io/bootique/shiro/web/mdc/ShiroWebModuleProviderTest.java b/...que-shiro-web-mdc/src/test/java/io/bootique/shiro/web/mdc/ShiroWebModuleProviderTest.java
@@ -1,12 +1,30 @@
 package io.bootique.shiro.web.mdc;
 
+import io.bootique.BQRuntime;
+import io.bootique.shiro.web.ShiroWebModule;
 import io.bootique.test.junit.BQModuleProviderChecker;
+import io.bootique.test.junit.BQTestFactory;
+import org.junit.Rule;
 import org.junit.Test;
 
+import static com.google.common.collect.ImmutableList.of;
+
 public class ShiroWebModuleProviderTest {
 
+    @Rule
+    public BQTestFactory testFactory = new BQTestFactory();
+
     @Test
     public void testPresentInJar() {
         BQModuleProviderChecker.testPresentInJar(ShiroWebMDCModuleProvider.class);
     }
+
+    @Test
+    public void testModuleDeclaresDependencies() {
+        final BQRuntime bqRuntime = testFactory.app().module(new ShiroWebMDCModuleProvider()).createRuntime();
+        BQModuleProviderChecker.testModulesLoaded(bqRuntime, of(
+                ShiroWebModule.class,
+                ShiroWebMDCModule.class
+        ));
+    }
 }
diff --git a/bootique-shiro-web/src/main/java/io/bootique/shiro/web/ShiroWebModuleProvider.java b/bootique-shiro-web/src/main/java/io/bootique/shiro/web/ShiroWebModuleProvider.java
@@ -3,13 +3,17 @@
 import com.google.inject.Module;
 import io.bootique.BQModule;
 import io.bootique.BQModuleProvider;
+import io.bootique.jetty.JettyModuleProvider;
 import io.bootique.shiro.ShiroModule;
+import io.bootique.shiro.ShiroModuleProvider;
 
 import java.lang.reflect.Type;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 
+import static java.util.Arrays.asList;
+
 public class ShiroWebModuleProvider implements BQModuleProvider {
 
     @Override
@@ -33,4 +37,12 @@ public BQModule.Builder moduleBuilder() {
     public Map<String, Type> configs() {
         return Collections.singletonMap("shiroweb", MappedShiroFilterFactory.class);
     }
+
+    @Override
+    public Collection<BQModuleProvider> dependencies() {
+        return asList(
+                new JettyModuleProvider(),
+                new ShiroModuleProvider()
+        );
+    }
 }
diff --git a/bootique-shiro-web/src/test/java/io/bootique/shiro/web/ShiroWebModuleProviderTest.java b/bootique-shiro-web/src/test/java/io/bootique/shiro/web/ShiroWebModuleProviderTest.java
@@ -1,10 +1,20 @@
 package io.bootique.shiro.web;
 
+import io.bootique.BQRuntime;
+import io.bootique.jetty.JettyModule;
+import io.bootique.shiro.ShiroModule;
 import io.bootique.test.junit.BQModuleProviderChecker;
+import io.bootique.test.junit.BQTestFactory;
+import org.junit.Rule;
 import org.junit.Test;
 
+import static com.google.common.collect.ImmutableList.of;
+
 public class ShiroWebModuleProviderTest {
 
+    @Rule
+    public BQTestFactory testFactory = new BQTestFactory();
+
     @Test
     public void testAutoLoading() {
         BQModuleProviderChecker.testPresentInJar(ShiroWebModuleProvider.class);
@@ -14,4 +24,14 @@ public void testAutoLoading() {
     public void testMetadata() {
         BQModuleProviderChecker.testMetadata(ShiroWebModuleProvider.class);
     }
+
+    @Test
+    public void testModuleDeclaresDependencies() {
+        final BQRuntime bqRuntime = testFactory.app().module(new ShiroWebModuleProvider()).createRuntime();
+        BQModuleProviderChecker.testModulesLoaded(bqRuntime, of(
+                JettyModule.class,
+                ShiroModule.class,
+                ShiroWebModule.class
+        ));
+    }
 }