tamaya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anat...@apache.org
Subject [4/4] incubator-tamaya git commit: Just updated refactoring done on dormant part (not compiling).
Date Fri, 13 Feb 2015 20:18:18 GMT
Just updated refactoring done on dormant part (not compiling).


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/68c9c7fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/68c9c7fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/68c9c7fc

Branch: refs/heads/master
Commit: 68c9c7fcf682caa3878ba4e6b1a165a9f4e444ce
Parents: ccb0668
Author: anatole <anatole@apache.org>
Authored: Fri Feb 13 21:15:04 2015 +0100
Committer: anatole <anatole@apache.org>
Committed: Fri Feb 13 21:17:16 2015 +0100

----------------------------------------------------------------------
 .../main/java/old/AbstractPropertySource.java   |  4 +--
 .../main/java/old/AggregatedPropertySource.java |  6 ++--
 .../src/main/java/old/AggregationPolicy.java    |  2 +-
 .../main/java/old/BuildablePropertySource.java  |  2 +-
 .../src/main/java/old/ConfigurationBuilder.java | 28 ++++++++---------
 .../main/java/old/ContextualPropertySource.java |  2 +-
 .../main/java/old/DelegatingPropertySource.java |  3 +-
 .../java/old/SubtractingPropertySource.java     |  2 +-
 .../tamaya/core/config/ConfigChangeSet.java     |  2 +-
 .../core/config/ConfigChangeSetBuilder.java     |  4 +--
 .../tamaya/core/config/FrozenConfiguration.java |  1 +
 .../core/properties/FrozenPropertySource.java   |  2 +-
 .../core/properties/MapBasedPropertySource.java |  3 +-
 .../properties/PropertySourceFunctions.java     |  6 ++--
 .../factories/PropertySourceFactory.java        | 32 ++++++++++----------
 .../factories/PropertySourcesBuilder.java       |  4 +--
 .../filtered/FilteredPropertySource.java        |  2 +-
 .../filtered/IntersectingPropertySource.java    |  5 ---
 .../filtered/MappedPropertySource.java          |  1 -
 .../java/org/apache/tamaya/JavaOneDemo.java     |  1 +
 .../properties/PropertySourceBuilderTest.java   |  2 +-
 .../tamaya/internal/TestConfigProvider.java     |  1 -
 .../apache/tamaya/ucs/UC1ReadProperties.java    |  2 +-
 .../apache/tamaya/ucs/UC2CombineProperties.java |  2 +-
 .../org.apache.tamaya.spi.PropertyFilter        | 20 ++++++++++++
 25 files changed, 75 insertions(+), 64 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/68c9c7fc/dormant/core/src/main/java/old/AbstractPropertySource.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/java/old/AbstractPropertySource.java b/dormant/core/src/main/java/old/AbstractPropertySource.java
index 7d188b5..879e5a2 100644
--- a/dormant/core/src/main/java/old/AbstractPropertySource.java
+++ b/dormant/core/src/main/java/old/AbstractPropertySource.java
@@ -21,10 +21,10 @@ package org.apache.tamaya.core.properties;
 import java.io.Serializable;
 import java.util.*;
 
-import org.apache.tamaya.PropertySource;
+import org.apache.tamaya.spi.PropertySource;
 
 /**
- * Abstract base class for implementing a {@link org.apache.tamaya.PropertySource}.
+ * Abstract base class for implementing a {@link org.apache.tamaya.spi.PropertySource}.
  */
 public abstract class AbstractPropertySource implements PropertySource, Serializable{
     /**

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/68c9c7fc/dormant/core/src/main/java/old/AggregatedPropertySource.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/java/old/AggregatedPropertySource.java b/dormant/core/src/main/java/old/AggregatedPropertySource.java
index 14ea651..e833533 100644
--- a/dormant/core/src/main/java/old/AggregatedPropertySource.java
+++ b/dormant/core/src/main/java/old/AggregatedPropertySource.java
@@ -18,12 +18,12 @@
  */
 package org.apache.tamaya.core.properties;
 
-import org.apache.tamaya.*;
+import org.apache.tamaya.spi.PropertySource;
 
 import java.util.*;
 
 /**
- * Implementation for a {@link org.apache.tamaya.PropertySource} that is an aggregate current
+ * Implementation for a {@link org.apache.tamaya.spi.PropertySource} that is an aggregate
current
  * multiple child instances. Controlled by an {@link org.apache.tamaya.AggregationPolicy}
the
  * following aggregations are supported:
  * <ul>
@@ -66,7 +66,7 @@ class AggregatedPropertySource extends AbstractPropertySource {
 	}
 
 	/**
-	 * Return the names current the {@link org.apache.tamaya.PropertySource} instances to be
+	 * Return the names current the {@link org.apache.tamaya.spi.PropertySource} instances to
be
 	 * aggregated in this instance, in the order current precedence (the first are
 	 * the weakest).
 	 * 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/68c9c7fc/dormant/core/src/main/java/old/AggregationPolicy.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/java/old/AggregationPolicy.java b/dormant/core/src/main/java/old/AggregationPolicy.java
index 99be931..c4c5fda 100644
--- a/dormant/core/src/main/java/old/AggregationPolicy.java
+++ b/dormant/core/src/main/java/old/AggregationPolicy.java
@@ -61,7 +61,7 @@ public interface AggregationPolicy {
     /**
      * Interpret later keys as override (additive and override), replacing
      * the key loaded earlier/fromMap previous contained
-     * {@link org.apache.tamaya.PropertySource}.
+     * {@link org.apache.tamaya.spi.PropertySource}.
      */
     public static final AggregationPolicy OVERRIDE = (k, v1, v2) -> v2;
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/68c9c7fc/dormant/core/src/main/java/old/BuildablePropertySource.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/java/old/BuildablePropertySource.java b/dormant/core/src/main/java/old/BuildablePropertySource.java
index 847fbe9..3a79429 100644
--- a/dormant/core/src/main/java/old/BuildablePropertySource.java
+++ b/dormant/core/src/main/java/old/BuildablePropertySource.java
@@ -17,7 +17,7 @@
  */
 package org.apache.tamaya.core.properties;
 
-import org.apache.tamaya.PropertySource;
+import org.apache.tamaya.spi.PropertySource;
 
 import java.util.Map;
 import java.util.Objects;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/68c9c7fc/dormant/core/src/main/java/old/ConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/java/old/ConfigurationBuilder.java b/dormant/core/src/main/java/old/ConfigurationBuilder.java
index a68e6f4..0b737fa 100644
--- a/dormant/core/src/main/java/old/ConfigurationBuilder.java
+++ b/dormant/core/src/main/java/old/ConfigurationBuilder.java
@@ -27,7 +27,7 @@ import java.util.function.Predicate;
 import java.util.function.Supplier;
 
 import org.apache.tamaya.Configuration;
-import org.apache.tamaya.PropertySource;
+import org.apache.tamaya.spi.PropertySource;
 import org.apache.tamaya.core.config.FreezedConfiguration;
 import org.apache.tamaya.core.properties.AggregationPolicy;
 import org.apache.tamaya.core.properties.PropertySourceBuilder;
@@ -145,7 +145,7 @@ public final class ConfigurationBuilder {
 
 
     /**
-     * Creates a new {@link org.apache.tamaya.PropertySource} using the given command line
arguments and adds it
+     * Creates a new {@link org.apache.tamaya.spi.PropertySource} using the given command
line arguments and adds it
      * using the current aggregation policy in place.
      *
      * @param args the command line arguments, not null.
@@ -157,7 +157,7 @@ public final class ConfigurationBuilder {
     }
 
     /**
-     * Creates a new read-only {@link org.apache.tamaya.PropertySource} by reading the according
path format. The effective format read
+     * Creates a new read-only {@link org.apache.tamaya.spi.PropertySource} by reading the
according path format. The effective format read
      * hereby are determined by the {@code PathResolverService} configured into the {@code
Bootstrap} SPI.
      * Properties read are aggregated using the current aggregation policy active.
      *
@@ -171,7 +171,7 @@ public final class ConfigurationBuilder {
 
 
     /**
-     * Creates a new read-only {@link org.apache.tamaya.PropertySource} by reading the according
path format. The effective format read
+     * Creates a new read-only {@link org.apache.tamaya.spi.PropertySource} by reading the
according path format. The effective format read
      * hereby are determined by the {@code PathResolverService} configured into the {@code
Bootstrap} SPI.
      * Properties read are aggregated using the current aggregation policy active.
      *
@@ -184,7 +184,7 @@ public final class ConfigurationBuilder {
     }
 
     /**
-     * Creates a new read-only {@link org.apache.tamaya.PropertySource} by reading the according
URL format.
+     * Creates a new read-only {@link org.apache.tamaya.spi.PropertySource} by reading the
according URL format.
      * Properties read are aggregated using the current aggregation policy active.
      *
      * @param urls the urls to be read, not null.
@@ -196,7 +196,7 @@ public final class ConfigurationBuilder {
     }
 
     /**
-     * Creates a new read-only {@link org.apache.tamaya.PropertySource} by reading the according
URL format.
+     * Creates a new read-only {@link org.apache.tamaya.spi.PropertySource} by reading the
according URL format.
      * Properties read are aggregated using the current aggregation policy active.
      *
      * @param urls the urls to be read, not null.
@@ -209,7 +209,7 @@ public final class ConfigurationBuilder {
 
 
     /**
-     * Creates a new read-only {@link org.apache.tamaya.PropertySource} based on the given
map.
+     * Creates a new read-only {@link org.apache.tamaya.spi.PropertySource} based on the
given map.
      * Properties read are aggregated using the current aggregation policy active.
      *
      * @param map the map to be added, not null.
@@ -242,7 +242,7 @@ public final class ConfigurationBuilder {
     }
 
     /**
-     * Adds the given {@link org.apache.tamaya.PropertySource} instances using the current
{@link AggregationPolicy}
+     * Adds the given {@link org.apache.tamaya.spi.PropertySource} instances using the current
{@link AggregationPolicy}
      * active.
      *
      * @param providers the maps to be included, not null.
@@ -255,7 +255,7 @@ public final class ConfigurationBuilder {
 
 
     /**
-     * Adds the given {@link org.apache.tamaya.PropertySource} instances using the current
{@link AggregationPolicy}
+     * Adds the given {@link org.apache.tamaya.spi.PropertySource} instances using the current
{@link AggregationPolicy}
      * active.
      *
      * @param providers the maps to be included, not null.
@@ -268,7 +268,7 @@ public final class ConfigurationBuilder {
 
 
     /**
-     * Intersetcs the current properties with the given {@link org.apache.tamaya.PropertySource}
instance.
+     * Intersetcs the current properties with the given {@link org.apache.tamaya.spi.PropertySource}
instance.
      *
      * @param providers the maps to be intersected, not null.
      * @return the builder for chaining.
@@ -280,7 +280,7 @@ public final class ConfigurationBuilder {
 
 
     /**
-     * Subtracts with the given {@link org.apache.tamaya.PropertySource} instance from the
current properties.
+     * Subtracts with the given {@link org.apache.tamaya.spi.PropertySource} instance from
the current properties.
      *
      * @param providers the maps to be subtracted, not null.
      * @return the builder for chaining.
@@ -313,7 +313,7 @@ public final class ConfigurationBuilder {
     }
 
     /**
-     * Creates a new contextual {@link org.apache.tamaya.PropertySource}. Contextual maps
delegate to different instances current PropertyMap depending
+     * Creates a new contextual {@link org.apache.tamaya.spi.PropertySource}. Contextual
maps delegate to different instances current PropertyMap depending
      * on the keys returned fromMap the isolationP
      *
      * @param mapSupplier          the supplier creating new provider instances
@@ -353,7 +353,7 @@ public final class ConfigurationBuilder {
     }
 
     /**
-     * Creates a {@link org.apache.tamaya.PropertySource} instance that is serializable and
immutable,
+     * Creates a {@link org.apache.tamaya.spi.PropertySource} instance that is serializable
and immutable,
      * so it can be sent over a network connection.
      *
      * @return the freezed instance, never null.
@@ -363,7 +363,7 @@ public final class ConfigurationBuilder {
     }
 
     /**
-     * Creates a {@link org.apache.tamaya.PropertySource} instance that is serializable and
immutable,
+     * Creates a {@link org.apache.tamaya.spi.PropertySource} instance that is serializable
and immutable,
      * so it can be sent over a network connection.
      *
      * @return the freezed instance, never null.

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/68c9c7fc/dormant/core/src/main/java/old/ContextualPropertySource.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/java/old/ContextualPropertySource.java b/dormant/core/src/main/java/old/ContextualPropertySource.java
index 6290706..3ff5e15 100644
--- a/dormant/core/src/main/java/old/ContextualPropertySource.java
+++ b/dormant/core/src/main/java/old/ContextualPropertySource.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tamaya.core.properties;
 
-import org.apache.tamaya.*;
+import org.apache.tamaya.spi.PropertySource;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/68c9c7fc/dormant/core/src/main/java/old/DelegatingPropertySource.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/java/old/DelegatingPropertySource.java b/dormant/core/src/main/java/old/DelegatingPropertySource.java
index 9cb9f57..7f4ce43 100644
--- a/dormant/core/src/main/java/old/DelegatingPropertySource.java
+++ b/dormant/core/src/main/java/old/DelegatingPropertySource.java
@@ -18,13 +18,12 @@
  */
 package old;
 
-import org.apache.tamaya.PropertySource;
 import org.apache.tamaya.spi.PropertySource;
 
 import java.util.*;
 
 /**
- * Implementation for a {@link org.apache.tamaya.PropertySource} that is an aggregate current
+ * Implementation for a {@link org.apache.tamaya.spi.PropertySource} that is an aggregate
current
  * multiple child instances. Controlled by an {@link org.apache.tamaya.AggregationPolicy}
the
  * following aggregations are supported:
  * <ul>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/68c9c7fc/dormant/core/src/main/java/old/SubtractingPropertySource.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/java/old/SubtractingPropertySource.java b/dormant/core/src/main/java/old/SubtractingPropertySource.java
index f78ceb9..4dc1d18 100644
--- a/dormant/core/src/main/java/old/SubtractingPropertySource.java
+++ b/dormant/core/src/main/java/old/SubtractingPropertySource.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tamaya.core.properties;
 
-import org.apache.tamaya.PropertySource;
+import org.apache.tamaya.spi.PropertySource;
 
 import java.util.*;
 import java.util.stream.Collectors;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/68c9c7fc/dormant/core/src/main/java/org/apache/tamaya/core/config/ConfigChangeSet.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/java/org/apache/tamaya/core/config/ConfigChangeSet.java
b/dormant/core/src/main/java/org/apache/tamaya/core/config/ConfigChangeSet.java
index 7ef3477..2c701c6 100644
--- a/dormant/core/src/main/java/org/apache/tamaya/core/config/ConfigChangeSet.java
+++ b/dormant/core/src/main/java/org/apache/tamaya/core/config/ConfigChangeSet.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tamaya.core.config;
 
-import org.apache.tamaya.PropertySource;
+import org.apache.tamaya.spi.PropertySource;
 
 import java.beans.PropertyChangeEvent;
 import java.io.Serializable;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/68c9c7fc/dormant/core/src/main/java/org/apache/tamaya/core/config/ConfigChangeSetBuilder.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/java/org/apache/tamaya/core/config/ConfigChangeSetBuilder.java
b/dormant/core/src/main/java/org/apache/tamaya/core/config/ConfigChangeSetBuilder.java
index 0b536e0..62b50ac 100644
--- a/dormant/core/src/main/java/org/apache/tamaya/core/config/ConfigChangeSetBuilder.java
+++ b/dormant/core/src/main/java/org/apache/tamaya/core/config/ConfigChangeSetBuilder.java
@@ -19,7 +19,7 @@
 package org.apache.tamaya.core.config;
 
 import org.apache.tamaya.Configuration;
-import org.apache.tamaya.PropertySource;
+import org.apache.tamaya.spi.PropertySource;
 
 import java.beans.PropertyChangeEvent;
 import java.util.*;
@@ -27,7 +27,7 @@ import java.util.function.Function;
 
 /**
  * Models a set current changes to be applied to a configuration/property provider.  Such
a set can be applied
- * to any {@link org.apache.tamaya.PropertySource} instance. If the provider is mutable it
may check the
+ * to any {@link org.apache.tamaya.spi.PropertySource} instance. If the provider is mutable
it may check the
  * version given and applyChanges the changes to the provider/configuration, including triggering
current regarding
  * change events.
  * <p>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/68c9c7fc/dormant/core/src/main/java/org/apache/tamaya/core/config/FrozenConfiguration.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/java/org/apache/tamaya/core/config/FrozenConfiguration.java
b/dormant/core/src/main/java/org/apache/tamaya/core/config/FrozenConfiguration.java
index 43d6957..f2eb7c2 100644
--- a/dormant/core/src/main/java/org/apache/tamaya/core/config/FrozenConfiguration.java
+++ b/dormant/core/src/main/java/org/apache/tamaya/core/config/FrozenConfiguration.java
@@ -20,6 +20,7 @@ package org.apache.tamaya.core.config;
 
 import org.apache.tamaya.*;
 import org.apache.tamaya.core.properties.PropertySourceBuilder;
+import org.apache.tamaya.spi.PropertySource;
 
 import java.io.Serializable;
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/68c9c7fc/dormant/core/src/main/java/org/apache/tamaya/core/properties/FrozenPropertySource.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/java/org/apache/tamaya/core/properties/FrozenPropertySource.java
b/dormant/core/src/main/java/org/apache/tamaya/core/properties/FrozenPropertySource.java
index 94da0f5..2fe1237 100644
--- a/dormant/core/src/main/java/org/apache/tamaya/core/properties/FrozenPropertySource.java
+++ b/dormant/core/src/main/java/org/apache/tamaya/core/properties/FrozenPropertySource.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tamaya.core.properties;
 
-import org.apache.tamaya.*;
+import org.apache.tamaya.spi.PropertySource;
 
 import java.io.Serializable;
 import java.lang.Override;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/68c9c7fc/dormant/core/src/main/java/org/apache/tamaya/core/properties/MapBasedPropertySource.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/java/org/apache/tamaya/core/properties/MapBasedPropertySource.java
b/dormant/core/src/main/java/org/apache/tamaya/core/properties/MapBasedPropertySource.java
index 26a8114..a224509 100644
--- a/dormant/core/src/main/java/org/apache/tamaya/core/properties/MapBasedPropertySource.java
+++ b/dormant/core/src/main/java/org/apache/tamaya/core/properties/MapBasedPropertySource.java
@@ -21,11 +21,10 @@ package org.apache.tamaya.core.properties;
 import java.lang.Override;
 import java.lang.String;
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 /**
- * Models a {@link org.apache.tamaya.PropertySource} that can be build using a builder pattern.
+ * Models a {@link org.apache.tamaya.spi.PropertySource} that can be build using a builder
pattern.
  */
 public class MapBasedPropertySource implements PropertySource {
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/68c9c7fc/dormant/core/src/main/java/org/apache/tamaya/core/properties/PropertySourceFunctions.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/java/org/apache/tamaya/core/properties/PropertySourceFunctions.java
b/dormant/core/src/main/java/org/apache/tamaya/core/properties/PropertySourceFunctions.java
index c081c94..f089f42 100644
--- a/dormant/core/src/main/java/org/apache/tamaya/core/properties/PropertySourceFunctions.java
+++ b/dormant/core/src/main/java/org/apache/tamaya/core/properties/PropertySourceFunctions.java
@@ -18,13 +18,11 @@
  */
 package org.apache.tamaya.core.properties;
 
-import org.apache.tamaya.PropertySource;
+import org.apache.tamaya.spi.PropertySource;
 
 import java.util.*;
-import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.function.UnaryOperator;
-import java.util.stream.Collectors;
 
 /**
  * Accessor that provides useful functions along with configuration.
@@ -65,7 +63,7 @@ public final class PropertySourceFunctions {
 
 
     /**
-     * Intersetcs the current properties with the given {@link org.apache.tamaya.PropertySource}
instance.
+     * Intersetcs the current properties with the given {@link org.apache.tamaya.spi.PropertySource}
instance.
      *
      * @param providers the maps to be intersected, not null.
      * @return the builder for chaining.

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/68c9c7fc/dormant/core/src/main/java/org/apache/tamaya/core/properties/factories/PropertySourceFactory.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/java/org/apache/tamaya/core/properties/factories/PropertySourceFactory.java
b/dormant/core/src/main/java/org/apache/tamaya/core/properties/factories/PropertySourceFactory.java
index b7d985c..802e470 100644
--- a/dormant/core/src/main/java/org/apache/tamaya/core/properties/factories/PropertySourceFactory.java
+++ b/dormant/core/src/main/java/org/apache/tamaya/core/properties/factories/PropertySourceFactory.java
@@ -25,7 +25,7 @@ import java.util.function.BiFunction;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 
-import org.apache.tamaya.PropertySource;
+import org.apache.tamaya.spi.PropertySource;
 
 /**
  * Default implementation current the singleton backing bean for the {@link org.apache.tamaya.core.properties.PropertySourceBuilder}.
@@ -108,18 +108,18 @@ public final class PropertySourceFactory {
     }
 
     /**
-     * Returns a read-only {@link org.apache.tamaya.PropertySource} reflecting the current
runtime environment properties.
+     * Returns a read-only {@link org.apache.tamaya.spi.PropertySource} reflecting the current
runtime environment properties.
      *
-     * @return a new read-only {@link org.apache.tamaya.PropertySource} instance based on
the current runtime environment properties.
+     * @return a new read-only {@link org.apache.tamaya.spi.PropertySource} instance based
on the current runtime environment properties.
      */
     public static PropertySource fromEnvironmentProperties() {
         return ENV_PROPERTYSOURCE;
     }
 
     /**
-     * Creates a new read-only {@link org.apache.tamaya.PropertySource} reflecting the current
system properties.
+     * Creates a new read-only {@link org.apache.tamaya.spi.PropertySource} reflecting the
current system properties.
      *
-     * @return a new read-only {@link org.apache.tamaya.PropertySource} instance based on
the current system properties.
+     * @return a new read-only {@link org.apache.tamaya.spi.PropertySource} instance based
on the current system properties.
      */
     public static PropertySource fromSystemProperties() {
         return new SystemPropertiesPropertySource();
@@ -133,7 +133,7 @@ public final class PropertySourceFactory {
     }
 
     /**
-     * Creates a new {@link org.apache.tamaya.PropertySource} containing all property maps
given, hereby using the given AggregationPolicy.
+     * Creates a new {@link org.apache.tamaya.spi.PropertySource} containing all property
maps given, hereby using the given AggregationPolicy.
      *
      * @param policy       the AggregationPolicy to be used, not null.
      * @param providers the maps to be included, not null.
@@ -147,7 +147,7 @@ public final class PropertySourceFactory {
     }
 
     /**
-     * Creates a new {@link org.apache.tamaya.PropertySource} that is mutable by adding a
map based instance that overrides
+     * Creates a new {@link org.apache.tamaya.spi.PropertySource} that is mutable by adding
a map based instance that overrides
      * values fromMap the original map.
      * @param provider the provider to be made mutable, not null.
      * @return the mutable instance.
@@ -164,7 +164,7 @@ public final class PropertySourceFactory {
     }
 
     /**
-     * Creates a new {@link org.apache.tamaya.PropertySource} containing only properties
that are shared by all given maps,
+     * Creates a new {@link org.apache.tamaya.spi.PropertySource} containing only properties
that are shared by all given maps,
      * hereby later maps in the array override  properties fromMap previous instances.
      * @param aggregationPolicy the policy to resolve aggregation conflicts.
      * @param providers the maps to be included, not null.
@@ -175,7 +175,7 @@ public final class PropertySourceFactory {
     }
 
     /**
-     * Creates a new {@link org.apache.tamaya.PropertySource} containing only properties
fromMap the target instance, that are not contained
+     * Creates a new {@link org.apache.tamaya.spi.PropertySource} containing only properties
fromMap the target instance, that are not contained
      * in one current the other maps passed.
      *
      * @param target         the base map, not null.
@@ -188,7 +188,7 @@ public final class PropertySourceFactory {
 
 
     /**
-     * Creates a filtered {@link org.apache.tamaya.PropertySource} (a view) current a given
base {@link }PropertyMap}. The filter hereby is
+     * Creates a filtered {@link org.apache.tamaya.spi.PropertySource} (a view) current a
given base {@link }PropertyMap}. The filter hereby is
      * applied dynamically on access, so also runtime changes current the base map are reflected
appropriately.
      *
      * @param name the base map instance, not null.
@@ -203,7 +203,7 @@ public final class PropertySourceFactory {
     }
 
     /**
-     * Creates a new contextual {@link org.apache.tamaya.PropertySource}. Contextual maps
delegate to different instances current PropertyMap depending
+     * Creates a new contextual {@link org.apache.tamaya.spi.PropertySource}. Contextual
maps delegate to different instances current PropertyMap depending
      * on the keys returned fromMap the isolationP
      *
      * @param name the base name instance, not null.
@@ -220,7 +220,7 @@ public final class PropertySourceFactory {
 
 
     /**
-     * Creates a filtered {@link org.apache.tamaya.PropertySource} (a view) current a given
base {@link }PropertyMap}. The filter hereby is
+     * Creates a filtered {@link org.apache.tamaya.spi.PropertySource} (a view) current a
given base {@link }PropertyMap}. The filter hereby is
      * applied dynamically on access, so also runtime changes current the base map are reflected
appropriately.
      *
      * @param name the base name instance, not null.
@@ -236,9 +236,9 @@ public final class PropertySourceFactory {
     }
 
     /**
-     * Creates a {@link org.apache.tamaya.PropertySource} where all keys current a current
map,
+     * Creates a {@link org.apache.tamaya.spi.PropertySource} where all keys current a current
map,
      * existing in another map are replaced
-     * with the ones fromMap the other {@link org.apache.tamaya.PropertySource}. The filter
hereby is
+     * with the ones fromMap the other {@link org.apache.tamaya.spi.PropertySource}. The
filter hereby is
      * applied dynamically on access, so also runtime changes current the base map are reflected
appropriately.
      * Keys not existing in the {@code mainMap}, but present in {@code replacementMao} will
be hidden.
      *
@@ -257,7 +257,7 @@ public final class PropertySourceFactory {
     }
 
     /**
-     * Creates a new {@link org.apache.tamaya.PropertySource} given an existing one, and
an alternate
+     * Creates a new {@link org.apache.tamaya.spi.PropertySource} given an existing one,
and an alternate
      * meta-info.
      * @param name the new meta-information, not null.
      * @param baseProvider the property source, not null.
@@ -268,7 +268,7 @@ public final class PropertySourceFactory {
     }
 
     /**
-     * Creates a new filtered {@link org.apache.tamaya.PropertySource} using the given filter.
+     * Creates a new filtered {@link org.apache.tamaya.spi.PropertySource} using the given
filter.
      * @param name the base name instance, not null.
      * @param valueFilter the value filter function, null result will remove the given entries.
      * @param current the source to be filtered

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/68c9c7fc/dormant/core/src/main/java/org/apache/tamaya/core/properties/factories/PropertySourcesBuilder.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/java/org/apache/tamaya/core/properties/factories/PropertySourcesBuilder.java
b/dormant/core/src/main/java/org/apache/tamaya/core/properties/factories/PropertySourcesBuilder.java
index 7914eef..0da4ff1 100644
--- a/dormant/core/src/main/java/org/apache/tamaya/core/properties/factories/PropertySourcesBuilder.java
+++ b/dormant/core/src/main/java/org/apache/tamaya/core/properties/factories/PropertySourcesBuilder.java
@@ -321,7 +321,7 @@ public final class PropertySourcesBuilder {
 
 //
 //    /**
-//     * Filters the current {@link org.apache.tamaya.PropertySource} with the given valueFilter.
+//     * Filters the current {@link org.apache.tamaya.spi.PropertySource} with the given
valueFilter.
 //     *
 //     * @param valueFilter the value filter, not null.
 //     * @return the (dynamically) filtered source instance, never null.
@@ -337,7 +337,7 @@ public final class PropertySourcesBuilder {
 
 
     /**
-     * Subtracts with the given {@link org.apache.tamaya.PropertySource} instance from the
current properties.
+     * Subtracts with the given {@link org.apache.tamaya.spi.PropertySource} instance from
the current properties.
      *
      * @param providers the maps to be subtracted, not null.
      * @return the builder for chaining.

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/68c9c7fc/dormant/core/src/main/java/org/apache/tamaya/core/properties/filtered/FilteredPropertySource.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/java/org/apache/tamaya/core/properties/filtered/FilteredPropertySource.java
b/dormant/core/src/main/java/org/apache/tamaya/core/properties/filtered/FilteredPropertySource.java
index ecf2950..ca7a18b 100644
--- a/dormant/core/src/main/java/org/apache/tamaya/core/properties/filtered/FilteredPropertySource.java
+++ b/dormant/core/src/main/java/org/apache/tamaya/core/properties/filtered/FilteredPropertySource.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tamaya.core.properties;
 
-import org.apache.tamaya.PropertySource;
+import org.apache.tamaya.spi.PropertySource;
 
 import java.lang.Override;
 import java.lang.String;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/68c9c7fc/dormant/core/src/main/java/org/apache/tamaya/core/properties/filtered/IntersectingPropertySource.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/java/org/apache/tamaya/core/properties/filtered/IntersectingPropertySource.java
b/dormant/core/src/main/java/org/apache/tamaya/core/properties/filtered/IntersectingPropertySource.java
index e441985..df73148 100644
--- a/dormant/core/src/main/java/org/apache/tamaya/core/properties/filtered/IntersectingPropertySource.java
+++ b/dormant/core/src/main/java/org/apache/tamaya/core/properties/filtered/IntersectingPropertySource.java
@@ -18,13 +18,8 @@
  */
 package org.apache.tamaya.core.properties.filtered;
 
-import org.apache.tamaya.*;
-import org.apache.tamaya.core.properties.filtered.AggregatedPropertySource;
 import org.apache.tamaya.spi.PropertySource;
 
-import java.util.*;
-import java.util.stream.Collectors;
-
 /**
  * Provider implementation that combines multiple other config by intersecting
  * the key/values common to one source.

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/68c9c7fc/dormant/core/src/main/java/org/apache/tamaya/core/properties/filtered/MappedPropertySource.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/main/java/org/apache/tamaya/core/properties/filtered/MappedPropertySource.java
b/dormant/core/src/main/java/org/apache/tamaya/core/properties/filtered/MappedPropertySource.java
index 0db716d..60533f3 100644
--- a/dormant/core/src/main/java/org/apache/tamaya/core/properties/filtered/MappedPropertySource.java
+++ b/dormant/core/src/main/java/org/apache/tamaya/core/properties/filtered/MappedPropertySource.java
@@ -6,7 +6,6 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.function.UnaryOperator;
 
-import org.apache.tamaya.PropertySource;
 import org.apache.tamaya.spi.PropertySource;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/68c9c7fc/dormant/core/src/test/java/org/apache/tamaya/JavaOneDemo.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/test/java/org/apache/tamaya/JavaOneDemo.java b/dormant/core/src/test/java/org/apache/tamaya/JavaOneDemo.java
index 27ae481..b5cdf93 100644
--- a/dormant/core/src/test/java/org/apache/tamaya/JavaOneDemo.java
+++ b/dormant/core/src/test/java/org/apache/tamaya/JavaOneDemo.java
@@ -26,6 +26,7 @@ import java.util.Map;
 
 import org.apache.tamaya.core.ConfigurationFunctions;
 import org.apache.tamaya.core.properties.PropertySourceBuilder;
+import org.apache.tamaya.spi.PropertySource;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/68c9c7fc/dormant/core/src/test/java/org/apache/tamaya/core/properties/PropertySourceBuilderTest.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/test/java/org/apache/tamaya/core/properties/PropertySourceBuilderTest.java
b/dormant/core/src/test/java/org/apache/tamaya/core/properties/PropertySourceBuilderTest.java
index f7e73f3..66b822e 100644
--- a/dormant/core/src/test/java/org/apache/tamaya/core/properties/PropertySourceBuilderTest.java
+++ b/dormant/core/src/test/java/org/apache/tamaya/core/properties/PropertySourceBuilderTest.java
@@ -18,7 +18,7 @@
  */
 package org.apache.tamaya.core.properties;
 
-import org.apache.tamaya.PropertySource;
+import org.apache.tamaya.spi.PropertySource;
 import org.junit.Test;
 
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/68c9c7fc/dormant/core/src/test/java/org/apache/tamaya/internal/TestConfigProvider.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/test/java/org/apache/tamaya/internal/TestConfigProvider.java
b/dormant/core/src/test/java/org/apache/tamaya/internal/TestConfigProvider.java
index e8ec52a..4224d02 100644
--- a/dormant/core/src/test/java/org/apache/tamaya/internal/TestConfigProvider.java
+++ b/dormant/core/src/test/java/org/apache/tamaya/internal/TestConfigProvider.java
@@ -18,7 +18,6 @@
  */
 package org.apache.tamaya.internal;
 
-import org.apache.tamaya.PropertySource;
 import org.apache.tamaya.core.properties.PropertySourceBuilder;
 import old.ConfigurationProviderSpi;
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/68c9c7fc/dormant/core/src/test/java/org/apache/tamaya/ucs/UC1ReadProperties.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/test/java/org/apache/tamaya/ucs/UC1ReadProperties.java b/dormant/core/src/test/java/org/apache/tamaya/ucs/UC1ReadProperties.java
index 423ec94..3ef1613 100644
--- a/dormant/core/src/test/java/org/apache/tamaya/ucs/UC1ReadProperties.java
+++ b/dormant/core/src/test/java/org/apache/tamaya/ucs/UC1ReadProperties.java
@@ -27,7 +27,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 import org.apache.tamaya.Configuration;
-import org.apache.tamaya.PropertySource;
+import org.apache.tamaya.spi.PropertySource;
 import org.apache.tamaya.core.ConfigurationFunctions;
 import org.apache.tamaya.core.properties.AggregationPolicy;
 import org.apache.tamaya.core.properties.PropertySourceBuilder;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/68c9c7fc/dormant/core/src/test/java/org/apache/tamaya/ucs/UC2CombineProperties.java
----------------------------------------------------------------------
diff --git a/dormant/core/src/test/java/org/apache/tamaya/ucs/UC2CombineProperties.java b/dormant/core/src/test/java/org/apache/tamaya/ucs/UC2CombineProperties.java
index 76c6132..e563f7b 100644
--- a/dormant/core/src/test/java/org/apache/tamaya/ucs/UC2CombineProperties.java
+++ b/dormant/core/src/test/java/org/apache/tamaya/ucs/UC2CombineProperties.java
@@ -19,7 +19,7 @@
 package org.apache.tamaya.ucs;
 
 import org.apache.tamaya.ConfigException;
-import org.apache.tamaya.PropertySource;
+import org.apache.tamaya.spi.PropertySource;
 import org.apache.tamaya.core.properties.AggregationPolicy;
 import org.apache.tamaya.core.properties.PropertySourceBuilder;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/68c9c7fc/dormant/core/src/test/resources/META-INF/services/org.apache.tamaya.spi.PropertyFilter
----------------------------------------------------------------------
diff --git a/dormant/core/src/test/resources/META-INF/services/org.apache.tamaya.spi.PropertyFilter
b/dormant/core/src/test/resources/META-INF/services/org.apache.tamaya.spi.PropertyFilter
new file mode 100644
index 0000000..59bbab3
--- /dev/null
+++ b/dormant/core/src/test/resources/META-INF/services/org.apache.tamaya.spi.PropertyFilter
@@ -0,0 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy current the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+org.apache.tamaya.core.testdata.TestPropertyFilter
+org.apache.tamaya.core.testdata.TestPropertyFilterRemoving


Mime
View raw message