From d757db67c3927b26ae0b6af186fbfc242d6a66de Mon Sep 17 00:00:00 2001 From: Ednara Oliveira Date: Fri, 12 Apr 2013 09:34:41 -0300 Subject: [PATCH] Exceção de conversão de tipo --- impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationLoader.java | 7 ++++++- impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationMapValueExtractor.java | 5 +---- impl/core/src/main/resources/demoiselle-core-bundle.properties | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationLoader.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationLoader.java index 1bec4a6..ca190e9 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationLoader.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ConfigurationLoader.java @@ -53,6 +53,7 @@ import javax.validation.Validator; import javax.validation.ValidatorFactory; import org.apache.commons.configuration.AbstractConfiguration; +import org.apache.commons.configuration.ConversionException; import org.apache.commons.configuration.FileConfiguration; import org.apache.commons.configuration.PropertiesConfiguration; import org.apache.commons.configuration.SystemConfiguration; @@ -241,7 +242,11 @@ public class ConfigurationLoader implements Serializable { } catch (ConfigurationException cause) { throw cause; - } catch (Exception cause) { + } catch (ConversionException cause) { + throw new ConfigurationException(getBundle().getString("configuration-not-conversion" , this.prefix + getKey(field), field.getType().toString()) , cause); + } + + catch (Exception cause) { // TODO Lançar mensagem informando que houve erro ao tentar extrair o valor com o extrator tal. throw new ConfigurationException("", cause); } 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 af46003..a0b5970 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 @@ -74,10 +74,7 @@ public class ConfigurationMapValueExtractor implements ConfigurationValueExtract } String mapKey = matcher.group(3) == null ? "default" : matcher.group(3); - Object mapValue = configuration.getString(confKey); - if (!Strings.isEmpty((String) mapValue)){ - value.put(mapKey, mapValue); - } + value.put(mapKey, configuration.getString(confKey)); } } diff --git a/impl/core/src/main/resources/demoiselle-core-bundle.properties b/impl/core/src/main/resources/demoiselle-core-bundle.properties index cfef2af..674bc00 100644 --- a/impl/core/src/main/resources/demoiselle-core-bundle.properties +++ b/impl/core/src/main/resources/demoiselle-core-bundle.properties @@ -60,6 +60,7 @@ configuration-attribute-is-mandatory=A configura\u00E7\u00E3o {0} \u00E9 obrigat configuration-name-attribute-cant-be-empty=A nota\u00E7\u00E3o Name n\u00E3o pode estar em branco configuration-key-not-found=Chave de configura\u00E7\u00E3o {0} n\u00E3o encontrada configuration-extractor-not-found=N\u00E3o foi poss\u00EDvel encontrar a classe extratora para o atributo {0}. Implemente a interface {1} para criar sua classe extratora. +configuration-not-conversion=N\u00E3o \u00E9 poss\u00EDvel converter o valor {0} para o tipo {1} transaction-not-defined=Nenhuma transa\u00E7\u00E3o foi definida. Para utilizar @{0} \u00E9 preciso definir a propriedade frameworkdemoiselle.transaction.class com a estrat\u00E9gia de transa\u00E7\u00E3o desejada no arquivo demoiselle.properties executing-all=Executando todos os \: {0} -- libgit2 0.21.2