You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2015/11/18 19:53:42 UTC
[5/6] tomee git commit: Cleanup
Cleanup
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/a4330bf8
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a4330bf8
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a4330bf8
Branch: refs/heads/tomee-1.7.x
Commit: a4330bf84a2d9866d7330fc01f638b6032cfa2f0
Parents: 7e07f10
Author: AndyGee <an...@gmx.de>
Authored: Wed Nov 18 19:51:58 2015 +0100
Committer: AndyGee <an...@gmx.de>
Committed: Wed Nov 18 19:51:58 2015 +0100
----------------------------------------------------------------------
.../tomee/catalina/realm/CdiEventRealm.java | 5 +-
.../tomee/common/LegacyAnnotationProcessor.java | 105 +++++++++----------
2 files changed, 54 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/a4330bf8/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/CdiEventRealm.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/CdiEventRealm.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/CdiEventRealm.java
index 2588820..985c4b9 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/CdiEventRealm.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/CdiEventRealm.java
@@ -99,12 +99,13 @@ public class CdiEventRealm extends RealmBase {
public SecurityConstraint[] findSecurityConstraints(final Request request, final Context context) {
final SecurityConstraint[] sc = super.findSecurityConstraints(request, context);
- if (beanManager() == null) {
+ final BeanManager beanManager = beanManager();
+ if (beanManager == null) {
return sc;
}
final FindSecurityConstraintsEvent event = new FindSecurityConstraintsEvent(request.getRequest(), context.getPath());
- beanManager().fireEvent(event);
+ beanManager.fireEvent(event);
if (!event.getRoles().isEmpty()) {
final SecurityConstraint s = new SecurityConstraint();
http://git-wip-us.apache.org/repos/asf/tomee/blob/a4330bf8/tomee/tomee-common/src/main/java/org/apache/tomee/common/LegacyAnnotationProcessor.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-common/src/main/java/org/apache/tomee/common/LegacyAnnotationProcessor.java b/tomee/tomee-common/src/main/java/org/apache/tomee/common/LegacyAnnotationProcessor.java
index e83cb71..0438075 100644
--- a/tomee/tomee-common/src/main/java/org/apache/tomee/common/LegacyAnnotationProcessor.java
+++ b/tomee/tomee-common/src/main/java/org/apache/tomee/common/LegacyAnnotationProcessor.java
@@ -65,16 +65,16 @@ public class LegacyAnnotationProcessor {
while (clazz != null) {
final Method[] methods = clazz.getDeclaredMethods();
Method postConstruct = null;
- for (int i = 0; i < methods.length; i++) {
- if (methods[i].isAnnotationPresent(PostConstruct.class)) {
+ for (final Method method : methods) {
+ if (method.isAnnotationPresent(PostConstruct.class)) {
if ((postConstruct != null)
- || (methods[i].getParameterTypes().length != 0)
- || (Modifier.isStatic(methods[i].getModifiers()))
- || (methods[i].getExceptionTypes().length > 0)
- || (!methods[i].getReturnType().getName().equals("void"))) {
+ || (method.getParameterTypes().length != 0)
+ || (Modifier.isStatic(method.getModifiers()))
+ || (method.getExceptionTypes().length > 0)
+ || (!method.getReturnType().getName().equals("void"))) {
throw new IllegalArgumentException("Invalid PostConstruct annotation");
}
- postConstruct = methods[i];
+ postConstruct = method;
}
}
@@ -102,16 +102,16 @@ public class LegacyAnnotationProcessor {
while (clazz != null) {
final Method[] methods = clazz.getDeclaredMethods();
Method preDestroy = null;
- for (int i = 0; i < methods.length; i++) {
- if (methods[i].isAnnotationPresent(PreDestroy.class)) {
+ for (final Method method : methods) {
+ if (method.isAnnotationPresent(PreDestroy.class)) {
if ((preDestroy != null)
- || (methods[i].getParameterTypes().length != 0)
- || (Modifier.isStatic(methods[i].getModifiers()))
- || (methods[i].getExceptionTypes().length > 0)
- || (!methods[i].getReturnType().getName().equals("void"))) {
+ || (method.getParameterTypes().length != 0)
+ || (Modifier.isStatic(method.getModifiers()))
+ || (method.getExceptionTypes().length > 0)
+ || (!method.getReturnType().getName().equals("void"))) {
throw new IllegalArgumentException("Invalid PreDestroy annotation");
}
- preDestroy = methods[i];
+ preDestroy = method;
}
}
@@ -144,34 +144,34 @@ public class LegacyAnnotationProcessor {
while (clazz != null) {
// Initialize fields annotations
final Field[] fields = clazz.getDeclaredFields();
- for (int i = 0; i < fields.length; i++) {
- if (fields[i].isAnnotationPresent(Resource.class)) {
+ for (final Field field : fields) {
+ if (field.isAnnotationPresent(Resource.class)) {
final Resource annotation =
- fields[i].getAnnotation(Resource.class);
- lookupFieldResource(context, instance, fields[i],
+ field.getAnnotation(Resource.class);
+ lookupFieldResource(context, instance, field,
annotation.name(), clazz);
}
- if (fields[i].isAnnotationPresent(EJB.class)) {
- final EJB annotation = fields[i].getAnnotation(EJB.class);
- lookupFieldResource(context, instance, fields[i],
+ if (field.isAnnotationPresent(EJB.class)) {
+ final EJB annotation = field.getAnnotation(EJB.class);
+ lookupFieldResource(context, instance, field,
annotation.name(), clazz);
}
- if (fields[i].isAnnotationPresent(WebServiceRef.class)) {
+ if (field.isAnnotationPresent(WebServiceRef.class)) {
final WebServiceRef annotation =
- fields[i].getAnnotation(WebServiceRef.class);
- lookupFieldResource(context, instance, fields[i],
+ field.getAnnotation(WebServiceRef.class);
+ lookupFieldResource(context, instance, field,
annotation.name(), clazz);
}
- if (fields[i].isAnnotationPresent(PersistenceContext.class)) {
+ if (field.isAnnotationPresent(PersistenceContext.class)) {
final PersistenceContext annotation =
- fields[i].getAnnotation(PersistenceContext.class);
- lookupFieldResource(context, instance, fields[i],
+ field.getAnnotation(PersistenceContext.class);
+ lookupFieldResource(context, instance, field,
annotation.name(), clazz);
}
- if (fields[i].isAnnotationPresent(PersistenceUnit.class)) {
+ if (field.isAnnotationPresent(PersistenceUnit.class)) {
final PersistenceUnit annotation =
- fields[i].getAnnotation(PersistenceUnit.class);
- lookupFieldResource(context, instance, fields[i],
+ field.getAnnotation(PersistenceUnit.class);
+ lookupFieldResource(context, instance, field,
annotation.name(), clazz);
}
}
@@ -179,33 +179,33 @@ public class LegacyAnnotationProcessor {
// Initialize methods annotations
final Method[] methods = clazz.getDeclaredMethods();
- for (int i = 0; i < methods.length; i++) {
- if (methods[i].isAnnotationPresent(Resource.class)) {
- final Resource annotation = methods[i].getAnnotation(Resource.class);
- lookupMethodResource(context, instance, methods[i],
+ for (final Method method : methods) {
+ if (method.isAnnotationPresent(Resource.class)) {
+ final Resource annotation = method.getAnnotation(Resource.class);
+ lookupMethodResource(context, instance, method,
annotation.name(), clazz);
}
- if (methods[i].isAnnotationPresent(EJB.class)) {
- final EJB annotation = methods[i].getAnnotation(EJB.class);
- lookupMethodResource(context, instance, methods[i],
+ if (method.isAnnotationPresent(EJB.class)) {
+ final EJB annotation = method.getAnnotation(EJB.class);
+ lookupMethodResource(context, instance, method,
annotation.name(), clazz);
}
- if (methods[i].isAnnotationPresent(WebServiceRef.class)) {
+ if (method.isAnnotationPresent(WebServiceRef.class)) {
final WebServiceRef annotation =
- methods[i].getAnnotation(WebServiceRef.class);
- lookupMethodResource(context, instance, methods[i],
+ method.getAnnotation(WebServiceRef.class);
+ lookupMethodResource(context, instance, method,
annotation.name(), clazz);
}
- if (methods[i].isAnnotationPresent(PersistenceContext.class)) {
+ if (method.isAnnotationPresent(PersistenceContext.class)) {
final PersistenceContext annotation =
- methods[i].getAnnotation(PersistenceContext.class);
- lookupMethodResource(context, instance, methods[i],
+ method.getAnnotation(PersistenceContext.class);
+ lookupMethodResource(context, instance, method,
annotation.name(), clazz);
}
- if (methods[i].isAnnotationPresent(PersistenceUnit.class)) {
+ if (method.isAnnotationPresent(PersistenceUnit.class)) {
final PersistenceUnit annotation =
- methods[i].getAnnotation(PersistenceUnit.class);
- lookupMethodResource(context, instance, methods[i],
+ method.getAnnotation(PersistenceUnit.class);
+ lookupMethodResource(context, instance, method,
annotation.name(), clazz);
}
}
@@ -222,8 +222,7 @@ public class LegacyAnnotationProcessor {
final Object instance, final Field field, final String name, final Class<?> clazz)
throws NamingException, IllegalAccessException {
- Object lookedupResource = null;
- boolean accessibility = false;
+ final Object lookedupResource;
if ((name != null) && (name.length() > 0)) {
lookedupResource = context.lookup(name);
@@ -231,7 +230,7 @@ public class LegacyAnnotationProcessor {
lookedupResource = context.lookup(clazz.getName() + "/" + field.getName());
}
- accessibility = field.isAccessible();
+ final boolean accessibility = field.isAccessible();
field.setAccessible(true);
field.set(instance, lookedupResource);
field.setAccessible(accessibility);
@@ -251,17 +250,15 @@ public class LegacyAnnotationProcessor {
throw new IllegalArgumentException("Invalid method resource injection annotation");
}
- Object lookedupResource = null;
- boolean accessibility = false;
+ final Object lookedupResource;
- if ((name != null) &&
- (name.length() > 0)) {
+ if ((name != null) && (name.length() > 0)) {
lookedupResource = context.lookup(name);
} else {
lookedupResource = context.lookup(clazz.getName() + "/" + method.getName().substring(3));
}
- accessibility = method.isAccessible();
+ final boolean accessibility = method.isAccessible();
method.setAccessible(true);
method.invoke(instance, lookedupResource);
method.setAccessible(accessibility);