Author: markt
Date: Wed Jan 23 10:23:32 2013
New Revision: 1437321
URL: http://svn.apache.org/viewvc?rev=1437321&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54448
Correctly handle @Resource annotations on primitives.
Includes test case.
Patch provided by Violeta Georgieva.
Added:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TesterServletWithAnnotations.java
- copied unchanged from r1437317,
tomcat/trunk/test/org/apache/catalina/startup/TesterServletWithAnnotations.java
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/Introspection.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestContextConfig.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1437317
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java?rev=1437321&r1=1437320&r2=1437321&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java
Wed Jan 23 10:23:32 2013
@@ -1190,7 +1190,7 @@ public class NamingResources extends Lif
// No match - ignore this injection target
continue;
}
- targetType = convertPrimitiveType(targetType);
+ targetType = Introspection.convertPrimitiveType(targetType);
if (typeClass == null) {
// Need to find a common type amongst the injection targets
@@ -1243,26 +1243,4 @@ public class NamingResources extends Lif
}
return null;
}
-
- private Class<?> convertPrimitiveType(Class<?> clazz) {
- if (clazz.equals(char.class)) {
- return Character.class;
- } else if (clazz.equals(int.class)) {
- return Integer.class;
- } else if (clazz.equals(boolean.class)) {
- return Boolean.class;
- } else if (clazz.equals(double.class)) {
- return Double.class;
- } else if (clazz.equals(byte.class)) {
- return Byte.class;
- } else if (clazz.equals(short.class)) {
- return Short.class;
- } else if (clazz.equals(long.class)) {
- return Long.class;
- } else if (clazz.equals(float.class)) {
- return Float.class;
- } else {
- return clazz;
- }
- }
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java?rev=1437321&r1=1437320&r2=1437321&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
Wed Jan 23 10:23:32 2013
@@ -265,7 +265,7 @@ public class WebAnnotationSet {
Resource annotation = field.getAnnotation(Resource.class);
String defaultName =
classClass.getName() + SEPARATOR + field.getName();
- String defaultType = field.getType().getCanonicalName();
+ Class<?> defaultType = field.getType();
addResource(context, annotation, defaultName, defaultType);
}
}
@@ -290,8 +290,8 @@ public class WebAnnotationSet {
String defaultName = classClass.getName() + SEPARATOR +
Introspection.getPropertyName(method);
- String defaultType =
- (method.getParameterTypes()[0]).getCanonicalName();
+ Class<?> defaultType =
+ (method.getParameterTypes()[0]);
addResource(context, annotation, defaultName, defaultType);
}
}
@@ -309,7 +309,7 @@ public class WebAnnotationSet {
}
protected static void addResource(Context context, Resource annotation,
- String defaultName, String defaultType) {
+ String defaultName, Class<?> defaultType) {
String name = getName(annotation, defaultName);
String type = getType(annotation, defaultType);
@@ -412,14 +412,14 @@ public class WebAnnotationSet {
}
- private static String getType(Resource annotation, String defaultType) {
- String type = annotation.type().getCanonicalName();
- if (type == null || type.equals("java.lang.Object")) {
+ private static String getType(Resource annotation, Class<?> defaultType) {
+ Class<?> type = annotation.type();
+ if (type == null || type.equals(Object.class)) {
if (defaultType != null) {
type = defaultType;
}
}
- return type;
+ return Introspection.convertPrimitiveType(type).getCanonicalName();
}
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/Introspection.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/Introspection.java?rev=1437321&r1=1437320&r2=1437321&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/Introspection.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/Introspection.java Wed
Jan 23 10:23:32 2013
@@ -153,4 +153,34 @@ public class Introspection {
}
return clazz;
}
+
+ /**
+ * Converts the primitive type to its corresponding wrapper.
+ *
+ * @param clazz
+ * Class that will be evaluated
+ * @return if the parameter is a primitive type returns its wrapper;
+ * otherwise returns the same class
+ */
+ public static Class<?> convertPrimitiveType(Class<?> clazz) {
+ if (clazz.equals(char.class)) {
+ return Character.class;
+ } else if (clazz.equals(int.class)) {
+ return Integer.class;
+ } else if (clazz.equals(boolean.class)) {
+ return Boolean.class;
+ } else if (clazz.equals(double.class)) {
+ return Double.class;
+ } else if (clazz.equals(byte.class)) {
+ return Byte.class;
+ } else if (clazz.equals(short.class)) {
+ return Short.class;
+ } else if (clazz.equals(long.class)) {
+ return Long.class;
+ } else if (clazz.equals(float.class)) {
+ return Float.class;
+ } else {
+ return clazz;
+ }
+ }
}
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestContextConfig.java?rev=1437321&r1=1437320&r2=1437321&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestContextConfig.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TestContextConfig.java
Wed Jan 23 10:23:32 2013
@@ -126,6 +126,25 @@ public class TestContextConfig extends T
assertPageContains("/test/testServlet", "postConstruct1()");
}
+ @Test
+ public void testBug54448() throws Exception {
+ Tomcat tomcat = getTomcatInstance();
+
+ File appDir = new File("test/webapp-3.0-fragments");
+ Context context = tomcat.addWebapp(null, "/test",
+ appDir.getAbsolutePath());
+
+ Tomcat.addServlet(context, "TestServlet",
+ "org.apache.catalina.startup.TesterServletWithAnnotations");
+ context.addServletMapping("/testServlet", "TestServlet");
+
+ tomcat.enableNaming();
+
+ tomcat.start();
+
+ assertPageContains("/test/testServlet", "envEntry: 1");
+ }
+
private static class CustomDefaultServletSCI
implements ServletContainerInitializer {
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1437321&r1=1437320&r2=1437321&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jan 23 10:23:32 2013
@@ -61,6 +61,10 @@
triggered a NPE when digested passwords were used and an authentication
attempt was made for a user that did not exist in the realm. (markt)
</fix>
+ <fix>
+ <bug>54448</bug>: Correctly handle @Resource annotations on primitives.
+ Patch provided by Violeta Georgieva. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
