You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by gp...@apache.org on 2012/02/21 15:48:55 UTC

[1/2] git commit: DELTASPIKE-102 fixed sonar findings

Updated Branches:
  refs/heads/master 13bcf1004 -> 446441b30


DELTASPIKE-102 fixed sonar findings


Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/446441b3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/446441b3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/446441b3

Branch: refs/heads/master
Commit: 446441b300c600ee1576599dfffa04dc62bd91f5
Parents: 4fe5dbc
Author: gpetracek <gp...@apache.org>
Authored: Tue Feb 21 15:47:32 2012 +0100
Committer: gpetracek <gp...@apache.org>
Committed: Tue Feb 21 15:47:32 2012 +0100

----------------------------------------------------------------------
 .../deltaspike/cdise/owb/MockServletContext.java   |   12 --------
 .../cdise/owb/OpenWebBeansContainerControl.java    |   22 +++++++-------
 .../apache/deltaspike/cdise/tck/beans/User.java    |    2 +
 .../AbstractPropertyExpressionInterpreter.java     |    3 --
 .../deltaspike/core/api/literal/TypedLiteral.java  |    2 +
 .../api/metadata/builder/AnnotatedTypeBuilder.java |   14 +++++-----
 .../core/api/projectstage/ProjectStage.java        |   18 +++++++++++-
 .../deltaspike/core/util/ClassDeactivation.java    |    4 +-
 .../deltaspike/core/util/HierarchyDiscovery.java   |    6 +++-
 .../deltaspike/core/util/ProjectStageProducer.java |    9 ++++++
 .../apache/deltaspike/core/util/Reflections.java   |   14 +++-------
 .../org/apache/deltaspike/core/util/Types.java     |    3 +-
 .../impl/config/DefaultConfigSourceProvider.java   |    2 +-
 .../core/impl/exclude/ExcludeExtension.java        |    2 +-
 .../deltaspike/core/impl/util/JndiUtils.java       |    2 +-
 .../security/impl/DefaultSecurityStrategy.java     |    6 ----
 16 files changed, 63 insertions(+), 58 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/446441b3/deltaspike/cdise/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockServletContext.java
----------------------------------------------------------------------
diff --git a/deltaspike/cdise/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockServletContext.java b/deltaspike/cdise/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockServletContext.java
index b40fb51..519b8db 100644
--- a/deltaspike/cdise/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockServletContext.java
+++ b/deltaspike/cdise/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockServletContext.java
@@ -37,18 +37,13 @@ import javax.servlet.ServletException;
  */
 public class MockServletContext implements ServletContext
 {
-
-    @SuppressWarnings("unchecked")
     private Hashtable attributes = new Hashtable();
 
-
-
     public Object getAttribute(String name)
     {
         return attributes.get(name);
     }
 
-    @SuppressWarnings("unchecked")
     public Enumeration getAttributeNames()
     {
         return attributes.keys();
@@ -69,7 +64,6 @@ public class MockServletContext implements ServletContext
         return null;
     }
 
-    @SuppressWarnings("unchecked")
     public Enumeration getInitParameterNames()
     {
         return new StringTokenizer(""); // 'standard' empty Enumeration
@@ -115,7 +109,6 @@ public class MockServletContext implements ServletContext
         return null;
     }
 
-    @SuppressWarnings("unchecked")
     public Set getResourcePaths(String path)
     {
         return null;
@@ -136,13 +129,11 @@ public class MockServletContext implements ServletContext
         return null;
     }
 
-    @SuppressWarnings("unchecked")
     public Enumeration getServletNames()
     {
         return null;
     }
 
-    @SuppressWarnings("unchecked")
     public Enumeration getServlets()
     {
         return null;
@@ -156,13 +147,11 @@ public class MockServletContext implements ServletContext
     public void log(Exception exception, String msg)
     {
         // TODO
-
     }
 
     public void log(String message, Throwable throwable)
     {
         // TODO
-
     }
 
     public void removeAttribute(String name)
@@ -175,5 +164,4 @@ public class MockServletContext implements ServletContext
     {
         attributes.put(name, object);
     }
-
 }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/446441b3/deltaspike/cdise/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/OpenWebBeansContainerControl.java
----------------------------------------------------------------------
diff --git a/deltaspike/cdise/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/OpenWebBeansContainerControl.java b/deltaspike/cdise/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/OpenWebBeansContainerControl.java
index 84b99cd..07b40a1 100644
--- a/deltaspike/cdise/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/OpenWebBeansContainerControl.java
+++ b/deltaspike/cdise/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/OpenWebBeansContainerControl.java
@@ -42,7 +42,7 @@ import org.apache.webbeans.spi.ContainerLifecycle;
  */
 public class OpenWebBeansContainerControl implements CdiContainer
 {
-    private static final Logger logger = Logger.getLogger(OpenWebBeansContainerControl.class.getName());
+    private static final Logger LOG = Logger.getLogger(OpenWebBeansContainerControl.class.getName());
 
     private ContainerLifecycle  lifecycle = null;
     private MockServletContext servletContext = null;
@@ -145,8 +145,7 @@ public class OpenWebBeansContainerControl implements CdiContainer
         }
         else
         {
-            logger.log(Level.WARNING,
-                       "destroy was called for an inactive context (" + Singleton.class.getName() + ")");
+            logDestroyOfInactiveContext(Singleton.class.getName());
         }
 
     }
@@ -163,8 +162,7 @@ public class OpenWebBeansContainerControl implements CdiContainer
         }
         else
         {
-            logger.log(Level.WARNING,
-                       "destroy was called for an inactive context (" + ApplicationScoped.class.getName() + ")");
+            logDestroyOfInactiveContext(ApplicationScoped.class.getName());
         }
     }
 
@@ -180,8 +178,7 @@ public class OpenWebBeansContainerControl implements CdiContainer
         }
         else
         {
-            logger.log(Level.WARNING,
-                       "destroy was called for an inactive context (" + ConversationScoped.class.getName() + ")");
+            logDestroyOfInactiveContext(ConversationScoped.class.getName());
         }
     }
 
@@ -217,8 +214,7 @@ public class OpenWebBeansContainerControl implements CdiContainer
         }
         else
         {
-            logger.log(Level.WARNING,
-                       "destroy was called for an inactive context (" + RequestScoped.class.getName() + ")");
+            logDestroyOfInactiveContext(RequestScoped.class.getName());
         }
     }
 
@@ -234,8 +230,7 @@ public class OpenWebBeansContainerControl implements CdiContainer
         }
         else
         {
-            logger.log(Level.WARNING,
-                       "destroy was called for an inactive context (" + SessionScoped.class.getName() + ")");
+            logDestroyOfInactiveContext(SessionScoped.class.getName());
         }
     }
     
@@ -244,4 +239,9 @@ public class OpenWebBeansContainerControl implements CdiContainer
         return lifecycle.getBeanManager();
     }
 
+    private void logDestroyOfInactiveContext(String contextName)
+    {
+        LOG.log(Level.WARNING,
+                "destroy was called for an inactive context (" + contextName + ")");
+    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/446441b3/deltaspike/cdise/tck/src/main/java/org/apache/deltaspike/cdise/tck/beans/User.java
----------------------------------------------------------------------
diff --git a/deltaspike/cdise/tck/src/main/java/org/apache/deltaspike/cdise/tck/beans/User.java b/deltaspike/cdise/tck/src/main/java/org/apache/deltaspike/cdise/tck/beans/User.java
index 238437b..61cc2b0 100644
--- a/deltaspike/cdise/tck/src/main/java/org/apache/deltaspike/cdise/tck/beans/User.java
+++ b/deltaspike/cdise/tck/src/main/java/org/apache/deltaspike/cdise/tck/beans/User.java
@@ -24,6 +24,8 @@ import java.io.Serializable;
 @SessionScoped
 public class User implements Serializable
 {
+    private static final long serialVersionUID = -4171521313675763849L;
+
     private String name;
 
     public String getName()

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/446441b3/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/interpreter/AbstractPropertyExpressionInterpreter.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/interpreter/AbstractPropertyExpressionInterpreter.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/interpreter/AbstractPropertyExpressionInterpreter.java
index 968f74e..0bdaa39 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/interpreter/AbstractPropertyExpressionInterpreter.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/interpreter/AbstractPropertyExpressionInterpreter.java
@@ -33,9 +33,6 @@ public abstract class AbstractPropertyExpressionInterpreter implements Expressio
 {
     private static final String ASTERISK = "*";
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public final Boolean evaluate(String expressions)
     {

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/446441b3/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/TypedLiteral.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/TypedLiteral.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/TypedLiteral.java
index 98f6167..f233ec8 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/TypedLiteral.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/literal/TypedLiteral.java
@@ -27,6 +27,8 @@ import javax.enterprise.util.AnnotationLiteral;
  */
 public class TypedLiteral extends AnnotationLiteral<Typed> implements Typed
 {
+    private static final long serialVersionUID = 6805980497117269525L;
+
     private final Class<?>[] value;
 
     public TypedLiteral()

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/446441b3/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/builder/AnnotatedTypeBuilder.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/builder/AnnotatedTypeBuilder.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/builder/AnnotatedTypeBuilder.java
index b1a236a..f0f9f90 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/builder/AnnotatedTypeBuilder.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/builder/AnnotatedTypeBuilder.java
@@ -405,12 +405,10 @@ public class AnnotatedTypeBuilder<X>
                                                                   int position,
                                                                   Class<? extends Annotation> annotationType)
     {
-        if (constructorParameters.get(constructor) != null)
+        if (constructorParameters.get(constructor) != null &&
+            constructorParameters.get(constructor).get(position) != null)
         {
-            if (constructorParameters.get(constructor).get(position) != null)
-            {
-                constructorParameters.get(constructor).get(position).remove(annotationType);
-            }
+            constructorParameters.get(constructor).get(position).remove(annotationType);
         }
         return this;
     }
@@ -659,7 +657,8 @@ public class AnnotatedTypeBuilder<X>
                 annotationBuilder = new AnnotationBuilder();
                 fields.put(field, annotationBuilder);
             }
-            field.setAccessible(true);
+            Reflections.setAccessible(field);
+
             for (Annotation annotation : field.getAnnotations())
             {
                 if (overwrite || !annotationBuilder.isAnnotationPresent(annotation.annotationType()))
@@ -677,7 +676,8 @@ public class AnnotatedTypeBuilder<X>
                 annotationBuilder = new AnnotationBuilder();
                 methods.put(method, annotationBuilder);
             }
-            method.setAccessible(true);
+            Reflections.setAccessible(method);
+
             for (Annotation annotation : method.getAnnotations())
             {
                 if (overwrite || !annotationBuilder.isAnnotationPresent(annotation.annotationType()))

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/446441b3/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/projectstage/ProjectStage.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/projectstage/ProjectStage.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/projectstage/ProjectStage.java
index 7ced0b8..408a4f1 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/projectstage/ProjectStage.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/projectstage/ProjectStage.java
@@ -151,9 +151,21 @@ public abstract class ProjectStage implements Serializable
         String projectStageClassName = this.getClass().getSimpleName();
         psName = projectStageClassName;
 
+        init(projectStageClassName, this);
+    }
+
+    /**
+     * This function exists to prevent findbugs to complain about
+     * setting a static member from a non-static function.
+     *
+     * @param projectStageClassName name of the project-stage
+     * @param projectStage instance of the project-stage
+     */
+    private static void init(String projectStageClassName, ProjectStage projectStage)
+    {
         if (!projectStages.containsKey(projectStageClassName))
         {
-            projectStages.put(projectStageClassName, this);
+            projectStages.put(projectStageClassName, projectStage);
         }
         else
         {
@@ -180,7 +192,9 @@ public abstract class ProjectStage implements Serializable
      */
     public static ProjectStage[] values()
     {
-        return values;
+        ProjectStage[] result = new ProjectStage[values.length];
+        System.arraycopy(values, 0, result, 0, values.length);
+        return result;
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/446441b3/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassDeactivation.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassDeactivation.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassDeactivation.java
index f12fea3..ba6c9c1 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassDeactivation.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassDeactivation.java
@@ -33,7 +33,7 @@ import java.util.logging.Logger;
  * Helper methods for {@link ClassDeactivator}
  */
 @Typed()
-public final class ClassDeactivation
+public abstract class ClassDeactivation
 {
     private static final Logger LOG = Logger.getLogger(ClassDeactivation.class.getName());
 
@@ -55,7 +55,7 @@ public final class ClassDeactivation
     
     private ClassDeactivation()
     {
-        // private ct to prevent utility class from instantiation.
+        // prevent instantiation
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/446441b3/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/HierarchyDiscovery.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/HierarchyDiscovery.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/HierarchyDiscovery.java
index 41b2f93..1163162 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/HierarchyDiscovery.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/HierarchyDiscovery.java
@@ -27,6 +27,8 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * Utility class for resolving all bean types from a given type.
@@ -69,7 +71,9 @@ public class HierarchyDiscovery
         }
         catch (StackOverflowError e)
         {
-            System.out.println("type" + type);
+            Logger logger = Logger.getLogger(HierarchyDiscovery.class.getName());
+
+            logger.log(Level.WARNING, "type: " + type.toString(), e);
             Thread.dumpStack();
             throw e;
         }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/446441b3/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProjectStageProducer.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProjectStageProducer.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProjectStageProducer.java
index 9f0cf14..4865d5a 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProjectStageProducer.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProjectStageProducer.java
@@ -202,6 +202,15 @@ public class ProjectStageProducer implements Serializable
      */
     protected void reset()
     {
+        resetCache();
+    }
+
+    /**
+     * This function exists to prevent findbugs to complain about
+     * setting a static member from a non-static function.
+     */
+    private static void resetCache()
+    {
         projectStage = null;
         projectStageProducer = null;
     }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/446441b3/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/Reflections.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/Reflections.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/Reflections.java
index 1f96d98..4323cfb 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/Reflections.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/Reflections.java
@@ -55,7 +55,7 @@ import java.util.Set;
 //X TODO: Look at merging this with some of the other classes from CODI, or if they're really needed
 //X TODO: Also some methods need JavaDoc
 @Typed()
-public class Reflections
+public abstract class Reflections
 {
     /**
      * An empty array of type {@link Annotation}, useful converting lists to
@@ -75,6 +75,7 @@ public class Reflections
 
     private Reflections()
     {
+        // prevent instantiation
     }
 
     /**
@@ -743,12 +744,9 @@ public class Reflections
         {
             return (Class<T>) type;
         }
-        else if (type instanceof ParameterizedType)
+        else if (type instanceof ParameterizedType && ((ParameterizedType) type).getRawType() instanceof Class<?>)
         {
-            if (((ParameterizedType) type).getRawType() instanceof Class<?>)
-            {
-                return (Class<T>) ((ParameterizedType) type).getRawType();
-            }
+            return (Class<T>) ((ParameterizedType) type).getRawType();
         }
         return null;
     }
@@ -781,10 +779,6 @@ public class Reflections
                     map.put((Class<?>) ((ParameterizedType) type).getRawType(), type);
                 }
             }
-            else if (type instanceof TypeVariable<?>)
-            {
-
-            }
         }
         return map;
     }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/446441b3/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/Types.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/Types.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/Types.java
index d7a8441..ac76796 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/Types.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/Types.java
@@ -26,10 +26,11 @@ import java.lang.reflect.Type;
  * Utilities for Types.
  */
 @Typed()
-public class Types
+public abstract class Types
 {
     private Types()
     {
+        // prevent instantiation
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/446441b3/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/DefaultConfigSourceProvider.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/DefaultConfigSourceProvider.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/DefaultConfigSourceProvider.java
index 3b78f34..015d52c 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/DefaultConfigSourceProvider.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/DefaultConfigSourceProvider.java
@@ -65,7 +65,7 @@ public class DefaultConfigSourceProvider implements ConfigSourceProvider
         }
         catch (IOException ioe) 
         {
-            throw new RuntimeException("problem while loading DeltaSpike property files", ioe);
+            throw new IllegalStateException("problem while loading DeltaSpike property files", ioe);
         }
         
     }

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/446441b3/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/ExcludeExtension.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/ExcludeExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/ExcludeExtension.java
index 403cf97..ff4b16d 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/ExcludeExtension.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/ExcludeExtension.java
@@ -500,7 +500,7 @@ public class ExcludeExtension implements Extension, Deactivatable
         {
             isOwbDetected = false;
 
-            RuntimeException runtimeException = new RuntimeException();
+            IllegalStateException runtimeException = new IllegalStateException();
 
             for (StackTraceElement element : runtimeException.getStackTrace())
             {

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/446441b3/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/JndiUtils.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/JndiUtils.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/JndiUtils.java
index 52430f1..aeb424c 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/JndiUtils.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/JndiUtils.java
@@ -30,7 +30,7 @@ import java.util.logging.Logger;
  * This is the internal helper class for low level access to JNDI
  */
 @Typed()
-public class JndiUtils
+public abstract class JndiUtils
 {
     private static final Logger LOG = Logger.getLogger(JndiUtils.class.getName());
 

http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/446441b3/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/DefaultSecurityStrategy.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/DefaultSecurityStrategy.java b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/DefaultSecurityStrategy.java
index e8a157c..a6cae59 100644
--- a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/DefaultSecurityStrategy.java
+++ b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/DefaultSecurityStrategy.java
@@ -29,7 +29,6 @@ import org.apache.deltaspike.security.spi.EditableAccessDecisionVoterContext;
 import org.apache.deltaspike.security.spi.SecurityStrategy;
 
 import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.spi.BeanManager;
 import javax.inject.Inject;
 import javax.interceptor.InvocationContext;
 import java.lang.annotation.Annotation;
@@ -50,11 +49,6 @@ public class DefaultSecurityStrategy implements SecurityStrategy
     @Inject
     private AccessDecisionVoterContext voterContext;
 
-    //all implementations will be serializable
-    @Inject
-    @SuppressWarnings("NonSerializableFieldInSerializableClass")
-    private BeanManager beanManager;
-
     /**
      * {@inheritDoc}
      */