diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/configuration/Configuration.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/configuration/Configuration.java index a1f0a13..e9eff1a 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/configuration/Configuration.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/configuration/Configuration.java @@ -61,7 +61,6 @@ import javax.enterprise.util.Nonbinding; * * @author SERPRO */ -// @Singleton @Stereotype @Inherited @Target(TYPE) diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoader.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoader.java index 434e438..21fcd55 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoader.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoader.java @@ -160,10 +160,16 @@ public class ConfigurationLoader implements Serializable { Configuration classAnnotation = type.getAnnotation(Configuration.class); if (!Strings.isEmpty(classAnnotation.prefix())) { - // TODO Verificar se o prefixo foi informado sem o ponto. Se sim, emitir um log do tipo WARN avisando para o - // usuário corrigir manualmente e colocar o ponto automaticamente para evitar quebra de compatibilidade. + prefix = classAnnotation.prefix(); - prefix = classAnnotation.prefix() + "."; + if (prefix.charAt(prefix.length() - 1) != '.') { + getLogger().warn( + "ATENÇÃO!!! Informe o ponto (.) ao final da declaração do atributo prefix = \"" + prefix + + "\" da anotação @Configuration da classe " + type.getCanonicalName() + + " para evitar incompatibilidade com as próximas versões do Demoiselle."); + + prefix += "."; + } } return prefix; @@ -200,9 +206,12 @@ public class ConfigurationLoader implements Serializable { } } - // TODO Se a variável key estiver diferente de field.getName() neste ponto, emitir um log WARN avisando que o - // formato encontrado em key deve ser definido manualmente utilizando a anotação @Name no atributo - // correspondente da classe de configuração do usuário. + if (!field.getName().equals(key)) { + getLogger().warn( + "ATENÇÃO!!! Anote o atributo " + field.getName() + " da classe " + + field.getDeclaringClass().getCanonicalName() + " com @Name(\"" + key + + "\") para evitar incompatibilidade com as próximas versões do Demoiselle."); + } if (matches == 0) { getLogger().debug(getBundle().getString("configuration-key-not-found", key, conventions)); diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/PaginationConfig.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/PaginationConfig.java index 7dbabb2..6b7c942 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/PaginationConfig.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/PaginationConfig.java @@ -47,7 +47,7 @@ import br.gov.frameworkdemoiselle.configuration.Configuration; * * @author SERPRO */ -@Configuration(prefix = "frameworkdemoiselle.pagination") +@Configuration(prefix = "frameworkdemoiselle.pagination.") public class PaginationConfig implements Serializable { private static final long serialVersionUID = 1L; diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfigImpl.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfigImpl.java index a8c7365..4bd6976 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfigImpl.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/SecurityConfigImpl.java @@ -38,19 +38,23 @@ package br.gov.frameworkdemoiselle.internal.configuration; import java.io.Serializable; +import br.gov.frameworkdemoiselle.annotation.Name; import br.gov.frameworkdemoiselle.configuration.Configuration; import br.gov.frameworkdemoiselle.security.Authenticator; import br.gov.frameworkdemoiselle.security.Authorizer; -@Configuration(prefix = "frameworkdemoiselle.security") +@Configuration(prefix = "frameworkdemoiselle.security.") public class SecurityConfigImpl implements Serializable, SecurityConfig { private static final long serialVersionUID = 1L; + @Name("enabled") private boolean enabled = true; + @Name("authenticator.class") private Class authenticatorClass; + @Name("authorizer.class") private Class authorizerClass; /* diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/TransactionConfig.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/TransactionConfig.java index 2a9cdd7..ecad868 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/TransactionConfig.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/TransactionConfig.java @@ -42,7 +42,7 @@ import br.gov.frameworkdemoiselle.annotation.Name; import br.gov.frameworkdemoiselle.configuration.Configuration; import br.gov.frameworkdemoiselle.transaction.Transaction; -@Configuration(prefix = "frameworkdemoiselle.transaction") +@Configuration(prefix = "frameworkdemoiselle.transaction.") public class TransactionConfig implements Serializable { private static final long serialVersionUID = 1L; diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoaderTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoaderTest.java index 8a00157..de636ff 100644 --- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoaderTest.java +++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/internal/configuration/ConfigurationLoaderTest.java @@ -133,7 +133,7 @@ public class ConfigurationLoaderTest { } - @Configuration(prefix = "frameworkdemoiselle.configurationtest") + @Configuration(prefix = "frameworkdemoiselle.configurationtest.") public class ConfigurationWithPrefix { @Name("nameConfiguration") @@ -282,7 +282,7 @@ public class ConfigurationLoaderTest { } - @Configuration(prefix = "br.gov.frameworkdemoiselle") + @Configuration(prefix = "br.gov.frameworkdemoiselle.") public class ConfigurationPropertiesSuccessWithPrefixNonAmbiguous { protected String success; diff --git a/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/EntityManagerConfig.java b/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/EntityManagerConfig.java index 9fefb52..36c66cd 100644 --- a/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/EntityManagerConfig.java +++ b/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/EntityManagerConfig.java @@ -44,7 +44,7 @@ import br.gov.frameworkdemoiselle.configuration.Configuration; /** * Configuration class responsible for retrieving specific entity manager parameter values from properties file. */ -@Configuration(prefix = "frameworkdemoiselle.persistence") +@Configuration(prefix = "frameworkdemoiselle.persistence.") public class EntityManagerConfig implements Serializable { private static final long serialVersionUID = 1L; diff --git a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ExceptionHandlerConfig.java b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ExceptionHandlerConfig.java index 5124283..b335c39 100644 --- a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ExceptionHandlerConfig.java +++ b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/ExceptionHandlerConfig.java @@ -41,7 +41,7 @@ import java.io.Serializable; import br.gov.frameworkdemoiselle.annotation.Name; import br.gov.frameworkdemoiselle.configuration.Configuration; -@Configuration(prefix = "frameworkdemoiselle.handle") +@Configuration(prefix = "frameworkdemoiselle.handle.") public class ExceptionHandlerConfig implements Serializable { private static final long serialVersionUID = 1L; diff --git a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/JsfSecurityConfig.java b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/JsfSecurityConfig.java index 05a5c98..670d33a 100644 --- a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/JsfSecurityConfig.java +++ b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/JsfSecurityConfig.java @@ -41,7 +41,7 @@ import java.io.Serializable; import br.gov.frameworkdemoiselle.annotation.Name; import br.gov.frameworkdemoiselle.configuration.Configuration; -@Configuration(prefix = "frameworkdemoiselle.security") +@Configuration(prefix = "frameworkdemoiselle.security.") public class JsfSecurityConfig implements Serializable { private static final long serialVersionUID = 1L; @@ -49,7 +49,6 @@ public class JsfSecurityConfig implements Serializable { @Name("login.page") private String loginPage = "/login"; - // @Name("welcome.page") @Name("redirect.after.login") private String redirectAfterLogin = "/index"; -- libgit2 0.21.2