diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/annotation/Priority.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/annotation/Priority.java index 32a5e9b..61fe0e1 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/annotation/Priority.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/annotation/Priority.java @@ -60,6 +60,14 @@ public @interface Priority { */ static int MIN_PRIORITY = Integer.MAX_VALUE; + static int L1_PRIORITY = MIN_PRIORITY; + + static int L2_PRIORITY = L1_PRIORITY - 100; + + static int L3_PRIORITY = L2_PRIORITY - 100; + + static int L4_PRIORITY = L3_PRIORITY - 100; + /** * An integer value defines the priority order. */ diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationArrayValueExtractor.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationArrayValueExtractor.java index d62bbcd..d6f69ac 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationArrayValueExtractor.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationArrayValueExtractor.java @@ -36,7 +36,7 @@ */ package br.gov.frameworkdemoiselle.internal.implementation; -import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY; +import static br.gov.frameworkdemoiselle.annotation.Priority.L2_PRIORITY; import java.lang.reflect.Field; @@ -46,7 +46,7 @@ import org.apache.commons.configuration.DataConfiguration; import br.gov.frameworkdemoiselle.annotation.Priority; import br.gov.frameworkdemoiselle.configuration.ConfigurationValueExtractor; -@Priority(EXTENSIONS_L1_PRIORITY) +@Priority(L2_PRIORITY) public class ConfigurationArrayValueExtractor implements ConfigurationValueExtractor { @Override diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationClassValueExtractor.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationClassValueExtractor.java index 42d2210..fe778b0 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationClassValueExtractor.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationClassValueExtractor.java @@ -36,7 +36,7 @@ */ package br.gov.frameworkdemoiselle.internal.implementation; -import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY; +import static br.gov.frameworkdemoiselle.annotation.Priority.L2_PRIORITY; import java.lang.reflect.Field; @@ -46,7 +46,7 @@ import br.gov.frameworkdemoiselle.annotation.Priority; import br.gov.frameworkdemoiselle.configuration.ConfigurationValueExtractor; import br.gov.frameworkdemoiselle.util.Reflections; -@Priority(EXTENSIONS_L1_PRIORITY) +@Priority(L2_PRIORITY) public class ConfigurationClassValueExtractor implements ConfigurationValueExtractor { @Override diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationMapValueExtractor.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationMapValueExtractor.java index 08bc2a1..a5a7599 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationMapValueExtractor.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationMapValueExtractor.java @@ -36,7 +36,7 @@ */ package br.gov.frameworkdemoiselle.internal.implementation; -import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY; +import static br.gov.frameworkdemoiselle.annotation.Priority.L2_PRIORITY; import java.lang.reflect.Field; import java.util.HashMap; @@ -50,7 +50,7 @@ import org.apache.commons.configuration.Configuration; import br.gov.frameworkdemoiselle.annotation.Priority; import br.gov.frameworkdemoiselle.configuration.ConfigurationValueExtractor; -@Priority(EXTENSIONS_L1_PRIORITY) +@Priority(L2_PRIORITY) public class ConfigurationMapValueExtractor implements ConfigurationValueExtractor { @Override diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationPrimitiveOrWrapperValueExtractor.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationPrimitiveOrWrapperValueExtractor.java index b22799e..58ead78 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationPrimitiveOrWrapperValueExtractor.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationPrimitiveOrWrapperValueExtractor.java @@ -36,7 +36,7 @@ */ package br.gov.frameworkdemoiselle.internal.implementation; -import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY; +import static br.gov.frameworkdemoiselle.annotation.Priority.L2_PRIORITY; import java.lang.reflect.Field; import java.util.HashSet; @@ -50,7 +50,7 @@ import org.apache.commons.lang.ClassUtils; import br.gov.frameworkdemoiselle.annotation.Priority; import br.gov.frameworkdemoiselle.configuration.ConfigurationValueExtractor; -@Priority(EXTENSIONS_L1_PRIORITY) +@Priority(L2_PRIORITY) public class ConfigurationPrimitiveOrWrapperValueExtractor implements ConfigurationValueExtractor { private static final Set wrappers = new HashSet(); diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationStringValueExtractor.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationStringValueExtractor.java index 9166f3e..97a7106 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationStringValueExtractor.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationStringValueExtractor.java @@ -36,7 +36,7 @@ */ package br.gov.frameworkdemoiselle.internal.implementation; -import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY; +import static br.gov.frameworkdemoiselle.annotation.Priority.L2_PRIORITY; import java.lang.reflect.Field; @@ -45,7 +45,7 @@ import org.apache.commons.configuration.Configuration; import br.gov.frameworkdemoiselle.annotation.Priority; import br.gov.frameworkdemoiselle.configuration.ConfigurationValueExtractor; -@Priority(EXTENSIONS_L1_PRIORITY) +@Priority(L2_PRIORITY) public class ConfigurationStringValueExtractor implements ConfigurationValueExtractor { @Override diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultAuthenticator.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultAuthenticator.java index 9f56cba..c0fdb2b 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultAuthenticator.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultAuthenticator.java @@ -36,14 +36,16 @@ */ package br.gov.frameworkdemoiselle.internal.implementation; -import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.CORE_PRIORITY; +import static br.gov.frameworkdemoiselle.annotation.Priority.L1_PRIORITY; + +import java.security.Principal; + import br.gov.frameworkdemoiselle.DemoiselleException; import br.gov.frameworkdemoiselle.annotation.Priority; import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer; import br.gov.frameworkdemoiselle.security.AuthenticationException; import br.gov.frameworkdemoiselle.security.Authenticator; import br.gov.frameworkdemoiselle.security.SecurityContext; -import br.gov.frameworkdemoiselle.security.User; import br.gov.frameworkdemoiselle.util.ResourceBundle; /** @@ -52,8 +54,7 @@ import br.gov.frameworkdemoiselle.util.ResourceBundle; * @author SERPRO * @see Authenticator */ -@SuppressWarnings("deprecation") -@Priority(CORE_PRIORITY) +@Priority(L1_PRIORITY) public class DefaultAuthenticator implements Authenticator { private static final long serialVersionUID = 1L; @@ -80,7 +81,7 @@ public class DefaultAuthenticator implements Authenticator { * @see br.gov.frameworkdemoiselle.security.Authenticator#getUser() */ @Override - public User getUser() { + public Principal getUser() { throw getException(); } diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultAuthorizer.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultAuthorizer.java index b35a8c0..799d0c8 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultAuthorizer.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultAuthorizer.java @@ -36,7 +36,7 @@ */ package br.gov.frameworkdemoiselle.internal.implementation; -import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.CORE_PRIORITY; +import static br.gov.frameworkdemoiselle.annotation.Priority.L1_PRIORITY; import br.gov.frameworkdemoiselle.DemoiselleException; import br.gov.frameworkdemoiselle.annotation.Priority; import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer; @@ -50,7 +50,7 @@ import br.gov.frameworkdemoiselle.util.ResourceBundle; * @author SERPRO * @see Authorizer */ -@Priority(CORE_PRIORITY) +@Priority(L1_PRIORITY) public class DefaultAuthorizer implements Authorizer { private static final long serialVersionUID = 1L; diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultTransaction.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultTransaction.java index ff6eedc..d5a5730 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultTransaction.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultTransaction.java @@ -36,7 +36,7 @@ */ package br.gov.frameworkdemoiselle.internal.implementation; -import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.CORE_PRIORITY; +import static br.gov.frameworkdemoiselle.annotation.Priority.L1_PRIORITY; import br.gov.frameworkdemoiselle.DemoiselleException; import br.gov.frameworkdemoiselle.annotation.Priority; import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer; @@ -50,7 +50,7 @@ import br.gov.frameworkdemoiselle.util.ResourceBundle; * @author SERPRO * @see Transaction */ -@Priority(CORE_PRIORITY) +@Priority(L1_PRIORITY) public class DefaultTransaction implements Transaction { private static final long serialVersionUID = 1L; diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/LoggerMessageAppender.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/LoggerMessageAppender.java index 819cd8e..3e24c79 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/LoggerMessageAppender.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/LoggerMessageAppender.java @@ -36,7 +36,7 @@ */ package br.gov.frameworkdemoiselle.internal.implementation; -import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.CORE_PRIORITY; +import static br.gov.frameworkdemoiselle.annotation.Priority.L1_PRIORITY; import javax.inject.Inject; @@ -46,7 +46,7 @@ import br.gov.frameworkdemoiselle.annotation.Priority; import br.gov.frameworkdemoiselle.message.Message; import br.gov.frameworkdemoiselle.message.MessageAppender; -@Priority(CORE_PRIORITY) +@Priority(L1_PRIORITY) public class LoggerMessageAppender implements MessageAppender { private static final long serialVersionUID = 1L; diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/StrategySelector.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/StrategySelector.java index 5df5c1e..4b51153 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/StrategySelector.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/StrategySelector.java @@ -36,8 +36,6 @@ */ package br.gov.frameworkdemoiselle.internal.implementation; -import static br.gov.frameworkdemoiselle.annotation.Priority.MIN_PRIORITY; - import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; @@ -58,14 +56,6 @@ import br.gov.frameworkdemoiselle.util.ResourceBundle; public final class StrategySelector implements Serializable { - public static final int CORE_PRIORITY = MIN_PRIORITY; - - public static final int EXTENSIONS_L1_PRIORITY = CORE_PRIORITY - 100; - - public static final int EXTENSIONS_L2_PRIORITY = EXTENSIONS_L1_PRIORITY - 100; - - public static final int COMPONENTS_PRIORITY = EXTENSIONS_L2_PRIORITY - 100; - private static final long serialVersionUID = 1L; private static ResourceBundle bundle; diff --git a/impl/extension/jdbc/src/main/java/br/gov/frameworkdemoiselle/transaction/JDBCTransaction.java b/impl/extension/jdbc/src/main/java/br/gov/frameworkdemoiselle/transaction/JDBCTransaction.java index c73186a..9081bf4 100644 --- a/impl/extension/jdbc/src/main/java/br/gov/frameworkdemoiselle/transaction/JDBCTransaction.java +++ b/impl/extension/jdbc/src/main/java/br/gov/frameworkdemoiselle/transaction/JDBCTransaction.java @@ -36,7 +36,7 @@ */ package br.gov.frameworkdemoiselle.transaction; -import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY; +import static br.gov.frameworkdemoiselle.annotation.Priority.L2_PRIORITY; import java.io.Serializable; import java.sql.Connection; @@ -55,7 +55,7 @@ import br.gov.frameworkdemoiselle.util.Beans; * @author SERPRO * @see Transaction */ -@Priority(EXTENSIONS_L1_PRIORITY) +@Priority(L2_PRIORITY) public class JDBCTransaction implements Transaction { private static final long serialVersionUID = 1L; diff --git a/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/transaction/JPATransaction.java b/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/transaction/JPATransaction.java index dba4bb6..4b5193f 100644 --- a/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/transaction/JPATransaction.java +++ b/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/transaction/JPATransaction.java @@ -36,7 +36,7 @@ */ package br.gov.frameworkdemoiselle.transaction; -import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY; +import static br.gov.frameworkdemoiselle.annotation.Priority.L2_PRIORITY; import java.util.Collection; @@ -53,7 +53,7 @@ import br.gov.frameworkdemoiselle.util.Beans; * @author SERPRO * @see Transaction */ -@Priority(EXTENSIONS_L1_PRIORITY) +@Priority(L2_PRIORITY) public class JPATransaction implements Transaction { private static final long serialVersionUID = 1L; diff --git a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/FacesMessageAppender.java b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/FacesMessageAppender.java index 1f7add7..f9e8a7e 100644 --- a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/FacesMessageAppender.java +++ b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/FacesMessageAppender.java @@ -36,13 +36,13 @@ */ package br.gov.frameworkdemoiselle.internal.implementation; -import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L2_PRIORITY; +import static br.gov.frameworkdemoiselle.annotation.Priority.L3_PRIORITY; import br.gov.frameworkdemoiselle.annotation.Priority; import br.gov.frameworkdemoiselle.message.Message; import br.gov.frameworkdemoiselle.message.MessageAppender; import br.gov.frameworkdemoiselle.util.Faces; -@Priority(EXTENSIONS_L2_PRIORITY) +@Priority(L3_PRIORITY) public class FacesMessageAppender implements MessageAppender { private static final long serialVersionUID = 1L; diff --git a/impl/extension/jta/src/main/java/br/gov/frameworkdemoiselle/transaction/JTATransaction.java b/impl/extension/jta/src/main/java/br/gov/frameworkdemoiselle/transaction/JTATransaction.java index b6ed7de..8b1e838 100644 --- a/impl/extension/jta/src/main/java/br/gov/frameworkdemoiselle/transaction/JTATransaction.java +++ b/impl/extension/jta/src/main/java/br/gov/frameworkdemoiselle/transaction/JTATransaction.java @@ -36,7 +36,7 @@ */ package br.gov.frameworkdemoiselle.transaction; -import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L2_PRIORITY; +import static br.gov.frameworkdemoiselle.annotation.Priority.L3_PRIORITY; import static javax.transaction.Status.STATUS_MARKED_ROLLBACK; import static javax.transaction.Status.STATUS_NO_TRANSACTION; import static javax.transaction.Status.STATUS_ROLLEDBACK; @@ -47,7 +47,7 @@ import javax.transaction.UserTransaction; import br.gov.frameworkdemoiselle.annotation.Priority; import br.gov.frameworkdemoiselle.util.Beans; -@Priority(EXTENSIONS_L2_PRIORITY) +@Priority(L3_PRIORITY) public class JTATransaction implements Transaction { private static final long serialVersionUID = 1L; diff --git a/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/security/ServletAuthenticator.java b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/security/ServletAuthenticator.java index 01523c6..34064a3 100644 --- a/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/security/ServletAuthenticator.java +++ b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/security/ServletAuthenticator.java @@ -36,7 +36,7 @@ */ package br.gov.frameworkdemoiselle.security; -import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY; +import static br.gov.frameworkdemoiselle.annotation.Priority.L2_PRIORITY; import java.security.Principal; @@ -48,7 +48,7 @@ import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer; import br.gov.frameworkdemoiselle.util.Beans; import br.gov.frameworkdemoiselle.util.ResourceBundle; -@Priority(EXTENSIONS_L1_PRIORITY) +@Priority(L2_PRIORITY) public class ServletAuthenticator implements Authenticator { private static final long serialVersionUID = 1L; diff --git a/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/security/ServletAuthorizer.java b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/security/ServletAuthorizer.java index 45d89c8..9886757 100644 --- a/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/security/ServletAuthorizer.java +++ b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/security/ServletAuthorizer.java @@ -36,7 +36,7 @@ */ package br.gov.frameworkdemoiselle.security; -import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY; +import static br.gov.frameworkdemoiselle.annotation.Priority.L2_PRIORITY; import javax.servlet.http.HttpServletRequest; @@ -46,7 +46,7 @@ import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer; import br.gov.frameworkdemoiselle.util.Beans; import br.gov.frameworkdemoiselle.util.ResourceBundle; -@Priority(EXTENSIONS_L1_PRIORITY) +@Priority(L2_PRIORITY) public class ServletAuthorizer implements Authorizer { private static final long serialVersionUID = 1L; -- libgit2 0.21.2