Download as
Browse Code »

Commit 020c2a425c193bd9f5595df0e9bca6c2d809ca01

Authored by Cleverson Sacramento
1 parent 759bd632
Exists in master

Modificando a localização das constantes de nível de prioridade

Showing 17 changed files with 42 additions and 43 deletions   Show diff stats
impl/core/src/main/java/br/gov/frameworkdemoiselle/annotation/Priority.java
  Diff comments   View file @020c2a4
... ... @@ -60,6 +60,14 @@ public @interface Priority {
60 60 */
61 61 static int MIN_PRIORITY = Integer.MAX_VALUE;
62 62  
  63 + static int L1_PRIORITY = MIN_PRIORITY;
  64 +
  65 + static int L2_PRIORITY = L1_PRIORITY - 100;
  66 +
  67 + static int L3_PRIORITY = L2_PRIORITY - 100;
  68 +
  69 + static int L4_PRIORITY = L3_PRIORITY - 100;
  70 +
63 71 /**
64 72 * An integer value defines the priority order.
65 73 */
... ...
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationArrayValueExtractor.java
  Diff comments   View file @020c2a4
... ... @@ -36,7 +36,7 @@
36 36 */
37 37 package br.gov.frameworkdemoiselle.internal.implementation;
38 38  
39   -import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY;
  39 +import static br.gov.frameworkdemoiselle.annotation.Priority.L2_PRIORITY;
40 40  
41 41 import java.lang.reflect.Field;
42 42  
... ... @@ -46,7 +46,7 @@ import org.apache.commons.configuration.DataConfiguration;
46 46 import br.gov.frameworkdemoiselle.annotation.Priority;
47 47 import br.gov.frameworkdemoiselle.configuration.ConfigurationValueExtractor;
48 48  
49   -@Priority(EXTENSIONS_L1_PRIORITY)
  49 +@Priority(L2_PRIORITY)
50 50 public class ConfigurationArrayValueExtractor implements ConfigurationValueExtractor {
51 51  
52 52 @Override
... ...
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationClassValueExtractor.java
  Diff comments   View file @020c2a4
... ... @@ -36,7 +36,7 @@
36 36 */
37 37 package br.gov.frameworkdemoiselle.internal.implementation;
38 38  
39   -import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY;
  39 +import static br.gov.frameworkdemoiselle.annotation.Priority.L2_PRIORITY;
40 40  
41 41 import java.lang.reflect.Field;
42 42  
... ... @@ -46,7 +46,7 @@ import br.gov.frameworkdemoiselle.annotation.Priority;
46 46 import br.gov.frameworkdemoiselle.configuration.ConfigurationValueExtractor;
47 47 import br.gov.frameworkdemoiselle.util.Reflections;
48 48  
49   -@Priority(EXTENSIONS_L1_PRIORITY)
  49 +@Priority(L2_PRIORITY)
50 50 public class ConfigurationClassValueExtractor implements ConfigurationValueExtractor {
51 51  
52 52 @Override
... ...
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationMapValueExtractor.java
  Diff comments   View file @020c2a4
... ... @@ -36,7 +36,7 @@
36 36 */
37 37 package br.gov.frameworkdemoiselle.internal.implementation;
38 38  
39   -import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY;
  39 +import static br.gov.frameworkdemoiselle.annotation.Priority.L2_PRIORITY;
40 40  
41 41 import java.lang.reflect.Field;
42 42 import java.util.HashMap;
... ... @@ -50,7 +50,7 @@ import org.apache.commons.configuration.Configuration;
50 50 import br.gov.frameworkdemoiselle.annotation.Priority;
51 51 import br.gov.frameworkdemoiselle.configuration.ConfigurationValueExtractor;
52 52  
53   -@Priority(EXTENSIONS_L1_PRIORITY)
  53 +@Priority(L2_PRIORITY)
54 54 public class ConfigurationMapValueExtractor implements ConfigurationValueExtractor {
55 55  
56 56 @Override
... ...
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationPrimitiveOrWrapperValueExtractor.java
  Diff comments   View file @020c2a4
... ... @@ -36,7 +36,7 @@
36 36 */
37 37 package br.gov.frameworkdemoiselle.internal.implementation;
38 38  
39   -import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY;
  39 +import static br.gov.frameworkdemoiselle.annotation.Priority.L2_PRIORITY;
40 40  
41 41 import java.lang.reflect.Field;
42 42 import java.util.HashSet;
... ... @@ -50,7 +50,7 @@ import org.apache.commons.lang.ClassUtils;
50 50 import br.gov.frameworkdemoiselle.annotation.Priority;
51 51 import br.gov.frameworkdemoiselle.configuration.ConfigurationValueExtractor;
52 52  
53   -@Priority(EXTENSIONS_L1_PRIORITY)
  53 +@Priority(L2_PRIORITY)
54 54 public class ConfigurationPrimitiveOrWrapperValueExtractor implements ConfigurationValueExtractor {
55 55  
56 56 private static final Set<Object> wrappers = new HashSet<Object>();
... ...
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationStringValueExtractor.java
  Diff comments   View file @020c2a4
... ... @@ -36,7 +36,7 @@
36 36 */
37 37 package br.gov.frameworkdemoiselle.internal.implementation;
38 38  
39   -import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY;
  39 +import static br.gov.frameworkdemoiselle.annotation.Priority.L2_PRIORITY;
40 40  
41 41 import java.lang.reflect.Field;
42 42  
... ... @@ -45,7 +45,7 @@ import org.apache.commons.configuration.Configuration;
45 45 import br.gov.frameworkdemoiselle.annotation.Priority;
46 46 import br.gov.frameworkdemoiselle.configuration.ConfigurationValueExtractor;
47 47  
48   -@Priority(EXTENSIONS_L1_PRIORITY)
  48 +@Priority(L2_PRIORITY)
49 49 public class ConfigurationStringValueExtractor implements ConfigurationValueExtractor {
50 50  
51 51 @Override
... ...
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultAuthenticator.java
  Diff comments   View file @020c2a4
... ... @@ -36,14 +36,16 @@
36 36 */
37 37 package br.gov.frameworkdemoiselle.internal.implementation;
38 38  
39   -import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.CORE_PRIORITY;
  39 +import static br.gov.frameworkdemoiselle.annotation.Priority.L1_PRIORITY;
  40 +
  41 +import java.security.Principal;
  42 +
40 43 import br.gov.frameworkdemoiselle.DemoiselleException;
41 44 import br.gov.frameworkdemoiselle.annotation.Priority;
42 45 import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
43 46 import br.gov.frameworkdemoiselle.security.AuthenticationException;
44 47 import br.gov.frameworkdemoiselle.security.Authenticator;
45 48 import br.gov.frameworkdemoiselle.security.SecurityContext;
46   -import br.gov.frameworkdemoiselle.security.User;
47 49 import br.gov.frameworkdemoiselle.util.ResourceBundle;
48 50  
49 51 /**
... ... @@ -52,8 +54,7 @@ import br.gov.frameworkdemoiselle.util.ResourceBundle;
52 54 * @author SERPRO
53 55 * @see Authenticator
54 56 */
55   -@SuppressWarnings("deprecation")
56   -@Priority(CORE_PRIORITY)
  57 +@Priority(L1_PRIORITY)
57 58 public class DefaultAuthenticator implements Authenticator {
58 59  
59 60 private static final long serialVersionUID = 1L;
... ... @@ -80,7 +81,7 @@ public class DefaultAuthenticator implements Authenticator {
80 81 * @see br.gov.frameworkdemoiselle.security.Authenticator#getUser()
81 82 */
82 83 @Override
83   - public User getUser() {
  84 + public Principal getUser() {
84 85 throw getException();
85 86 }
86 87  
... ...
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultAuthorizer.java
  Diff comments   View file @020c2a4
... ... @@ -36,7 +36,7 @@
36 36 */
37 37 package br.gov.frameworkdemoiselle.internal.implementation;
38 38  
39   -import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.CORE_PRIORITY;
  39 +import static br.gov.frameworkdemoiselle.annotation.Priority.L1_PRIORITY;
40 40 import br.gov.frameworkdemoiselle.DemoiselleException;
41 41 import br.gov.frameworkdemoiselle.annotation.Priority;
42 42 import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
... ... @@ -50,7 +50,7 @@ import br.gov.frameworkdemoiselle.util.ResourceBundle;
50 50 * @author SERPRO
51 51 * @see Authorizer
52 52 */
53   -@Priority(CORE_PRIORITY)
  53 +@Priority(L1_PRIORITY)
54 54 public class DefaultAuthorizer implements Authorizer {
55 55  
56 56 private static final long serialVersionUID = 1L;
... ...
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/DefaultTransaction.java
  Diff comments   View file @020c2a4
... ... @@ -36,7 +36,7 @@
36 36 */
37 37 package br.gov.frameworkdemoiselle.internal.implementation;
38 38  
39   -import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.CORE_PRIORITY;
  39 +import static br.gov.frameworkdemoiselle.annotation.Priority.L1_PRIORITY;
40 40 import br.gov.frameworkdemoiselle.DemoiselleException;
41 41 import br.gov.frameworkdemoiselle.annotation.Priority;
42 42 import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
... ... @@ -50,7 +50,7 @@ import br.gov.frameworkdemoiselle.util.ResourceBundle;
50 50 * @author SERPRO
51 51 * @see Transaction
52 52 */
53   -@Priority(CORE_PRIORITY)
  53 +@Priority(L1_PRIORITY)
54 54 public class DefaultTransaction implements Transaction {
55 55  
56 56 private static final long serialVersionUID = 1L;
... ...
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/LoggerMessageAppender.java
  Diff comments   View file @020c2a4
... ... @@ -36,7 +36,7 @@
36 36 */
37 37 package br.gov.frameworkdemoiselle.internal.implementation;
38 38  
39   -import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.CORE_PRIORITY;
  39 +import static br.gov.frameworkdemoiselle.annotation.Priority.L1_PRIORITY;
40 40  
41 41 import javax.inject.Inject;
42 42  
... ... @@ -46,7 +46,7 @@ import br.gov.frameworkdemoiselle.annotation.Priority;
46 46 import br.gov.frameworkdemoiselle.message.Message;
47 47 import br.gov.frameworkdemoiselle.message.MessageAppender;
48 48  
49   -@Priority(CORE_PRIORITY)
  49 +@Priority(L1_PRIORITY)
50 50 public class LoggerMessageAppender implements MessageAppender {
51 51  
52 52 private static final long serialVersionUID = 1L;
... ...
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/StrategySelector.java
  Diff comments   View file @020c2a4
... ... @@ -36,8 +36,6 @@
36 36 */
37 37 package br.gov.frameworkdemoiselle.internal.implementation;
38 38  
39   -import static br.gov.frameworkdemoiselle.annotation.Priority.MIN_PRIORITY;
40   -
41 39 import java.io.Serializable;
42 40 import java.util.ArrayList;
43 41 import java.util.Collection;
... ... @@ -58,14 +56,6 @@ import br.gov.frameworkdemoiselle.util.ResourceBundle;
58 56  
59 57 public final class StrategySelector implements Serializable {
60 58  
61   - public static final int CORE_PRIORITY = MIN_PRIORITY;
62   -
63   - public static final int EXTENSIONS_L1_PRIORITY = CORE_PRIORITY - 100;
64   -
65   - public static final int EXTENSIONS_L2_PRIORITY = EXTENSIONS_L1_PRIORITY - 100;
66   -
67   - public static final int COMPONENTS_PRIORITY = EXTENSIONS_L2_PRIORITY - 100;
68   -
69 59 private static final long serialVersionUID = 1L;
70 60  
71 61 private static ResourceBundle bundle;
... ...
impl/extension/jdbc/src/main/java/br/gov/frameworkdemoiselle/transaction/JDBCTransaction.java
  Diff comments   View file @020c2a4
... ... @@ -36,7 +36,7 @@
36 36 */
37 37 package br.gov.frameworkdemoiselle.transaction;
38 38  
39   -import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY;
  39 +import static br.gov.frameworkdemoiselle.annotation.Priority.L2_PRIORITY;
40 40  
41 41 import java.io.Serializable;
42 42 import java.sql.Connection;
... ... @@ -55,7 +55,7 @@ import br.gov.frameworkdemoiselle.util.Beans;
55 55 * @author SERPRO
56 56 * @see Transaction
57 57 */
58   -@Priority(EXTENSIONS_L1_PRIORITY)
  58 +@Priority(L2_PRIORITY)
59 59 public class JDBCTransaction implements Transaction {
60 60  
61 61 private static final long serialVersionUID = 1L;
... ...
impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/transaction/JPATransaction.java
  Diff comments   View file @020c2a4
... ... @@ -36,7 +36,7 @@
36 36 */
37 37 package br.gov.frameworkdemoiselle.transaction;
38 38  
39   -import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY;
  39 +import static br.gov.frameworkdemoiselle.annotation.Priority.L2_PRIORITY;
40 40  
41 41 import java.util.Collection;
42 42  
... ... @@ -53,7 +53,7 @@ import br.gov.frameworkdemoiselle.util.Beans;
53 53 * @author SERPRO
54 54 * @see Transaction
55 55 */
56   -@Priority(EXTENSIONS_L1_PRIORITY)
  56 +@Priority(L2_PRIORITY)
57 57 public class JPATransaction implements Transaction {
58 58  
59 59 private static final long serialVersionUID = 1L;
... ...
impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/FacesMessageAppender.java
  Diff comments   View file @020c2a4
... ... @@ -36,13 +36,13 @@
36 36 */
37 37 package br.gov.frameworkdemoiselle.internal.implementation;
38 38  
39   -import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L2_PRIORITY;
  39 +import static br.gov.frameworkdemoiselle.annotation.Priority.L3_PRIORITY;
40 40 import br.gov.frameworkdemoiselle.annotation.Priority;
41 41 import br.gov.frameworkdemoiselle.message.Message;
42 42 import br.gov.frameworkdemoiselle.message.MessageAppender;
43 43 import br.gov.frameworkdemoiselle.util.Faces;
44 44  
45   -@Priority(EXTENSIONS_L2_PRIORITY)
  45 +@Priority(L3_PRIORITY)
46 46 public class FacesMessageAppender implements MessageAppender {
47 47  
48 48 private static final long serialVersionUID = 1L;
... ...
impl/extension/jta/src/main/java/br/gov/frameworkdemoiselle/transaction/JTATransaction.java
  Diff comments   View file @020c2a4
... ... @@ -36,7 +36,7 @@
36 36 */
37 37 package br.gov.frameworkdemoiselle.transaction;
38 38  
39   -import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L2_PRIORITY;
  39 +import static br.gov.frameworkdemoiselle.annotation.Priority.L3_PRIORITY;
40 40 import static javax.transaction.Status.STATUS_MARKED_ROLLBACK;
41 41 import static javax.transaction.Status.STATUS_NO_TRANSACTION;
42 42 import static javax.transaction.Status.STATUS_ROLLEDBACK;
... ... @@ -47,7 +47,7 @@ import javax.transaction.UserTransaction;
47 47 import br.gov.frameworkdemoiselle.annotation.Priority;
48 48 import br.gov.frameworkdemoiselle.util.Beans;
49 49  
50   -@Priority(EXTENSIONS_L2_PRIORITY)
  50 +@Priority(L3_PRIORITY)
51 51 public class JTATransaction implements Transaction {
52 52  
53 53 private static final long serialVersionUID = 1L;
... ...
impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/security/ServletAuthenticator.java
  Diff comments   View file @020c2a4
... ... @@ -36,7 +36,7 @@
36 36 */
37 37 package br.gov.frameworkdemoiselle.security;
38 38  
39   -import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY;
  39 +import static br.gov.frameworkdemoiselle.annotation.Priority.L2_PRIORITY;
40 40  
41 41 import java.security.Principal;
42 42  
... ... @@ -48,7 +48,7 @@ import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
48 48 import br.gov.frameworkdemoiselle.util.Beans;
49 49 import br.gov.frameworkdemoiselle.util.ResourceBundle;
50 50  
51   -@Priority(EXTENSIONS_L1_PRIORITY)
  51 +@Priority(L2_PRIORITY)
52 52 public class ServletAuthenticator implements Authenticator {
53 53  
54 54 private static final long serialVersionUID = 1L;
... ...
impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/security/ServletAuthorizer.java
  Diff comments   View file @020c2a4
... ... @@ -36,7 +36,7 @@
36 36 */
37 37 package br.gov.frameworkdemoiselle.security;
38 38  
39   -import static br.gov.frameworkdemoiselle.internal.implementation.StrategySelector.EXTENSIONS_L1_PRIORITY;
  39 +import static br.gov.frameworkdemoiselle.annotation.Priority.L2_PRIORITY;
40 40  
41 41 import javax.servlet.http.HttpServletRequest;
42 42  
... ... @@ -46,7 +46,7 @@ import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
46 46 import br.gov.frameworkdemoiselle.util.Beans;
47 47 import br.gov.frameworkdemoiselle.util.ResourceBundle;
48 48  
49   -@Priority(EXTENSIONS_L1_PRIORITY)
  49 +@Priority(L2_PRIORITY)
50 50 public class ServletAuthorizer implements Authorizer {
51 51  
52 52 private static final long serialVersionUID = 1L;
... ...