Repository: incubator-tamaya Updated Branches: refs/heads/master c95acfd5d -> f1800cc88
Fix warnings, add type info. Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/9b87e123 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/9b87e123 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/9b87e123 Branch: refs/heads/master Commit: 9b87e123aebbac8236cbc8d58372f1a85440dd9b Parents: c95acfd Author: Phil Ottlinger <[email protected]> Authored: Sat Jun 9 08:08:08 2018 +0200 Committer: Phil Ottlinger <[email protected]> Committed: Sat Jun 9 08:08:08 2018 +0200 ---------------------------------------------------------------------- .../propertysource/BasePropertySource.java | 15 +++++++-------- .../spisupport/propertysource/MapPropertySource.java | 2 +- .../PropertiesResourcePropertySource.java | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/9b87e123/code/spi-support/src/main/java/org/apache/tamaya/spisupport/propertysource/BasePropertySource.java ---------------------------------------------------------------------- diff --git a/code/spi-support/src/main/java/org/apache/tamaya/spisupport/propertysource/BasePropertySource.java b/code/spi-support/src/main/java/org/apache/tamaya/spisupport/propertysource/BasePropertySource.java index 4fded83..e8c35db 100644 --- a/code/spi-support/src/main/java/org/apache/tamaya/spisupport/propertysource/BasePropertySource.java +++ b/code/spi-support/src/main/java/org/apache/tamaya/spisupport/propertysource/BasePropertySource.java @@ -18,15 +18,14 @@ */ package org.apache.tamaya.spisupport.propertysource; -import org.apache.tamaya.spi.PropertySource; -import org.apache.tamaya.spi.PropertyValue; -import org.apache.tamaya.spi.PropertyValueBuilder; - import java.util.Map; import java.util.Objects; import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.tamaya.spi.PropertySource; +import org.apache.tamaya.spi.PropertyValue; + /** * Abstract {@link org.apache.tamaya.spi.PropertySource} that allows setting a default ordinal to be used, if no * ordinal is provided with the config. @@ -89,8 +88,8 @@ public abstract class BasePropertySource implements PropertySource{ } /** - * Allows setting the ordinal of this property source explcitly. This will override any evaluated - * ordinal, or default ordinal. To reset an explcit ordinal call {@code setOrdinal(null);}. + * Allows setting the ordinal of this property source explicitly. This will override any evaluated + * ordinal, or default ordinal. To reset an explicit ordinal call {@code setOrdinal(null);}. * @param ordinal the explicit ordinal, or {@code null}. */ public void setOrdinal(Integer ordinal){ @@ -98,8 +97,8 @@ public abstract class BasePropertySource implements PropertySource{ } /** - * Allows setting the ordinal of this property source explcitly. This will override any evaluated - * ordinal, or default ordinal. To reset an explcit ordinal call {@code setOrdinal(null);}. + * Allows setting the ordinal of this property source explicitly. This will override any evaluated + * ordinal, or default ordinal. To reset an explicit ordinal call {@code setOrdinal(null);}. * @param defaultOrdinal the default ordinal, or {@code null}. */ public void setDefaultOrdinal(Integer defaultOrdinal){ http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/9b87e123/code/spi-support/src/main/java/org/apache/tamaya/spisupport/propertysource/MapPropertySource.java ---------------------------------------------------------------------- diff --git a/code/spi-support/src/main/java/org/apache/tamaya/spisupport/propertysource/MapPropertySource.java b/code/spi-support/src/main/java/org/apache/tamaya/spisupport/propertysource/MapPropertySource.java index 7d637bb..a4a9bd7 100644 --- a/code/spi-support/src/main/java/org/apache/tamaya/spisupport/propertysource/MapPropertySource.java +++ b/code/spi-support/src/main/java/org/apache/tamaya/spisupport/propertysource/MapPropertySource.java @@ -87,7 +87,7 @@ public class MapPropertySource extends BasePropertySource { */ public static Map<String, String> getMap(Properties props) { Map<String, String> result = new HashMap<>(); - for (Map.Entry en : props.entrySet()) { + for (Map.Entry<?,?> en : props.entrySet()) { result.put(en.getKey().toString(), en.getValue().toString()); } return result; http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/9b87e123/code/spi-support/src/main/java/org/apache/tamaya/spisupport/propertysource/PropertiesResourcePropertySource.java ---------------------------------------------------------------------- diff --git a/code/spi-support/src/main/java/org/apache/tamaya/spisupport/propertysource/PropertiesResourcePropertySource.java b/code/spi-support/src/main/java/org/apache/tamaya/spisupport/propertysource/PropertiesResourcePropertySource.java index 94f2dec..ae800da 100644 --- a/code/spi-support/src/main/java/org/apache/tamaya/spisupport/propertysource/PropertiesResourcePropertySource.java +++ b/code/spi-support/src/main/java/org/apache/tamaya/spisupport/propertysource/PropertiesResourcePropertySource.java @@ -95,7 +95,7 @@ public class PropertiesResourcePropertySource extends MapPropertySource { try (InputStream is = url.openStream()) { Properties props = new Properties(); props.load(is); - for (Map.Entry en : props.entrySet()) { + for (Map.Entry<?,?> en : props.entrySet()) { result.put(en.getKey().toString(), en.getValue().toString()); } } catch (Exception e) {
