You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by li...@apache.org on 2012/01/10 05:58:07 UTC
git commit: [DELTASPIKE-45] Fixing checkstyle issues
Updated Branches:
refs/heads/master bf9bf4817 -> 1880190f9
[DELTASPIKE-45] Fixing checkstyle issues
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/1880190f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/1880190f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/1880190f
Branch: refs/heads/master
Commit: 1880190f9276b2f76fe9e32283fde311feaa426f
Parents: bf9bf48
Author: Jason Porter <li...@apache.org>
Authored: Mon Jan 9 21:57:34 2012 -0700
Committer: Jason Porter <li...@apache.org>
Committed: Mon Jan 9 21:57:34 2012 -0700
----------------------------------------------------------------------
.../core/api/metadata/AnnotatedCallableImpl.java | 4 ++-
.../api/metadata/AnnotatedConstructorImpl.java | 4 +--
.../core/api/metadata/AnnotatedFieldImpl.java | 4 +--
.../core/api/metadata/AnnotatedMemberImpl.java | 4 +--
.../core/api/metadata/AnnotatedMethodImpl.java | 4 +--
.../core/api/metadata/AnnotatedTypeImpl.java | 16 ++++++++++----
.../core/api/metadata/AnnotationRedefiner.java | 6 +---
.../core/api/metadata/ParameterizedTypeImpl.java | 4 ++-
.../core/api/metadata/RedefinitionContext.java | 10 ++------
.../deltaspike/core/api/util/Reflections.java | 16 +++++++++++---
10 files changed, 38 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/1880190f/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedCallableImpl.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedCallableImpl.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedCallableImpl.java
index c90e954..cd27c95 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedCallableImpl.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedCallableImpl.java
@@ -60,7 +60,9 @@ abstract class AnnotatedCallableImpl<X, Y extends Member> extends AnnotatedMembe
}
- private static <X, Y extends Member> List<AnnotatedParameter<X>> getAnnotatedParameters(AnnotatedCallableImpl<X, Y> callable, Class<?>[] parameterTypes, Type[] genericTypes, Map<Integer, AnnotationStore> parameterAnnotations, Map<Integer, Type> parameterTypeOverrides)
+ private static <X, Y extends Member> List<AnnotatedParameter<X>> getAnnotatedParameters(AnnotatedCallableImpl<X, Y> callable, Class<?>[] parameterTypes, Type[] genericTypes,
+ Map<Integer, AnnotationStore> parameterAnnotations,
+ Map<Integer, Type> parameterTypeOverrides)
{
List<AnnotatedParameter<X>> parameters = new ArrayList<AnnotatedParameter<X>>();
int len = parameterTypes.length;
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/1880190f/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedConstructorImpl.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedConstructorImpl.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedConstructorImpl.java
index 8833baa..9cd1882 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedConstructorImpl.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedConstructorImpl.java
@@ -19,15 +19,13 @@
package org.apache.deltaspike.core.api.metadata;
-import org.apache.deltaspike.core.api.metadata.builder.AnnotatedTypeBuilder;
-
import javax.enterprise.inject.spi.AnnotatedConstructor;
import java.lang.reflect.Constructor;
import java.lang.reflect.Type;
import java.util.Map;
/**
- * Implementation of {@link AnnotatedConstructor} to be used in {@link AnnotatedTypeBuilder}
+ * Implementation of {@link AnnotatedConstructor} to be used in {@link org.apache.deltaspike.core.api.metadata.builder.AnnotatedTypeBuilder}
* and other CDI life cycle events.
*/
class AnnotatedConstructorImpl<X> extends AnnotatedCallableImpl<X, Constructor<X>> implements AnnotatedConstructor<X>
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/1880190f/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedFieldImpl.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedFieldImpl.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedFieldImpl.java
index 46190a5..708cad2 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedFieldImpl.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedFieldImpl.java
@@ -19,15 +19,13 @@
package org.apache.deltaspike.core.api.metadata;
-import org.apache.deltaspike.core.api.metadata.builder.AnnotatedTypeBuilder;
-
import javax.enterprise.inject.spi.AnnotatedField;
import javax.enterprise.inject.spi.AnnotatedType;
import java.lang.reflect.Field;
import java.lang.reflect.Type;
/**
- * Implementation of {@link AnnotatedField} to be used in CDI life cycle events and {@link AnnotatedTypeBuilder}.
+ * Implementation of {@link AnnotatedField} to be used in CDI life cycle events and {@link org.apache.deltaspike.core.api.metadata.builder.AnnotatedTypeBuilder}.
*/
class AnnotatedFieldImpl<X> extends AnnotatedMemberImpl<X, Field> implements AnnotatedField<X>
{
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/1880190f/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedMemberImpl.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedMemberImpl.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedMemberImpl.java
index 576610a..d0f1d19 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedMemberImpl.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedMemberImpl.java
@@ -19,8 +19,6 @@
package org.apache.deltaspike.core.api.metadata;
-import org.apache.deltaspike.core.api.metadata.builder.AnnotatedTypeBuilder;
-
import javax.enterprise.inject.spi.AnnotatedMember;
import javax.enterprise.inject.spi.AnnotatedType;
import java.lang.reflect.Member;
@@ -28,7 +26,7 @@ import java.lang.reflect.Modifier;
import java.lang.reflect.Type;
/**
- * An implementation of {@link AnnotatedMember} to be used in CDI life cycle events and {@link AnnotatedTypeBuilder}.
+ * An implementation of {@link AnnotatedMember} to be used in CDI life cycle events and {@link org.apache.deltaspike.core.api.metadata.builder.AnnotatedTypeBuilder}.
*/
abstract class AnnotatedMemberImpl<X, M extends Member> extends AnnotatedImpl implements AnnotatedMember<X>
{
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/1880190f/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedMethodImpl.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedMethodImpl.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedMethodImpl.java
index 67da218..9db15de 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedMethodImpl.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedMethodImpl.java
@@ -19,8 +19,6 @@
package org.apache.deltaspike.core.api.metadata;
-import org.apache.deltaspike.core.api.metadata.builder.AnnotatedTypeBuilder;
-
import javax.enterprise.inject.spi.AnnotatedMethod;
import javax.enterprise.inject.spi.AnnotatedType;
import java.lang.reflect.Method;
@@ -28,7 +26,7 @@ import java.lang.reflect.Type;
import java.util.Map;
/**
- * Implementation of {@link AnnotatedMethod} to be used in CDI life cycle events and {@link AnnotatedTypeBuilder}.
+ * Implementation of {@link AnnotatedMethod} to be used in CDI life cycle events and {@link org.apache.deltaspike.core.api.metadata.builder.AnnotatedTypeBuilder}.
*/
class AnnotatedMethodImpl<X> extends AnnotatedCallableImpl<X, Method> implements AnnotatedMethod<X>
{
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/1880190f/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedTypeImpl.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedTypeImpl.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedTypeImpl.java
index b5fb935..ba28de2 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedTypeImpl.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedTypeImpl.java
@@ -33,7 +33,7 @@ import java.util.Map;
import java.util.Set;
/**
- * An implementation of {@link AnnotatedType} to be used in CDI life cycle events and {@link AnnotatedTypeBuilder}.
+ * An implementation of {@link AnnotatedType} to be used in CDI life cycle events and {@link org.apache.deltaspike.core.api.metadata.builder.AnnotatedTypeBuilder}.
*/
public class AnnotatedTypeImpl<X> extends AnnotatedImpl implements AnnotatedType<X>
{
@@ -50,7 +50,10 @@ public class AnnotatedTypeImpl<X> extends AnnotatedImpl implements AnnotatedType
* <p/>
* If annotation have been added to other methods as well we add them to
*/
- public AnnotatedTypeImpl(Class<X> clazz, AnnotationStore typeAnnotations, Map<Field, AnnotationStore> fieldAnnotations, Map<Method, AnnotationStore> methodAnnotations, Map<Method, Map<Integer, AnnotationStore>> methodParameterAnnotations, Map<Constructor<?>, AnnotationStore> constructorAnnotations, Map<Constructor<?>, Map<Integer, AnnotationStore>> constructorParameterAnnotations, Map<Field, Type> fieldTypes, Map<Method, Map<Integer, Type>> methodParameterTypes, Map<Constructor<?>, Map<Integer, Type>> constructorParameterTypes)
+ public AnnotatedTypeImpl(Class<X> clazz, AnnotationStore typeAnnotations, Map<Field, AnnotationStore> fieldAnnotations, Map<Method, AnnotationStore> methodAnnotations,
+ Map<Method, Map<Integer, AnnotationStore>> methodParameterAnnotations, Map<Constructor<?>, AnnotationStore> constructorAnnotations,
+ Map<Constructor<?>, Map<Integer, AnnotationStore>> constructorParameterAnnotations, Map<Field, Type> fieldTypes,
+ Map<Method, Map<Integer, Type>> methodParameterTypes, Map<Constructor<?>, Map<Integer, Type>> constructorParameterTypes)
{
super(clazz, typeAnnotations, null, null);
this.javaClass = clazz;
@@ -60,7 +63,8 @@ public class AnnotatedTypeImpl<X> extends AnnotatedImpl implements AnnotatedType
Set<Field> fset = new HashSet<Field>();
for (Constructor<?> c : clazz.getConstructors())
{
- AnnotatedConstructor<X> nc = new AnnotatedConstructorImpl<X>(this, c, constructorAnnotations.get(c), constructorParameterAnnotations.get(c), constructorParameterTypes.get(c));
+ AnnotatedConstructor<X> nc = new AnnotatedConstructorImpl<X>(this, c, constructorAnnotations.get(c), constructorParameterAnnotations.get(c),
+ constructorParameterTypes.get(c));
constructors.add(nc);
cset.add(c);
}
@@ -68,7 +72,8 @@ public class AnnotatedTypeImpl<X> extends AnnotatedImpl implements AnnotatedType
{
if (!cset.contains(c.getKey()))
{
- AnnotatedConstructor<X> nc = new AnnotatedConstructorImpl<X>(this, c.getKey(), c.getValue(), constructorParameterAnnotations.get(c.getKey()), constructorParameterTypes.get(c.getKey()));
+ AnnotatedConstructor<X> nc = new AnnotatedConstructorImpl<X>(this, c.getKey(), c.getValue(), constructorParameterAnnotations.get(c.getKey()),
+ constructorParameterTypes.get(c.getKey()));
constructors.add(nc);
}
}
@@ -86,7 +91,8 @@ public class AnnotatedTypeImpl<X> extends AnnotatedImpl implements AnnotatedType
{
if (!c.getKey().getDeclaringClass().equals(Object.class) && !mset.contains(c.getKey()))
{
- AnnotatedMethodImpl<X> nc = new AnnotatedMethodImpl<X>(this, c.getKey(), c.getValue(), methodParameterAnnotations.get(c.getKey()), methodParameterTypes.get(c.getKey()));
+ AnnotatedMethodImpl<X> nc = new AnnotatedMethodImpl<X>(this, c.getKey(), c.getValue(), methodParameterAnnotations.get(c.getKey()),
+ methodParameterTypes.get(c.getKey()));
methods.add(nc);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/1880190f/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotationRedefiner.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotationRedefiner.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotationRedefiner.java
index 862f965..c28a95f 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotationRedefiner.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotationRedefiner.java
@@ -19,16 +19,14 @@
package org.apache.deltaspike.core.api.metadata;
-import org.apache.deltaspike.core.api.metadata.builder.AnnotatedTypeBuilder;
-
import java.lang.annotation.Annotation;
/**
* An implementation {@link AnnotationRedefiner} can be applied to an
- * {@link AnnotatedTypeBuilder}, and receives callbacks for each annotation of
+ * {@link org.apache.deltaspike.core.api.metadata.builder.AnnotatedTypeBuilder}, and receives callbacks for each annotation of
* the type is it applied for.
*
- * @see AnnotatedTypeBuilder
+ * @see org.apache.deltaspike.core.api.metadata.builder.AnnotatedTypeBuilder
*/
public interface AnnotationRedefiner<A extends Annotation>
{
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/1880190f/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/ParameterizedTypeImpl.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/ParameterizedTypeImpl.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/ParameterizedTypeImpl.java
index 123eab9..445e54d 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/ParameterizedTypeImpl.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/ParameterizedTypeImpl.java
@@ -72,7 +72,9 @@ public class ParameterizedTypeImpl implements ParameterizedType
ParameterizedType that = (ParameterizedType) obj;
Type thatOwnerType = that.getOwnerType();
Type thatRawType = that.getRawType();
- return (ownerType == null ? thatOwnerType == null : ownerType.equals(thatOwnerType)) && (rawType == null ? thatRawType == null : rawType.equals(thatRawType)) && Arrays.equals(actualTypeArguments, that.getActualTypeArguments());
+ return (ownerType == null ? thatOwnerType == null : ownerType.equals(thatOwnerType))
+ && (rawType == null ? thatRawType == null : rawType.equals(thatRawType))
+ && Arrays.equals(actualTypeArguments, that.getActualTypeArguments());
}
else
{
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/1880190f/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/RedefinitionContext.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/RedefinitionContext.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/RedefinitionContext.java
index a3aeefd..98fb4f9 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/RedefinitionContext.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/RedefinitionContext.java
@@ -19,21 +19,17 @@
package org.apache.deltaspike.core.api.metadata;
-import org.apache.deltaspike.core.api.metadata.builder.AnnotatedTypeBuilder;
import org.apache.deltaspike.core.api.metadata.builder.AnnotationBuilder;
import org.apache.deltaspike.core.api.util.Reflections;
import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
import java.lang.reflect.Type;
/**
* Provides access to the context of an annotation redefinition.
*
- * @see AnnotatedTypeBuilder
+ * @see org.apache.deltaspike.core.api.metadata.builder.AnnotatedTypeBuilder
* @see AnnotationRedefiner
*/
public class RedefinitionContext<A extends Annotation>
@@ -55,8 +51,8 @@ public class RedefinitionContext<A extends Annotation>
/**
* Access to the {@link AnnotatedElement} on which this annotation is
* defined. If the annotation is defined on a Field, this may be cast to
- * {@link Field}, if defined on a method, this may be cast to {@link Method},
- * if defined on a constructor, this may be cast to {@link Constructor}, if
+ * {@link java.lang.reflect.Field}, if defined on a method, this may be cast to {@link java.lang.reflect.Method},
+ * if defined on a constructor, this may be cast to {@link java.lang.reflect.Constructor}, if
* defined on a class, this may be cast to {@link Class}, or if
* defined on a parameter, this may be cast to {@link Parameter}
*/
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/1880190f/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/util/Reflections.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/util/Reflections.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/util/Reflections.java
index 6b0cfad..85c5e9f 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/util/Reflections.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/util/Reflections.java
@@ -40,13 +40,14 @@ import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
import java.lang.reflect.WildcardType;
import java.security.AccessController;
-import java.security.PrivilegedAction;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+//import java.util.Arrays;
+
/**
* Utilities for common reflection based actions. Some are basic Java Reflection based, others are CDI based.
*/
@@ -392,7 +393,8 @@ public class Reflections
}
if (Thread.currentThread().getContextClassLoader() != null)
{
- throw new ClassNotFoundException("Could not load class " + name + " with the context class loader " + Thread.currentThread().getContextClassLoader().toString() + " or any of the additional ClassLoaders: " + Arrays.toString(loaders));
+ throw new ClassNotFoundException(String.format("Could not load class %s with the context class loader %s or any of the additional ClassLoaders: %s",
+ name, Thread.currentThread().getContextClassLoader(), loaders));
}
else
{
@@ -404,8 +406,12 @@ public class Reflections
{
StringBuilder message = new StringBuilder(String.format("Exception invoking method [%s] on object [%s], using arguments [", method.getName(), obj));
if (args != null)
+ {
for (int i = 0; i < args.length; i++)
+ {
message.append((i > 0 ? "," : "") + args[i]);
+ }
+ }
message.append("]");
return message.toString();
}
@@ -413,7 +419,7 @@ public class Reflections
/**
* Set the accessibility flag on the {@link AccessibleObject} as described in
* {@link AccessibleObject#setAccessible(boolean)} within the context of
- * a {@link PrivilegedAction}.
+ * a {@link java.security.PrivilegedAction}.
*
* @param <A> member the accessible object type
* @param member the accessible object
@@ -1029,7 +1035,9 @@ public class Reflections
public static boolean isBindings(Annotation binding)
{
boolean isBindingAnnotation = false;
- if (binding.annotationType().isAnnotationPresent(Qualifier.class) && binding.annotationType().isAnnotationPresent(Retention.class) && binding.annotationType().getAnnotation(Retention.class).value().equals(RetentionPolicy.RUNTIME))
+ if (binding.annotationType().isAnnotationPresent(Qualifier.class)
+ && binding.annotationType().isAnnotationPresent(Retention.class)
+ && binding.annotationType().getAnnotation(Retention.class).value().equals(RetentionPolicy.RUNTIME))
{
isBindingAnnotation = true;
}