You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by mb...@apache.org on 2012/07/13 19:34:35 UTC
git commit: use Type for key type of ExceptionControlExtension
handlers map
Updated Branches:
refs/heads/master b1623a764 -> 78b37a9c7
use Type for key type of ExceptionControlExtension handlers map
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/78b37a9c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/78b37a9c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/78b37a9c
Branch: refs/heads/master
Commit: 78b37a9c71f8f5d7f540c54349cf483a9bb555d6
Parents: b1623a7
Author: mbenson <gu...@gmail.com>
Authored: Fri Jul 13 12:34:07 2012 -0500
Committer: mbenson <gu...@gmail.com>
Committed: Fri Jul 13 12:34:07 2012 -0500
----------------------------------------------------------------------
.../control/HandlerMethodStorageImpl.java | 7 +++----
.../extension/ExceptionControlExtension.java | 6 +++---
2 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/78b37a9c/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/HandlerMethodStorageImpl.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/HandlerMethodStorageImpl.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/HandlerMethodStorageImpl.java
index b6372da..cdd33f9 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/HandlerMethodStorageImpl.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/HandlerMethodStorageImpl.java
@@ -27,7 +27,6 @@ import javax.enterprise.inject.Typed;
import javax.enterprise.inject.spi.BeanManager;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
@@ -43,11 +42,11 @@ import java.util.logging.Logger;
@Typed()
class HandlerMethodStorageImpl implements HandlerMethodStorage
{
- private final Map<? super Type, Collection<HandlerMethod<? extends Throwable>>> allHandlers;
+ private final Map<Type, Collection<HandlerMethod<? extends Throwable>>> allHandlers;
private Logger log = Logger.getLogger(HandlerMethodStorageImpl.class.toString());
- HandlerMethodStorageImpl(Map<? super Type, Collection<HandlerMethod<? extends Throwable>>> allHandlers)
+ HandlerMethodStorageImpl(Map<Type, Collection<HandlerMethod<? extends Throwable>>> allHandlers)
{
this.allHandlers = allHandlers;
}
@@ -63,7 +62,7 @@ class HandlerMethodStorageImpl implements HandlerMethodStorage
else
{
allHandlers.put(handlerMethod.getExceptionType(),
- new HashSet<HandlerMethod<? extends Throwable>>(Arrays.asList(handlerMethod)));
+ new HashSet<HandlerMethod<? extends Throwable>>(Collections.singleton(handlerMethod)));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/78b37a9c/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/extension/ExceptionControlExtension.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/extension/ExceptionControlExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/extension/ExceptionControlExtension.java
index 7d0c442..9c0fc3f 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/extension/ExceptionControlExtension.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/extension/ExceptionControlExtension.java
@@ -57,7 +57,7 @@ public class ExceptionControlExtension implements Extension, Deactivatable
//this map is application scoped by the def. of the cdi spec.
//if it needs to be static a classloader key is needed + a cleanup in a BeforeShutdown observer
- private Map<? super Type, Collection<HandlerMethod<? extends Throwable>>> allHandlers
+ private Map<Type, Collection<HandlerMethod<? extends Throwable>>> allHandlers
= new HashMap<Type, Collection<HandlerMethod<? extends Throwable>>>();
private Boolean isActivated = null;
@@ -134,7 +134,7 @@ public class ExceptionControlExtension implements Extension, Deactivatable
return;
}
- for (Map.Entry<? super Type, Collection<HandlerMethod<? extends Throwable>>> entry : allHandlers.entrySet())
+ for (Map.Entry<Type, Collection<HandlerMethod<? extends Throwable>>> entry : allHandlers.entrySet())
{
for (HandlerMethod<? extends Throwable> handler : entry.getValue())
{
@@ -153,7 +153,7 @@ public class ExceptionControlExtension implements Extension, Deactivatable
}
}
- public Map<? super Type, Collection<HandlerMethod<? extends Throwable>>> getAllExceptionHandlers()
+ public Map<Type, Collection<HandlerMethod<? extends Throwable>>> getAllExceptionHandlers()
{
return Collections.unmodifiableMap(allHandlers);
}