From 3d9931eefdf28a06a3f42872af5c6eb3b79138c5 Mon Sep 17 00:00:00 2001 From: Jozef Hartinger Date: Fri, 14 Jan 2011 18:20:09 +0100 Subject: [PATCH] SEAMCATCH-30 --- .../jboss/seam/exception/control/ExceptionHandlerDispatch.java | 2 ++ .../exception/control/test/extension/DecoratorAsHandler.java | 1 + .../seam/exception/control/test/extension/ExtensionTest.java | 2 +- .../control/test/extension/literal/ArquillianLiteral.java | 1 + .../control/test/extension/literal/CatchQualifierLiteral.java | 1 + .../exception/control/test/handler/CalledExceptionHandler.java | 1 + .../exception/control/test/handler/HandlerComparatorTest.java | 2 +- .../exception/control/test/stack/ModifyExceptionStackTest.java | 1 + 8 files changed, 9 insertions(+), 2 deletions(-) diff --git a/impl/src/main/java/org/jboss/seam/exception/control/ExceptionHandlerDispatch.java b/impl/src/main/java/org/jboss/seam/exception/control/ExceptionHandlerDispatch.java index a04a742..b60b52a 100644 --- a/impl/src/main/java/org/jboss/seam/exception/control/ExceptionHandlerDispatch.java +++ b/impl/src/main/java/org/jboss/seam/exception/control/ExceptionHandlerDispatch.java @@ -78,6 +78,7 @@ public void executeHandlers(@Observes @Any ExceptionToCatch eventException, fina { if (!processedHandlers.contains(handler)) { + @SuppressWarnings("rawtypes") final CaughtException breadthFirstEvent = new CaughtException(stack, true, eventException.isHandled()); handler.notify(breadthFirstEvent, bm); @@ -120,6 +121,7 @@ public void executeHandlers(@Observes @Any ExceptionToCatch eventException, fina { if (!processedHandlers.contains(handler)) { + @SuppressWarnings("rawtypes") final CaughtException depthFirstEvent = new CaughtException(stack, false, eventException.isHandled()); handler.notify(depthFirstEvent, bm); diff --git a/impl/src/test/java/org/jboss/seam/exception/control/test/extension/DecoratorAsHandler.java b/impl/src/test/java/org/jboss/seam/exception/control/test/extension/DecoratorAsHandler.java index f1042aa..070116e 100644 --- a/impl/src/test/java/org/jboss/seam/exception/control/test/extension/DecoratorAsHandler.java +++ b/impl/src/test/java/org/jboss/seam/exception/control/test/extension/DecoratorAsHandler.java @@ -32,6 +32,7 @@ @HandlesExceptions public abstract class DecoratorAsHandler extends Account { + @SuppressWarnings("unused") @Inject @Delegate @Any diff --git a/impl/src/test/java/org/jboss/seam/exception/control/test/extension/ExtensionTest.java b/impl/src/test/java/org/jboss/seam/exception/control/test/extension/ExtensionTest.java index cb87067..63f5c1e 100644 --- a/impl/src/test/java/org/jboss/seam/exception/control/test/extension/ExtensionTest.java +++ b/impl/src/test/java/org/jboss/seam/exception/control/test/extension/ExtensionTest.java @@ -104,7 +104,7 @@ public void assertNumberOfHandlersFoundMatchesExpectedBreathFirst() @Test public void assertSQLHandlerFound() { - final List handlerMethods = new ArrayList(extension.getHandlersForExceptionType( + final List> handlerMethods = new ArrayList>(extension.getHandlersForExceptionType( SQLException.class, bm, Collections.emptySet(), TraversalMode.DEPTH_FIRST)); assertThat(handlerMethods.size(), is(4)); assertThat(handlerMethods.get(3).getExceptionType(), equalTo((Type) SQLException.class)); diff --git a/impl/src/test/java/org/jboss/seam/exception/control/test/extension/literal/ArquillianLiteral.java b/impl/src/test/java/org/jboss/seam/exception/control/test/extension/literal/ArquillianLiteral.java index 3c711e8..f78dbc9 100644 --- a/impl/src/test/java/org/jboss/seam/exception/control/test/extension/literal/ArquillianLiteral.java +++ b/impl/src/test/java/org/jboss/seam/exception/control/test/extension/literal/ArquillianLiteral.java @@ -21,6 +21,7 @@ import org.jboss.seam.exception.control.test.extension.Arquillian; +@SuppressWarnings("all") public class ArquillianLiteral extends AnnotationLiteral implements Arquillian { private static final long serialVersionUID = -3525383414748064487L; diff --git a/impl/src/test/java/org/jboss/seam/exception/control/test/extension/literal/CatchQualifierLiteral.java b/impl/src/test/java/org/jboss/seam/exception/control/test/extension/literal/CatchQualifierLiteral.java index 71130c7..01bffa7 100644 --- a/impl/src/test/java/org/jboss/seam/exception/control/test/extension/literal/CatchQualifierLiteral.java +++ b/impl/src/test/java/org/jboss/seam/exception/control/test/extension/literal/CatchQualifierLiteral.java @@ -21,6 +21,7 @@ import org.jboss.seam.exception.control.test.extension.CatchQualifier; +@SuppressWarnings("all") public class CatchQualifierLiteral extends AnnotationLiteral implements CatchQualifier { private static final long serialVersionUID = 6052715391406598552L; diff --git a/impl/src/test/java/org/jboss/seam/exception/control/test/handler/CalledExceptionHandler.java b/impl/src/test/java/org/jboss/seam/exception/control/test/handler/CalledExceptionHandler.java index 9411564..518fae0 100644 --- a/impl/src/test/java/org/jboss/seam/exception/control/test/handler/CalledExceptionHandler.java +++ b/impl/src/test/java/org/jboss/seam/exception/control/test/handler/CalledExceptionHandler.java @@ -61,6 +61,7 @@ void protectedHandler(@Handles CaughtException event) PROTECTED_HANDLER_CALLED = true; } + @SuppressWarnings("unused") private void handlerLocationInjections(BeanManager bm, @Handles CaughtException event) { if (bm != null) diff --git a/impl/src/test/java/org/jboss/seam/exception/control/test/handler/HandlerComparatorTest.java b/impl/src/test/java/org/jboss/seam/exception/control/test/handler/HandlerComparatorTest.java index c7d381e..7481e8e 100644 --- a/impl/src/test/java/org/jboss/seam/exception/control/test/handler/HandlerComparatorTest.java +++ b/impl/src/test/java/org/jboss/seam/exception/control/test/handler/HandlerComparatorTest.java @@ -60,7 +60,7 @@ public static Archive createTestArchive() @Test public void assertOrderIsCorrect() { - List handlers = new ArrayList(extension.getHandlersForExceptionType( + List> handlers = new ArrayList>(extension.getHandlersForExceptionType( IllegalArgumentException.class, bm, Collections.emptySet(), TraversalMode.DEPTH_FIRST)); assertEquals("catchThrowable", handlers.get(0).getJavaMethod().getName()); diff --git a/impl/src/test/java/org/jboss/seam/exception/control/test/stack/ModifyExceptionStackTest.java b/impl/src/test/java/org/jboss/seam/exception/control/test/stack/ModifyExceptionStackTest.java index 2e102e7..c78aeb6 100644 --- a/impl/src/test/java/org/jboss/seam/exception/control/test/stack/ModifyExceptionStackTest.java +++ b/impl/src/test/java/org/jboss/seam/exception/control/test/stack/ModifyExceptionStackTest.java @@ -62,6 +62,7 @@ public static Archive createTestArchive() .addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")); } + @SuppressWarnings("serial") public static class ApplicationException extends Exception {