Download as
Browse Code »

Commit a9f8df70b375bd53e6632c2a74ac1383d494a7c5

Authored by Cleverson Sacramento
1 parent ab378497
Exists in master

Movendo os Interceptors para o pacote externo

Showing 12 changed files with 1142 additions and 914 deletions   Show diff stats
impl/core/src/main/java/br/gov/frameworkdemoiselle/exception/ExceptionHandlerInterceptor.java 0 → 100644
  Diff comments   View file @a9f8df7
@@ -0,0 +1,217 @@ @@ -0,0 +1,217 @@
  1 +/*
  2 + * Demoiselle Framework
  3 + * Copyright (C) 2010 SERPRO
  4 + * ----------------------------------------------------------------------------
  5 + * This file is part of Demoiselle Framework.
  6 + *
  7 + * Demoiselle Framework is free software; you can redistribute it and/or
  8 + * modify it under the terms of the GNU Lesser General Public License version 3
  9 + * as published by the Free Software Foundation.
  10 + *
  11 + * This program is distributed in the hope that it will be useful,
  12 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
  13 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  14 + * GNU General Public License for more details.
  15 + *
  16 + * You should have received a copy of the GNU Lesser General Public License version 3
  17 + * along with this program; if not, see <http://www.gnu.org/licenses/>
  18 + * or write to the Free Software Foundation, Inc., 51 Franklin Street,
  19 + * Fifth Floor, Boston, MA 02110-1301, USA.
  20 + * ----------------------------------------------------------------------------
  21 + * Este arquivo é parte do Framework Demoiselle.
  22 + *
  23 + * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
  24 + * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
  25 + * do Software Livre (FSF).
  26 + *
  27 + * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
  28 + * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
  29 + * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
  30 + * para maiores detalhes.
  31 + *
  32 + * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
  33 + * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
  34 + * ou escreva para a Fundação do Software Livre (FSF) Inc.,
  35 + * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
  36 + */
  37 +package br.gov.frameworkdemoiselle.exception;
  38 +
  39 +import java.io.Serializable;
  40 +import java.lang.reflect.InvocationTargetException;
  41 +import java.lang.reflect.Method;
  42 +import java.util.HashMap;
  43 +import java.util.Map;
  44 +
  45 +import javax.interceptor.AroundInvoke;
  46 +import javax.interceptor.Interceptor;
  47 +import javax.interceptor.InvocationContext;
  48 +
  49 +import org.slf4j.Logger;
  50 +
  51 +import br.gov.frameworkdemoiselle.DemoiselleException;
  52 +import br.gov.frameworkdemoiselle.exception.ExceptionHandler;
  53 +import br.gov.frameworkdemoiselle.internal.bootstrap.CoreBootstrap;
  54 +import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;
  55 +import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
  56 +import br.gov.frameworkdemoiselle.stereotype.Controller;
  57 +import br.gov.frameworkdemoiselle.util.Beans;
  58 +import br.gov.frameworkdemoiselle.util.ResourceBundle;
  59 +
  60 +@Interceptor
  61 +@Controller
  62 +public class ExceptionHandlerInterceptor implements Serializable {
  63 +
  64 + private static final long serialVersionUID = 1L;
  65 +
  66 + private static ResourceBundle bundle;
  67 +
  68 + private static Logger logger;
  69 +
  70 + private final Map<Class<?>, Map<Class<?>, Method>> cache = new HashMap<Class<?>, Map<Class<?>, Method>>();
  71 +
  72 + private final boolean handleException(final Exception cause, final Object target) throws Exception {
  73 + getLogger().info(getBundle().getString("handling-exception", cause.getClass().getCanonicalName()));
  74 +
  75 + boolean handled = false;
  76 + Class<?> type = getType(target);
  77 +
  78 + if (!isLoaded(type)) {
  79 + loadHandlers(type);
  80 + }
  81 +
  82 + Method handler = getMethod(type, cause);
  83 + if (handler != null) {
  84 + invoke(handler, target, cause);
  85 + handled = true;
  86 + }
  87 +
  88 + return handled;
  89 + }
  90 +
  91 + private final Class<?> getType(final Object target) {
  92 + Class<?> type = target.getClass();
  93 + CoreBootstrap bootstrap = Beans.getReference(CoreBootstrap.class);
  94 +
  95 + if (!bootstrap.isAnnotatedType(type)) {
  96 + getLogger().debug(
  97 + getBundle().getString("proxy-detected", type,
  98 + type.getSuperclass()));
  99 + type = type.getSuperclass();
  100 + }
  101 +
  102 + return type;
  103 + }
  104 +
  105 + /**
  106 + * If there is an handler in the current class for the expected exception, then this method will be returned; Else
  107 + * returns null;
  108 + *
  109 + * @param type
  110 + * @param cause
  111 + * @return
  112 + */
  113 + private final Method getMethod(final Class<?> type, final Exception cause) {
  114 + Method handler = null;
  115 +
  116 + if (cache.containsKey(type) && cache.get(type).containsKey(cause.getClass())) {
  117 + handler = cache.get(type).get(cause.getClass());
  118 + }
  119 +
  120 + return handler;
  121 + }
  122 +
  123 + /**
  124 + * Create an map of Exception Handler for this class and put it on the cache.
  125 + *
  126 + * @param type
  127 + */
  128 + private final void loadHandlers(final Class<?> type) {
  129 + Map<Class<?>, Method> mapHandlers = new HashMap<Class<?>, Method>();
  130 + Method[] methods = type.getMethods();
  131 +
  132 + for (Method method : methods) {
  133 + if (method.isAnnotationPresent(ExceptionHandler.class)) {
  134 + validateHandler(method);
  135 + mapHandlers.put(method.getParameterTypes()[0], method);
  136 + }
  137 + }
  138 + cache.put(type, mapHandlers);
  139 + }
  140 +
  141 + /**
  142 + * Verify the method for compliance with an handler. It must be: public, single parameter, parameter type must be
  143 + * assigned from Exception
  144 + *
  145 + * @param method
  146 + */
  147 + private final void validateHandler(final Method method) {
  148 + if (method.getParameterTypes().length != 1) {
  149 + throw new DemoiselleException(getBundle().getString("must-declare-one-single-parameter",
  150 + method.toGenericString()));
  151 + }
  152 + }
  153 +
  154 + /**
  155 + * Indicates if this class is already loaded in cache control.
  156 + *
  157 + * @param type
  158 + * @return
  159 + */
  160 + private final boolean isLoaded(final Class<?> type) {
  161 + return cache.containsKey(type);
  162 + }
  163 +
  164 + private final void invoke(final Method method, final Object object, final Exception param) throws Exception {
  165 + boolean accessible = method.isAccessible();
  166 + method.setAccessible(true);
  167 +
  168 + try {
  169 + method.invoke(object, param);
  170 +
  171 + } catch (InvocationTargetException cause) {
  172 + Throwable targetTrowable = cause.getTargetException();
  173 +
  174 + if (targetTrowable instanceof Exception) {
  175 + throw (Exception) targetTrowable;
  176 + } else {
  177 + throw new Exception(targetTrowable);
  178 + }
  179 + }
  180 +
  181 + method.setAccessible(accessible);
  182 + }
  183 +
  184 + @AroundInvoke
  185 + public Object manage(final InvocationContext ic) throws Exception {
  186 + Object target = null;
  187 + Object result = null;
  188 +
  189 + try {
  190 + target = ic.getTarget();
  191 + result = ic.proceed();
  192 +
  193 + } catch (Exception cause) {
  194 + if (!handleException(cause, target)) {
  195 + throw cause;
  196 + }
  197 + }
  198 +
  199 + return result;
  200 + }
  201 +
  202 + private static ResourceBundle getBundle() {
  203 + if (bundle == null) {
  204 + bundle = ResourceBundleProducer.create("demoiselle-core-bundle");
  205 + }
  206 +
  207 + return bundle;
  208 + }
  209 +
  210 + private static Logger getLogger() {
  211 + if (logger == null) {
  212 + logger = LoggerProducer.create(ExceptionHandlerInterceptor.class);
  213 + }
  214 +
  215 + return logger;
  216 + }
  217 +}
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/MessageContextImpl.java
  Diff comments   View file @a9f8df7
@@ -44,7 +44,6 @@ import javax.enterprise.context.RequestScoped; @@ -44,7 +44,6 @@ import javax.enterprise.context.RequestScoped;
44 44
45 import org.slf4j.Logger; 45 import org.slf4j.Logger;
46 46
47 -import br.gov.frameworkdemoiselle.internal.interceptor.ExceptionHandlerInterceptor;  
48 import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer; 47 import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;
49 import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer; 48 import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
50 import br.gov.frameworkdemoiselle.message.DefaultMessage; 49 import br.gov.frameworkdemoiselle.message.DefaultMessage;
@@ -114,7 +113,7 @@ public class MessageContextImpl implements Serializable, MessageContext { @@ -114,7 +113,7 @@ public class MessageContextImpl implements Serializable, MessageContext {
114 113
115 private static Logger getLogger() { 114 private static Logger getLogger() {
116 if (logger == null) { 115 if (logger == null) {
117 - logger = LoggerProducer.create(ExceptionHandlerInterceptor.class); 116 + logger = LoggerProducer.create(MessageContext.class);
118 } 117 }
119 118
120 return logger; 119 return logger;
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/TransactionInfo.java
View file @ab37849
@@ -1,80 +0,0 @@ @@ -1,80 +0,0 @@
1 -/*  
2 - * Demoiselle Framework  
3 - * Copyright (C) 2010 SERPRO  
4 - * ----------------------------------------------------------------------------  
5 - * This file is part of Demoiselle Framework.  
6 - *  
7 - * Demoiselle Framework is free software; you can redistribute it and/or  
8 - * modify it under the terms of the GNU Lesser General Public License version 3  
9 - * as published by the Free Software Foundation.  
10 - *  
11 - * This program is distributed in the hope that it will be useful,  
12 - * but WITHOUT ANY WARRANTY; without even the implied warranty of  
13 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the  
14 - * GNU General Public License for more details.  
15 - *  
16 - * You should have received a copy of the GNU Lesser General Public License version 3  
17 - * along with this program; if not, see <http://www.gnu.org/licenses/>  
18 - * or write to the Free Software Foundation, Inc., 51 Franklin Street,  
19 - * Fifth Floor, Boston, MA 02110-1301, USA.  
20 - * ----------------------------------------------------------------------------  
21 - * Este arquivo é parte do Framework Demoiselle.  
22 - *  
23 - * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou  
24 - * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação  
25 - * do Software Livre (FSF).  
26 - *  
27 - * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA  
28 - * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou  
29 - * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português  
30 - * para maiores detalhes.  
31 - *  
32 - * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título  
33 - * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>  
34 - * ou escreva para a Fundação do Software Livre (FSF) Inc.,  
35 - * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.  
36 - */  
37 -package br.gov.frameworkdemoiselle.internal.implementation;  
38 -  
39 -import java.io.Serializable;  
40 -  
41 -import javax.enterprise.context.RequestScoped;  
42 -  
43 -@RequestScoped  
44 -public class TransactionInfo implements Serializable {  
45 -  
46 - private static final long serialVersionUID = 1L;  
47 -  
48 - private int counter = 0;  
49 -  
50 - private boolean owner;  
51 -  
52 - public TransactionInfo() {  
53 - clear();  
54 - }  
55 -  
56 - public void clear() {  
57 - this.owner = false;  
58 - this.counter = 0;  
59 - }  
60 -  
61 - public int getCounter() {  
62 - return counter;  
63 - }  
64 -  
65 - public void incrementCounter() {  
66 - this.counter++;  
67 - }  
68 -  
69 - public void decrementCounter() {  
70 - this.counter--;  
71 - }  
72 -  
73 - public void markAsOwner() {  
74 - this.owner = true;  
75 - }  
76 -  
77 - public boolean isOwner() {  
78 - return owner;  
79 - }  
80 -}  
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/interceptor/ExceptionHandlerInterceptor.java
  Diff comments   View file @a9f8df7
@@ -36,182 +36,32 @@ @@ -36,182 +36,32 @@
36 */ 36 */
37 package br.gov.frameworkdemoiselle.internal.interceptor; 37 package br.gov.frameworkdemoiselle.internal.interceptor;
38 38
39 -import java.io.Serializable;  
40 -import java.lang.reflect.InvocationTargetException;  
41 -import java.lang.reflect.Method;  
42 -import java.util.HashMap;  
43 -import java.util.Map;  
44 - 39 +import javax.inject.Inject;
45 import javax.interceptor.AroundInvoke; 40 import javax.interceptor.AroundInvoke;
46 import javax.interceptor.Interceptor; 41 import javax.interceptor.Interceptor;
47 import javax.interceptor.InvocationContext; 42 import javax.interceptor.InvocationContext;
48 43
49 import org.slf4j.Logger; 44 import org.slf4j.Logger;
50 45
51 -import br.gov.frameworkdemoiselle.DemoiselleException;  
52 -import br.gov.frameworkdemoiselle.exception.ExceptionHandler;  
53 -import br.gov.frameworkdemoiselle.internal.bootstrap.CoreBootstrap;  
54 -import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;  
55 -import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;  
56 import br.gov.frameworkdemoiselle.stereotype.Controller; 46 import br.gov.frameworkdemoiselle.stereotype.Controller;
57 -import br.gov.frameworkdemoiselle.util.Beans;  
58 -import br.gov.frameworkdemoiselle.util.ResourceBundle;  
59 47
  48 +/**
  49 + * @author 80342167553
  50 + */
  51 +@Deprecated
60 @Interceptor 52 @Interceptor
61 @Controller 53 @Controller
62 -public class ExceptionHandlerInterceptor implements Serializable { 54 +public class ExceptionHandlerInterceptor extends br.gov.frameworkdemoiselle.exception.ExceptionHandlerInterceptor {
63 55
64 private static final long serialVersionUID = 1L; 56 private static final long serialVersionUID = 1L;
65 57
66 - private static ResourceBundle bundle;  
67 -  
68 - private static Logger logger;  
69 -  
70 - private final Map<Class<?>, Map<Class<?>, Method>> cache = new HashMap<Class<?>, Map<Class<?>, Method>>();  
71 -  
72 - private final boolean handleException(final Exception cause, final Object target) throws Exception {  
73 - getLogger().info(getBundle().getString("handling-exception", cause.getClass().getCanonicalName()));  
74 -  
75 - boolean handled = false;  
76 - Class<?> type = getType(target);  
77 -  
78 - if (!isLoaded(type)) {  
79 - loadHandlers(type);  
80 - }  
81 -  
82 - Method handler = getMethod(type, cause);  
83 - if (handler != null) {  
84 - invoke(handler, target, cause);  
85 - handled = true;  
86 - }  
87 -  
88 - return handled;  
89 - }  
90 -  
91 - private final Class<?> getType(final Object target) {  
92 - Class<?> type = target.getClass();  
93 - CoreBootstrap bootstrap = Beans.getReference(CoreBootstrap.class);  
94 -  
95 - if (!bootstrap.isAnnotatedType(type)) {  
96 - getLogger().debug(  
97 - getBundle().getString("proxy-detected", type,  
98 - type.getSuperclass()));  
99 - type = type.getSuperclass();  
100 - }  
101 -  
102 - return type;  
103 - }  
104 -  
105 - /**  
106 - * If there is an handler in the current class for the expected exception, then this method will be returned; Else  
107 - * returns null;  
108 - *  
109 - * @param type  
110 - * @param cause  
111 - * @return  
112 - */  
113 - private final Method getMethod(final Class<?> type, final Exception cause) {  
114 - Method handler = null;  
115 -  
116 - if (cache.containsKey(type) && cache.get(type).containsKey(cause.getClass())) {  
117 - handler = cache.get(type).get(cause.getClass());  
118 - }  
119 -  
120 - return handler;  
121 - }  
122 -  
123 - /**  
124 - * Create an map of Exception Handler for this class and put it on the cache.  
125 - *  
126 - * @param type  
127 - */  
128 - private final void loadHandlers(final Class<?> type) {  
129 - Map<Class<?>, Method> mapHandlers = new HashMap<Class<?>, Method>();  
130 - Method[] methods = type.getMethods();  
131 -  
132 - for (Method method : methods) {  
133 - if (method.isAnnotationPresent(ExceptionHandler.class)) {  
134 - validateHandler(method);  
135 - mapHandlers.put(method.getParameterTypes()[0], method);  
136 - }  
137 - }  
138 - cache.put(type, mapHandlers);  
139 - }  
140 -  
141 - /**  
142 - * Verify the method for compliance with an handler. It must be: public, single parameter, parameter type must be  
143 - * assigned from Exception  
144 - *  
145 - * @param method  
146 - */  
147 - private final void validateHandler(final Method method) {  
148 - if (method.getParameterTypes().length != 1) {  
149 - throw new DemoiselleException(getBundle().getString("must-declare-one-single-parameter",  
150 - method.toGenericString()));  
151 - }  
152 - }  
153 -  
154 - /**  
155 - * Indicates if this class is already loaded in cache control.  
156 - *  
157 - * @param type  
158 - * @return  
159 - */  
160 - private final boolean isLoaded(final Class<?> type) {  
161 - return cache.containsKey(type);  
162 - }  
163 -  
164 - private final void invoke(final Method method, final Object object, final Exception param) throws Exception {  
165 - boolean accessible = method.isAccessible();  
166 - method.setAccessible(true);  
167 -  
168 - try {  
169 - method.invoke(object, param);  
170 -  
171 - } catch (InvocationTargetException cause) {  
172 - Throwable targetTrowable = cause.getTargetException();  
173 -  
174 - if (targetTrowable instanceof Exception) {  
175 - throw (Exception) targetTrowable;  
176 - } else {  
177 - throw new Exception(targetTrowable);  
178 - }  
179 - }  
180 -  
181 - method.setAccessible(accessible);  
182 - }  
183 - 58 + @Inject
  59 + private Logger logger;
  60 +
  61 + @Override
184 @AroundInvoke 62 @AroundInvoke
185 - public Object manage(final InvocationContext ic) throws Exception {  
186 - Object target = null;  
187 - Object result = null;  
188 -  
189 - try {  
190 - target = ic.getTarget();  
191 - result = ic.proceed();  
192 -  
193 - } catch (Exception cause) {  
194 - if (!handleException(cause, target)) {  
195 - throw cause;  
196 - }  
197 - }  
198 -  
199 - return result;  
200 - }  
201 -  
202 - private static ResourceBundle getBundle() {  
203 - if (bundle == null) {  
204 - bundle = ResourceBundleProducer.create("demoiselle-core-bundle");  
205 - }  
206 -  
207 - return bundle;  
208 - }  
209 -  
210 - private static Logger getLogger() {  
211 - if (logger == null) {  
212 - logger = LoggerProducer.create(ExceptionHandlerInterceptor.class);  
213 - }  
214 -  
215 - return logger; 63 + public Object manage(InvocationContext ic) throws Exception {
  64 + 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.");
  65 + return super.manage(ic);
216 } 66 }
217 } 67 }
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/interceptor/RequiredPermissionInterceptor.java
  Diff comments   View file @a9f8df7
@@ -36,158 +36,34 @@ @@ -36,158 +36,34 @@
36 */ 36 */
37 package br.gov.frameworkdemoiselle.internal.interceptor; 37 package br.gov.frameworkdemoiselle.internal.interceptor;
38 38
39 -import java.io.Serializable;  
40 -import java.security.Principal;  
41 - 39 +import javax.inject.Inject;
42 import javax.interceptor.AroundInvoke; 40 import javax.interceptor.AroundInvoke;
43 import javax.interceptor.Interceptor; 41 import javax.interceptor.Interceptor;
44 import javax.interceptor.InvocationContext; 42 import javax.interceptor.InvocationContext;
45 43
46 import org.slf4j.Logger; 44 import org.slf4j.Logger;
47 45
48 -import br.gov.frameworkdemoiselle.annotation.Name;  
49 -import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;  
50 -import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;  
51 -import br.gov.frameworkdemoiselle.security.AuthorizationException;  
52 import br.gov.frameworkdemoiselle.security.RequiredPermission; 46 import br.gov.frameworkdemoiselle.security.RequiredPermission;
53 -import br.gov.frameworkdemoiselle.security.SecurityContext;  
54 -import br.gov.frameworkdemoiselle.util.Beans;  
55 -import br.gov.frameworkdemoiselle.util.ResourceBundle;  
56 -import br.gov.frameworkdemoiselle.util.Strings;  
57 47
58 /** 48 /**
59 * Intercepts calls with {@code @RequiredPermission} annotations. 49 * Intercepts calls with {@code @RequiredPermission} annotations.
60 * 50 *
61 * @author SERPRO 51 * @author SERPRO
62 */ 52 */
  53 +@Deprecated
63 @Interceptor 54 @Interceptor
64 @RequiredPermission 55 @RequiredPermission
65 -public class RequiredPermissionInterceptor implements Serializable { 56 +public class RequiredPermissionInterceptor extends br.gov.frameworkdemoiselle.security.RequiredPermissionInterceptor {
66 57
67 private static final long serialVersionUID = 1L; 58 private static final long serialVersionUID = 1L;
68 59
69 - private SecurityContext securityContext;  
70 -  
71 - private static ResourceBundle bundle; 60 + @Inject
  61 + private Logger logger;
72 62
73 - private static Logger logger;  
74 -  
75 - /**  
76 - * Gets the values for both resource and operation properties of {@code @RequiredPermission}. Delegates to  
77 - * {@code SecurityContext} check permissions. If the user has the required permission it executes the mehtod,  
78 - * otherwise throws an exception. Returns what is returned from the intercepted method. If the method's return type  
79 - * is {@code void} returns {@code null}.  
80 - *  
81 - * @param ic  
82 - * the {@code InvocationContext} in which the method is being called  
83 - * @return what is returned from the intercepted method. If the method's return type is {@code void} returns  
84 - * {@code null}  
85 - * @throws Exception  
86 - * if there is an error during the permission check or during the method's processing  
87 - */ 63 + @Override
88 @AroundInvoke 64 @AroundInvoke
89 - public Object manage(final InvocationContext ic) throws Exception {  
90 - String resource = getResource(ic);  
91 - String operation = getOperation(ic);  
92 - String username = null;  
93 -  
94 - if (getSecurityContext().isLoggedIn()) {  
95 - username = getUsername();  
96 - getLogger().trace(getBundle().getString("access-checking", username, operation, resource));  
97 - }  
98 -  
99 - if (!getSecurityContext().hasPermission(resource, operation)) {  
100 - getLogger().error(getBundle().getString("access-denied", username, operation, resource));  
101 - throw new AuthorizationException(getBundle().getString("access-denied-ui", resource, operation));  
102 - }  
103 -  
104 - getLogger().debug(getBundle().getString("access-allowed", username, operation, resource));  
105 - return ic.proceed();  
106 - }  
107 -  
108 - /**  
109 - * Returns the id of the currently logged in user.  
110 - *  
111 - * @return the id of the currently logged in user  
112 - */  
113 - private String getUsername() {  
114 - String username = "";  
115 - Principal user = getSecurityContext().getCurrentUser();  
116 -  
117 - if (user != null && user.getName() != null) {  
118 - username = user.getName();  
119 - }  
120 -  
121 - return username;  
122 - }  
123 -  
124 - /**  
125 - * Returns the resource defined in {@code @RequiredPermission} annotation, the name defined in {@code @Name}  
126 - * annotation or the class name itself  
127 - *  
128 - * @param ic  
129 - * the {@code InvocationContext} in which the method is being called  
130 - * @return the resource defined in {@code @RequiredPermission} annotation, the name defined in {@code @Name}  
131 - * annotation or the class name itself  
132 - */  
133 - private String getResource(InvocationContext ic) {  
134 - RequiredPermission requiredPermission = ic.getMethod().getAnnotation(RequiredPermission.class);  
135 -  
136 - if (requiredPermission == null || Strings.isEmpty(requiredPermission.resource())) {  
137 - if (ic.getTarget().getClass().getAnnotation(Name.class) == null) {  
138 - return ic.getTarget().getClass().getSimpleName();  
139 - } else {  
140 - return ic.getTarget().getClass().getAnnotation(Name.class).value();  
141 - }  
142 - } else {  
143 - return requiredPermission.resource();  
144 - }  
145 - }  
146 -  
147 - /**  
148 - * Returns the operation defined in {@code @RequiredPermission} annotation, the name defined in {@code @Name}  
149 - * annotation or the method's name itself  
150 - *  
151 - * @param ic  
152 - * the {@code InvocationContext} in which the method is being called  
153 - * @return the operation defined in {@code @RequiredPermission} annotation, the name defined in {@code @Name}  
154 - * annotation or the method's name itself  
155 - */  
156 - private String getOperation(InvocationContext ic) {  
157 - RequiredPermission requiredPermission = ic.getMethod().getAnnotation(RequiredPermission.class);  
158 -  
159 - if (requiredPermission == null || Strings.isEmpty(requiredPermission.operation())) {  
160 - if (ic.getMethod().getAnnotation(Name.class) == null) {  
161 - return ic.getMethod().getName();  
162 - } else {  
163 - return ic.getMethod().getAnnotation(Name.class).value();  
164 - }  
165 - } else {  
166 - return requiredPermission.operation();  
167 - }  
168 - }  
169 -  
170 - private SecurityContext getSecurityContext() {  
171 - if (securityContext == null) {  
172 - securityContext = Beans.getReference(SecurityContext.class);  
173 - }  
174 -  
175 - return securityContext;  
176 - }  
177 -  
178 - private static ResourceBundle getBundle() {  
179 - if (bundle == null) {  
180 - bundle = ResourceBundleProducer.create("demoiselle-core-bundle");  
181 - }  
182 -  
183 - return bundle;  
184 - }  
185 -  
186 - private static Logger getLogger() {  
187 - if (logger == null) {  
188 - logger = LoggerProducer.create(RequiredPermissionInterceptor.class);  
189 - }  
190 -  
191 - return logger; 65 + public Object manage(InvocationContext ic) throws Exception {
  66 + 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.");
  67 + return super.manage(ic);
192 } 68 }
193 } 69 }
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/interceptor/RequiredRoleInterceptor.java
  Diff comments   View file @a9f8df7
@@ -36,127 +36,35 @@ @@ -36,127 +36,35 @@
36 */ 36 */
37 package br.gov.frameworkdemoiselle.internal.interceptor; 37 package br.gov.frameworkdemoiselle.internal.interceptor;
38 38
39 -import java.io.Serializable;  
40 -import java.util.ArrayList;  
41 -import java.util.Arrays;  
42 -import java.util.List;  
43 - 39 +import javax.inject.Inject;
44 import javax.interceptor.AroundInvoke; 40 import javax.interceptor.AroundInvoke;
45 import javax.interceptor.Interceptor; 41 import javax.interceptor.Interceptor;
46 import javax.interceptor.InvocationContext; 42 import javax.interceptor.InvocationContext;
47 43
48 import org.slf4j.Logger; 44 import org.slf4j.Logger;
49 45
50 -import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;  
51 -import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;  
52 -import br.gov.frameworkdemoiselle.security.AuthorizationException;  
53 import br.gov.frameworkdemoiselle.security.RequiredRole; 46 import br.gov.frameworkdemoiselle.security.RequiredRole;
54 -import br.gov.frameworkdemoiselle.security.SecurityContext;  
55 -import br.gov.frameworkdemoiselle.util.Beans;  
56 -import br.gov.frameworkdemoiselle.util.ResourceBundle;  
57 47
58 /** 48 /**
59 * Intercepts calls with {@code @RequiredRole} annotations. 49 * Intercepts calls with {@code @RequiredRole} annotations.
60 * 50 *
61 * @author SERPRO 51 * @author SERPRO
62 */ 52 */
  53 +@Deprecated
63 @Interceptor 54 @Interceptor
64 @RequiredRole(value = "") 55 @RequiredRole(value = "")
65 -public class RequiredRoleInterceptor implements Serializable { 56 +public class RequiredRoleInterceptor extends br.gov.frameworkdemoiselle.security.RequiredRoleInterceptor {
66 57
67 private static final long serialVersionUID = 1L; 58 private static final long serialVersionUID = 1L;
68 59
69 - private SecurityContext securityContext;  
70 -  
71 - private static ResourceBundle bundle;  
72 -  
73 - private static Logger logger; 60 + @Inject
  61 + private Logger logger;
74 62
75 - /**  
76 - * Gets the value property of {@code @RequiredRole}. Delegates to {@code SecurityContext} check role. If the user  
77 - * has the required role it executes the mehtod, otherwise throws an exception. Returns what is returned from the  
78 - * intercepted method. If the method's return type is {@code void} returns {@code null}.  
79 - *  
80 - * @param ic  
81 - * the {@code InvocationContext} in which the method is being called  
82 - * @return what is returned from the intercepted method. If the method's return type is {@code void} returns  
83 - * {@code null}  
84 - * @throws Exception  
85 - * if there is an error during the role check or during the method's processing  
86 - */ 63 + @Override
87 @AroundInvoke 64 @AroundInvoke
88 - public Object manage(final InvocationContext ic) throws Exception {  
89 - List<String> roles = getRoles(ic);  
90 -  
91 - if (getSecurityContext().isLoggedIn()) {  
92 - getLogger().info(  
93 - getBundle().getString("has-role-verification", getSecurityContext().getCurrentUser().getName(), roles));  
94 - }  
95 -  
96 - List<String> userRoles = new ArrayList<String>();  
97 -  
98 - for (String role : roles) {  
99 - if (getSecurityContext().hasRole(role)) {  
100 - userRoles.add(role);  
101 - }  
102 - }  
103 -  
104 - if (userRoles.isEmpty()) {  
105 - getLogger().error(  
106 - getBundle().getString("does-not-have-role", getSecurityContext().getCurrentUser().getName(), roles));  
107 -  
108 - @SuppressWarnings("unused")  
109 - AuthorizationException a = new AuthorizationException(null);  
110 - throw new AuthorizationException(getBundle().getString("does-not-have-role-ui", roles));  
111 - }  
112 -  
113 - getLogger().debug(getBundle().getString("user-has-role", getSecurityContext().getCurrentUser().getName(), userRoles));  
114 -  
115 - return ic.proceed();  
116 - }  
117 -  
118 - /**  
119 - * Returns the value defined in {@code @RequiredRole} annotation.  
120 - *  
121 - * @param ic  
122 - * the {@code InvocationContext} in which the method is being called  
123 - * @return the value defined in {@code @RequiredRole} annotation  
124 - */  
125 - private List<String> getRoles(InvocationContext ic) {  
126 - String[] roles = {};  
127 -  
128 - if (ic.getMethod().getAnnotation(RequiredRole.class) == null) {  
129 - if (ic.getTarget().getClass().getAnnotation(RequiredRole.class) != null) {  
130 - roles = ic.getTarget().getClass().getAnnotation(RequiredRole.class).value();  
131 - }  
132 - } else {  
133 - roles = ic.getMethod().getAnnotation(RequiredRole.class).value();  
134 - }  
135 -  
136 - return Arrays.asList(roles);  
137 - }  
138 -  
139 - private SecurityContext getSecurityContext() {  
140 - if (securityContext == null) {  
141 - securityContext = Beans.getReference(SecurityContext.class);  
142 - }  
143 -  
144 - return securityContext; 65 + public Object manage(InvocationContext ic) throws Exception {
  66 + 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.");
  67 + return super.manage(ic);
145 } 68 }
146 69
147 - private static ResourceBundle getBundle() {  
148 - if (bundle == null) {  
149 - bundle = ResourceBundleProducer.create("demoiselle-core-bundle");  
150 - }  
151 -  
152 - return bundle;  
153 - }  
154 -  
155 - private static Logger getLogger() {  
156 - if (logger == null) {  
157 - logger = LoggerProducer.create(RequiredRoleInterceptor.class);  
158 - }  
159 -  
160 - return logger;  
161 - }  
162 } 70 }
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/interceptor/TransactionalInterceptor.java
  Diff comments   View file @a9f8df7
@@ -36,168 +36,32 @@ @@ -36,168 +36,32 @@
36 */ 36 */
37 package br.gov.frameworkdemoiselle.internal.interceptor; 37 package br.gov.frameworkdemoiselle.internal.interceptor;
38 38
39 -import java.io.Serializable;  
40 -  
41 -import javax.enterprise.context.ContextNotActiveException; 39 +import javax.inject.Inject;
42 import javax.interceptor.AroundInvoke; 40 import javax.interceptor.AroundInvoke;
43 import javax.interceptor.Interceptor; 41 import javax.interceptor.Interceptor;
44 import javax.interceptor.InvocationContext; 42 import javax.interceptor.InvocationContext;
45 43
46 import org.slf4j.Logger; 44 import org.slf4j.Logger;
47 45
48 -import br.gov.frameworkdemoiselle.exception.ApplicationException;  
49 -import br.gov.frameworkdemoiselle.internal.implementation.TransactionInfo;  
50 -import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;  
51 -import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;  
52 -import br.gov.frameworkdemoiselle.transaction.Transaction;  
53 -import br.gov.frameworkdemoiselle.transaction.TransactionContext;  
54 import br.gov.frameworkdemoiselle.transaction.Transactional; 46 import br.gov.frameworkdemoiselle.transaction.Transactional;
55 -import br.gov.frameworkdemoiselle.util.Beans;  
56 -import br.gov.frameworkdemoiselle.util.ResourceBundle;  
57 47
  48 +/**
  49 + * @author 80342167553
  50 + */
  51 +@Deprecated
58 @Interceptor 52 @Interceptor
59 @Transactional 53 @Transactional
60 -public class TransactionalInterceptor implements Serializable { 54 +public class TransactionalInterceptor extends br.gov.frameworkdemoiselle.transaction.TransactionalInterceptor {
61 55
62 private static final long serialVersionUID = 1L; 56 private static final long serialVersionUID = 1L;
63 57
64 - private TransactionContext transactionContext;  
65 -  
66 - private TransactionInfo transactionInfo;  
67 -  
68 - private static ResourceBundle bundle;  
69 -  
70 - private static Logger logger;  
71 -  
72 - private TransactionContext getTransactionContext() {  
73 - if (this.transactionContext == null) {  
74 - this.transactionContext = Beans.getReference(TransactionContext.class);  
75 - }  
76 -  
77 - return this.transactionContext;  
78 - }  
79 -  
80 - private TransactionInfo newTransactionInfo() {  
81 - TransactionInfo instance;  
82 -  
83 - try {  
84 - instance = Beans.getReference(TransactionInfo.class);  
85 - instance.getCounter();  
86 -  
87 - } catch (ContextNotActiveException cause) {  
88 - instance = new TransactionInfo() {  
89 -  
90 - private static final long serialVersionUID = 1L;  
91 -  
92 - @Override  
93 - public boolean isOwner() {  
94 - return false;  
95 - }  
96 - };  
97 - }  
98 -  
99 - return instance;  
100 - }  
101 -  
102 - private TransactionInfo getTransactionInfo() {  
103 - if (this.transactionInfo == null) {  
104 - this.transactionInfo = newTransactionInfo();  
105 - }  
106 -  
107 - return this.transactionInfo;  
108 - } 58 + @Inject
  59 + private Logger logger;
109 60
  61 + @Override
110 @AroundInvoke 62 @AroundInvoke
111 - public Object manage(final InvocationContext ic) throws Exception {  
112 - initiate(ic);  
113 -  
114 - Object result = null;  
115 - try {  
116 - getLogger().debug(getBundle().getString("transactional-execution", ic.getMethod().toGenericString()));  
117 - result = ic.proceed();  
118 -  
119 - } catch (Exception cause) {  
120 - handleException(cause);  
121 - throw cause;  
122 -  
123 - } finally {  
124 - complete(ic);  
125 - }  
126 -  
127 - return result;  
128 - }  
129 -  
130 - private void initiate(final InvocationContext ic) {  
131 - Transaction transaction = getTransactionContext().getCurrentTransaction();  
132 - TransactionInfo transactionInfo = getTransactionInfo();  
133 -  
134 - if (!transaction.isActive()) {  
135 - transaction.begin();  
136 - transactionInfo.markAsOwner();  
137 - getLogger().info(getBundle().getString("begin-transaction"));  
138 - }  
139 -  
140 - transactionInfo.incrementCounter();  
141 - }  
142 -  
143 - private void handleException(final Exception cause) {  
144 - Transaction transaction = getTransactionContext().getCurrentTransaction();  
145 -  
146 - if (!transaction.isMarkedRollback()) {  
147 - boolean rollback = false;  
148 - ApplicationException annotation = cause.getClass().getAnnotation(ApplicationException.class);  
149 -  
150 - if (annotation == null || annotation.rollback()) {  
151 - rollback = true;  
152 - }  
153 -  
154 - if (rollback) {  
155 - transaction.setRollbackOnly();  
156 - getLogger().info(getBundle().getString("transaction-marked-rollback", cause.getMessage()));  
157 - }  
158 - }  
159 - }  
160 -  
161 - private void complete(final InvocationContext ic) {  
162 - Transaction transaction = getTransactionContext().getCurrentTransaction();  
163 - TransactionInfo transactionInfo = getTransactionInfo();  
164 - transactionInfo.decrementCounter();  
165 -  
166 - if (transactionInfo.getCounter() == 0 && transaction.isActive()) {  
167 -  
168 - if (transactionInfo.isOwner()) {  
169 - if (transaction.isMarkedRollback()) {  
170 - transaction.rollback();  
171 - transactionInfo.clear();  
172 -  
173 - getLogger().info(getBundle().getString("transaction-rolledback"));  
174 -  
175 - } else {  
176 - transaction.commit();  
177 - transactionInfo.clear();  
178 -  
179 - getLogger().info(getBundle().getString("transaction-commited"));  
180 - }  
181 - }  
182 -  
183 - } else if (transactionInfo.getCounter() == 0 && !transaction.isActive()) {  
184 - getLogger().info(getBundle().getString("transaction-already-finalized"));  
185 - }  
186 - }  
187 -  
188 - private static ResourceBundle getBundle() {  
189 - if (bundle == null) {  
190 - bundle = ResourceBundleProducer.create("demoiselle-core-bundle");  
191 - }  
192 -  
193 - return bundle;  
194 - }  
195 -  
196 - private static Logger getLogger() {  
197 - if (logger == null) {  
198 - logger = LoggerProducer.create(TransactionalInterceptor.class);  
199 - }  
200 -  
201 - return logger; 63 + public Object manage(InvocationContext ic) throws Exception {
  64 + 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.");
  65 + return super.manage(ic);
202 } 66 }
203 } 67 }
impl/core/src/main/java/br/gov/frameworkdemoiselle/security/RequiredPermissionInterceptor.java 0 → 100644
  Diff comments   View file @a9f8df7
@@ -0,0 +1,193 @@ @@ -0,0 +1,193 @@
  1 +/*
  2 + * Demoiselle Framework
  3 + * Copyright (C) 2010 SERPRO
  4 + * ----------------------------------------------------------------------------
  5 + * This file is part of Demoiselle Framework.
  6 + *
  7 + * Demoiselle Framework is free software; you can redistribute it and/or
  8 + * modify it under the terms of the GNU Lesser General Public License version 3
  9 + * as published by the Free Software Foundation.
  10 + *
  11 + * This program is distributed in the hope that it will be useful,
  12 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
  13 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  14 + * GNU General Public License for more details.
  15 + *
  16 + * You should have received a copy of the GNU Lesser General Public License version 3
  17 + * along with this program; if not, see <http://www.gnu.org/licenses/>
  18 + * or write to the Free Software Foundation, Inc., 51 Franklin Street,
  19 + * Fifth Floor, Boston, MA 02110-1301, USA.
  20 + * ----------------------------------------------------------------------------
  21 + * Este arquivo é parte do Framework Demoiselle.
  22 + *
  23 + * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
  24 + * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
  25 + * do Software Livre (FSF).
  26 + *
  27 + * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
  28 + * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
  29 + * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
  30 + * para maiores detalhes.
  31 + *
  32 + * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
  33 + * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
  34 + * ou escreva para a Fundação do Software Livre (FSF) Inc.,
  35 + * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
  36 + */
  37 +package br.gov.frameworkdemoiselle.security;
  38 +
  39 +import java.io.Serializable;
  40 +import java.security.Principal;
  41 +
  42 +import javax.interceptor.AroundInvoke;
  43 +import javax.interceptor.Interceptor;
  44 +import javax.interceptor.InvocationContext;
  45 +
  46 +import org.slf4j.Logger;
  47 +
  48 +import br.gov.frameworkdemoiselle.annotation.Name;
  49 +import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;
  50 +import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
  51 +import br.gov.frameworkdemoiselle.security.AuthorizationException;
  52 +import br.gov.frameworkdemoiselle.security.RequiredPermission;
  53 +import br.gov.frameworkdemoiselle.security.SecurityContext;
  54 +import br.gov.frameworkdemoiselle.util.Beans;
  55 +import br.gov.frameworkdemoiselle.util.ResourceBundle;
  56 +import br.gov.frameworkdemoiselle.util.Strings;
  57 +
  58 +/**
  59 + * Intercepts calls with {@code @RequiredPermission} annotations.
  60 + *
  61 + * @author SERPRO
  62 + */
  63 +@Interceptor
  64 +@RequiredPermission
  65 +public class RequiredPermissionInterceptor implements Serializable {
  66 +
  67 + private static final long serialVersionUID = 1L;
  68 +
  69 + private SecurityContext securityContext;
  70 +
  71 + private static ResourceBundle bundle;
  72 +
  73 + private static Logger logger;
  74 +
  75 + /**
  76 + * Gets the values for both resource and operation properties of {@code @RequiredPermission}. Delegates to
  77 + * {@code SecurityContext} check permissions. If the user has the required permission it executes the mehtod,
  78 + * otherwise throws an exception. Returns what is returned from the intercepted method. If the method's return type
  79 + * is {@code void} returns {@code null}.
  80 + *
  81 + * @param ic
  82 + * the {@code InvocationContext} in which the method is being called
  83 + * @return what is returned from the intercepted method. If the method's return type is {@code void} returns
  84 + * {@code null}
  85 + * @throws Exception
  86 + * if there is an error during the permission check or during the method's processing
  87 + */
  88 + @AroundInvoke
  89 + public Object manage(final InvocationContext ic) throws Exception {
  90 + String resource = getResource(ic);
  91 + String operation = getOperation(ic);
  92 + String username = null;
  93 +
  94 + if (getSecurityContext().isLoggedIn()) {
  95 + username = getUsername();
  96 + getLogger().trace(getBundle().getString("access-checking", username, operation, resource));
  97 + }
  98 +
  99 + if (!getSecurityContext().hasPermission(resource, operation)) {
  100 + getLogger().error(getBundle().getString("access-denied", username, operation, resource));
  101 + throw new AuthorizationException(getBundle().getString("access-denied-ui", resource, operation));
  102 + }
  103 +
  104 + getLogger().debug(getBundle().getString("access-allowed", username, operation, resource));
  105 + return ic.proceed();
  106 + }
  107 +
  108 + /**
  109 + * Returns the id of the currently logged in user.
  110 + *
  111 + * @return the id of the currently logged in user
  112 + */
  113 + private String getUsername() {
  114 + String username = "";
  115 + Principal user = getSecurityContext().getCurrentUser();
  116 +
  117 + if (user != null && user.getName() != null) {
  118 + username = user.getName();
  119 + }
  120 +
  121 + return username;
  122 + }
  123 +
  124 + /**
  125 + * Returns the resource defined in {@code @RequiredPermission} annotation, the name defined in {@code @Name}
  126 + * annotation or the class name itself
  127 + *
  128 + * @param ic
  129 + * the {@code InvocationContext} in which the method is being called
  130 + * @return the resource defined in {@code @RequiredPermission} annotation, the name defined in {@code @Name}
  131 + * annotation or the class name itself
  132 + */
  133 + private String getResource(InvocationContext ic) {
  134 + RequiredPermission requiredPermission = ic.getMethod().getAnnotation(RequiredPermission.class);
  135 +
  136 + if (requiredPermission == null || Strings.isEmpty(requiredPermission.resource())) {
  137 + if (ic.getTarget().getClass().getAnnotation(Name.class) == null) {
  138 + return ic.getTarget().getClass().getSimpleName();
  139 + } else {
  140 + return ic.getTarget().getClass().getAnnotation(Name.class).value();
  141 + }
  142 + } else {
  143 + return requiredPermission.resource();
  144 + }
  145 + }
  146 +
  147 + /**
  148 + * Returns the operation defined in {@code @RequiredPermission} annotation, the name defined in {@code @Name}
  149 + * annotation or the method's name itself
  150 + *
  151 + * @param ic
  152 + * the {@code InvocationContext} in which the method is being called
  153 + * @return the operation defined in {@code @RequiredPermission} annotation, the name defined in {@code @Name}
  154 + * annotation or the method's name itself
  155 + */
  156 + private String getOperation(InvocationContext ic) {
  157 + RequiredPermission requiredPermission = ic.getMethod().getAnnotation(RequiredPermission.class);
  158 +
  159 + if (requiredPermission == null || Strings.isEmpty(requiredPermission.operation())) {
  160 + if (ic.getMethod().getAnnotation(Name.class) == null) {
  161 + return ic.getMethod().getName();
  162 + } else {
  163 + return ic.getMethod().getAnnotation(Name.class).value();
  164 + }
  165 + } else {
  166 + return requiredPermission.operation();
  167 + }
  168 + }
  169 +
  170 + private SecurityContext getSecurityContext() {
  171 + if (securityContext == null) {
  172 + securityContext = Beans.getReference(SecurityContext.class);
  173 + }
  174 +
  175 + return securityContext;
  176 + }
  177 +
  178 + private static ResourceBundle getBundle() {
  179 + if (bundle == null) {
  180 + bundle = ResourceBundleProducer.create("demoiselle-core-bundle");
  181 + }
  182 +
  183 + return bundle;
  184 + }
  185 +
  186 + private static Logger getLogger() {
  187 + if (logger == null) {
  188 + logger = LoggerProducer.create(RequiredPermissionInterceptor.class);
  189 + }
  190 +
  191 + return logger;
  192 + }
  193 +}
impl/core/src/main/java/br/gov/frameworkdemoiselle/security/RequiredRoleInterceptor.java 0 → 100644
  Diff comments   View file @a9f8df7
@@ -0,0 +1,162 @@ @@ -0,0 +1,162 @@
  1 +/*
  2 + * Demoiselle Framework
  3 + * Copyright (C) 2010 SERPRO
  4 + * ----------------------------------------------------------------------------
  5 + * This file is part of Demoiselle Framework.
  6 + *
  7 + * Demoiselle Framework is free software; you can redistribute it and/or
  8 + * modify it under the terms of the GNU Lesser General Public License version 3
  9 + * as published by the Free Software Foundation.
  10 + *
  11 + * This program is distributed in the hope that it will be useful,
  12 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
  13 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  14 + * GNU General Public License for more details.
  15 + *
  16 + * You should have received a copy of the GNU Lesser General Public License version 3
  17 + * along with this program; if not, see <http://www.gnu.org/licenses/>
  18 + * or write to the Free Software Foundation, Inc., 51 Franklin Street,
  19 + * Fifth Floor, Boston, MA 02110-1301, USA.
  20 + * ----------------------------------------------------------------------------
  21 + * Este arquivo é parte do Framework Demoiselle.
  22 + *
  23 + * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
  24 + * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
  25 + * do Software Livre (FSF).
  26 + *
  27 + * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
  28 + * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
  29 + * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
  30 + * para maiores detalhes.
  31 + *
  32 + * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
  33 + * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
  34 + * ou escreva para a Fundação do Software Livre (FSF) Inc.,
  35 + * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
  36 + */
  37 +package br.gov.frameworkdemoiselle.security;
  38 +
  39 +import java.io.Serializable;
  40 +import java.util.ArrayList;
  41 +import java.util.Arrays;
  42 +import java.util.List;
  43 +
  44 +import javax.interceptor.AroundInvoke;
  45 +import javax.interceptor.Interceptor;
  46 +import javax.interceptor.InvocationContext;
  47 +
  48 +import org.slf4j.Logger;
  49 +
  50 +import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;
  51 +import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
  52 +import br.gov.frameworkdemoiselle.security.AuthorizationException;
  53 +import br.gov.frameworkdemoiselle.security.RequiredRole;
  54 +import br.gov.frameworkdemoiselle.security.SecurityContext;
  55 +import br.gov.frameworkdemoiselle.util.Beans;
  56 +import br.gov.frameworkdemoiselle.util.ResourceBundle;
  57 +
  58 +/**
  59 + * Intercepts calls with {@code @RequiredRole} annotations.
  60 + *
  61 + * @author SERPRO
  62 + */
  63 +@Interceptor
  64 +@RequiredRole(value = "")
  65 +public class RequiredRoleInterceptor implements Serializable {
  66 +
  67 + private static final long serialVersionUID = 1L;
  68 +
  69 + private SecurityContext securityContext;
  70 +
  71 + private static ResourceBundle bundle;
  72 +
  73 + private static Logger logger;
  74 +
  75 + /**
  76 + * Gets the value property of {@code @RequiredRole}. Delegates to {@code SecurityContext} check role. If the user
  77 + * has the required role it executes the mehtod, otherwise throws an exception. Returns what is returned from the
  78 + * intercepted method. If the method's return type is {@code void} returns {@code null}.
  79 + *
  80 + * @param ic
  81 + * the {@code InvocationContext} in which the method is being called
  82 + * @return what is returned from the intercepted method. If the method's return type is {@code void} returns
  83 + * {@code null}
  84 + * @throws Exception
  85 + * if there is an error during the role check or during the method's processing
  86 + */
  87 + @AroundInvoke
  88 + public Object manage(final InvocationContext ic) throws Exception {
  89 + List<String> roles = getRoles(ic);
  90 +
  91 + if (getSecurityContext().isLoggedIn()) {
  92 + getLogger().info(
  93 + getBundle().getString("has-role-verification", getSecurityContext().getCurrentUser().getName(), roles));
  94 + }
  95 +
  96 + List<String> userRoles = new ArrayList<String>();
  97 +
  98 + for (String role : roles) {
  99 + if (getSecurityContext().hasRole(role)) {
  100 + userRoles.add(role);
  101 + }
  102 + }
  103 +
  104 + if (userRoles.isEmpty()) {
  105 + getLogger().error(
  106 + getBundle().getString("does-not-have-role", getSecurityContext().getCurrentUser().getName(), roles));
  107 +
  108 + @SuppressWarnings("unused")
  109 + AuthorizationException a = new AuthorizationException(null);
  110 + throw new AuthorizationException(getBundle().getString("does-not-have-role-ui", roles));
  111 + }
  112 +
  113 + getLogger().debug(getBundle().getString("user-has-role", getSecurityContext().getCurrentUser().getName(), userRoles));
  114 +
  115 + return ic.proceed();
  116 + }
  117 +
  118 + /**
  119 + * Returns the value defined in {@code @RequiredRole} annotation.
  120 + *
  121 + * @param ic
  122 + * the {@code InvocationContext} in which the method is being called
  123 + * @return the value defined in {@code @RequiredRole} annotation
  124 + */
  125 + private List<String> getRoles(InvocationContext ic) {
  126 + String[] roles = {};
  127 +
  128 + if (ic.getMethod().getAnnotation(RequiredRole.class) == null) {
  129 + if (ic.getTarget().getClass().getAnnotation(RequiredRole.class) != null) {
  130 + roles = ic.getTarget().getClass().getAnnotation(RequiredRole.class).value();
  131 + }
  132 + } else {
  133 + roles = ic.getMethod().getAnnotation(RequiredRole.class).value();
  134 + }
  135 +
  136 + return Arrays.asList(roles);
  137 + }
  138 +
  139 + private SecurityContext getSecurityContext() {
  140 + if (securityContext == null) {
  141 + securityContext = Beans.getReference(SecurityContext.class);
  142 + }
  143 +
  144 + return securityContext;
  145 + }
  146 +
  147 + private static ResourceBundle getBundle() {
  148 + if (bundle == null) {
  149 + bundle = ResourceBundleProducer.create("demoiselle-core-bundle");
  150 + }
  151 +
  152 + return bundle;
  153 + }
  154 +
  155 + private static Logger getLogger() {
  156 + if (logger == null) {
  157 + logger = LoggerProducer.create(RequiredRoleInterceptor.class);
  158 + }
  159 +
  160 + return logger;
  161 + }
  162 +}
impl/core/src/main/java/br/gov/frameworkdemoiselle/transaction/TransactionalInterceptor.java 0 → 100644
  Diff comments   View file @a9f8df7
@@ -0,0 +1,239 @@ @@ -0,0 +1,239 @@
  1 +/*
  2 + * Demoiselle Framework
  3 + * Copyright (C) 2010 SERPRO
  4 + * ----------------------------------------------------------------------------
  5 + * This file is part of Demoiselle Framework.
  6 + *
  7 + * Demoiselle Framework is free software; you can redistribute it and/or
  8 + * modify it under the terms of the GNU Lesser General Public License version 3
  9 + * as published by the Free Software Foundation.
  10 + *
  11 + * This program is distributed in the hope that it will be useful,
  12 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
  13 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  14 + * GNU General Public License for more details.
  15 + *
  16 + * You should have received a copy of the GNU Lesser General Public License version 3
  17 + * along with this program; if not, see <http://www.gnu.org/licenses/>
  18 + * or write to the Free Software Foundation, Inc., 51 Franklin Street,
  19 + * Fifth Floor, Boston, MA 02110-1301, USA.
  20 + * ----------------------------------------------------------------------------
  21 + * Este arquivo é parte do Framework Demoiselle.
  22 + *
  23 + * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
  24 + * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
  25 + * do Software Livre (FSF).
  26 + *
  27 + * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
  28 + * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
  29 + * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
  30 + * para maiores detalhes.
  31 + *
  32 + * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
  33 + * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
  34 + * ou escreva para a Fundação do Software Livre (FSF) Inc.,
  35 + * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
  36 + */
  37 +package br.gov.frameworkdemoiselle.transaction;
  38 +
  39 +import java.io.Serializable;
  40 +
  41 +import javax.enterprise.context.ContextNotActiveException;
  42 +import javax.enterprise.context.RequestScoped;
  43 +import javax.interceptor.AroundInvoke;
  44 +import javax.interceptor.Interceptor;
  45 +import javax.interceptor.InvocationContext;
  46 +
  47 +import org.slf4j.Logger;
  48 +
  49 +import br.gov.frameworkdemoiselle.exception.ApplicationException;
  50 +import br.gov.frameworkdemoiselle.internal.producer.LoggerProducer;
  51 +import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
  52 +import br.gov.frameworkdemoiselle.util.Beans;
  53 +import br.gov.frameworkdemoiselle.util.ResourceBundle;
  54 +
  55 +@Interceptor
  56 +@Transactional
  57 +public class TransactionalInterceptor implements Serializable {
  58 +
  59 + private static final long serialVersionUID = 1L;
  60 +
  61 + private TransactionContext transactionContext;
  62 +
  63 + private TransactionInfo transactionInfo;
  64 +
  65 + private static ResourceBundle bundle;
  66 +
  67 + private static Logger logger;
  68 +
  69 + private TransactionContext getTransactionContext() {
  70 + if (this.transactionContext == null) {
  71 + this.transactionContext = Beans.getReference(TransactionContext.class);
  72 + }
  73 +
  74 + return this.transactionContext;
  75 + }
  76 +
  77 + private TransactionInfo newTransactionInfo() {
  78 + TransactionInfo instance;
  79 +
  80 + try {
  81 + instance = Beans.getReference(TransactionInfo.class);
  82 + instance.getCounter();
  83 +
  84 + } catch (ContextNotActiveException cause) {
  85 + instance = new TransactionInfo() {
  86 +
  87 + private static final long serialVersionUID = 1L;
  88 +
  89 + @Override
  90 + public boolean isOwner() {
  91 + return false;
  92 + }
  93 + };
  94 + }
  95 +
  96 + return instance;
  97 + }
  98 +
  99 + private TransactionInfo getTransactionInfo() {
  100 + if (this.transactionInfo == null) {
  101 + this.transactionInfo = newTransactionInfo();
  102 + }
  103 +
  104 + return this.transactionInfo;
  105 + }
  106 +
  107 + @AroundInvoke
  108 + public Object manage(final InvocationContext ic) throws Exception {
  109 + initiate(ic);
  110 +
  111 + Object result = null;
  112 + try {
  113 + getLogger().debug(getBundle().getString("transactional-execution", ic.getMethod().toGenericString()));
  114 + result = ic.proceed();
  115 +
  116 + } catch (Exception cause) {
  117 + handleException(cause);
  118 + throw cause;
  119 +
  120 + } finally {
  121 + complete(ic);
  122 + }
  123 +
  124 + return result;
  125 + }
  126 +
  127 + private void initiate(final InvocationContext ic) {
  128 + Transaction transaction = getTransactionContext().getCurrentTransaction();
  129 + TransactionInfo transactionInfo = getTransactionInfo();
  130 +
  131 + if (!transaction.isActive()) {
  132 + transaction.begin();
  133 + transactionInfo.markAsOwner();
  134 + getLogger().info(getBundle().getString("begin-transaction"));
  135 + }
  136 +
  137 + transactionInfo.incrementCounter();
  138 + }
  139 +
  140 + private void handleException(final Exception cause) {
  141 + Transaction transaction = getTransactionContext().getCurrentTransaction();
  142 +
  143 + if (!transaction.isMarkedRollback()) {
  144 + boolean rollback = false;
  145 + ApplicationException annotation = cause.getClass().getAnnotation(ApplicationException.class);
  146 +
  147 + if (annotation == null || annotation.rollback()) {
  148 + rollback = true;
  149 + }
  150 +
  151 + if (rollback) {
  152 + transaction.setRollbackOnly();
  153 + getLogger().info(getBundle().getString("transaction-marked-rollback", cause.getMessage()));
  154 + }
  155 + }
  156 + }
  157 +
  158 + private void complete(final InvocationContext ic) {
  159 + Transaction transaction = getTransactionContext().getCurrentTransaction();
  160 + TransactionInfo transactionInfo = getTransactionInfo();
  161 + transactionInfo.decrementCounter();
  162 +
  163 + if (transactionInfo.getCounter() == 0 && transaction.isActive()) {
  164 +
  165 + if (transactionInfo.isOwner()) {
  166 + if (transaction.isMarkedRollback()) {
  167 + transaction.rollback();
  168 + transactionInfo.clear();
  169 +
  170 + getLogger().info(getBundle().getString("transaction-rolledback"));
  171 +
  172 + } else {
  173 + transaction.commit();
  174 + transactionInfo.clear();
  175 +
  176 + getLogger().info(getBundle().getString("transaction-commited"));
  177 + }
  178 + }
  179 +
  180 + } else if (transactionInfo.getCounter() == 0 && !transaction.isActive()) {
  181 + getLogger().info(getBundle().getString("transaction-already-finalized"));
  182 + }
  183 + }
  184 +
  185 + private static ResourceBundle getBundle() {
  186 + if (bundle == null) {
  187 + bundle = ResourceBundleProducer.create("demoiselle-core-bundle");
  188 + }
  189 +
  190 + return bundle;
  191 + }
  192 +
  193 + private static Logger getLogger() {
  194 + if (logger == null) {
  195 + logger = LoggerProducer.create(TransactionalInterceptor.class);
  196 + }
  197 +
  198 + return logger;
  199 + }
  200 +
  201 + @RequestScoped
  202 + class TransactionInfo implements Serializable {
  203 +
  204 + private static final long serialVersionUID = 1L;
  205 +
  206 + private int counter = 0;
  207 +
  208 + private boolean owner;
  209 +
  210 + public TransactionInfo() {
  211 + clear();
  212 + }
  213 +
  214 + public void clear() {
  215 + this.owner = false;
  216 + this.counter = 0;
  217 + }
  218 +
  219 + public int getCounter() {
  220 + return counter;
  221 + }
  222 +
  223 + public void incrementCounter() {
  224 + this.counter++;
  225 + }
  226 +
  227 + public void decrementCounter() {
  228 + this.counter--;
  229 + }
  230 +
  231 + public void markAsOwner() {
  232 + this.owner = true;
  233 + }
  234 +
  235 + public boolean isOwner() {
  236 + return owner;
  237 + }
  238 + }
  239 +}
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/implementation/TransactionInfoTest.java
  Diff comments   View file @a9f8df7
1 -/*  
2 - * Demoiselle Framework  
3 - * Copyright (C) 2010 SERPRO  
4 - * ----------------------------------------------------------------------------  
5 - * This file is part of Demoiselle Framework.  
6 - *  
7 - * Demoiselle Framework is free software; you can redistribute it and/or  
8 - * modify it under the terms of the GNU Lesser General Public License version 3  
9 - * as published by the Free Software Foundation.  
10 - *  
11 - * This program is distributed in the hope that it will be useful,  
12 - * but WITHOUT ANY WARRANTY; without even the implied warranty of  
13 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the  
14 - * GNU General Public License for more details.  
15 - *  
16 - * You should have received a copy of the GNU Lesser General Public License version 3  
17 - * along with this program; if not, see <http://www.gnu.org/licenses/>  
18 - * or write to the Free Software Foundation, Inc., 51 Franklin Street,  
19 - * Fifth Floor, Boston, MA 02110-1301, USA.  
20 - * ----------------------------------------------------------------------------  
21 - * Este arquivo é parte do Framework Demoiselle.  
22 - *  
23 - * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou  
24 - * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação  
25 - * do Software Livre (FSF).  
26 - *  
27 - * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA  
28 - * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou  
29 - * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português  
30 - * para maiores detalhes.  
31 - *  
32 - * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título  
33 - * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>  
34 - * ou escreva para a Fundação do Software Livre (FSF) Inc.,  
35 - * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.  
36 - */  
37 -package br.gov.frameworkdemoiselle.internal.implementation;  
38 -  
39 -import org.junit.Assert;  
40 -import org.junit.Test;  
41 -  
42 -  
43 -public class TransactionInfoTest {  
44 -  
45 - private TransactionInfo transactionInfo = new TransactionInfo();  
46 -  
47 - @Test  
48 - public void testMarkAsOwner(){  
49 - transactionInfo.markAsOwner();  
50 - Assert.assertTrue(transactionInfo.isOwner());  
51 - }  
52 -  
53 - @Test  
54 - public void testIncrementCounter() {  
55 - int count = transactionInfo.getCounter();  
56 -  
57 - transactionInfo.incrementCounter();  
58 - Assert.assertEquals(count+1, transactionInfo.getCounter());  
59 -  
60 - transactionInfo.incrementCounter();  
61 - Assert.assertEquals(count+2, transactionInfo.getCounter());  
62 - }  
63 -  
64 - @Test  
65 - public void testDecrementCounter() {  
66 - int count = transactionInfo.getCounter();  
67 -  
68 - transactionInfo.incrementCounter();  
69 - Assert.assertEquals(count+1, transactionInfo.getCounter());  
70 -  
71 - transactionInfo.decrementCounter();  
72 - Assert.assertEquals(count, transactionInfo.getCounter());  
73 - }  
74 -  
75 - @Test  
76 - public void testClear() {  
77 - transactionInfo.incrementCounter();  
78 - transactionInfo.markAsOwner();  
79 -  
80 - transactionInfo.clear();  
81 -  
82 - Assert.assertEquals(0, transactionInfo.getCounter());  
83 - Assert.assertFalse(transactionInfo.isOwner());  
84 - }  
85 -} 1 +///*
  2 +// * Demoiselle Framework
  3 +// * Copyright (C) 2010 SERPRO
  4 +// * ----------------------------------------------------------------------------
  5 +// * This file is part of Demoiselle Framework.
  6 +// *
  7 +// * Demoiselle Framework is free software; you can redistribute it and/or
  8 +// * modify it under the terms of the GNU Lesser General Public License version 3
  9 +// * as published by the Free Software Foundation.
  10 +// *
  11 +// * This program is distributed in the hope that it will be useful,
  12 +// * but WITHOUT ANY WARRANTY; without even the implied warranty of
  13 +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  14 +// * GNU General Public License for more details.
  15 +// *
  16 +// * You should have received a copy of the GNU Lesser General Public License version 3
  17 +// * along with this program; if not, see <http://www.gnu.org/licenses/>
  18 +// * or write to the Free Software Foundation, Inc., 51 Franklin Street,
  19 +// * Fifth Floor, Boston, MA 02110-1301, USA.
  20 +// * ----------------------------------------------------------------------------
  21 +// * Este arquivo é parte do Framework Demoiselle.
  22 +// *
  23 +// * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
  24 +// * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
  25 +// * do Software Livre (FSF).
  26 +// *
  27 +// * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
  28 +// * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
  29 +// * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
  30 +// * para maiores detalhes.
  31 +// *
  32 +// * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
  33 +// * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
  34 +// * ou escreva para a Fundação do Software Livre (FSF) Inc.,
  35 +// * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
  36 +// */
  37 +//package br.gov.frameworkdemoiselle.internal.implementation;
  38 +//
  39 +//import org.junit.Assert;
  40 +//import org.junit.Test;
  41 +//
  42 +//
  43 +//public class TransactionInfoTest {
  44 +//
  45 +// private TransactionInfo transactionInfo = new TransactionInfo();
  46 +//
  47 +// @Test
  48 +// public void testMarkAsOwner(){
  49 +// transactionInfo.markAsOwner();
  50 +// Assert.assertTrue(transactionInfo.isOwner());
  51 +// }
  52 +//
  53 +// @Test
  54 +// public void testIncrementCounter() {
  55 +// int count = transactionInfo.getCounter();
  56 +//
  57 +// transactionInfo.incrementCounter();
  58 +// Assert.assertEquals(count+1, transactionInfo.getCounter());
  59 +//
  60 +// transactionInfo.incrementCounter();
  61 +// Assert.assertEquals(count+2, transactionInfo.getCounter());
  62 +// }
  63 +//
  64 +// @Test
  65 +// public void testDecrementCounter() {
  66 +// int count = transactionInfo.getCounter();
  67 +//
  68 +// transactionInfo.incrementCounter();
  69 +// Assert.assertEquals(count+1, transactionInfo.getCounter());
  70 +//
  71 +// transactionInfo.decrementCounter();
  72 +// Assert.assertEquals(count, transactionInfo.getCounter());
  73 +// }
  74 +//
  75 +// @Test
  76 +// public void testClear() {
  77 +// transactionInfo.incrementCounter();
  78 +// transactionInfo.markAsOwner();
  79 +//
  80 +// transactionInfo.clear();
  81 +//
  82 +// Assert.assertEquals(0, transactionInfo.getCounter());
  83 +// Assert.assertFalse(transactionInfo.isOwner());
  84 +// }
  85 +//}
impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/interceptor/TransactionalInterceptorTest.java
  Diff comments   View file @a9f8df7
1 -/*  
2 - * Demoiselle Framework  
3 - * Copyright (C) 2010 SERPRO  
4 - * ----------------------------------------------------------------------------  
5 - * This file is part of Demoiselle Framework.  
6 - *  
7 - * Demoiselle Framework is free software; you can redistribute it and/or  
8 - * modify it under the terms of the GNU Lesser General Public License version 3  
9 - * as published by the Free Software Foundation.  
10 - *  
11 - * This program is distributed in the hope that it will be useful,  
12 - * but WITHOUT ANY WARRANTY; without even the implied warranty of  
13 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the  
14 - * GNU General Public License for more details.  
15 - *  
16 - * You should have received a copy of the GNU Lesser General Public License version 3  
17 - * along with this program; if not, see <http://www.gnu.org/licenses/>  
18 - * or write to the Free Software Foundation, Inc., 51 Franklin Street,  
19 - * Fifth Floor, Boston, MA 02110-1301, USA.  
20 - * ----------------------------------------------------------------------------  
21 - * Este arquivo é parte do Framework Demoiselle.  
22 - *  
23 - * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou  
24 - * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação  
25 - * do Software Livre (FSF).  
26 - *  
27 - * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA  
28 - * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou  
29 - * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português  
30 - * para maiores detalhes.  
31 - *  
32 - * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título  
33 - * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>  
34 - * ou escreva para a Fundação do Software Livre (FSF) Inc.,  
35 - * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.  
36 - */  
37 -package br.gov.frameworkdemoiselle.internal.interceptor;  
38 -  
39 -import static org.easymock.EasyMock.expect;  
40 -import static org.easymock.EasyMock.verify;  
41 -import static org.junit.Assert.assertEquals;  
42 -import static org.junit.Assert.assertTrue;  
43 -import static org.junit.Assert.fail;  
44 -import static org.powermock.api.easymock.PowerMock.mockStatic;  
45 -import static org.powermock.api.easymock.PowerMock.replay;  
46 -import static org.powermock.api.easymock.PowerMock.replayAll;  
47 -  
48 -import java.util.Locale;  
49 -  
50 -import javax.enterprise.inject.Instance;  
51 -import javax.interceptor.InvocationContext;  
52 -  
53 -import org.easymock.EasyMock;  
54 -import org.junit.Before;  
55 -import org.junit.Test;  
56 -import org.junit.runner.RunWith;  
57 -import org.powermock.core.classloader.annotations.PrepareForTest;  
58 -import org.powermock.modules.junit4.PowerMockRunner;  
59 -  
60 -import br.gov.frameworkdemoiselle.DemoiselleException;  
61 -import br.gov.frameworkdemoiselle.internal.implementation.TransactionInfo;  
62 -import br.gov.frameworkdemoiselle.transaction.Transaction;  
63 -import br.gov.frameworkdemoiselle.transaction.TransactionContext;  
64 -import br.gov.frameworkdemoiselle.util.Beans;  
65 -  
66 -@RunWith(PowerMockRunner.class)  
67 -@PrepareForTest(Beans.class)  
68 -public class TransactionalInterceptorTest {  
69 -  
70 - private TransactionalInterceptor interceptor;  
71 -  
72 - private InvocationContext ic;  
73 -  
74 - private Transaction transaction;  
75 -  
76 - private TransactionContext transactionContext;  
77 -  
78 - class ClassWithMethod {  
79 -  
80 - public void method() {  
81 - System.out.println("test method");  
82 - }  
83 - }  
84 -  
85 - @Before  
86 - @SuppressWarnings("unchecked")  
87 - public void setUp() throws Exception {  
88 - Instance<Transaction> transactionInstance = EasyMock.createMock(Instance.class);  
89 - Instance<TransactionInfo> transactionInfoInstance = EasyMock.createMock(Instance.class);  
90 - Instance<TransactionContext> transactionContextInstance = EasyMock.createMock(Instance.class);  
91 -  
92 - TransactionInfo transactionInfo = new TransactionInfo();  
93 - transaction = EasyMock.createMock(Transaction.class);  
94 - this.transactionContext = EasyMock.createMock(TransactionContext.class);  
95 - this.ic = EasyMock.createMock(InvocationContext.class);  
96 -  
97 - mockStatic(Beans.class);  
98 - expect(Beans.getReference(Locale.class)).andReturn(Locale.getDefault());  
99 - expect(Beans.getReference(TransactionContext.class)).andReturn(transactionContext);  
100 - expect(Beans.getReference(TransactionInfo.class)).andReturn(transactionInfo);  
101 -  
102 - expect(transactionInstance.get()).andReturn(transaction).anyTimes();  
103 - expect(transactionContextInstance.get()).andReturn(transactionContext).anyTimes();  
104 - expect(transactionInfoInstance.get()).andReturn(transactionInfo).anyTimes();  
105 - expect(transactionContext.getCurrentTransaction()).andReturn(transaction).anyTimes();  
106 - expect(this.ic.proceed()).andReturn(null);  
107 - expect(this.ic.getMethod()).andReturn(ClassWithMethod.class.getMethod("method"));  
108 - replayAll(Beans.class, this.ic, transactionContextInstance, transactionInfoInstance, transactionInstance,  
109 - transactionContext);  
110 -  
111 - this.interceptor = new TransactionalInterceptor();  
112 -  
113 - }  
114 -  
115 - @Test  
116 - public void testManageWithInativeTransactionAndTransactionInterceptorBeginAndDoNotIsMarkedRollback()  
117 - throws Exception {  
118 - expect(this.transaction.isActive()).andReturn(false).times(1);  
119 - expect(this.transaction.isActive()).andReturn(true).times(2);  
120 - expect(this.transaction.isMarkedRollback()).andReturn(false).anyTimes();  
121 - this.transaction.begin();  
122 - this.transaction.commit();  
123 - replay(this.transaction);  
124 -  
125 - assertEquals(null, this.interceptor.manage(this.ic));  
126 - verify();  
127 - }  
128 -  
129 - @Test  
130 - public void testManageWithInativeTransactionAndTransactionInterceptorBeginAndIsMarkedRollback() throws Exception {  
131 - expect(this.transaction.isActive()).andReturn(false).times(1);  
132 - expect(this.transaction.isActive()).andReturn(true).times(2);  
133 - expect(this.transaction.isMarkedRollback()).andReturn(true).anyTimes();  
134 - this.transaction.begin();  
135 - this.transaction.rollback();  
136 - replay(this.transaction);  
137 -  
138 - assertEquals(null, this.interceptor.manage(this.ic));  
139 - verify();  
140 - }  
141 -  
142 - @Test  
143 - public void testManageWithAtiveTransaction() throws Exception {  
144 - expect(this.transaction.isActive()).andReturn(true).anyTimes();  
145 - replay(this.transaction);  
146 -  
147 - assertEquals(null, this.interceptor.manage(this.ic));  
148 - verify();  
149 - }  
150 -  
151 - @Test  
152 - public void testManageWithAtiveTransactionButTheTransactionWasInative() throws Exception {  
153 - expect(this.transaction.isActive()).andReturn(true).times(1);  
154 - expect(this.transaction.isActive()).andReturn(false).times(2);  
155 - replay(this.transaction);  
156 -  
157 - assertEquals(null, this.interceptor.manage(this.ic));  
158 - verify();  
159 - }  
160 -  
161 - @Test  
162 - public void testManageWithAtiveTransactionAndMethodThrowExceptionAndDoNotIsMarkedRollback() throws Exception {  
163 - expect(this.transaction.isActive()).andReturn(true).anyTimes();  
164 - expect(this.transaction.isMarkedRollback()).andReturn(false).anyTimes();  
165 - this.transaction.setRollbackOnly();  
166 - replay(this.transaction);  
167 -  
168 - this.ic = EasyMock.createMock(InvocationContext.class);  
169 - expect(this.ic.proceed()).andThrow(new DemoiselleException(""));  
170 - expect(this.ic.getMethod()).andReturn(ClassWithMethod.class.getMethod("method"));  
171 - replay(this.ic);  
172 -  
173 - try {  
174 - this.interceptor.manage(this.ic);  
175 - fail();  
176 - } catch (DemoiselleException cause) {  
177 - assertTrue(true);  
178 - }  
179 - verify();  
180 - }  
181 -  
182 - @Test  
183 - public void testManageWithAtiveTransactionAndMethodThrowExceptionAndIsMarkedRollback() throws Exception {  
184 - expect(this.transaction.isActive()).andReturn(true).anyTimes();  
185 - expect(this.transaction.isMarkedRollback()).andReturn(true).anyTimes();  
186 - this.transaction.setRollbackOnly();  
187 - replay(this.transaction);  
188 -  
189 - this.ic = EasyMock.createMock(InvocationContext.class);  
190 - expect(this.ic.proceed()).andThrow(new DemoiselleException(""));  
191 - expect(this.ic.getMethod()).andReturn(ClassWithMethod.class.getMethod("method"));  
192 - replay(this.ic);  
193 -  
194 - try {  
195 - this.interceptor.manage(this.ic);  
196 - fail();  
197 - } catch (DemoiselleException cause) {  
198 - assertTrue(true);  
199 - }  
200 - verify();  
201 - }  
202 -} 1 +///*
  2 +// * Demoiselle Framework
  3 +// * Copyright (C) 2010 SERPRO
  4 +// * ----------------------------------------------------------------------------
  5 +// * This file is part of Demoiselle Framework.
  6 +// *
  7 +// * Demoiselle Framework is free software; you can redistribute it and/or
  8 +// * modify it under the terms of the GNU Lesser General Public License version 3
  9 +// * as published by the Free Software Foundation.
  10 +// *
  11 +// * This program is distributed in the hope that it will be useful,
  12 +// * but WITHOUT ANY WARRANTY; without even the implied warranty of
  13 +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  14 +// * GNU General Public License for more details.
  15 +// *
  16 +// * You should have received a copy of the GNU Lesser General Public License version 3
  17 +// * along with this program; if not, see <http://www.gnu.org/licenses/>
  18 +// * or write to the Free Software Foundation, Inc., 51 Franklin Street,
  19 +// * Fifth Floor, Boston, MA 02110-1301, USA.
  20 +// * ----------------------------------------------------------------------------
  21 +// * Este arquivo é parte do Framework Demoiselle.
  22 +// *
  23 +// * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou
  24 +// * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação
  25 +// * do Software Livre (FSF).
  26 +// *
  27 +// * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA
  28 +// * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou
  29 +// * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português
  30 +// * para maiores detalhes.
  31 +// *
  32 +// * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título
  33 +// * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>
  34 +// * ou escreva para a Fundação do Software Livre (FSF) Inc.,
  35 +// * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
  36 +// */
  37 +//package br.gov.frameworkdemoiselle.internal.interceptor;
  38 +//
  39 +//import static org.easymock.EasyMock.expect;
  40 +//import static org.easymock.EasyMock.verify;
  41 +//import static org.junit.Assert.assertEquals;
  42 +//import static org.junit.Assert.assertTrue;
  43 +//import static org.junit.Assert.fail;
  44 +//import static org.powermock.api.easymock.PowerMock.mockStatic;
  45 +//import static org.powermock.api.easymock.PowerMock.replay;
  46 +//import static org.powermock.api.easymock.PowerMock.replayAll;
  47 +//
  48 +//import java.util.Locale;
  49 +//
  50 +//import javax.enterprise.inject.Instance;
  51 +//import javax.interceptor.InvocationContext;
  52 +//
  53 +//import org.easymock.EasyMock;
  54 +//import org.junit.Before;
  55 +//import org.junit.Test;
  56 +//import org.junit.runner.RunWith;
  57 +//import org.powermock.core.classloader.annotations.PrepareForTest;
  58 +//import org.powermock.modules.junit4.PowerMockRunner;
  59 +//
  60 +//import br.gov.frameworkdemoiselle.DemoiselleException;
  61 +//import br.gov.frameworkdemoiselle.internal.implementation.TransactionInfo;
  62 +//import br.gov.frameworkdemoiselle.transaction.Transaction;
  63 +//import br.gov.frameworkdemoiselle.transaction.TransactionContext;
  64 +//import br.gov.frameworkdemoiselle.util.Beans;
  65 +//
  66 +//@RunWith(PowerMockRunner.class)
  67 +//@PrepareForTest(Beans.class)
  68 +//public class TransactionalInterceptorTest {
  69 +//
  70 +// private TransactionalInterceptor interceptor;
  71 +//
  72 +// private InvocationContext ic;
  73 +//
  74 +// private Transaction transaction;
  75 +//
  76 +// private TransactionContext transactionContext;
  77 +//
  78 +// class ClassWithMethod {
  79 +//
  80 +// public void method() {
  81 +// System.out.println("test method");
  82 +// }
  83 +// }
  84 +//
  85 +// @Before
  86 +// @SuppressWarnings("unchecked")
  87 +// public void setUp() throws Exception {
  88 +// Instance<Transaction> transactionInstance = EasyMock.createMock(Instance.class);
  89 +// Instance<TransactionInfo> transactionInfoInstance = EasyMock.createMock(Instance.class);
  90 +// Instance<TransactionContext> transactionContextInstance = EasyMock.createMock(Instance.class);
  91 +//
  92 +// TransactionInfo transactionInfo = new TransactionInfo();
  93 +// transaction = EasyMock.createMock(Transaction.class);
  94 +// this.transactionContext = EasyMock.createMock(TransactionContext.class);
  95 +// this.ic = EasyMock.createMock(InvocationContext.class);
  96 +//
  97 +// mockStatic(Beans.class);
  98 +// expect(Beans.getReference(Locale.class)).andReturn(Locale.getDefault());
  99 +// expect(Beans.getReference(TransactionContext.class)).andReturn(transactionContext);
  100 +// expect(Beans.getReference(TransactionInfo.class)).andReturn(transactionInfo);
  101 +//
  102 +// expect(transactionInstance.get()).andReturn(transaction).anyTimes();
  103 +// expect(transactionContextInstance.get()).andReturn(transactionContext).anyTimes();
  104 +// expect(transactionInfoInstance.get()).andReturn(transactionInfo).anyTimes();
  105 +// expect(transactionContext.getCurrentTransaction()).andReturn(transaction).anyTimes();
  106 +// expect(this.ic.proceed()).andReturn(null);
  107 +// expect(this.ic.getMethod()).andReturn(ClassWithMethod.class.getMethod("method"));
  108 +// replayAll(Beans.class, this.ic, transactionContextInstance, transactionInfoInstance, transactionInstance,
  109 +// transactionContext);
  110 +//
  111 +// this.interceptor = new TransactionalInterceptor();
  112 +//
  113 +// }
  114 +//
  115 +// @Test
  116 +// public void testManageWithInativeTransactionAndTransactionInterceptorBeginAndDoNotIsMarkedRollback()
  117 +// throws Exception {
  118 +// expect(this.transaction.isActive()).andReturn(false).times(1);
  119 +// expect(this.transaction.isActive()).andReturn(true).times(2);
  120 +// expect(this.transaction.isMarkedRollback()).andReturn(false).anyTimes();
  121 +// this.transaction.begin();
  122 +// this.transaction.commit();
  123 +// replay(this.transaction);
  124 +//
  125 +// assertEquals(null, this.interceptor.manage(this.ic));
  126 +// verify();
  127 +// }
  128 +//
  129 +// @Test
  130 +// public void testManageWithInativeTransactionAndTransactionInterceptorBeginAndIsMarkedRollback() throws Exception {
  131 +// expect(this.transaction.isActive()).andReturn(false).times(1);
  132 +// expect(this.transaction.isActive()).andReturn(true).times(2);
  133 +// expect(this.transaction.isMarkedRollback()).andReturn(true).anyTimes();
  134 +// this.transaction.begin();
  135 +// this.transaction.rollback();
  136 +// replay(this.transaction);
  137 +//
  138 +// assertEquals(null, this.interceptor.manage(this.ic));
  139 +// verify();
  140 +// }
  141 +//
  142 +// @Test
  143 +// public void testManageWithAtiveTransaction() throws Exception {
  144 +// expect(this.transaction.isActive()).andReturn(true).anyTimes();
  145 +// replay(this.transaction);
  146 +//
  147 +// assertEquals(null, this.interceptor.manage(this.ic));
  148 +// verify();
  149 +// }
  150 +//
  151 +// @Test
  152 +// public void testManageWithAtiveTransactionButTheTransactionWasInative() throws Exception {
  153 +// expect(this.transaction.isActive()).andReturn(true).times(1);
  154 +// expect(this.transaction.isActive()).andReturn(false).times(2);
  155 +// replay(this.transaction);
  156 +//
  157 +// assertEquals(null, this.interceptor.manage(this.ic));
  158 +// verify();
  159 +// }
  160 +//
  161 +// @Test
  162 +// public void testManageWithAtiveTransactionAndMethodThrowExceptionAndDoNotIsMarkedRollback() throws Exception {
  163 +// expect(this.transaction.isActive()).andReturn(true).anyTimes();
  164 +// expect(this.transaction.isMarkedRollback()).andReturn(false).anyTimes();
  165 +// this.transaction.setRollbackOnly();
  166 +// replay(this.transaction);
  167 +//
  168 +// this.ic = EasyMock.createMock(InvocationContext.class);
  169 +// expect(this.ic.proceed()).andThrow(new DemoiselleException(""));
  170 +// expect(this.ic.getMethod()).andReturn(ClassWithMethod.class.getMethod("method"));
  171 +// replay(this.ic);
  172 +//
  173 +// try {
  174 +// this.interceptor.manage(this.ic);
  175 +// fail();
  176 +// } catch (DemoiselleException cause) {
  177 +// assertTrue(true);
  178 +// }
  179 +// verify();
  180 +// }
  181 +//
  182 +// @Test
  183 +// public void testManageWithAtiveTransactionAndMethodThrowExceptionAndIsMarkedRollback() throws Exception {
  184 +// expect(this.transaction.isActive()).andReturn(true).anyTimes();
  185 +// expect(this.transaction.isMarkedRollback()).andReturn(true).anyTimes();
  186 +// this.transaction.setRollbackOnly();
  187 +// replay(this.transaction);
  188 +//
  189 +// this.ic = EasyMock.createMock(InvocationContext.class);
  190 +// expect(this.ic.proceed()).andThrow(new DemoiselleException(""));
  191 +// expect(this.ic.getMethod()).andReturn(ClassWithMethod.class.getMethod("method"));
  192 +// replay(this.ic);
  193 +//
  194 +// try {
  195 +// this.interceptor.manage(this.ic);
  196 +// fail();
  197 +// } catch (DemoiselleException cause) {
  198 +// assertTrue(true);
  199 +// }
  200 +// verify();
  201 +// }
  202 +//}