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 new file mode 100644 index 0000000..9e87eb3 --- /dev/null +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/exception/ExceptionHandlerInterceptor.java @@ -0,0 +1,217 @@ +/* + * Demoiselle Framework + * Copyright (C) 2010 SERPRO + * ---------------------------------------------------------------------------- + * This file is part of Demoiselle Framework. + * + * Demoiselle Framework is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License version 3 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License version 3 + * along with this program; if not, see + * or write to the Free Software Foundation, Inc., 51 Franklin Street, + * Fifth Floor, Boston, MA 02110-1301, USA. + * ---------------------------------------------------------------------------- + * Este arquivo é parte do Framework Demoiselle. + * + * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou + * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação + * do Software Livre (FSF). + * + * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA + * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou + * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português + * para maiores detalhes. + * + * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título + * "LICENCA.txt", junto com esse programa. Se não, acesse + * ou escreva para a Fundação do Software Livre (FSF) Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. + */ +package br.gov.frameworkdemoiselle.exception; + +import java.io.Serializable; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.Map; + +import javax.interceptor.AroundInvoke; +import javax.interceptor.Interceptor; +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; +import br.gov.frameworkdemoiselle.stereotype.Controller; +import br.gov.frameworkdemoiselle.util.Beans; +import br.gov.frameworkdemoiselle.util.ResourceBundle; + +@Interceptor +@Controller +public class ExceptionHandlerInterceptor implements Serializable { + + private static final long serialVersionUID = 1L; + + private static ResourceBundle bundle; + + private static Logger logger; + + private final Map, Map, Method>> cache = new HashMap, Map, Method>>(); + + private final boolean handleException(final Exception cause, final Object target) throws Exception { + getLogger().info(getBundle().getString("handling-exception", cause.getClass().getCanonicalName())); + + boolean handled = false; + Class type = getType(target); + + if (!isLoaded(type)) { + loadHandlers(type); + } + + Method handler = getMethod(type, cause); + if (handler != null) { + invoke(handler, target, cause); + handled = true; + } + + return handled; + } + + private final Class getType(final Object target) { + Class type = target.getClass(); + CoreBootstrap bootstrap = Beans.getReference(CoreBootstrap.class); + + if (!bootstrap.isAnnotatedType(type)) { + getLogger().debug( + getBundle().getString("proxy-detected", type, + type.getSuperclass())); + type = type.getSuperclass(); + } + + return type; + } + + /** + * If there is an handler in the current class for the expected exception, then this method will be returned; Else + * returns null; + * + * @param type + * @param cause + * @return + */ + private final Method getMethod(final Class type, final Exception cause) { + Method handler = null; + + if (cache.containsKey(type) && cache.get(type).containsKey(cause.getClass())) { + handler = cache.get(type).get(cause.getClass()); + } + + return handler; + } + + /** + * Create an map of Exception Handler for this class and put it on the cache. + * + * @param type + */ + private final void loadHandlers(final Class type) { + Map, Method> mapHandlers = new HashMap, Method>(); + Method[] methods = type.getMethods(); + + for (Method method : methods) { + if (method.isAnnotationPresent(ExceptionHandler.class)) { + validateHandler(method); + mapHandlers.put(method.getParameterTypes()[0], method); + } + } + cache.put(type, mapHandlers); + } + + /** + * Verify the method for compliance with an handler. It must be: public, single parameter, parameter type must be + * assigned from Exception + * + * @param method + */ + private final void validateHandler(final Method method) { + if (method.getParameterTypes().length != 1) { + throw new DemoiselleException(getBundle().getString("must-declare-one-single-parameter", + method.toGenericString())); + } + } + + /** + * Indicates if this class is already loaded in cache control. + * + * @param type + * @return + */ + private final boolean isLoaded(final Class type) { + return cache.containsKey(type); + } + + private final void invoke(final Method method, final Object object, final Exception param) throws Exception { + boolean accessible = method.isAccessible(); + method.setAccessible(true); + + try { + method.invoke(object, param); + + } catch (InvocationTargetException cause) { + Throwable targetTrowable = cause.getTargetException(); + + if (targetTrowable instanceof Exception) { + throw (Exception) targetTrowable; + } else { + throw new Exception(targetTrowable); + } + } + + method.setAccessible(accessible); + } + + @AroundInvoke + public Object manage(final InvocationContext ic) throws Exception { + Object target = null; + Object result = null; + + try { + target = ic.getTarget(); + result = ic.proceed(); + + } catch (Exception cause) { + if (!handleException(cause, target)) { + throw cause; + } + } + + return result; + } + + private static ResourceBundle getBundle() { + if (bundle == null) { + bundle = ResourceBundleProducer.create("demoiselle-core-bundle"); + } + + return bundle; + } + + private static Logger getLogger() { + if (logger == null) { + logger = LoggerProducer.create(ExceptionHandlerInterceptor.class); + } + + return logger; + } +} diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/MessageContextImpl.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/MessageContextImpl.java index 22b5e97..8142c78 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/MessageContextImpl.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/MessageContextImpl.java @@ -44,7 +44,6 @@ import javax.enterprise.context.RequestScoped; import org.slf4j.Logger; -import br.gov.frameworkdemoiselle.internal.interceptor.ExceptionHandlerInterceptor; import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer; import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer; import br.gov.frameworkdemoiselle.message.DefaultMessage; @@ -114,7 +113,7 @@ public class MessageContextImpl implements Serializable, MessageContext { private static Logger getLogger() { if (logger == null) { - logger = LoggerProducer.create(ExceptionHandlerInterceptor.class); + logger = LoggerProducer.create(MessageContext.class); } return logger; diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/TransactionInfo.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/TransactionInfo.java deleted file mode 100644 index c0d597c..0000000 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/TransactionInfo.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Demoiselle Framework - * Copyright (C) 2010 SERPRO - * ---------------------------------------------------------------------------- - * This file is part of Demoiselle Framework. - * - * Demoiselle Framework is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License version 3 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License version 3 - * along with this program; if not, see - * or write to the Free Software Foundation, Inc., 51 Franklin Street, - * Fifth Floor, Boston, MA 02110-1301, USA. - * ---------------------------------------------------------------------------- - * Este arquivo é parte do Framework Demoiselle. - * - * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou - * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação - * do Software Livre (FSF). - * - * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA - * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou - * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português - * para maiores detalhes. - * - * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título - * "LICENCA.txt", junto com esse programa. Se não, acesse - * ou escreva para a Fundação do Software Livre (FSF) Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. - */ -package br.gov.frameworkdemoiselle.internal.implementation; - -import java.io.Serializable; - -import javax.enterprise.context.RequestScoped; - -@RequestScoped -public class TransactionInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - private int counter = 0; - - private boolean owner; - - public TransactionInfo() { - clear(); - } - - public void clear() { - this.owner = false; - this.counter = 0; - } - - public int getCounter() { - return counter; - } - - public void incrementCounter() { - this.counter++; - } - - public void decrementCounter() { - this.counter--; - } - - public void markAsOwner() { - this.owner = true; - } - - public boolean isOwner() { - return owner; - } -} diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/interceptor/ExceptionHandlerInterceptor.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/interceptor/ExceptionHandlerInterceptor.java index 425fa9c..2e094c3 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/interceptor/ExceptionHandlerInterceptor.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/interceptor/ExceptionHandlerInterceptor.java @@ -36,182 +36,32 @@ */ package br.gov.frameworkdemoiselle.internal.interceptor; -import java.io.Serializable; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.HashMap; -import java.util.Map; - +import javax.inject.Inject; import javax.interceptor.AroundInvoke; import javax.interceptor.Interceptor; 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; import br.gov.frameworkdemoiselle.stereotype.Controller; -import br.gov.frameworkdemoiselle.util.Beans; -import br.gov.frameworkdemoiselle.util.ResourceBundle; +/** + * @author 80342167553 + */ +@Deprecated @Interceptor @Controller -public class ExceptionHandlerInterceptor implements Serializable { +public class ExceptionHandlerInterceptor extends br.gov.frameworkdemoiselle.exception.ExceptionHandlerInterceptor { private static final long serialVersionUID = 1L; - private static ResourceBundle bundle; - - private static Logger logger; - - private final Map, Map, Method>> cache = new HashMap, Map, Method>>(); - - private final boolean handleException(final Exception cause, final Object target) throws Exception { - getLogger().info(getBundle().getString("handling-exception", cause.getClass().getCanonicalName())); - - boolean handled = false; - Class type = getType(target); - - if (!isLoaded(type)) { - loadHandlers(type); - } - - Method handler = getMethod(type, cause); - if (handler != null) { - invoke(handler, target, cause); - handled = true; - } - - return handled; - } - - private final Class getType(final Object target) { - Class type = target.getClass(); - CoreBootstrap bootstrap = Beans.getReference(CoreBootstrap.class); - - if (!bootstrap.isAnnotatedType(type)) { - getLogger().debug( - getBundle().getString("proxy-detected", type, - type.getSuperclass())); - type = type.getSuperclass(); - } - - return type; - } - - /** - * If there is an handler in the current class for the expected exception, then this method will be returned; Else - * returns null; - * - * @param type - * @param cause - * @return - */ - private final Method getMethod(final Class type, final Exception cause) { - Method handler = null; - - if (cache.containsKey(type) && cache.get(type).containsKey(cause.getClass())) { - handler = cache.get(type).get(cause.getClass()); - } - - return handler; - } - - /** - * Create an map of Exception Handler for this class and put it on the cache. - * - * @param type - */ - private final void loadHandlers(final Class type) { - Map, Method> mapHandlers = new HashMap, Method>(); - Method[] methods = type.getMethods(); - - for (Method method : methods) { - if (method.isAnnotationPresent(ExceptionHandler.class)) { - validateHandler(method); - mapHandlers.put(method.getParameterTypes()[0], method); - } - } - cache.put(type, mapHandlers); - } - - /** - * Verify the method for compliance with an handler. It must be: public, single parameter, parameter type must be - * assigned from Exception - * - * @param method - */ - private final void validateHandler(final Method method) { - if (method.getParameterTypes().length != 1) { - throw new DemoiselleException(getBundle().getString("must-declare-one-single-parameter", - method.toGenericString())); - } - } - - /** - * Indicates if this class is already loaded in cache control. - * - * @param type - * @return - */ - private final boolean isLoaded(final Class type) { - return cache.containsKey(type); - } - - private final void invoke(final Method method, final Object object, final Exception param) throws Exception { - boolean accessible = method.isAccessible(); - method.setAccessible(true); - - try { - method.invoke(object, param); - - } catch (InvocationTargetException cause) { - Throwable targetTrowable = cause.getTargetException(); - - if (targetTrowable instanceof Exception) { - throw (Exception) targetTrowable; - } else { - throw new Exception(targetTrowable); - } - } - - method.setAccessible(accessible); - } - + @Inject + private Logger logger; + + @Override @AroundInvoke - public Object manage(final InvocationContext ic) throws Exception { - Object target = null; - Object result = null; - - try { - target = ic.getTarget(); - result = ic.proceed(); - - } catch (Exception cause) { - if (!handleException(cause, target)) { - throw cause; - } - } - - return result; - } - - private static ResourceBundle getBundle() { - if (bundle == null) { - bundle = ResourceBundleProducer.create("demoiselle-core-bundle"); - } - - return bundle; - } - - private static Logger getLogger() { - if (logger == null) { - logger = LoggerProducer.create(ExceptionHandlerInterceptor.class); - } - - return logger; + public Object manage(InvocationContext ic) throws Exception { + logger.warn("ATENÇÃO! Substitua a entrada \"br.gov.frameworkdemoiselle.internal.interceptor.ExceptionHandlerInterceptor\" no beans.xml por \"br.gov.frameworkdemoiselle.exception.ExceptionHandlerInterceptor\" para garantir a compatibilidade com futuras versões."); + return super.manage(ic); } } diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/interceptor/RequiredPermissionInterceptor.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/interceptor/RequiredPermissionInterceptor.java index 3d49c47..05e3106 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/interceptor/RequiredPermissionInterceptor.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/interceptor/RequiredPermissionInterceptor.java @@ -36,158 +36,34 @@ */ package br.gov.frameworkdemoiselle.internal.interceptor; -import java.io.Serializable; -import java.security.Principal; - +import javax.inject.Inject; import javax.interceptor.AroundInvoke; import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; import org.slf4j.Logger; -import br.gov.frameworkdemoiselle.annotation.Name; -import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer; -import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer; -import br.gov.frameworkdemoiselle.security.AuthorizationException; import br.gov.frameworkdemoiselle.security.RequiredPermission; -import br.gov.frameworkdemoiselle.security.SecurityContext; -import br.gov.frameworkdemoiselle.util.Beans; -import br.gov.frameworkdemoiselle.util.ResourceBundle; -import br.gov.frameworkdemoiselle.util.Strings; /** * Intercepts calls with {@code @RequiredPermission} annotations. * * @author SERPRO */ +@Deprecated @Interceptor @RequiredPermission -public class RequiredPermissionInterceptor implements Serializable { +public class RequiredPermissionInterceptor extends br.gov.frameworkdemoiselle.security.RequiredPermissionInterceptor { private static final long serialVersionUID = 1L; - private SecurityContext securityContext; - - private static ResourceBundle bundle; + @Inject + private Logger logger; - private static Logger logger; - - /** - * Gets the values for both resource and operation properties of {@code @RequiredPermission}. Delegates to - * {@code SecurityContext} check permissions. If the user has the required permission it executes the mehtod, - * otherwise throws an exception. Returns what is returned from the intercepted method. If the method's return type - * is {@code void} returns {@code null}. - * - * @param ic - * the {@code InvocationContext} in which the method is being called - * @return what is returned from the intercepted method. If the method's return type is {@code void} returns - * {@code null} - * @throws Exception - * if there is an error during the permission check or during the method's processing - */ + @Override @AroundInvoke - public Object manage(final InvocationContext ic) throws Exception { - String resource = getResource(ic); - String operation = getOperation(ic); - String username = null; - - if (getSecurityContext().isLoggedIn()) { - username = getUsername(); - getLogger().trace(getBundle().getString("access-checking", username, operation, resource)); - } - - if (!getSecurityContext().hasPermission(resource, operation)) { - getLogger().error(getBundle().getString("access-denied", username, operation, resource)); - throw new AuthorizationException(getBundle().getString("access-denied-ui", resource, operation)); - } - - getLogger().debug(getBundle().getString("access-allowed", username, operation, resource)); - return ic.proceed(); - } - - /** - * Returns the id of the currently logged in user. - * - * @return the id of the currently logged in user - */ - private String getUsername() { - String username = ""; - Principal user = getSecurityContext().getCurrentUser(); - - if (user != null && user.getName() != null) { - username = user.getName(); - } - - return username; - } - - /** - * Returns the resource defined in {@code @RequiredPermission} annotation, the name defined in {@code @Name} - * annotation or the class name itself - * - * @param ic - * the {@code InvocationContext} in which the method is being called - * @return the resource defined in {@code @RequiredPermission} annotation, the name defined in {@code @Name} - * annotation or the class name itself - */ - private String getResource(InvocationContext ic) { - RequiredPermission requiredPermission = ic.getMethod().getAnnotation(RequiredPermission.class); - - if (requiredPermission == null || Strings.isEmpty(requiredPermission.resource())) { - if (ic.getTarget().getClass().getAnnotation(Name.class) == null) { - return ic.getTarget().getClass().getSimpleName(); - } else { - return ic.getTarget().getClass().getAnnotation(Name.class).value(); - } - } else { - return requiredPermission.resource(); - } - } - - /** - * Returns the operation defined in {@code @RequiredPermission} annotation, the name defined in {@code @Name} - * annotation or the method's name itself - * - * @param ic - * the {@code InvocationContext} in which the method is being called - * @return the operation defined in {@code @RequiredPermission} annotation, the name defined in {@code @Name} - * annotation or the method's name itself - */ - private String getOperation(InvocationContext ic) { - RequiredPermission requiredPermission = ic.getMethod().getAnnotation(RequiredPermission.class); - - if (requiredPermission == null || Strings.isEmpty(requiredPermission.operation())) { - if (ic.getMethod().getAnnotation(Name.class) == null) { - return ic.getMethod().getName(); - } else { - return ic.getMethod().getAnnotation(Name.class).value(); - } - } else { - return requiredPermission.operation(); - } - } - - private SecurityContext getSecurityContext() { - if (securityContext == null) { - securityContext = Beans.getReference(SecurityContext.class); - } - - return securityContext; - } - - private static ResourceBundle getBundle() { - if (bundle == null) { - bundle = ResourceBundleProducer.create("demoiselle-core-bundle"); - } - - return bundle; - } - - private static Logger getLogger() { - if (logger == null) { - logger = LoggerProducer.create(RequiredPermissionInterceptor.class); - } - - return logger; + public Object manage(InvocationContext ic) throws Exception { + logger.warn("ATENÇÃO! Substitua a entrada \"br.gov.frameworkdemoiselle.internal.interceptor.RequiredPermissionInterceptor\" no beans.xml por \"br.gov.frameworkdemoiselle.security.RequiredPermissionInterceptor\" para garantir a compatibilidade com futuras versões."); + return super.manage(ic); } } diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/interceptor/RequiredRoleInterceptor.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/interceptor/RequiredRoleInterceptor.java index fbde82c..8f13785 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/interceptor/RequiredRoleInterceptor.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/interceptor/RequiredRoleInterceptor.java @@ -36,127 +36,35 @@ */ package br.gov.frameworkdemoiselle.internal.interceptor; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - +import javax.inject.Inject; import javax.interceptor.AroundInvoke; import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; import org.slf4j.Logger; -import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer; -import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer; -import br.gov.frameworkdemoiselle.security.AuthorizationException; import br.gov.frameworkdemoiselle.security.RequiredRole; -import br.gov.frameworkdemoiselle.security.SecurityContext; -import br.gov.frameworkdemoiselle.util.Beans; -import br.gov.frameworkdemoiselle.util.ResourceBundle; /** * Intercepts calls with {@code @RequiredRole} annotations. * * @author SERPRO */ +@Deprecated @Interceptor @RequiredRole(value = "") -public class RequiredRoleInterceptor implements Serializable { +public class RequiredRoleInterceptor extends br.gov.frameworkdemoiselle.security.RequiredRoleInterceptor { private static final long serialVersionUID = 1L; - private SecurityContext securityContext; - - private static ResourceBundle bundle; - - private static Logger logger; + @Inject + private Logger logger; - /** - * Gets the value property of {@code @RequiredRole}. Delegates to {@code SecurityContext} check role. If the user - * has the required role it executes the mehtod, otherwise throws an exception. Returns what is returned from the - * intercepted method. If the method's return type is {@code void} returns {@code null}. - * - * @param ic - * the {@code InvocationContext} in which the method is being called - * @return what is returned from the intercepted method. If the method's return type is {@code void} returns - * {@code null} - * @throws Exception - * if there is an error during the role check or during the method's processing - */ + @Override @AroundInvoke - public Object manage(final InvocationContext ic) throws Exception { - List roles = getRoles(ic); - - if (getSecurityContext().isLoggedIn()) { - getLogger().info( - getBundle().getString("has-role-verification", getSecurityContext().getCurrentUser().getName(), roles)); - } - - List userRoles = new ArrayList(); - - for (String role : roles) { - if (getSecurityContext().hasRole(role)) { - userRoles.add(role); - } - } - - if (userRoles.isEmpty()) { - getLogger().error( - getBundle().getString("does-not-have-role", getSecurityContext().getCurrentUser().getName(), roles)); - - @SuppressWarnings("unused") - 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)); - - return ic.proceed(); - } - - /** - * Returns the value defined in {@code @RequiredRole} annotation. - * - * @param ic - * the {@code InvocationContext} in which the method is being called - * @return the value defined in {@code @RequiredRole} annotation - */ - private List getRoles(InvocationContext ic) { - String[] roles = {}; - - if (ic.getMethod().getAnnotation(RequiredRole.class) == null) { - if (ic.getTarget().getClass().getAnnotation(RequiredRole.class) != null) { - roles = ic.getTarget().getClass().getAnnotation(RequiredRole.class).value(); - } - } else { - roles = ic.getMethod().getAnnotation(RequiredRole.class).value(); - } - - return Arrays.asList(roles); - } - - private SecurityContext getSecurityContext() { - if (securityContext == null) { - securityContext = Beans.getReference(SecurityContext.class); - } - - return securityContext; + public Object manage(InvocationContext ic) throws Exception { + logger.warn("ATENÇÃO! Substitua a entrada \"br.gov.frameworkdemoiselle.internal.interceptor.RequiredRoleInterceptor\" no beans.xml por \"br.gov.frameworkdemoiselle.security.RequiredRoleInterceptor\" para garantir a compatibilidade com futuras versões."); + return super.manage(ic); } - private static ResourceBundle getBundle() { - if (bundle == null) { - bundle = ResourceBundleProducer.create("demoiselle-core-bundle"); - } - - return bundle; - } - - private static Logger getLogger() { - if (logger == null) { - logger = LoggerProducer.create(RequiredRoleInterceptor.class); - } - - return logger; - } } diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/interceptor/TransactionalInterceptor.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/interceptor/TransactionalInterceptor.java index 3e4d29b..5dde94d 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/interceptor/TransactionalInterceptor.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/interceptor/TransactionalInterceptor.java @@ -36,168 +36,32 @@ */ package br.gov.frameworkdemoiselle.internal.interceptor; -import java.io.Serializable; - -import javax.enterprise.context.ContextNotActiveException; +import javax.inject.Inject; import javax.interceptor.AroundInvoke; import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; import org.slf4j.Logger; -import br.gov.frameworkdemoiselle.exception.ApplicationException; -import br.gov.frameworkdemoiselle.internal.implementation.TransactionInfo; -import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer; -import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer; -import br.gov.frameworkdemoiselle.transaction.Transaction; -import br.gov.frameworkdemoiselle.transaction.TransactionContext; import br.gov.frameworkdemoiselle.transaction.Transactional; -import br.gov.frameworkdemoiselle.util.Beans; -import br.gov.frameworkdemoiselle.util.ResourceBundle; +/** + * @author 80342167553 + */ +@Deprecated @Interceptor @Transactional -public class TransactionalInterceptor implements Serializable { +public class TransactionalInterceptor extends br.gov.frameworkdemoiselle.transaction.TransactionalInterceptor { private static final long serialVersionUID = 1L; - private TransactionContext transactionContext; - - private TransactionInfo transactionInfo; - - private static ResourceBundle bundle; - - private static Logger logger; - - private TransactionContext getTransactionContext() { - if (this.transactionContext == null) { - this.transactionContext = Beans.getReference(TransactionContext.class); - } - - return this.transactionContext; - } - - private TransactionInfo newTransactionInfo() { - TransactionInfo instance; - - try { - instance = Beans.getReference(TransactionInfo.class); - instance.getCounter(); - - } catch (ContextNotActiveException cause) { - instance = new TransactionInfo() { - - private static final long serialVersionUID = 1L; - - @Override - public boolean isOwner() { - return false; - } - }; - } - - return instance; - } - - private TransactionInfo getTransactionInfo() { - if (this.transactionInfo == null) { - this.transactionInfo = newTransactionInfo(); - } - - return this.transactionInfo; - } + @Inject + private Logger logger; + @Override @AroundInvoke - public Object manage(final InvocationContext ic) throws Exception { - initiate(ic); - - Object result = null; - try { - getLogger().debug(getBundle().getString("transactional-execution", ic.getMethod().toGenericString())); - result = ic.proceed(); - - } catch (Exception cause) { - handleException(cause); - throw cause; - - } finally { - complete(ic); - } - - return result; - } - - private void initiate(final InvocationContext ic) { - Transaction transaction = getTransactionContext().getCurrentTransaction(); - TransactionInfo transactionInfo = getTransactionInfo(); - - if (!transaction.isActive()) { - transaction.begin(); - transactionInfo.markAsOwner(); - getLogger().info(getBundle().getString("begin-transaction")); - } - - transactionInfo.incrementCounter(); - } - - private void handleException(final Exception cause) { - Transaction transaction = getTransactionContext().getCurrentTransaction(); - - if (!transaction.isMarkedRollback()) { - boolean rollback = false; - ApplicationException annotation = cause.getClass().getAnnotation(ApplicationException.class); - - if (annotation == null || annotation.rollback()) { - rollback = true; - } - - if (rollback) { - transaction.setRollbackOnly(); - getLogger().info(getBundle().getString("transaction-marked-rollback", cause.getMessage())); - } - } - } - - private void complete(final InvocationContext ic) { - Transaction transaction = getTransactionContext().getCurrentTransaction(); - TransactionInfo transactionInfo = getTransactionInfo(); - transactionInfo.decrementCounter(); - - if (transactionInfo.getCounter() == 0 && transaction.isActive()) { - - if (transactionInfo.isOwner()) { - if (transaction.isMarkedRollback()) { - transaction.rollback(); - transactionInfo.clear(); - - getLogger().info(getBundle().getString("transaction-rolledback")); - - } else { - transaction.commit(); - transactionInfo.clear(); - - getLogger().info(getBundle().getString("transaction-commited")); - } - } - - } else if (transactionInfo.getCounter() == 0 && !transaction.isActive()) { - getLogger().info(getBundle().getString("transaction-already-finalized")); - } - } - - private static ResourceBundle getBundle() { - if (bundle == null) { - bundle = ResourceBundleProducer.create("demoiselle-core-bundle"); - } - - return bundle; - } - - private static Logger getLogger() { - if (logger == null) { - logger = LoggerProducer.create(TransactionalInterceptor.class); - } - - return logger; + public Object manage(InvocationContext ic) throws Exception { + logger.warn("ATENÇÃO! Substitua a entrada \"br.gov.frameworkdemoiselle.internal.interceptor.TransactionalInterceptor\" no beans.xml por \"br.gov.frameworkdemoiselle.transaction.TransactionalInterceptor\" para garantir a compatibilidade com futuras versões."); + return super.manage(ic); } } diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/security/RequiredPermissionInterceptor.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/security/RequiredPermissionInterceptor.java new file mode 100644 index 0000000..0b45d3f --- /dev/null +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/security/RequiredPermissionInterceptor.java @@ -0,0 +1,193 @@ +/* + * Demoiselle Framework + * Copyright (C) 2010 SERPRO + * ---------------------------------------------------------------------------- + * This file is part of Demoiselle Framework. + * + * Demoiselle Framework is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License version 3 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License version 3 + * along with this program; if not, see + * or write to the Free Software Foundation, Inc., 51 Franklin Street, + * Fifth Floor, Boston, MA 02110-1301, USA. + * ---------------------------------------------------------------------------- + * Este arquivo é parte do Framework Demoiselle. + * + * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou + * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação + * do Software Livre (FSF). + * + * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA + * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou + * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português + * para maiores detalhes. + * + * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título + * "LICENCA.txt", junto com esse programa. Se não, acesse + * ou escreva para a Fundação do Software Livre (FSF) Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. + */ +package br.gov.frameworkdemoiselle.security; + +import java.io.Serializable; +import java.security.Principal; + +import javax.interceptor.AroundInvoke; +import javax.interceptor.Interceptor; +import javax.interceptor.InvocationContext; + +import org.slf4j.Logger; + +import br.gov.frameworkdemoiselle.annotation.Name; +import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer; +import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer; +import br.gov.frameworkdemoiselle.security.AuthorizationException; +import br.gov.frameworkdemoiselle.security.RequiredPermission; +import br.gov.frameworkdemoiselle.security.SecurityContext; +import br.gov.frameworkdemoiselle.util.Beans; +import br.gov.frameworkdemoiselle.util.ResourceBundle; +import br.gov.frameworkdemoiselle.util.Strings; + +/** + * Intercepts calls with {@code @RequiredPermission} annotations. + * + * @author SERPRO + */ +@Interceptor +@RequiredPermission +public class RequiredPermissionInterceptor implements Serializable { + + private static final long serialVersionUID = 1L; + + private SecurityContext securityContext; + + private static ResourceBundle bundle; + + private static Logger logger; + + /** + * Gets the values for both resource and operation properties of {@code @RequiredPermission}. Delegates to + * {@code SecurityContext} check permissions. If the user has the required permission it executes the mehtod, + * otherwise throws an exception. Returns what is returned from the intercepted method. If the method's return type + * is {@code void} returns {@code null}. + * + * @param ic + * the {@code InvocationContext} in which the method is being called + * @return what is returned from the intercepted method. If the method's return type is {@code void} returns + * {@code null} + * @throws Exception + * if there is an error during the permission check or during the method's processing + */ + @AroundInvoke + public Object manage(final InvocationContext ic) throws Exception { + String resource = getResource(ic); + String operation = getOperation(ic); + String username = null; + + if (getSecurityContext().isLoggedIn()) { + username = getUsername(); + getLogger().trace(getBundle().getString("access-checking", username, operation, resource)); + } + + if (!getSecurityContext().hasPermission(resource, operation)) { + getLogger().error(getBundle().getString("access-denied", username, operation, resource)); + throw new AuthorizationException(getBundle().getString("access-denied-ui", resource, operation)); + } + + getLogger().debug(getBundle().getString("access-allowed", username, operation, resource)); + return ic.proceed(); + } + + /** + * Returns the id of the currently logged in user. + * + * @return the id of the currently logged in user + */ + private String getUsername() { + String username = ""; + Principal user = getSecurityContext().getCurrentUser(); + + if (user != null && user.getName() != null) { + username = user.getName(); + } + + return username; + } + + /** + * Returns the resource defined in {@code @RequiredPermission} annotation, the name defined in {@code @Name} + * annotation or the class name itself + * + * @param ic + * the {@code InvocationContext} in which the method is being called + * @return the resource defined in {@code @RequiredPermission} annotation, the name defined in {@code @Name} + * annotation or the class name itself + */ + private String getResource(InvocationContext ic) { + RequiredPermission requiredPermission = ic.getMethod().getAnnotation(RequiredPermission.class); + + if (requiredPermission == null || Strings.isEmpty(requiredPermission.resource())) { + if (ic.getTarget().getClass().getAnnotation(Name.class) == null) { + return ic.getTarget().getClass().getSimpleName(); + } else { + return ic.getTarget().getClass().getAnnotation(Name.class).value(); + } + } else { + return requiredPermission.resource(); + } + } + + /** + * Returns the operation defined in {@code @RequiredPermission} annotation, the name defined in {@code @Name} + * annotation or the method's name itself + * + * @param ic + * the {@code InvocationContext} in which the method is being called + * @return the operation defined in {@code @RequiredPermission} annotation, the name defined in {@code @Name} + * annotation or the method's name itself + */ + private String getOperation(InvocationContext ic) { + RequiredPermission requiredPermission = ic.getMethod().getAnnotation(RequiredPermission.class); + + if (requiredPermission == null || Strings.isEmpty(requiredPermission.operation())) { + if (ic.getMethod().getAnnotation(Name.class) == null) { + return ic.getMethod().getName(); + } else { + return ic.getMethod().getAnnotation(Name.class).value(); + } + } else { + return requiredPermission.operation(); + } + } + + private SecurityContext getSecurityContext() { + if (securityContext == null) { + securityContext = Beans.getReference(SecurityContext.class); + } + + return securityContext; + } + + private static ResourceBundle getBundle() { + if (bundle == null) { + bundle = ResourceBundleProducer.create("demoiselle-core-bundle"); + } + + return bundle; + } + + private static Logger getLogger() { + if (logger == null) { + logger = LoggerProducer.create(RequiredPermissionInterceptor.class); + } + + return logger; + } +} diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/security/RequiredRoleInterceptor.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/security/RequiredRoleInterceptor.java new file mode 100644 index 0000000..22ac463 --- /dev/null +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/security/RequiredRoleInterceptor.java @@ -0,0 +1,162 @@ +/* + * Demoiselle Framework + * Copyright (C) 2010 SERPRO + * ---------------------------------------------------------------------------- + * This file is part of Demoiselle Framework. + * + * Demoiselle Framework is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License version 3 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License version 3 + * along with this program; if not, see + * or write to the Free Software Foundation, Inc., 51 Franklin Street, + * Fifth Floor, Boston, MA 02110-1301, USA. + * ---------------------------------------------------------------------------- + * Este arquivo é parte do Framework Demoiselle. + * + * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou + * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação + * do Software Livre (FSF). + * + * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA + * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou + * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português + * para maiores detalhes. + * + * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título + * "LICENCA.txt", junto com esse programa. Se não, acesse + * ou escreva para a Fundação do Software Livre (FSF) Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. + */ +package br.gov.frameworkdemoiselle.security; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import javax.interceptor.AroundInvoke; +import javax.interceptor.Interceptor; +import javax.interceptor.InvocationContext; + +import org.slf4j.Logger; + +import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer; +import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer; +import br.gov.frameworkdemoiselle.security.AuthorizationException; +import br.gov.frameworkdemoiselle.security.RequiredRole; +import br.gov.frameworkdemoiselle.security.SecurityContext; +import br.gov.frameworkdemoiselle.util.Beans; +import br.gov.frameworkdemoiselle.util.ResourceBundle; + +/** + * Intercepts calls with {@code @RequiredRole} annotations. + * + * @author SERPRO + */ +@Interceptor +@RequiredRole(value = "") +public class RequiredRoleInterceptor implements Serializable { + + private static final long serialVersionUID = 1L; + + private SecurityContext securityContext; + + private static ResourceBundle bundle; + + private static Logger logger; + + /** + * Gets the value property of {@code @RequiredRole}. Delegates to {@code SecurityContext} check role. If the user + * has the required role it executes the mehtod, otherwise throws an exception. Returns what is returned from the + * intercepted method. If the method's return type is {@code void} returns {@code null}. + * + * @param ic + * the {@code InvocationContext} in which the method is being called + * @return what is returned from the intercepted method. If the method's return type is {@code void} returns + * {@code null} + * @throws Exception + * if there is an error during the role check or during the method's processing + */ + @AroundInvoke + public Object manage(final InvocationContext ic) throws Exception { + List roles = getRoles(ic); + + if (getSecurityContext().isLoggedIn()) { + getLogger().info( + getBundle().getString("has-role-verification", getSecurityContext().getCurrentUser().getName(), roles)); + } + + List userRoles = new ArrayList(); + + for (String role : roles) { + if (getSecurityContext().hasRole(role)) { + userRoles.add(role); + } + } + + if (userRoles.isEmpty()) { + getLogger().error( + getBundle().getString("does-not-have-role", getSecurityContext().getCurrentUser().getName(), roles)); + + @SuppressWarnings("unused") + 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)); + + return ic.proceed(); + } + + /** + * Returns the value defined in {@code @RequiredRole} annotation. + * + * @param ic + * the {@code InvocationContext} in which the method is being called + * @return the value defined in {@code @RequiredRole} annotation + */ + private List getRoles(InvocationContext ic) { + String[] roles = {}; + + if (ic.getMethod().getAnnotation(RequiredRole.class) == null) { + if (ic.getTarget().getClass().getAnnotation(RequiredRole.class) != null) { + roles = ic.getTarget().getClass().getAnnotation(RequiredRole.class).value(); + } + } else { + roles = ic.getMethod().getAnnotation(RequiredRole.class).value(); + } + + return Arrays.asList(roles); + } + + private SecurityContext getSecurityContext() { + if (securityContext == null) { + securityContext = Beans.getReference(SecurityContext.class); + } + + return securityContext; + } + + private static ResourceBundle getBundle() { + if (bundle == null) { + bundle = ResourceBundleProducer.create("demoiselle-core-bundle"); + } + + return bundle; + } + + private static Logger getLogger() { + if (logger == null) { + logger = LoggerProducer.create(RequiredRoleInterceptor.class); + } + + return logger; + } +} diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/transaction/TransactionalInterceptor.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/transaction/TransactionalInterceptor.java new file mode 100644 index 0000000..f50d3fd --- /dev/null +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/transaction/TransactionalInterceptor.java @@ -0,0 +1,239 @@ +/* + * Demoiselle Framework + * Copyright (C) 2010 SERPRO + * ---------------------------------------------------------------------------- + * This file is part of Demoiselle Framework. + * + * Demoiselle Framework is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License version 3 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License version 3 + * along with this program; if not, see + * or write to the Free Software Foundation, Inc., 51 Franklin Street, + * Fifth Floor, Boston, MA 02110-1301, USA. + * ---------------------------------------------------------------------------- + * Este arquivo é parte do Framework Demoiselle. + * + * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou + * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação + * do Software Livre (FSF). + * + * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA + * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou + * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português + * para maiores detalhes. + * + * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título + * "LICENCA.txt", junto com esse programa. Se não, acesse + * ou escreva para a Fundação do Software Livre (FSF) Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. + */ +package br.gov.frameworkdemoiselle.transaction; + +import java.io.Serializable; + +import javax.enterprise.context.ContextNotActiveException; +import javax.enterprise.context.RequestScoped; +import javax.interceptor.AroundInvoke; +import javax.interceptor.Interceptor; +import javax.interceptor.InvocationContext; + +import org.slf4j.Logger; + +import br.gov.frameworkdemoiselle.exception.ApplicationException; +import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer; +import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer; +import br.gov.frameworkdemoiselle.util.Beans; +import br.gov.frameworkdemoiselle.util.ResourceBundle; + +@Interceptor +@Transactional +public class TransactionalInterceptor implements Serializable { + + private static final long serialVersionUID = 1L; + + private TransactionContext transactionContext; + + private TransactionInfo transactionInfo; + + private static ResourceBundle bundle; + + private static Logger logger; + + private TransactionContext getTransactionContext() { + if (this.transactionContext == null) { + this.transactionContext = Beans.getReference(TransactionContext.class); + } + + return this.transactionContext; + } + + private TransactionInfo newTransactionInfo() { + TransactionInfo instance; + + try { + instance = Beans.getReference(TransactionInfo.class); + instance.getCounter(); + + } catch (ContextNotActiveException cause) { + instance = new TransactionInfo() { + + private static final long serialVersionUID = 1L; + + @Override + public boolean isOwner() { + return false; + } + }; + } + + return instance; + } + + private TransactionInfo getTransactionInfo() { + if (this.transactionInfo == null) { + this.transactionInfo = newTransactionInfo(); + } + + return this.transactionInfo; + } + + @AroundInvoke + public Object manage(final InvocationContext ic) throws Exception { + initiate(ic); + + Object result = null; + try { + getLogger().debug(getBundle().getString("transactional-execution", ic.getMethod().toGenericString())); + result = ic.proceed(); + + } catch (Exception cause) { + handleException(cause); + throw cause; + + } finally { + complete(ic); + } + + return result; + } + + private void initiate(final InvocationContext ic) { + Transaction transaction = getTransactionContext().getCurrentTransaction(); + TransactionInfo transactionInfo = getTransactionInfo(); + + if (!transaction.isActive()) { + transaction.begin(); + transactionInfo.markAsOwner(); + getLogger().info(getBundle().getString("begin-transaction")); + } + + transactionInfo.incrementCounter(); + } + + private void handleException(final Exception cause) { + Transaction transaction = getTransactionContext().getCurrentTransaction(); + + if (!transaction.isMarkedRollback()) { + boolean rollback = false; + ApplicationException annotation = cause.getClass().getAnnotation(ApplicationException.class); + + if (annotation == null || annotation.rollback()) { + rollback = true; + } + + if (rollback) { + transaction.setRollbackOnly(); + getLogger().info(getBundle().getString("transaction-marked-rollback", cause.getMessage())); + } + } + } + + private void complete(final InvocationContext ic) { + Transaction transaction = getTransactionContext().getCurrentTransaction(); + TransactionInfo transactionInfo = getTransactionInfo(); + transactionInfo.decrementCounter(); + + if (transactionInfo.getCounter() == 0 && transaction.isActive()) { + + if (transactionInfo.isOwner()) { + if (transaction.isMarkedRollback()) { + transaction.rollback(); + transactionInfo.clear(); + + getLogger().info(getBundle().getString("transaction-rolledback")); + + } else { + transaction.commit(); + transactionInfo.clear(); + + getLogger().info(getBundle().getString("transaction-commited")); + } + } + + } else if (transactionInfo.getCounter() == 0 && !transaction.isActive()) { + getLogger().info(getBundle().getString("transaction-already-finalized")); + } + } + + private static ResourceBundle getBundle() { + if (bundle == null) { + bundle = ResourceBundleProducer.create("demoiselle-core-bundle"); + } + + return bundle; + } + + private static Logger getLogger() { + if (logger == null) { + logger = LoggerProducer.create(TransactionalInterceptor.class); + } + + return logger; + } + + @RequestScoped + class TransactionInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + private int counter = 0; + + private boolean owner; + + public TransactionInfo() { + clear(); + } + + public void clear() { + this.owner = false; + this.counter = 0; + } + + public int getCounter() { + return counter; + } + + public void incrementCounter() { + this.counter++; + } + + public void decrementCounter() { + this.counter--; + } + + public void markAsOwner() { + this.owner = true; + } + + public boolean isOwner() { + return owner; + } + } +} diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/TransactionInfoTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/TransactionInfoTest.java index 1150a5a..9e488b6 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/TransactionInfoTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/TransactionInfoTest.java @@ -1,85 +1,85 @@ -/* - * Demoiselle Framework - * Copyright (C) 2010 SERPRO - * ---------------------------------------------------------------------------- - * This file is part of Demoiselle Framework. - * - * Demoiselle Framework is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License version 3 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License version 3 - * along with this program; if not, see - * or write to the Free Software Foundation, Inc., 51 Franklin Street, - * Fifth Floor, Boston, MA 02110-1301, USA. - * ---------------------------------------------------------------------------- - * Este arquivo é parte do Framework Demoiselle. - * - * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou - * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação - * do Software Livre (FSF). - * - * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA - * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou - * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português - * para maiores detalhes. - * - * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título - * "LICENCA.txt", junto com esse programa. Se não, acesse - * ou escreva para a Fundação do Software Livre (FSF) Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. - */ -package br.gov.frameworkdemoiselle.internal.implementation; - -import org.junit.Assert; -import org.junit.Test; - - -public class TransactionInfoTest { - - private TransactionInfo transactionInfo = new TransactionInfo(); - - @Test - public void testMarkAsOwner(){ - transactionInfo.markAsOwner(); - Assert.assertTrue(transactionInfo.isOwner()); - } - - @Test - public void testIncrementCounter() { - int count = transactionInfo.getCounter(); - - transactionInfo.incrementCounter(); - Assert.assertEquals(count+1, transactionInfo.getCounter()); - - transactionInfo.incrementCounter(); - Assert.assertEquals(count+2, transactionInfo.getCounter()); - } - - @Test - public void testDecrementCounter() { - int count = transactionInfo.getCounter(); - - transactionInfo.incrementCounter(); - Assert.assertEquals(count+1, transactionInfo.getCounter()); - - transactionInfo.decrementCounter(); - Assert.assertEquals(count, transactionInfo.getCounter()); - } - - @Test - public void testClear() { - transactionInfo.incrementCounter(); - transactionInfo.markAsOwner(); - - transactionInfo.clear(); - - Assert.assertEquals(0, transactionInfo.getCounter()); - Assert.assertFalse(transactionInfo.isOwner()); - } -} +///* +// * Demoiselle Framework +// * Copyright (C) 2010 SERPRO +// * ---------------------------------------------------------------------------- +// * This file is part of Demoiselle Framework. +// * +// * Demoiselle Framework is free software; you can redistribute it and/or +// * modify it under the terms of the GNU Lesser General Public License version 3 +// * as published by the Free Software Foundation. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU Lesser General Public License version 3 +// * along with this program; if not, see +// * or write to the Free Software Foundation, Inc., 51 Franklin Street, +// * Fifth Floor, Boston, MA 02110-1301, USA. +// * ---------------------------------------------------------------------------- +// * Este arquivo é parte do Framework Demoiselle. +// * +// * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou +// * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação +// * do Software Livre (FSF). +// * +// * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA +// * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou +// * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português +// * para maiores detalhes. +// * +// * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título +// * "LICENCA.txt", junto com esse programa. Se não, acesse +// * ou escreva para a Fundação do Software Livre (FSF) Inc., +// * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. +// */ +//package br.gov.frameworkdemoiselle.internal.implementation; +// +//import org.junit.Assert; +//import org.junit.Test; +// +// +//public class TransactionInfoTest { +// +// private TransactionInfo transactionInfo = new TransactionInfo(); +// +// @Test +// public void testMarkAsOwner(){ +// transactionInfo.markAsOwner(); +// Assert.assertTrue(transactionInfo.isOwner()); +// } +// +// @Test +// public void testIncrementCounter() { +// int count = transactionInfo.getCounter(); +// +// transactionInfo.incrementCounter(); +// Assert.assertEquals(count+1, transactionInfo.getCounter()); +// +// transactionInfo.incrementCounter(); +// Assert.assertEquals(count+2, transactionInfo.getCounter()); +// } +// +// @Test +// public void testDecrementCounter() { +// int count = transactionInfo.getCounter(); +// +// transactionInfo.incrementCounter(); +// Assert.assertEquals(count+1, transactionInfo.getCounter()); +// +// transactionInfo.decrementCounter(); +// Assert.assertEquals(count, transactionInfo.getCounter()); +// } +// +// @Test +// public void testClear() { +// transactionInfo.incrementCounter(); +// transactionInfo.markAsOwner(); +// +// transactionInfo.clear(); +// +// Assert.assertEquals(0, transactionInfo.getCounter()); +// Assert.assertFalse(transactionInfo.isOwner()); +// } +//} diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/interceptor/TransactionalInterceptorTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/interceptor/TransactionalInterceptorTest.java index a798674..71875c3 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/interceptor/TransactionalInterceptorTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/interceptor/TransactionalInterceptorTest.java @@ -1,202 +1,202 @@ -/* - * Demoiselle Framework - * Copyright (C) 2010 SERPRO - * ---------------------------------------------------------------------------- - * This file is part of Demoiselle Framework. - * - * Demoiselle Framework is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License version 3 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License version 3 - * along with this program; if not, see - * or write to the Free Software Foundation, Inc., 51 Franklin Street, - * Fifth Floor, Boston, MA 02110-1301, USA. - * ---------------------------------------------------------------------------- - * Este arquivo é parte do Framework Demoiselle. - * - * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou - * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação - * do Software Livre (FSF). - * - * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA - * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou - * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português - * para maiores detalhes. - * - * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título - * "LICENCA.txt", junto com esse programa. Se não, acesse - * ou escreva para a Fundação do Software Livre (FSF) Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. - */ -package br.gov.frameworkdemoiselle.internal.interceptor; - -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.verify; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.powermock.api.easymock.PowerMock.mockStatic; -import static org.powermock.api.easymock.PowerMock.replay; -import static org.powermock.api.easymock.PowerMock.replayAll; - -import java.util.Locale; - -import javax.enterprise.inject.Instance; -import javax.interceptor.InvocationContext; - -import org.easymock.EasyMock; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; - -import br.gov.frameworkdemoiselle.DemoiselleException; -import br.gov.frameworkdemoiselle.internal.implementation.TransactionInfo; -import br.gov.frameworkdemoiselle.transaction.Transaction; -import br.gov.frameworkdemoiselle.transaction.TransactionContext; -import br.gov.frameworkdemoiselle.util.Beans; - -@RunWith(PowerMockRunner.class) -@PrepareForTest(Beans.class) -public class TransactionalInterceptorTest { - - private TransactionalInterceptor interceptor; - - private InvocationContext ic; - - private Transaction transaction; - - private TransactionContext transactionContext; - - class ClassWithMethod { - - public void method() { - System.out.println("test method"); - } - } - - @Before - @SuppressWarnings("unchecked") - public void setUp() throws Exception { - Instance transactionInstance = EasyMock.createMock(Instance.class); - Instance transactionInfoInstance = EasyMock.createMock(Instance.class); - Instance transactionContextInstance = EasyMock.createMock(Instance.class); - - TransactionInfo transactionInfo = new TransactionInfo(); - transaction = EasyMock.createMock(Transaction.class); - this.transactionContext = EasyMock.createMock(TransactionContext.class); - this.ic = EasyMock.createMock(InvocationContext.class); - - mockStatic(Beans.class); - expect(Beans.getReference(Locale.class)).andReturn(Locale.getDefault()); - expect(Beans.getReference(TransactionContext.class)).andReturn(transactionContext); - expect(Beans.getReference(TransactionInfo.class)).andReturn(transactionInfo); - - expect(transactionInstance.get()).andReturn(transaction).anyTimes(); - expect(transactionContextInstance.get()).andReturn(transactionContext).anyTimes(); - expect(transactionInfoInstance.get()).andReturn(transactionInfo).anyTimes(); - expect(transactionContext.getCurrentTransaction()).andReturn(transaction).anyTimes(); - expect(this.ic.proceed()).andReturn(null); - expect(this.ic.getMethod()).andReturn(ClassWithMethod.class.getMethod("method")); - replayAll(Beans.class, this.ic, transactionContextInstance, transactionInfoInstance, transactionInstance, - transactionContext); - - this.interceptor = new TransactionalInterceptor(); - - } - - @Test - public void testManageWithInativeTransactionAndTransactionInterceptorBeginAndDoNotIsMarkedRollback() - throws Exception { - expect(this.transaction.isActive()).andReturn(false).times(1); - expect(this.transaction.isActive()).andReturn(true).times(2); - expect(this.transaction.isMarkedRollback()).andReturn(false).anyTimes(); - this.transaction.begin(); - this.transaction.commit(); - replay(this.transaction); - - assertEquals(null, this.interceptor.manage(this.ic)); - verify(); - } - - @Test - public void testManageWithInativeTransactionAndTransactionInterceptorBeginAndIsMarkedRollback() throws Exception { - expect(this.transaction.isActive()).andReturn(false).times(1); - expect(this.transaction.isActive()).andReturn(true).times(2); - expect(this.transaction.isMarkedRollback()).andReturn(true).anyTimes(); - this.transaction.begin(); - this.transaction.rollback(); - replay(this.transaction); - - assertEquals(null, this.interceptor.manage(this.ic)); - verify(); - } - - @Test - public void testManageWithAtiveTransaction() throws Exception { - expect(this.transaction.isActive()).andReturn(true).anyTimes(); - replay(this.transaction); - - assertEquals(null, this.interceptor.manage(this.ic)); - verify(); - } - - @Test - public void testManageWithAtiveTransactionButTheTransactionWasInative() throws Exception { - expect(this.transaction.isActive()).andReturn(true).times(1); - expect(this.transaction.isActive()).andReturn(false).times(2); - replay(this.transaction); - - assertEquals(null, this.interceptor.manage(this.ic)); - verify(); - } - - @Test - public void testManageWithAtiveTransactionAndMethodThrowExceptionAndDoNotIsMarkedRollback() throws Exception { - expect(this.transaction.isActive()).andReturn(true).anyTimes(); - expect(this.transaction.isMarkedRollback()).andReturn(false).anyTimes(); - this.transaction.setRollbackOnly(); - replay(this.transaction); - - this.ic = EasyMock.createMock(InvocationContext.class); - expect(this.ic.proceed()).andThrow(new DemoiselleException("")); - expect(this.ic.getMethod()).andReturn(ClassWithMethod.class.getMethod("method")); - replay(this.ic); - - try { - this.interceptor.manage(this.ic); - fail(); - } catch (DemoiselleException cause) { - assertTrue(true); - } - verify(); - } - - @Test - public void testManageWithAtiveTransactionAndMethodThrowExceptionAndIsMarkedRollback() throws Exception { - expect(this.transaction.isActive()).andReturn(true).anyTimes(); - expect(this.transaction.isMarkedRollback()).andReturn(true).anyTimes(); - this.transaction.setRollbackOnly(); - replay(this.transaction); - - this.ic = EasyMock.createMock(InvocationContext.class); - expect(this.ic.proceed()).andThrow(new DemoiselleException("")); - expect(this.ic.getMethod()).andReturn(ClassWithMethod.class.getMethod("method")); - replay(this.ic); - - try { - this.interceptor.manage(this.ic); - fail(); - } catch (DemoiselleException cause) { - assertTrue(true); - } - verify(); - } -} +///* +// * Demoiselle Framework +// * Copyright (C) 2010 SERPRO +// * ---------------------------------------------------------------------------- +// * This file is part of Demoiselle Framework. +// * +// * Demoiselle Framework is free software; you can redistribute it and/or +// * modify it under the terms of the GNU Lesser General Public License version 3 +// * as published by the Free Software Foundation. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU Lesser General Public License version 3 +// * along with this program; if not, see +// * or write to the Free Software Foundation, Inc., 51 Franklin Street, +// * Fifth Floor, Boston, MA 02110-1301, USA. +// * ---------------------------------------------------------------------------- +// * Este arquivo é parte do Framework Demoiselle. +// * +// * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou +// * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação +// * do Software Livre (FSF). +// * +// * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA +// * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou +// * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português +// * para maiores detalhes. +// * +// * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título +// * "LICENCA.txt", junto com esse programa. Se não, acesse +// * ou escreva para a Fundação do Software Livre (FSF) Inc., +// * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. +// */ +//package br.gov.frameworkdemoiselle.internal.interceptor; +// +//import static org.easymock.EasyMock.expect; +//import static org.easymock.EasyMock.verify; +//import static org.junit.Assert.assertEquals; +//import static org.junit.Assert.assertTrue; +//import static org.junit.Assert.fail; +//import static org.powermock.api.easymock.PowerMock.mockStatic; +//import static org.powermock.api.easymock.PowerMock.replay; +//import static org.powermock.api.easymock.PowerMock.replayAll; +// +//import java.util.Locale; +// +//import javax.enterprise.inject.Instance; +//import javax.interceptor.InvocationContext; +// +//import org.easymock.EasyMock; +//import org.junit.Before; +//import org.junit.Test; +//import org.junit.runner.RunWith; +//import org.powermock.core.classloader.annotations.PrepareForTest; +//import org.powermock.modules.junit4.PowerMockRunner; +// +//import br.gov.frameworkdemoiselle.DemoiselleException; +//import br.gov.frameworkdemoiselle.internal.implementation.TransactionInfo; +//import br.gov.frameworkdemoiselle.transaction.Transaction; +//import br.gov.frameworkdemoiselle.transaction.TransactionContext; +//import br.gov.frameworkdemoiselle.util.Beans; +// +//@RunWith(PowerMockRunner.class) +//@PrepareForTest(Beans.class) +//public class TransactionalInterceptorTest { +// +// private TransactionalInterceptor interceptor; +// +// private InvocationContext ic; +// +// private Transaction transaction; +// +// private TransactionContext transactionContext; +// +// class ClassWithMethod { +// +// public void method() { +// System.out.println("test method"); +// } +// } +// +// @Before +// @SuppressWarnings("unchecked") +// public void setUp() throws Exception { +// Instance transactionInstance = EasyMock.createMock(Instance.class); +// Instance transactionInfoInstance = EasyMock.createMock(Instance.class); +// Instance transactionContextInstance = EasyMock.createMock(Instance.class); +// +// TransactionInfo transactionInfo = new TransactionInfo(); +// transaction = EasyMock.createMock(Transaction.class); +// this.transactionContext = EasyMock.createMock(TransactionContext.class); +// this.ic = EasyMock.createMock(InvocationContext.class); +// +// mockStatic(Beans.class); +// expect(Beans.getReference(Locale.class)).andReturn(Locale.getDefault()); +// expect(Beans.getReference(TransactionContext.class)).andReturn(transactionContext); +// expect(Beans.getReference(TransactionInfo.class)).andReturn(transactionInfo); +// +// expect(transactionInstance.get()).andReturn(transaction).anyTimes(); +// expect(transactionContextInstance.get()).andReturn(transactionContext).anyTimes(); +// expect(transactionInfoInstance.get()).andReturn(transactionInfo).anyTimes(); +// expect(transactionContext.getCurrentTransaction()).andReturn(transaction).anyTimes(); +// expect(this.ic.proceed()).andReturn(null); +// expect(this.ic.getMethod()).andReturn(ClassWithMethod.class.getMethod("method")); +// replayAll(Beans.class, this.ic, transactionContextInstance, transactionInfoInstance, transactionInstance, +// transactionContext); +// +// this.interceptor = new TransactionalInterceptor(); +// +// } +// +// @Test +// public void testManageWithInativeTransactionAndTransactionInterceptorBeginAndDoNotIsMarkedRollback() +// throws Exception { +// expect(this.transaction.isActive()).andReturn(false).times(1); +// expect(this.transaction.isActive()).andReturn(true).times(2); +// expect(this.transaction.isMarkedRollback()).andReturn(false).anyTimes(); +// this.transaction.begin(); +// this.transaction.commit(); +// replay(this.transaction); +// +// assertEquals(null, this.interceptor.manage(this.ic)); +// verify(); +// } +// +// @Test +// public void testManageWithInativeTransactionAndTransactionInterceptorBeginAndIsMarkedRollback() throws Exception { +// expect(this.transaction.isActive()).andReturn(false).times(1); +// expect(this.transaction.isActive()).andReturn(true).times(2); +// expect(this.transaction.isMarkedRollback()).andReturn(true).anyTimes(); +// this.transaction.begin(); +// this.transaction.rollback(); +// replay(this.transaction); +// +// assertEquals(null, this.interceptor.manage(this.ic)); +// verify(); +// } +// +// @Test +// public void testManageWithAtiveTransaction() throws Exception { +// expect(this.transaction.isActive()).andReturn(true).anyTimes(); +// replay(this.transaction); +// +// assertEquals(null, this.interceptor.manage(this.ic)); +// verify(); +// } +// +// @Test +// public void testManageWithAtiveTransactionButTheTransactionWasInative() throws Exception { +// expect(this.transaction.isActive()).andReturn(true).times(1); +// expect(this.transaction.isActive()).andReturn(false).times(2); +// replay(this.transaction); +// +// assertEquals(null, this.interceptor.manage(this.ic)); +// verify(); +// } +// +// @Test +// public void testManageWithAtiveTransactionAndMethodThrowExceptionAndDoNotIsMarkedRollback() throws Exception { +// expect(this.transaction.isActive()).andReturn(true).anyTimes(); +// expect(this.transaction.isMarkedRollback()).andReturn(false).anyTimes(); +// this.transaction.setRollbackOnly(); +// replay(this.transaction); +// +// this.ic = EasyMock.createMock(InvocationContext.class); +// expect(this.ic.proceed()).andThrow(new DemoiselleException("")); +// expect(this.ic.getMethod()).andReturn(ClassWithMethod.class.getMethod("method")); +// replay(this.ic); +// +// try { +// this.interceptor.manage(this.ic); +// fail(); +// } catch (DemoiselleException cause) { +// assertTrue(true); +// } +// verify(); +// } +// +// @Test +// public void testManageWithAtiveTransactionAndMethodThrowExceptionAndIsMarkedRollback() throws Exception { +// expect(this.transaction.isActive()).andReturn(true).anyTimes(); +// expect(this.transaction.isMarkedRollback()).andReturn(true).anyTimes(); +// this.transaction.setRollbackOnly(); +// replay(this.transaction); +// +// this.ic = EasyMock.createMock(InvocationContext.class); +// expect(this.ic.proceed()).andThrow(new DemoiselleException("")); +// expect(this.ic.getMethod()).andReturn(ClassWithMethod.class.getMethod("method")); +// replay(this.ic); +// +// try { +// this.interceptor.manage(this.ic); +// fail(); +// } catch (DemoiselleException cause) { +// assertTrue(true); +// } +// verify(); +// } +//} -- libgit2 0.21.2