From cb57091bd299bf6cf61c43f2c1abf88339b130f5 Mon Sep 17 00:00:00 2001 From: Cleverson Sacramento Date: Tue, 19 Mar 2013 14:01:46 -0300 Subject: [PATCH] Correções de violações críticas de implementação apontadas pelo Sonar --- impl/core/src/main/java/br/gov/frameworkdemoiselle/exception/ExceptionHandlerInterceptor.java | 4 +--- impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/AbstractLifecycleBootstrap.java | 4 ++-- impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AnnotatedMethodProcessor.java | 6 +++--- impl/core/src/main/java/br/gov/frameworkdemoiselle/security/RequiredRoleInterceptor.java | 17 ++++++++--------- impl/extension/jdbc/src/main/java/br/gov/frameworkdemoiselle/internal/producer/DataSourceProducer.java | 4 ++-- impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/producer/EntityManagerFactoryProducer.java | 4 ++-- impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/util/Redirector.java | 7 ++++--- 7 files changed, 22 insertions(+), 24 deletions(-) diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/exception/ExceptionHandlerInterceptor.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/exception/ExceptionHandlerInterceptor.java index cc7cd98..7a8a9b0 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/exception/ExceptionHandlerInterceptor.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/exception/ExceptionHandlerInterceptor.java @@ -49,7 +49,6 @@ import javax.interceptor.InvocationContext; import org.slf4j.Logger; import br.gov.frameworkdemoiselle.DemoiselleException; -import br.gov.frameworkdemoiselle.exception.ExceptionHandler; import br.gov.frameworkdemoiselle.internal.bootstrap.CoreBootstrap; import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer; import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer; @@ -186,11 +185,10 @@ public class ExceptionHandlerInterceptor implements Serializable { @AroundInvoke public Object manage(final InvocationContext ic) throws Exception { - Object target = null; Object result = null; + Object target = ic.getTarget(); try { - target = ic.getTarget(); result = ic.proceed(); } catch (Exception cause) { diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/AbstractLifecycleBootstrap.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/AbstractLifecycleBootstrap.java index 705fdc7..d5fb5dc 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/AbstractLifecycleBootstrap.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/AbstractLifecycleBootstrap.java @@ -131,7 +131,7 @@ public abstract class AbstractLifecycleBootstrap implement getLogger().debug(getBundle().getString("executing-all", getAnnotationClass().getSimpleName())); Collections.sort(processors); - Throwable failure = null; + Exception failure = null; if (!registered) { for (CustomContext tempContext : tempContexts) { @@ -153,7 +153,7 @@ public abstract class AbstractLifecycleBootstrap implement iter.remove(); } - } catch (Throwable cause) { + } catch (Exception cause) { failure = cause; } } diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AnnotatedMethodProcessor.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AnnotatedMethodProcessor.java index 5f99e08..58869ca 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AnnotatedMethodProcessor.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AnnotatedMethodProcessor.java @@ -85,7 +85,7 @@ public class AnnotatedMethodProcessor implements Comparable implements Comparable userRoles = new ArrayList(); @@ -102,15 +100,16 @@ public class RequiredRoleInterceptor implements Serializable { } if (userRoles.isEmpty()) { - getLogger().error( - getBundle().getString("does-not-have-role", getSecurityContext().getCurrentUser().getName(), roles)); + getLogger() + .error(getBundle().getString("does-not-have-role", getSecurityContext().getCurrentUser().getName(), + roles)); - @SuppressWarnings("unused") - AuthorizationException a = new AuthorizationException(null); + // AuthorizationException a = new AuthorizationException(null); throw new AuthorizationException(getBundle().getString("does-not-have-role-ui", roles)); } - getLogger().debug(getBundle().getString("user-has-role", getSecurityContext().getCurrentUser().getName(), userRoles)); + getLogger().debug( + getBundle().getString("user-has-role", getSecurityContext().getCurrentUser().getName(), userRoles)); return ic.proceed(); } diff --git a/impl/extension/jdbc/src/main/java/br/gov/frameworkdemoiselle/internal/producer/DataSourceProducer.java b/impl/extension/jdbc/src/main/java/br/gov/frameworkdemoiselle/internal/producer/DataSourceProducer.java index 72878d9..2a5a059 100644 --- a/impl/extension/jdbc/src/main/java/br/gov/frameworkdemoiselle/internal/producer/DataSourceProducer.java +++ b/impl/extension/jdbc/src/main/java/br/gov/frameworkdemoiselle/internal/producer/DataSourceProducer.java @@ -48,8 +48,8 @@ public class DataSourceProducer implements Serializable { try { create(dataBaseName); - } catch (Throwable t) { - throw new DemoiselleException(t); + } catch (Exception cause) { + throw new DemoiselleException(cause); } logger.debug(bundle.getString("datasource-name-found", dataBaseName)); diff --git a/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/producer/EntityManagerFactoryProducer.java b/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/producer/EntityManagerFactoryProducer.java index a036695..7775fcb 100644 --- a/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/producer/EntityManagerFactoryProducer.java +++ b/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/producer/EntityManagerFactoryProducer.java @@ -113,8 +113,8 @@ public class EntityManagerFactoryProducer implements Serializable { try { create(persistenceUnit); - } catch (Throwable t) { - throw new DemoiselleException(t); + } catch (Exception cause) { + throw new DemoiselleException(cause); } logger.debug(bundle.getString("persistence-unit-name-found", persistenceUnit)); diff --git a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/util/Redirector.java b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/util/Redirector.java index cdfdb4f..1ef9e77 100644 --- a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/util/Redirector.java +++ b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/util/Redirector.java @@ -42,6 +42,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import javax.faces.FacesException; import javax.faces.application.ViewHandler; @@ -81,10 +82,10 @@ public class Redirector implements Serializable { ArrayList list; result = new HashMap>(); - for (String key : map.keySet()) { + for (Entry entry : map.entrySet()) { list = new ArrayList(); - list.add(map.get(key).toString()); - result.put(key, list); + list.add(entry.getValue().toString()); + result.put(entry.getKey(), list); } } -- libgit2 0.21.2