Repository: incubator-tamaya Updated Branches: refs/heads/master 5b0aebc9a -> ebe237cb9
Fixed CheckStyle issues and issues reported by FindBugs. Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/ebe237cb Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/ebe237cb Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/ebe237cb Branch: refs/heads/master Commit: ebe237cb91bdb4b5f8b74016fbac432ddc24716f Parents: 5b0aebc Author: Oliver B. Fischer <[email protected]> Authored: Wed Jan 21 02:08:13 2015 +0100 Committer: Oliver B. Fischer <[email protected]> Committed: Wed Jan 21 02:08:13 2015 +0100 ---------------------------------------------------------------------- .../apache/tamaya/core/internal/PropertyConverterManager.java | 3 +-- .../apache/tamaya/core/internal/converters/BooleanConverter.java | 2 +- .../apache/tamaya/core/internal/converters/EnumConverter.java | 4 +--- .../java/org/apache/tamaya/event/PropertyChangeSetBuilder.java | 2 -- 4 files changed, 3 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ebe237cb/java8/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java ---------------------------------------------------------------------- diff --git a/java8/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java b/java8/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java index fdfb03d..15af9ac 100644 --- a/java8/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java +++ b/java8/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java @@ -66,8 +66,7 @@ public class PropertyConverterManager { if(type==null || type.getActualTypeArguments().length==0){ LOG.warning(() -> "Failed to register PropertyConverter, no generic type information available: " + conv.getClass().getName()); - } - else { + } else { Type targetType = type.getActualTypeArguments()[0]; register((Class<?>)targetType, conv); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ebe237cb/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/BooleanConverter.java ---------------------------------------------------------------------- diff --git a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/BooleanConverter.java b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/BooleanConverter.java index 9eeda1b..a9cb5ad 100644 --- a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/BooleanConverter.java +++ b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/BooleanConverter.java @@ -36,7 +36,7 @@ public class BooleanConverter implements PropertyConverter<Boolean> { String ignoreCaseValue = Objects.requireNonNull(value) .trim() .toLowerCase(Locale.ENGLISH); - + switch(ignoreCaseValue) { case "yes": case "y": http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ebe237cb/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/EnumConverter.java ---------------------------------------------------------------------- diff --git a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/EnumConverter.java b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/EnumConverter.java index 902ce87..652c808 100644 --- a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/EnumConverter.java +++ b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/EnumConverter.java @@ -51,10 +51,8 @@ public class EnumConverter<T> implements PropertyConverter<T> { public T convert(String value) { try { return (T) factory.invoke(null, value); - } - catch (InvocationTargetException | IllegalAccessException e) { + } catch (InvocationTargetException | IllegalAccessException e) { throw new ConfigException("Invalid enum value '" + value + "' for " + enumType.getName(), e); } - } } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ebe237cb/modules/injection/src/main/java/org/apache/tamaya/event/PropertyChangeSetBuilder.java ---------------------------------------------------------------------- diff --git a/modules/injection/src/main/java/org/apache/tamaya/event/PropertyChangeSetBuilder.java b/modules/injection/src/main/java/org/apache/tamaya/event/PropertyChangeSetBuilder.java index 57a6264..99fa9e5 100644 --- a/modules/injection/src/main/java/org/apache/tamaya/event/PropertyChangeSetBuilder.java +++ b/modules/injection/src/main/java/org/apache/tamaya/event/PropertyChangeSetBuilder.java @@ -20,7 +20,6 @@ package org.apache.tamaya.event; import org.apache.tamaya.spi.PropertySource; -import java.beans.PropertyChangeEvent; import java.util.*; /** @@ -122,7 +121,6 @@ public final class PropertyChangeSetBuilder { * @return the builder for chaining. */ public PropertyChangeSetBuilder addChanges(Map<String,String> map1, Map<String,String> map2) { - List<PropertyChangeEvent> changes = new ArrayList<>(); for (Map.Entry<String, String> en : map1.entrySet()) { String val = map2.get(en.getKey()); if (val==null) {
