Commits

Sam Adams  committed 97abb8b

Fix config injection

  • Participants
  • Parent commits 5cfabbd

Comments (0)

Files changed (3)

File acceptance-test-driver/src/main/java/net/chempound/acceptance/dsl/ChempoundTestModule.java

 package net.chempound.acceptance.dsl;
 
-import net.chempound.ChempoundConfigurationModule;
 import net.chempound.DefaultChempoundModule;
 import net.chempound.compchem.CompChemModule;
-import net.chempound.config.DefaultPropertySource;
 import net.chempound.config.StubChempoundConfiguration;
 import net.chempound.datastore.InMemoryJenaTripleStore;
 import net.chempound.datastore.TripleStore;
 import net.chempound.storage.InMemoryResourceStore;
 import net.chempound.storage.ResourceStore;
 import net.chempound.webapp.DefaultChempoundWebModule;
+import net.chempound.webapp.StubChempoundConfigurationModule;
 
 import java.io.File;
 import java.net.URI;
     @Override
     protected void configure() {
         super.configure();
-        install(new ChempoundConfigurationModule(new StubChempoundConfiguration(rootUri, workspace), new DefaultPropertySource()));
+        install(new StubChempoundConfigurationModule(new StubChempoundConfiguration(rootUri, workspace)));
         install(new DefaultChempoundModule());
         install(new CompChemModule());
         bind(ResourceStore.class).to(InMemoryResourceStore.class);

File acceptance-test-driver/src/main/java/net/chempound/acceptance/dsl/driver/ServiceDocumentMatchers.java

         };
     }
 
+    @SafeVarargs
     public static Matcher<SwordServiceDocument> hasWorkspace(final Matcher<SwordWorkspace>... matchers) {
         return new TypeSafeMatcher<SwordServiceDocument>() {
             @Override
         };
     }
 
+    @SafeVarargs
     public static Matcher<SwordWorkspace> hasCollection(final Matcher<SwordServiceDocumentCollection>... matchers) {
         return new TypeSafeMatcher<SwordWorkspace>() {
             @Override

File acceptance-test-driver/src/main/java/net/chempound/acceptance/dsl/driver/sword/SwordCollectionMatchers.java

 
 public class SwordCollectionMatchers {
 
+    @SafeVarargs
     public static Matcher<SwordCollection> hasEntry(final Matcher<SwordEntry>... matchers) {
         return new TypeSafeMatcher<SwordCollection>() {
             @Override
         };
     }
 
+    @SafeVarargs
     public static Matcher<SwordCollection> doesNotHaveEntry(final Matcher<SwordEntry>... matchers) {
         return new TypeSafeMatcher<SwordCollection>() {
             @Override