Tidy up package structure a bit

This commit is contained in:
Dave Syer
2017-06-04 11:23:02 +01:00
parent b810a80ae7
commit 63c8c2e47f
11 changed files with 81 additions and 112 deletions

View File

@@ -7,7 +7,8 @@ import javax.inject.Inject;
import org.junit.Test;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.guice.annotation.ModuleRegistryConfiguration;
import org.springframework.context.annotation.Configuration;
import org.springframework.guice.annotation.EnableGuiceModules;
import org.springframework.guice.injector.SpringInjector;
import com.google.inject.AbstractModule;
@@ -32,11 +33,16 @@ public class SimpleWiringTests {
@Test
public void hybridFoo() {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(TestConfig.class, ModuleRegistryConfiguration.class);
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(TestConfig.class, ModulesConfig.class);
Injector app = new SpringInjector(context);
assertNotNull(app.getInstance(Foo.class));
}
@Configuration
@EnableGuiceModules
static class ModulesConfig {
}
public static class TestConfig extends AbstractModule {
@Override
protected void configure() {