Fix for https://glassfish.dev.java.net/issues/show_bug.cgi?id=11134 ("@Inject support in Tag handler")

Jan Luehe · Jan Luehe · commit 2fdf6fa6d789 · 2009-11-23T19:24:10.000Z
Reviewed by: kchung

svn path=/trunk/; revision=1230
diff --git a/impl/src/main/java/org/apache/jasper/compiler/Generator.java b/impl/src/main/java/org/apache/jasper/compiler/Generator.java
@@ -2290,16 +2290,12 @@ private void generateCustomStart(
                 out.print(tagHandlerClassName);
                 out.println(".class);");
             } else {
-                out.print("new ");
+                out.print("(_jspx_resourceInjector != null) ? ");
+                out.print("_jspx_resourceInjector.createTagHandlerInstance(");
+                out.print(tagHandlerClassName);
+                out.print(".class) : new ");
                 out.print(tagHandlerClassName);
                 out.println("();");
-                out.printil("if (_jspx_resourceInjector != null) {");
-                out.pushIndent();
-                out.printin("_jspx_resourceInjector.inject(");
-                out.print(tagHandlerVar);
-                out.printil(");");
-                out.popIndent();
-                out.printil("}");
             }
 
             generateSetters(n, tagHandlerVar, handlerInfo, false);
@@ -2519,18 +2515,13 @@ private void generateCustomDoTag(
             out.print(" ");
             out.print(tagHandlerVar);
             out.print(" = ");
-            out.print("new ");
+            out.print("(_jspx_resourceInjector != null) ? ");
+            out.print("_jspx_resourceInjector.createTagHandlerInstance(");
+            out.print(tagHandlerClassName);
+            out.print(".class) : new ");
             out.print(tagHandlerClassName);
             out.println("();");
 
-            out.printil("if (_jspx_resourceInjector != null) {");
-            out.pushIndent();
-            out.printin("_jspx_resourceInjector.inject(");
-            out.print(tagHandlerVar);
-            out.printil(");");
-            out.popIndent();
-            out.printil("}");
-
             generateSetters(n, tagHandlerVar, handlerInfo, true);
 
             // Set the body
diff --git a/impl/src/main/java/org/apache/jasper/runtime/TagHandlerPool.java b/impl/src/main/java/org/apache/jasper/runtime/TagHandlerPool.java
@@ -160,9 +160,11 @@ public Tag get(Class handlerClass) throws JspException {
         // wait for us to construct a tag for this thread.
         Tag tagHandler = null;
         try {
-            tagHandler = (Tag) handlerClass.newInstance();
             if (resourceInjector != null) {
-                resourceInjector.inject(tagHandler);
+                tagHandler = (Tag) resourceInjector.createTagHandlerInstance(
+                    handlerClass);
+            } else {
+                tagHandler = (Tag) handlerClass.newInstance();
             }
         } catch (Exception e) {
             throw new JspException(e.getMessage(), e);
diff --git a/impl/src/main/java/org/glassfish/jsp/api/ResourceInjector.java b/impl/src/main/java/org/glassfish/jsp/api/ResourceInjector.java
@@ -36,7 +36,6 @@
 
 package org.glassfish.jsp.api;
 
-import javax.servlet.ServletContext;
 import javax.servlet.jsp.tagext.JspTag;
 
 /**
@@ -47,27 +46,15 @@
 public interface ResourceInjector {
 
     /**
-     * Associates this ResourceInjector with the component environment of the
-     * given servlet context.
+     * Instantiates and injects the given tag handler class.
      *
-     * @param servletContext The servlet context 
-     */
-    public void setContext(ServletContext servletContext);
-
-
-    /**
-     * Injects the injectable resources from the component environment 
-     * associated with this ResourceInjector into the given tag handler
-     * instance. 
-     *
-     * <p>Any @PostConstruct methods on the class (and super-classes)
-     * of the instance will be invoked after injection.
-     *
-     * @param handler The tag handler instance to be injected
+     * @param clazz the tag handler class to be instantiated and injected
      *
-     * @throws Exception if an error occurs during injection
+     * @throws Exception if an error has occurred during instantiation or
+     * injection
      */
-    public void inject(JspTag handler) throws Exception;
+    public <T extends JspTag> T createTagHandlerInstance(Class<T> clazz)
+            throws Exception;
 
     /**
      * Invokes any @PreDestroy methods defined on the instance's class
