FORGE-2424: Migrated templates addon to simple container

forge · Aug 5, 2015 · 9be392c · 9be392c
1 parent db47f62
commit 9be392c
Show file tree

Hide file tree

Showing 11 changed files with 96 additions and 72 deletions.
diff --git a/templates/addon/pom.xml b/templates/addon/pom.xml
@@ -11,7 +11,7 @@
    <dependencies>
       <dependency>
          <groupId>org.jboss.forge.furnace.container</groupId>
-         <artifactId>cdi</artifactId>
+         <artifactId>simple</artifactId>
          <classifier>forge-addon</classifier>
          <scope>provided</scope>
       </dependency>

diff --git a/templates/freemarker/pom.xml b/templates/freemarker/pom.xml
@@ -1,38 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>templates-parent</artifactId>
-        <groupId>org.jboss.forge.addon</groupId>
-        <version>2.17.1-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <properties>
-        <version.freemarker>2.3.20</version.freemarker>
-    </properties>
-    <artifactId>templates-freemarker</artifactId>
-    <name>Forge - Freemarker SPI impl in Templates Addon</name>
-    <dependencies>
-        <dependency>
-            <groupId>org.jboss.forge.furnace.container</groupId>
-            <artifactId>cdi-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.forge.addon</groupId>
-            <artifactId>templates-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.forge.addon</groupId>
-            <artifactId>resources</artifactId>
-            <classifier>forge-addon</classifier>
-        </dependency>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+   <parent>
+      <artifactId>templates-parent</artifactId>
+      <groupId>org.jboss.forge.addon</groupId>
+      <version>2.17.1-SNAPSHOT</version>
+   </parent>
+   <modelVersion>4.0.0</modelVersion>
+   <properties>
+      <version.freemarker>2.3.20</version.freemarker>
+   </properties>
+   <artifactId>templates-freemarker</artifactId>
+   <name>Forge - Freemarker SPI impl in Templates Addon</name>
+   <dependencies>
+      <dependency>
+         <groupId>org.jboss.forge.furnace.container</groupId>
+         <artifactId>simple</artifactId>
+         <classifier>forge-addon</classifier>
+         <scope>provided</scope>
+      </dependency>
 
-        <!-- Freemarker -->
-        <dependency>
-            <groupId>org.freemarker</groupId>
-            <artifactId>freemarker</artifactId>
-            <version>${version.freemarker}</version>
-        </dependency>
-    </dependencies>
+      <dependency>
+         <groupId>org.jboss.forge.addon</groupId>
+         <artifactId>templates-api</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.jboss.forge.addon</groupId>
+         <artifactId>resources</artifactId>
+         <classifier>forge-addon</classifier>
+      </dependency>
+
+      <!-- Freemarker -->
+      <dependency>
+         <groupId>org.freemarker</groupId>
+         <artifactId>freemarker</artifactId>
+         <version>${version.freemarker}</version>
+      </dependency>
+   </dependencies>
 
 </project>
diff --git a/...src/main/java/org/jboss/forge/addon/templates/freemarker/FreemarkerTemplateGenerator.java b/...src/main/java/org/jboss/forge/addon/templates/freemarker/FreemarkerTemplateGenerator.java
@@ -7,9 +7,6 @@
 
 package org.jboss.forge.addon.templates.freemarker;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
 import org.jboss.forge.addon.resource.Resource;
 import org.jboss.forge.addon.templates.Template;
 import org.jboss.forge.addon.templates.TemplateGenerator;
@@ -21,10 +18,8 @@
  * 
  * @author <a href="ggastald@redhat.com">George Gastaldi</a>
  */
-@Singleton
 public class FreemarkerTemplateGenerator implements TemplateGenerator
 {
-   @Inject
    private ResourceTemplateLoader loader;
    private Configuration config;
 
@@ -37,17 +32,26 @@ public boolean handles(Class<? extends Template> type)
    @Override
    public Template create(Resource<?> template, Class<? extends Template> type)
    {
-      return new FreemarkerTemplateImpl(loader, template, getConfiguration());
+      return new FreemarkerTemplateImpl(getResourceTemplateLoader(), template, getConfiguration());
    }
 
    private Configuration getConfiguration()
    {
       if (config == null)
       {
          config = new Configuration();
-         config.setTemplateLoader(loader);
+         config.setTemplateLoader(getResourceTemplateLoader());
       }
       return config;
    }
 
+   private ResourceTemplateLoader getResourceTemplateLoader()
+   {
+      if (loader == null)
+      {
+         loader = new ResourceTemplateLoader();
+      }
+      return loader;
+   }
+
 }
diff --git a/...rker/src/main/java/org/jboss/forge/addon/templates/freemarker/ResourceTemplateLoader.java b/...rker/src/main/java/org/jboss/forge/addon/templates/freemarker/ResourceTemplateLoader.java
@@ -14,12 +14,11 @@
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
 import org.jboss.forge.addon.resource.FileResource;
 import org.jboss.forge.addon.resource.Resource;
 import org.jboss.forge.addon.resource.ResourceFactory;
+import org.jboss.forge.furnace.addons.AddonRegistry;
+import org.jboss.forge.furnace.container.simple.lifecycle.SimpleContainer;
 
 import freemarker.cache.StatefulTemplateLoader;
 
@@ -29,15 +28,10 @@
  * @author <a href="ggastald@redhat.com">George Gastaldi</a>
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */
-@Singleton
 public class ResourceTemplateLoader implements StatefulTemplateLoader
 {
    private final Map<String, ResourceId> resourceMap = new ConcurrentHashMap<>();
 
-   /**
-    * Needed for includes
-    */
-   @Inject
    private ResourceFactory resourceFactory;
 
    String register(Resource<?> resource)
@@ -70,7 +64,7 @@ public Object findTemplateSource(String name) throws IOException
 
       if (id == null)
       {
-         Resource<?> includedResource = resourceFactory.create(name);
+         Resource<?> includedResource = getResourceFactory().create(name);
          if (includedResource != null && includedResource.exists())
          {
             id = generateResourceId(includedResource);
@@ -116,4 +110,14 @@ private ResourceId generateResourceId(Resource<?> resource)
       return new ResourceId(resource);
    }
 
+   private ResourceFactory getResourceFactory()
+   {
+      if (resourceFactory == null)
+      {
+         AddonRegistry addonRegistry = SimpleContainer.getFurnace(getClass().getClassLoader()).getAddonRegistry();
+         resourceFactory = addonRegistry.getServices(ResourceFactory.class).get();
+      }
+      return resourceFactory;
+   }
+
 }
diff --git a/templates/freemarker/src/main/resources/META-INF/beans.xml b/templates/freemarker/src/main/resources/META-INF/beans.xml
diff --git a/...ain/resources/META-INF/services/org.jboss.forge.furnace.container.simple.SingletonService b/...ain/resources/META-INF/services/org.jboss.forge.furnace.container.simple.SingletonService
@@ -0,0 +1,3 @@
+org.jboss.forge.addon.templates.freemarker.FreemarkerTemplateGenerator
+# This should be moved to templates-impl. Bug in simple container
+org.jboss.forge.addon.templates.TemplateFactoryImpl
diff --git a/templates/impl/pom.xml b/templates/impl/pom.xml
@@ -11,7 +11,8 @@
    <dependencies>
       <dependency>
          <groupId>org.jboss.forge.furnace.container</groupId>
-         <artifactId>cdi-api</artifactId>
+         <artifactId>simple</artifactId>
+         <classifier>forge-addon</classifier>
          <scope>provided</scope>
       </dependency>
       <dependency>

diff --git a/templates/impl/src/main/java/org/jboss/forge/addon/templates/TemplateFactoryImpl.java b/templates/impl/src/main/java/org/jboss/forge/addon/templates/TemplateFactoryImpl.java
@@ -7,10 +7,9 @@
 
 package org.jboss.forge.addon.templates;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
 import org.jboss.forge.addon.resource.Resource;
+import org.jboss.forge.furnace.addons.AddonRegistry;
+import org.jboss.forge.furnace.container.simple.lifecycle.SimpleContainer;
 import org.jboss.forge.furnace.services.Imported;
 import org.jboss.forge.furnace.util.Assert;
 
@@ -19,10 +18,8 @@
  * @author <a href="ggastald@redhat.com">George Gastaldi</a>
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  */
-@Singleton
 public class TemplateFactoryImpl implements TemplateFactory
 {
-   @Inject
    private Imported<TemplateGenerator> generators;
 
    @Override
@@ -31,7 +28,7 @@ public Template create(Resource<?> template, Class<? extends Template> type)
       Assert.notNull(template, "Template resource cannot be null");
       Assert.isTrue(template.exists(), "Template does not exist: " + template);
 
-      for (TemplateGenerator generator : generators)
+      for (TemplateGenerator generator : getTemplateGenerators())
       {
          if (generator.handles(type))
          {
@@ -41,4 +38,14 @@ public Template create(Resource<?> template, Class<? extends Template> type)
 
       return null;
    }
+
+   private Imported<TemplateGenerator> getTemplateGenerators()
+   {
+      if (generators == null)
+      {
+         AddonRegistry addonRegistry = SimpleContainer.getFurnace(getClass().getClassLoader()).getAddonRegistry();
+         generators = addonRegistry.getServices(TemplateGenerator.class);
+      }
+      return generators;
+   }
 }
diff --git a/templates/impl/src/main/resources/META-INF/beans.xml b/templates/impl/src/main/resources/META-INF/beans.xml
diff --git a/templates/tests/pom.xml b/templates/tests/pom.xml
@@ -11,9 +11,8 @@
    <dependencies>
       <dependency>
          <groupId>org.jboss.forge.furnace.container</groupId>
-         <artifactId>cdi</artifactId>
+         <artifactId>simple</artifactId>
          <classifier>forge-addon</classifier>
-         <scope>provided</scope>
       </dependency>
       <dependency>
          <groupId>org.jboss.forge.furnace</groupId>

diff --git a/templates/tests/src/test/java/org/jboss/forge/addon/templates/TemplateTestCase.java b/templates/tests/src/test/java/org/jboss/forge/addon/templates/TemplateTestCase.java
@@ -10,8 +10,6 @@
 import java.net.URL;
 import java.util.Collections;
 
-import javax.inject.Inject;
-
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.forge.addon.resource.FileResource;
@@ -21,9 +19,12 @@
 import org.jboss.forge.arquillian.AddonDeployment;
 import org.jboss.forge.arquillian.AddonDeployments;
 import org.jboss.forge.arquillian.archive.AddonArchive;
+import org.jboss.forge.furnace.addons.AddonRegistry;
+import org.jboss.forge.furnace.container.simple.lifecycle.SimpleContainer;
 import org.jboss.forge.furnace.repositories.AddonDependencyEntry;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -42,21 +43,27 @@ public static AddonArchive getDeployment()
                .addClass(JavaBean.class)
                .addAsResource(TemplateTestCase.class.getResource("template.ftl"), packagePath + "/template.ftl")
                .addAsResource(TemplateTestCase.class.getResource("includes.ftl"), packagePath + "/includes.ftl")
+               .addAsServiceProvider("org.jboss.forge.furnace.container.simple.Service",
+                        TemplateTestCase.class.getName())
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi"),
+                        AddonDependencyEntry.create("org.jboss.forge.furnace.container:simple"),
                         AddonDependencyEntry.create("org.jboss.forge.addon:templates"),
-                        AddonDependencyEntry.create("org.jboss.forge.addon:resources")
-               );
+                        AddonDependencyEntry.create("org.jboss.forge.addon:resources"));
 
       return archive;
    }
 
-   @Inject
    private ResourceFactory resourceFactory;
-
-   @Inject
    private TemplateFactory templateFactory;
 
+   @Before
+   public void setUp()
+   {
+      AddonRegistry addonRegistry = SimpleContainer.getFurnace(getClass().getClassLoader()).getAddonRegistry();
+      this.resourceFactory = addonRegistry.getServices(ResourceFactory.class).get();
+      this.templateFactory = addonRegistry.getServices(TemplateFactory.class).get();
+   }
+
    @Test
    public void testProcessorFactoryInjection() throws Exception
    {