Less coupling in ResourceFactoryImpl and ResourceTransaction impl

forge · Oct 7, 2013 · fc380e6 · fc380e6
1 parent 128aa5b
commit fc380e6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/resources/impl/src/main/java/org/jboss/forge/addon/resource/ResourceFactoryImpl.java b/resources/impl/src/main/java/org/jboss/forge/addon/resource/ResourceFactoryImpl.java
@@ -13,8 +13,7 @@
 
 import org.jboss.forge.addon.resource.monitor.FileMonitor;
 import org.jboss.forge.addon.resource.monitor.ResourceMonitor;
-import org.jboss.forge.addon.resource.transaction.file.FileResourceTransactionImpl;
-import org.jboss.forge.addon.resource.transaction.file.FileResourceTransactionManager;
+import org.jboss.forge.addon.resource.transaction.ResourceTransaction;
 import org.jboss.forge.addon.resource.util.RelatedClassComparator;
 import org.jboss.forge.furnace.addons.AddonRegistry;
 import org.jboss.forge.furnace.services.Imported;
@@ -37,7 +36,7 @@ public class ResourceFactoryImpl implements ResourceFactory
    private FileMonitor fileMonitor;
 
    @Inject
-   private FileResourceTransactionManager transactionManager;
+   private Imported<ResourceTransaction> transaction;
 
    @Override
    @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -97,8 +96,8 @@ public ResourceMonitor monitor(Resource<?> resource, ResourceFilter resourceFilt
    }
 
    @Override
-   public FileResourceTransactionImpl getTransaction()
+   public ResourceTransaction getTransaction()
    {
-      return transactionManager.getCurrentTransaction(this);
+      return transaction.get();
    }
 }
diff --git a/...sts/src/test/java/org/jboss/forge/addon/resource/transaction/ResourceTransactionTest.java b/...sts/src/test/java/org/jboss/forge/addon/resource/transaction/ResourceTransactionTest.java
@@ -249,7 +249,7 @@ public void testResourceTransactionSucceeds() throws Exception
    public void testResourceTransactionInjection() throws Exception
    {
       Assert.assertNotNull(injectedTransaction);
-      Assert.assertEquals(injectedTransaction, resourceFactory.getTransaction());
+      Assert.assertFalse(injectedTransaction.isStarted());
    }
 
    /**