Refactoring towards internal DI. This can potentially simplify some o…

…f the internal codebase, and also accommodate for #330.
cucumber · May 29, 2012 · 450cc84 · 450cc84
1 parent adbacc7
commit 450cc84
Show file tree

Hide file tree

Showing 23 changed files with 46 additions and 112 deletions.
diff --git a/...untime/java/DefaultJavaObjectFactory.java → ...ber/runtime/DefaultJavaObjectFactory.java b/...untime/java/DefaultJavaObjectFactory.java → ...ber/runtime/DefaultJavaObjectFactory.java
@@ -1,7 +1,4 @@
-package cucumber.fallback.runtime.java;
-
-import cucumber.runtime.CucumberException;
-import cucumber.runtime.java.ObjectFactory;
+package cucumber.runtime;
 
 import java.lang.reflect.Constructor;
 import java.util.HashMap;

diff --git a/core/src/main/java/cucumber/runtime/ObjectFactory.java b/core/src/main/java/cucumber/runtime/ObjectFactory.java
@@ -0,0 +1,23 @@
+package cucumber.runtime;
+
+import cucumber.io.ClasspathResourceLoader;
+
+public interface ObjectFactory {
+    void start();
+
+    void stop();
+
+    void addClass(Class<?> clazz);
+
+    <T> T getInstance(Class<T> type);
+
+    public class Factory {
+        public static ObjectFactory newInstance(ClasspathResourceLoader classpathResourceLoader) {
+            try {
+                return classpathResourceLoader.instantiateExactlyOneSubclass(ObjectFactory.class, "cucumber.runtime", new Class[0], new Object[0]);
+            } catch (CucumberException ce) {
+                return new DefaultJavaObjectFactory();
+            }
+        }
+    }
+}
diff --git a/guice/src/main/java/cucumber/runtime/java/guice/GuiceFactory.java b/guice/src/main/java/cucumber/runtime/java/guice/GuiceFactory.java
@@ -4,7 +4,7 @@
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Module;
-import cucumber.runtime.java.ObjectFactory;
+import cucumber.runtime.ObjectFactory;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/guice/src/test/java/cucumber/runtime/java/guice/GuiceFactoryTest.java b/guice/src/test/java/cucumber/runtime/java/guice/GuiceFactoryTest.java
@@ -1,6 +1,6 @@
 package cucumber.runtime.java.guice;
 
-import cucumber.runtime.java.ObjectFactory;
+import cucumber.runtime.ObjectFactory;
 import org.junit.Test;
 
 import java.io.IOException;

diff --git a/java/src/main/java/cucumber/runtime/java/JavaBackend.java b/java/src/main/java/cucumber/runtime/java/JavaBackend.java
@@ -3,12 +3,12 @@
 import cucumber.annotation.After;
 import cucumber.annotation.Before;
 import cucumber.annotation.Order;
-import cucumber.fallback.runtime.java.DefaultJavaObjectFactory;
 import cucumber.io.ClasspathResourceLoader;
 import cucumber.io.ResourceLoader;
 import cucumber.runtime.Backend;
 import cucumber.runtime.CucumberException;
 import cucumber.runtime.Glue;
+import cucumber.runtime.ObjectFactory;
 import cucumber.runtime.UnreportedStepExecutor;
 import cucumber.runtime.Utils;
 import cucumber.runtime.snippets.SnippetGenerator;
@@ -29,7 +29,7 @@ public class JavaBackend implements Backend {
     public JavaBackend(ResourceLoader ignored) {
         classpathResourceLoader = new ClasspathResourceLoader(Thread.currentThread().getContextClassLoader());
         classpathMethodScanner = new ClasspathMethodScanner(classpathResourceLoader);
-        objectFactory = loadObjectFactory();
+        objectFactory = ObjectFactory.Factory.newInstance(classpathResourceLoader);
     }
 
     public JavaBackend(ObjectFactory objectFactory) {
@@ -38,20 +38,6 @@ public JavaBackend(ObjectFactory objectFactory) {
         this.objectFactory = objectFactory;
     }
 
-    private ObjectFactory loadObjectFactory() {
-        ObjectFactory foundOF;
-        if (ObjectFactoryHolder.getFactory() != null) {
-            foundOF = ObjectFactoryHolder.getFactory();
-        } else {
-            try {
-                foundOF = classpathResourceLoader.instantiateExactlyOneSubclass(ObjectFactory.class, "cucumber.runtime", new Class[0], new Object[0]);
-            } catch (CucumberException ce) {
-                foundOF = new DefaultJavaObjectFactory();
-            }
-        }
-        return foundOF;
-    }
-
     @Override
     public void loadGlue(Glue glue, List<String> gluePaths) {
         this.glue = glue;

diff --git a/java/src/main/java/cucumber/runtime/java/JavaHookDefinition.java b/java/src/main/java/cucumber/runtime/java/JavaHookDefinition.java
@@ -1,6 +1,7 @@
 package cucumber.runtime.java;
 
 import cucumber.runtime.HookDefinition;
+import cucumber.runtime.ObjectFactory;
 import cucumber.runtime.ScenarioResult;
 import cucumber.runtime.Utils;
 import gherkin.TagExpression;

diff --git a/java/src/main/java/cucumber/runtime/java/JavaStepDefinition.java b/java/src/main/java/cucumber/runtime/java/JavaStepDefinition.java
@@ -2,6 +2,7 @@
 
 import cucumber.runtime.JdkPatternArgumentMatcher;
 import cucumber.runtime.MethodFormat;
+import cucumber.runtime.ObjectFactory;
 import cucumber.runtime.ParameterType;
 import cucumber.runtime.StepDefinition;
 import cucumber.runtime.Utils;

diff --git a/java/src/main/java/cucumber/runtime/java/ObjectFactory.java b/java/src/main/java/cucumber/runtime/java/ObjectFactory.java
diff --git a/java/src/main/java/cucumber/runtime/java/ObjectFactoryHolder.java b/java/src/main/java/cucumber/runtime/java/ObjectFactoryHolder.java
diff --git a/java/src/test/java/cucumber/runtime/java/ClasspathMethodScannerTest.java b/java/src/test/java/cucumber/runtime/java/ClasspathMethodScannerTest.java
@@ -4,6 +4,7 @@
 import cucumber.io.ClasspathResourceLoader;
 import cucumber.runtime.CucumberException;
 import cucumber.runtime.Glue;
+import cucumber.runtime.ObjectFactory;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.mockito.internal.util.reflection.Whitebox;

diff --git a/java/src/test/java/cucumber/runtime/java/JavaBackendTest.java b/java/src/test/java/cucumber/runtime/java/JavaBackendTest.java
@@ -1,9 +1,10 @@
 package cucumber.runtime.java;
 
-import cucumber.fallback.runtime.java.DefaultJavaObjectFactory;
+import cucumber.runtime.DefaultJavaObjectFactory;
 import cucumber.runtime.CucumberException;
 import cucumber.runtime.Glue;
 import cucumber.runtime.HookDefinition;
+import cucumber.runtime.ObjectFactory;
 import cucumber.runtime.StepDefinition;
 import cucumber.runtime.StepDefinitionMatch;
 import cucumber.runtime.java.stepdefs.Stepdefs;

diff --git a/java/src/test/java/cucumber/runtime/java/JavaHookTest.java b/java/src/test/java/cucumber/runtime/java/JavaHookTest.java
@@ -5,6 +5,7 @@
 import cucumber.annotation.Order;
 import cucumber.runtime.Glue;
 import cucumber.runtime.HookDefinition;
+import cucumber.runtime.ObjectFactory;
 import cucumber.runtime.RuntimeGlue;
 import cucumber.runtime.UndefinedStepsTracker;
 import cucumber.runtime.converters.LocalizedXStreams;

diff --git a/java/src/test/java/cucumber/runtime/java/JavaObjectFactoryTest.java b/java/src/test/java/cucumber/runtime/java/JavaObjectFactoryTest.java
@@ -1,6 +1,7 @@
 package cucumber.runtime.java;
 
-import cucumber.fallback.runtime.java.DefaultJavaObjectFactory;
+import cucumber.runtime.DefaultJavaObjectFactory;
+import cucumber.runtime.ObjectFactory;
 import org.junit.Test;
 
 import static org.junit.Assert.assertNotNull;

diff --git a/java/src/test/java/cucumber/runtime/java/ObjectFactoryHolderTest.java b/java/src/test/java/cucumber/runtime/java/ObjectFactoryHolderTest.java
diff --git a/java/src/test/java/cucumber/runtime/java/SingletonFactory.java b/java/src/test/java/cucumber/runtime/java/SingletonFactory.java
@@ -1,5 +1,7 @@
 package cucumber.runtime.java;
 
+import cucumber.runtime.ObjectFactory;
+
 public class SingletonFactory implements ObjectFactory {
     private final Object singleton;
 

diff --git a/openejb/src/main/java/cucumber/runtime/java/openejb/OpenEJBObjectFactory.java b/openejb/src/main/java/cucumber/runtime/java/openejb/OpenEJBObjectFactory.java
@@ -2,7 +2,7 @@
 
 import cucumber.runtime.CucumberException;
 import cucumber.runtime.Utils;
-import cucumber.runtime.java.ObjectFactory;
+import cucumber.runtime.ObjectFactory;
 import org.apache.openejb.OpenEjbContainer;
 
 import javax.ejb.embeddable.EJBContainer;

diff --git a/openejb/src/test/java/cucumber/runtime/java/openejb/OpenEJBObjectFactoryTest.java b/openejb/src/test/java/cucumber/runtime/java/openejb/OpenEJBObjectFactoryTest.java
@@ -1,6 +1,6 @@
 package cucumber.runtime.java.openejb;
 
-import cucumber.runtime.java.ObjectFactory;
+import cucumber.runtime.ObjectFactory;
 import org.junit.Test;
 
 import static org.junit.Assert.assertNotNull;

diff --git a/picocontainer/src/main/java/cucumber/runtime/java/picocontainer/PicoFactory.java b/picocontainer/src/main/java/cucumber/runtime/java/picocontainer/PicoFactory.java
@@ -1,6 +1,6 @@
 package cucumber.runtime.java.picocontainer;
 
-import cucumber.runtime.java.ObjectFactory;
+import cucumber.runtime.ObjectFactory;
 import org.picocontainer.MutablePicoContainer;
 import org.picocontainer.PicoBuilder;
 

diff --git a/picocontainer/src/test/java/cucumber/runtime/java/picocontainer/PicoFactoryTest.java b/picocontainer/src/test/java/cucumber/runtime/java/picocontainer/PicoFactoryTest.java
@@ -1,6 +1,6 @@
 package cucumber.runtime.java.picocontainer;
 
-import cucumber.runtime.java.ObjectFactory;
+import cucumber.runtime.ObjectFactory;
 import org.junit.Test;
 
 import static org.junit.Assert.assertNotNull;

diff --git a/spring/src/main/java/cucumber/runtime/java/spring/SpringFactory.java b/spring/src/main/java/cucumber/runtime/java/spring/SpringFactory.java
@@ -1,7 +1,7 @@
 package cucumber.runtime.java.spring;
 
 import cucumber.runtime.CucumberException;
-import cucumber.runtime.java.ObjectFactory;
+import cucumber.runtime.ObjectFactory;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;

diff --git a/spring/src/test/java/cucumber/runtime/java/spring/SpringFactoryTest.java b/spring/src/test/java/cucumber/runtime/java/spring/SpringFactoryTest.java
@@ -1,6 +1,6 @@
 package cucumber.runtime.java.spring;
 
-import cucumber.runtime.java.ObjectFactory;
+import cucumber.runtime.ObjectFactory;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;

diff --git a/weld/src/main/java/cucumber/runtime/java/weld/WeldFactory.java b/weld/src/main/java/cucumber/runtime/java/weld/WeldFactory.java
@@ -1,6 +1,6 @@
 package cucumber.runtime.java.weld;
 
-import cucumber.runtime.java.ObjectFactory;
+import cucumber.runtime.ObjectFactory;
 import org.jboss.weld.environment.se.Weld;
 import org.jboss.weld.environment.se.WeldContainer;
 

diff --git a/weld/src/test/java/cucumber/runtime/java/weld/WeldFactoryTest.java b/weld/src/test/java/cucumber/runtime/java/weld/WeldFactoryTest.java
@@ -1,6 +1,6 @@
 package cucumber.runtime.java.weld;
 
-import cucumber.runtime.java.ObjectFactory;
+import cucumber.runtime.ObjectFactory;
 import org.junit.Test;
 
 import static org.junit.Assert.assertNotNull;