You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by po...@apache.org on 2017/11/29 23:13:34 UTC
incubator-tamaya-sandbox git commit: TAMAYA-321: Fix warnings
Repository: incubator-tamaya-sandbox
Updated Branches:
refs/heads/master 123c0c979 -> f85f35322
TAMAYA-321: Fix warnings
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/commit/f85f3532
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/f85f3532
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/f85f3532
Branch: refs/heads/master
Commit: f85f35322709a4baa887ddfbfd4d0a00fb409056
Parents: 123c0c9
Author: Phil Ottlinger <po...@apache.org>
Authored: Thu Nov 30 00:13:16 2017 +0100
Committer: Phil Ottlinger <po...@apache.org>
Committed: Thu Nov 30 00:13:16 2017 +0100
----------------------------------------------------------------------
.../ext/EnabledPropertySourceProvider.java | 15 ++++++++-------
.../metamodel/ext/FilteredPropertySource.java | 17 ++++++++++-------
.../metamodel/ext/RefreshablePropertySource.java | 2 +-
3 files changed, 19 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/f85f3532/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/EnabledPropertySourceProvider.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/EnabledPropertySourceProvider.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/EnabledPropertySourceProvider.java
index 88e0c78..6ccb734 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/EnabledPropertySourceProvider.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/EnabledPropertySourceProvider.java
@@ -18,19 +18,20 @@
*/
package org.apache.tamaya.metamodel.ext;
-import org.apache.tamaya.metamodel.Enabled;
-import org.apache.tamaya.spi.PropertySource;
-import org.apache.tamaya.spi.PropertySourceProvider;
-
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
-import javax.script.ScriptException;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import java.util.Objects;
import java.util.logging.Logger;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+
+import org.apache.tamaya.metamodel.Enabled;
+import org.apache.tamaya.spi.PropertySource;
+import org.apache.tamaya.spi.PropertySourceProvider;
+
/**
* Wrapped property source provider that allows enabling a property source using an
* {@code enabled} expression.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/f85f3532/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/FilteredPropertySource.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/FilteredPropertySource.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/FilteredPropertySource.java
index b67924b..a013532 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/FilteredPropertySource.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/FilteredPropertySource.java
@@ -18,11 +18,6 @@
*/
package org.apache.tamaya.metamodel.ext;
-import org.apache.tamaya.spi.*;
-import org.apache.tamaya.spisupport.propertysource.BasePropertySource;
-import org.apache.tamaya.spisupport.DefaultConfigurationContextBuilder;
-import org.apache.tamaya.spisupport.PropertySourceComparator;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -31,6 +26,15 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
+import org.apache.tamaya.spi.ConfigurationContext;
+import org.apache.tamaya.spi.FilterContext;
+import org.apache.tamaya.spi.PropertyFilter;
+import org.apache.tamaya.spi.PropertySource;
+import org.apache.tamaya.spi.PropertyValue;
+import org.apache.tamaya.spisupport.DefaultConfigurationBuilder;
+import org.apache.tamaya.spisupport.PropertySourceComparator;
+import org.apache.tamaya.spisupport.propertysource.BasePropertySource;
+
/**
* Property source that allows filtering on property source level. This class is thread-safe, accesses using or
* changing the filter list are synchronized.
@@ -39,8 +43,7 @@ public final class FilteredPropertySource extends BasePropertySource {
private PropertySource wrapped;
private List<PropertyFilter> filters = new ArrayList<>();
- private ConfigurationContext dummyContext = new DefaultConfigurationContextBuilder()
- .addPropertySources(this).build();
+ private ConfigurationContext dummyContext = new DefaultConfigurationBuilder().addPropertySources(this).build().getContext();
/**
* Constructor used privately. Use {@link #of(PropertySource)} for making a {@link PropertySource} filterable.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/f85f3532/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/RefreshablePropertySource.java
----------------------------------------------------------------------
diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/RefreshablePropertySource.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/RefreshablePropertySource.java
index b5152c7..efd046d 100644
--- a/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/RefreshablePropertySource.java
+++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/ext/RefreshablePropertySource.java
@@ -91,7 +91,7 @@ public final class RefreshablePropertySource
}
/**
- * Set the refresh period. This will be immedately applied from now. No explicit
+ * Set the refresh period. This will be immediately applied from now. No explicit
* refresh will be triggered now.
* @param units
* @param timeUnit