Skip to content

Commit

Permalink
removing references to "bootique-di"
Browse files Browse the repository at this point in the history 
now that the DI engine is the part of Bootique core
.. also adding explicit dependencies for test stacks that don't use auto-loading
  • Loading branch information
@andrus
andrus committed Dec 5, 2023
1 parent 50075ba commit 2da0484
Show file tree
Hide file tree
Showing 17 changed files with 38 additions and 43 deletions.
4 changes: 0 additions & 4 deletions bootique-bom-tests-all-kotlin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,6 @@
<!-- * bootique-kotlin-jackson (conflicts with bootique-kotlin-config) -->
<!-- * bootique-job-zookeeper (conflicts with bootique-job-consul) -->
<!-- * bootique-undertow (conflicts with bootique-jetty -->
<dependency>
<groupId>io.bootique.di</groupId>
<artifactId>bootique-di</artifactId>
</dependency>
<dependency>
<groupId>io.bootique</groupId>
<artifactId>bootique</artifactId>
Expand Down
4 changes: 0 additions & 4 deletions bootique-bom-tests-all/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,6 @@
<!-- * bootique-kotlin-jackson (conflicts with bootique-kotlin-config) -->
<!-- * bootique-job-zookeeper (conflicts with bootique-job-consul) -->
<!-- * bootique-undertow (conflicts with bootique-jetty -->
<dependency>
<groupId>io.bootique.di</groupId>
<artifactId>bootique-di</artifactId>
</dependency>
<dependency>
<groupId>io.bootique</groupId>
<artifactId>bootique</artifactId>
Expand Down
10 changes: 6 additions & 4 deletions bootique-bom-tests-all/src/test/java/io/bootique/bom/agrest/AgrestAppIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,15 @@

package io.bootique.bom.agrest;

import io.bootique.agrest.v4.AgrestModuleProvider;
import io.bootique.agrest.v4.AgrestModule;
import io.bootique.bom.agrest.r1.AgResource1;
import io.bootique.cayenne.v42.CayenneModule;
import io.bootique.command.CommandOutcome;
import io.bootique.jdbc.JdbcModule;
import io.bootique.jdbc.junit5.derby.DerbyTester;
import io.bootique.jdbc.tomcat.JdbcTomcatModuleProvider;
import io.bootique.jdbc.tomcat.JdbcTomcatModule;
import io.bootique.jersey.JerseyModule;
import io.bootique.jetty.JettyModule;
import io.bootique.junit5.*;
import org.junit.jupiter.api.Test;

Expand All @@ -48,8 +51,7 @@ public class AgrestAppIT {
private TestRuntumeBuilder appBuilder(String... args) {
return testFactory.app(args)
.module(db.moduleWithTestDataSource("ds"))
.moduleProvider(new AgrestModuleProvider())
.moduleProvider(new JdbcTomcatModuleProvider())
.modules(AgrestModule.class, JdbcTomcatModule.class, JdbcModule.class, CayenneModule.class, JettyModule.class, JerseyModule.class)
.module(b -> JerseyModule.extend(b).addResource(AgResource1.class));
}

Expand Down
10 changes: 6 additions & 4 deletions bootique-bom-tests-all/src/test/java/io/bootique/bom/agrest/AgrestAppJunit4IT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,14 @@

package io.bootique.bom.agrest;

import io.bootique.agrest.v4.AgrestModuleProvider;
import io.bootique.agrest.v4.AgrestModule;
import io.bootique.bom.agrest.r1.AgResource1;
import io.bootique.cayenne.v42.CayenneModule;
import io.bootique.command.CommandOutcome;
import io.bootique.jdbc.tomcat.JdbcTomcatModuleProvider;
import io.bootique.jdbc.JdbcModule;
import io.bootique.jdbc.tomcat.JdbcTomcatModule;
import io.bootique.jersey.JerseyModule;
import io.bootique.jetty.JettyModule;
import io.bootique.test.junit.BQTestFactory;
import io.bootique.test.junit.TestIO;
import org.junit.Rule;
Expand All @@ -44,8 +47,7 @@ public class AgrestAppJunit4IT {

private BQTestFactory.Builder appBuilder(String... args) {
return testFactory.app(args)
.moduleProvider(new AgrestModuleProvider())
.moduleProvider(new JdbcTomcatModuleProvider())
.modules(AgrestModule.class, CayenneModule.class, JdbcModule.class, JdbcTomcatModule.class, JettyModule.class, JerseyModule.class)
.module(b -> JerseyModule.extend(b).addResource(AgResource1.class));
}

Expand Down
3 changes: 2 additions & 1 deletion bootique-bom-tests-all/src/test/java/io/bootique/bom/cayenne/CayenneAppIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import io.bootique.BQCoreModule;
import io.bootique.cayenne.v42.CayenneModule;
import io.bootique.command.CommandOutcome;
import io.bootique.jdbc.JdbcModule;
import io.bootique.jdbc.junit5.derby.DerbyTester;
import io.bootique.jdbc.tomcat.JdbcTomcatModule;
import io.bootique.junit5.*;
Expand All @@ -41,7 +42,7 @@ public class CayenneAppIT {

private TestRuntumeBuilder appBuilder(String... args) {
return testFactory.app(args)
.moduleProvider(new CayenneModule())
.modules(CayenneModule.class, JdbcModule.class, JdbcTomcatModule.class)
.module(db.moduleWithTestDataSource("test2"))
.module(new JdbcTomcatModule())
.module(b -> BQCoreModule.extend(b).addCommand(RunQueryCommand.class));
Expand Down
4 changes: 2 additions & 2 deletions bootique-bom-tests-all/src/test/java/io/bootique/bom/cayenne/CayenneAppJunit4IT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import io.bootique.BQCoreModule;
import io.bootique.cayenne.v42.CayenneModule;
import io.bootique.command.CommandOutcome;
import io.bootique.jdbc.JdbcModule;
import io.bootique.jdbc.tomcat.JdbcTomcatModule;
import io.bootique.test.junit.BQTestFactory;
import io.bootique.test.junit.TestIO;
Expand All @@ -38,8 +39,7 @@ public class CayenneAppJunit4IT {

private BQTestFactory.Builder appBuilder(String... args) {
return testFactory.app(args)
.module(new CayenneModule())
.module(new JdbcTomcatModule())
.modules(CayenneModule.class, JdbcModule.class, JdbcTomcatModule.class)
.module(b -> BQCoreModule.extend(b).addCommand(RunQueryCommand.class));
}

Expand Down
5 changes: 3 additions & 2 deletions bootique-bom-tests-all/src/test/java/io/bootique/bom/jdbc/JdbcAppIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@

import io.bootique.BQCoreModule;
import io.bootique.command.CommandOutcome;
import io.bootique.jdbc.JdbcModule;
import io.bootique.jdbc.junit5.derby.DerbyTester;
import io.bootique.jdbc.tomcat.JdbcTomcatModuleProvider;
import io.bootique.jdbc.tomcat.JdbcTomcatModule;
import io.bootique.junit5.*;
import org.junit.jupiter.api.Test;

Expand All @@ -39,8 +40,8 @@ public class JdbcAppIT {

private TestRuntumeBuilder appBuilder(String... args) {
return testFactory.app(args)
.modules(JdbcTomcatModule.class, JdbcModule.class)
.module(db.moduleWithTestDataSource("test1"))
.moduleProvider(new JdbcTomcatModuleProvider())
.module(b -> BQCoreModule.extend(b).addCommand(RunSQLCommand.class));
}

Expand Down
5 changes: 3 additions & 2 deletions bootique-bom-tests-all/src/test/java/io/bootique/bom/jdbc/JdbcAppJunit4IT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@

import io.bootique.BQCoreModule;
import io.bootique.command.CommandOutcome;
import io.bootique.jdbc.tomcat.JdbcTomcatModuleProvider;
import io.bootique.jdbc.JdbcModule;
import io.bootique.jdbc.tomcat.JdbcTomcatModule;
import io.bootique.test.junit.BQTestFactory;
import io.bootique.test.junit.TestIO;
import org.junit.Rule;
Expand All @@ -36,7 +37,7 @@ public class JdbcAppJunit4IT {

private BQTestFactory.Builder appBuilder(String... args) {
return testFactory.app(args)
.moduleProvider(new JdbcTomcatModuleProvider())
.modules(JdbcTomcatModule.class, JdbcModule.class)
.module(b -> BQCoreModule.extend(b).addCommand(RunSQLCommand.class));
}

Expand Down
5 changes: 2 additions & 3 deletions bootique-bom-tests-all/src/test/java/io/bootique/bom/jersey/JerseyAppIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,10 @@
import io.bootique.bom.jersey.r2.Resource2;
import io.bootique.command.CommandOutcome;
import io.bootique.jersey.JerseyModule;
import io.bootique.jersey.JerseyModuleProvider;
import io.bootique.jetty.JettyModule;
import io.bootique.junit5.*;
import org.junit.jupiter.api.Test;


import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.Response;
Expand All @@ -45,7 +44,7 @@ public class JerseyAppIT {

private TestRuntumeBuilder appBuilder(String... args) {
return testFactory.app(args)
.moduleProvider(new JerseyModuleProvider())
.modules(JerseyModule.class, JettyModule.class)
.module(b -> JerseyModule.extend(b)
.addFeature(JerseyAppFeature.class)
.addPackage(Resource1.class.getPackage())
Expand Down
4 changes: 2 additions & 2 deletions bootique-bom-tests-all/src/test/java/io/bootique/bom/jersey/JerseyAppJunit4IT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import io.bootique.bom.jersey.r2.Resource2;
import io.bootique.command.CommandOutcome;
import io.bootique.jersey.JerseyModule;
import io.bootique.jersey.JerseyModuleProvider;
import io.bootique.jetty.JettyModule;
import io.bootique.test.junit.BQTestFactory;
import io.bootique.test.junit.TestIO;
import org.junit.Rule;
Expand All @@ -44,7 +44,7 @@ public class JerseyAppJunit4IT {

private BQTestFactory.Builder appBuilder(String... args) {
return testFactory.app(args)
.moduleProvider(new JerseyModuleProvider())
.modules(JerseyModule.class, JettyModule.class)
.module(b -> JerseyModule.extend(b)
.addFeature(JerseyAppFeature.class)
.addPackage(Resource1.class.getPackage())
Expand Down
3 changes: 1 addition & 2 deletions bootique-bom-tests-all/src/test/java/io/bootique/bom/jetty/JettyAppIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
package io.bootique.bom.jetty;

import io.bootique.jetty.JettyModule;
import io.bootique.jetty.JettyModuleProvider;
import io.bootique.junit5.*;
import org.junit.jupiter.api.Test;

Expand All @@ -40,7 +39,7 @@ public class JettyAppIT {

private TestRuntumeBuilder appBuilder(String... args) {
return testFactory.app(args)
.moduleProvider(new JettyModuleProvider())
.modules(JettyModule.class)
.module(b -> JettyModule.extend(b).addServlet(BomServlet.class).addFilter(BomFilter.class));
}

Expand Down
3 changes: 1 addition & 2 deletions bootique-bom-tests-all/src/test/java/io/bootique/bom/jetty/JettyAppJunit4IT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
package io.bootique.bom.jetty;

import io.bootique.jetty.JettyModule;
import io.bootique.jetty.JettyModuleProvider;
import io.bootique.test.junit.BQTestFactory;
import io.bootique.test.junit.TestIO;
import org.junit.Rule;
Expand All @@ -41,7 +40,7 @@ public class JettyAppJunit4IT {

private BQTestFactory.Builder appBuilder(String... args) {
return testFactory.app(args)
.moduleProvider(new JettyModuleProvider())
.modules(JettyModule.class)
.module(b -> JettyModule.extend(b).addServlet(BomServlet.class).addFilter(BomFilter.class));
}

Expand Down
2 changes: 1 addition & 1 deletion bootique-bom-tests-all/src/test/java/io/bootique/bom/logback/LogbackAppIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public class LogbackAppIT {

private TestRuntumeBuilder appBuilder(String... args) {
return testFactory.app(args)
.moduleProvider(new LogbackModule())
.modules(LogbackModule.class)
.module(b -> BQCoreModule.extend(b).addCommand(LogbackTestCommand.class));
}

Expand Down
2 changes: 1 addition & 1 deletion bootique-bom-tests-all/src/test/java/io/bootique/bom/logback/LogbackAppJunit4IT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public class LogbackAppJunit4IT {

private BQTestFactory.Builder appBuilder(String... args) {
return testFactory.app(args)
.moduleProvider(new LogbackModule())
.module(LogbackModule.class)
.module(b -> BQCoreModule.extend(b).addCommand(LogbackTestCommand.class));
}

Expand Down
6 changes: 4 additions & 2 deletions bootique-bom-tests-all/src/test/java/io/bootique/bom/mvc/MustacheAppIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@
import io.bootique.Bootique;
import io.bootique.bom.mvc.r1.MustacheResource;
import io.bootique.jersey.JerseyModule;
import io.bootique.jetty.JettyModule;
import io.bootique.jetty.junit5.JettyTester;
import io.bootique.junit5.BQApp;
import io.bootique.junit5.BQTest;
import io.bootique.mvc.mustache.MvcMustacheModuleProvider;
import io.bootique.mvc.MvcModule;
import io.bootique.mvc.mustache.MvcMustacheModule;
import org.junit.jupiter.api.Test;

import javax.ws.rs.client.WebTarget;
Expand All @@ -42,7 +44,7 @@ public class MustacheAppIT {

@BQApp
final BQRuntime app = Bootique.app("-c", "classpath:io/bootique/bom/mvc/test.yml", "-s")
.moduleProvider(new MvcMustacheModuleProvider())
.modules(MvcMustacheModule.class, JerseyModule.class, JettyModule.class, MvcModule.class)
.module(b -> JerseyModule.extend(b).addResource(MustacheResource.class))
.module(jetty.moduleReplacingConnectors())
.createRuntime();
Expand Down
6 changes: 4 additions & 2 deletions bootique-bom-tests-all/src/test/java/io/bootique/bom/mvc/MustacheAppJunit4IT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@

import io.bootique.bom.mvc.r1.MustacheResource;
import io.bootique.jersey.JerseyModule;
import io.bootique.mvc.mustache.MvcMustacheModuleProvider;
import io.bootique.jetty.JettyModule;
import io.bootique.mvc.MvcModule;
import io.bootique.mvc.mustache.MvcMustacheModule;
import io.bootique.test.junit.BQTestFactory;
import org.junit.Rule;
import org.junit.Test;
Expand All @@ -42,7 +44,7 @@ public class MustacheAppJunit4IT {
public void run() {

testFactory.app("--config=src/test/resources/io/bootique/bom/mvc/test.yml", "--server")
.moduleProvider(new MvcMustacheModuleProvider())
.modules(MvcMustacheModule.class, JerseyModule.class, JettyModule.class, MvcModule.class)
.module(binder -> JerseyModule.extend(binder).addResource(MustacheResource.class))
.run();

Expand Down
5 changes: 0 additions & 5 deletions bootique-bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.bootique.di</groupId>
<artifactId>bootique-di</artifactId>
<version>${bootique.version}</version>
</dependency>
<dependency>
<groupId>io.bootique</groupId>
<artifactId>bootique</artifactId>
Expand Down

0 comments on commit 2da0484

Please sign in to comment.