You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by an...@apache.org on 2015/04/17 22:41:25 UTC
[1/2] incubator-tamaya git commit: Moved PropertyConverter into SPI
package.
Repository: incubator-tamaya
Updated Branches:
refs/heads/master bcea803bb -> f9695b59f
Moved PropertyConverter into SPI package.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/513af214
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/513af214
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/513af214
Branch: refs/heads/master
Commit: 513af214940864600d8fe396ea3d582a2cb77303
Parents: bcea803
Author: anatole <an...@apache.org>
Authored: Fri Apr 17 22:39:23 2015 +0200
Committer: anatole <an...@apache.org>
Committed: Fri Apr 17 22:39:23 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/tamaya/Configuration.java | 4 +-
.../apache/tamaya/ConfigurationProvider.java | 11 -----
.../org/apache/tamaya/PropertyConverter.java | 41 ----------------
.../apache/tamaya/spi/ConfigurationContext.java | 5 +-
.../tamaya/spi/ConfigurationContextBuilder.java | 3 +-
.../apache/tamaya/spi/PropertyConverter.java | 41 ++++++++++++++++
.../core/internal/DefaultConfiguration.java | 6 +--
.../internal/DefaultConfigurationContext.java | 4 +-
.../DefaultConfigurationContextBuilder.java | 2 +-
.../core/internal/PropertyConverterManager.java | 4 +-
.../converters/BigDecimalConverter.java | 2 +-
.../converters/BigIntegerConverter.java | 2 +-
.../internal/converters/BooleanConverter.java | 2 +-
.../core/internal/converters/ByteConverter.java | 2 +-
.../core/internal/converters/CharConverter.java | 2 +-
.../internal/converters/ClassConverter.java | 2 +-
.../internal/converters/CurrencyConverter.java | 2 +-
.../internal/converters/DoubleConverter.java | 3 +-
.../core/internal/converters/EnumConverter.java | 2 +-
.../internal/converters/FloatConverter.java | 3 +-
.../internal/converters/IntegerConverter.java | 2 +-
.../core/internal/converters/LongConverter.java | 3 +-
.../internal/converters/NumberConverter.java | 2 +-
.../internal/converters/ShortConverter.java | 2 +-
.../core/internal/converters/URLConverter.java | 2 +-
.../core/internal/converters/URiConverter.java | 2 +-
.../org.apache.tamaya.PropertyConverter | 30 ------------
.../org.apache.tamaya.spi.PropertyConverter | 30 ++++++++++++
.../internal/PropertyConverterManagerTest.java | 2 +-
.../java/org/apache/tamaya/Configuration.java | 32 ++-----------
.../apache/tamaya/ConfigurationProvider.java | 11 -----
.../org/apache/tamaya/PropertyConverter.java | 49 --------------------
.../apache/tamaya/spi/ConfigurationContext.java | 3 +-
.../tamaya/spi/ConfigurationContextBuilder.java | 3 +-
.../apache/tamaya/spi/PropertyConverter.java | 49 ++++++++++++++++++++
.../core/internal/DefaultConfiguration.java | 10 ++--
.../internal/DefaultConfigurationContext.java | 4 +-
.../DefaultConfigurationContextBuilder.java | 2 +-
.../core/internal/PropertyConverterManager.java | 4 +-
.../converters/BigDecimalConverter.java | 2 +-
.../converters/BigIntegerConverter.java | 2 +-
.../internal/converters/BooleanConverter.java | 2 +-
.../core/internal/converters/ByteConverter.java | 2 +-
.../core/internal/converters/CharConverter.java | 2 +-
.../internal/converters/ClassConverter.java | 2 +-
.../internal/converters/CurrencyConverter.java | 2 +-
.../internal/converters/DoubleConverter.java | 2 +-
.../core/internal/converters/EnumConverter.java | 2 +-
.../internal/converters/FloatConverter.java | 2 +-
.../internal/converters/IntegerConverter.java | 2 +-
.../internal/converters/LocalDateConverter.java | 2 +-
.../converters/LocalDateTimeConverter.java | 2 +-
.../internal/converters/LocalTimeConverter.java | 2 +-
.../core/internal/converters/LongConverter.java | 2 +-
.../internal/converters/NumberConverter.java | 2 +-
.../internal/converters/ShortConverter.java | 2 +-
.../core/internal/converters/URLConverter.java | 2 +-
.../core/internal/converters/URiConverter.java | 2 +-
.../internal/converters/ZoneIdConverter.java | 2 +-
.../internal/PropertyConverterManagerTest.java | 2 +-
60 files changed, 189 insertions(+), 238 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java7/api/src/main/java/org/apache/tamaya/Configuration.java
----------------------------------------------------------------------
diff --git a/java7/api/src/main/java/org/apache/tamaya/Configuration.java b/java7/api/src/main/java/org/apache/tamaya/Configuration.java
index 6d30d0b..47edab2 100644
--- a/java7/api/src/main/java/org/apache/tamaya/Configuration.java
+++ b/java7/api/src/main/java/org/apache/tamaya/Configuration.java
@@ -50,7 +50,7 @@ public interface Configuration {
/**
* Get the property keys as type T. This will implicitly require a corresponding {@link
- * PropertyConverter} to be available that is capable current providing type T
+ * org.apache.tamaya.spi.PropertyConverter} to be available that is capable current providing type T
* fromMap the given String keys.
*
* @param key the property's absolute, or relative path, e.g. @code
@@ -63,7 +63,7 @@ public interface Configuration {
/**
* Get the property keys as type T. This will implicitly require a corresponding {@link
- * PropertyConverter} to be available that is capable current providing type T
+ * org.apache.tamaya.spi.PropertyConverter} to be available that is capable current providing type T
* fromMap the given String keys.
*
* @param key the property's absolute, or relative path, e.g. @code
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java7/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java
----------------------------------------------------------------------
diff --git a/java7/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java b/java7/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java
index 46a2315..861c943 100644
--- a/java7/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java
+++ b/java7/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java
@@ -75,17 +75,6 @@ public final class ConfigurationProvider {
}
/**
- * Method that allows to determine if a new {@link org.apache.tamaya.spi.ConfigurationContext} can be applied
- * programmatically.
- * @see #setConfigurationContext(org.apache.tamaya.spi.ConfigurationContext)
- * @return true, if {@link #setConfigurationContext(org.apache.tamaya.spi.ConfigurationContext)} is supported
- * by the current implementation.
- */
- public static boolean isConfigurationContextSettable() {
- return PROVIDER_SPI.isConfigurationContextSettable();
- }
-
- /**
* Create a new {@link org.apache.tamaya.spi.ConfigurationContextBuilder} instance. This method creates
* a new builder instance that is not related to any concrete {@link org.apache.tamaya.spi.ConfigurationContext}.
* You can use {@link #setConfigurationContext(org.apache.tamaya.spi.ConfigurationContext)} to change the
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java7/api/src/main/java/org/apache/tamaya/PropertyConverter.java
----------------------------------------------------------------------
diff --git a/java7/api/src/main/java/org/apache/tamaya/PropertyConverter.java b/java7/api/src/main/java/org/apache/tamaya/PropertyConverter.java
deleted file mode 100644
index bff85a3..0000000
--- a/java7/api/src/main/java/org/apache/tamaya/PropertyConverter.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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 of 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.
- */
-package org.apache.tamaya;
-
-
-/**
- * Interface for an property that converts a configured String into something else.
- * This is used for implementing type conversion from a property (String) to a certain target
- * type. Hereby the target type can be multivalued (eg collections) or complex if needed.
- */
-public interface PropertyConverter<T>{
-
- /**
- * Convert the given configuration keys from it' String representation into the required target type.
- * @param value the configuration keys
- * @return converted keys
- */
- T convert(String value);
-
- //X TODO probably add some diagnostic info which explains what kind of
- //X format(s) is supported.
- //X This could be useful if e.g. no converter in the chain felt responsible
- //X because a wrongly formatted configuration string had been used.
- //X This could probably also be handled via an additional Annotation on the converter.
-}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java7/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
----------------------------------------------------------------------
diff --git a/java7/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java b/java7/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
index 160194b..1ebfd8b 100644
--- a/java7/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
+++ b/java7/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
@@ -19,7 +19,6 @@
package org.apache.tamaya.spi;
-import org.apache.tamaya.PropertyConverter;
import org.apache.tamaya.TypeLiteral;
import java.util.List;
@@ -28,7 +27,7 @@ import java.util.Map;
/**
* Central SPI for programmatically dealing with the setup of the configuration system.
* This includes adding and enlisting {@link org.apache.tamaya.spi.PropertySource}s,
- * managing {@link org.apache.tamaya.PropertyConverter}s, ConfigFilters, etc.
+ * managing {@link PropertyConverter}s, ConfigFilters, etc.
*/
public interface ConfigurationContext {
@@ -56,7 +55,7 @@ public interface ConfigurationContext {
/**
- * This method can be used for programmatically adding {@link org.apache.tamaya.PropertyConverter}s.
+ * This method can be used for programmatically adding {@link PropertyConverter}s.
* It is not needed for normal 'usage' by end users, but only for Extension Developers!
*
* @param typeToConvert the type which the converter is for
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java7/api/src/main/java/org/apache/tamaya/spi/ConfigurationContextBuilder.java
----------------------------------------------------------------------
diff --git a/java7/api/src/main/java/org/apache/tamaya/spi/ConfigurationContextBuilder.java b/java7/api/src/main/java/org/apache/tamaya/spi/ConfigurationContextBuilder.java
index 0e75810..d0c39d6 100644
--- a/java7/api/src/main/java/org/apache/tamaya/spi/ConfigurationContextBuilder.java
+++ b/java7/api/src/main/java/org/apache/tamaya/spi/ConfigurationContextBuilder.java
@@ -18,7 +18,6 @@
*/
package org.apache.tamaya.spi;
-import org.apache.tamaya.PropertyConverter;
import org.apache.tamaya.TypeLiteral;
import java.util.Collection;
@@ -120,7 +119,7 @@ public interface ConfigurationContextBuilder {
ConfigurationContextBuilder removePropertyFilters(Collection<PropertyFilter> filters);
/**
- * This method can be used for programmatically adding {@link org.apache.tamaya.PropertyConverter}s.
+ * This method can be used for programmatically adding {@link PropertyConverter}s.
* It is not needed for normal 'usage' by end users, but only for Extension Developers!
*
* @param typeToConvert the type which the converter is for
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java7/api/src/main/java/org/apache/tamaya/spi/PropertyConverter.java
----------------------------------------------------------------------
diff --git a/java7/api/src/main/java/org/apache/tamaya/spi/PropertyConverter.java b/java7/api/src/main/java/org/apache/tamaya/spi/PropertyConverter.java
new file mode 100644
index 0000000..167e0a8
--- /dev/null
+++ b/java7/api/src/main/java/org/apache/tamaya/spi/PropertyConverter.java
@@ -0,0 +1,41 @@
+/*
+ * 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 of 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.
+ */
+package org.apache.tamaya.spi;
+
+
+/**
+ * Interface for an property that converts a configured String into something else.
+ * This is used for implementing type conversion from a property (String) to a certain target
+ * type. Hereby the target type can be multivalued (eg collections) or complex if needed.
+ */
+public interface PropertyConverter<T>{
+
+ /**
+ * Convert the given configuration keys from it' String representation into the required target type.
+ * @param value the configuration keys
+ * @return converted keys
+ */
+ T convert(String value);
+
+ //X TODO probably add some diagnostic info which explains what kind of
+ //X format(s) is supported.
+ //X This could be useful if e.g. no converter in the chain felt responsible
+ //X because a wrongly formatted configuration string had been used.
+ //X This could probably also be handled via an additional Annotation on the converter.
+}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java7/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
----------------------------------------------------------------------
diff --git a/java7/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java b/java7/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
index 754afb2..60d1307 100644
--- a/java7/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
+++ b/java7/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
@@ -22,7 +22,7 @@ import org.apache.tamaya.ConfigException;
import org.apache.tamaya.ConfigOperator;
import org.apache.tamaya.ConfigQuery;
import org.apache.tamaya.Configuration;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import org.apache.tamaya.TypeLiteral;
import org.apache.tamaya.spi.ConfigurationContext;
import org.apache.tamaya.spi.PropertyFilter;
@@ -210,7 +210,7 @@ public class DefaultConfiguration implements Configuration {
/**
* Accesses the current String value for the given key and tries to convert it
- * using the {@link org.apache.tamaya.PropertyConverter} instances provided by the current
+ * using the {@link org.apache.tamaya.spi.PropertyConverter} instances provided by the current
* {@link org.apache.tamaya.spi.ConfigurationContext}.
*
* @param key the property's absolute, or relative path, e.g. @code
@@ -226,7 +226,7 @@ public class DefaultConfiguration implements Configuration {
/**
* Accesses the current String value for the given key and tries to convert it
- * using the {@link org.apache.tamaya.PropertyConverter} instances provided by the current
+ * using the {@link org.apache.tamaya.spi.PropertyConverter} instances provided by the current
* {@link org.apache.tamaya.spi.ConfigurationContext}.
*
* @param key the property's absolute, or relative path, e.g. @code
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java7/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java
----------------------------------------------------------------------
diff --git a/java7/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java b/java7/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java
index bdcf7cc..2cd2207 100644
--- a/java7/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java
+++ b/java7/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java
@@ -20,7 +20,7 @@ package org.apache.tamaya.core.internal;
import org.apache.tamaya.TypeLiteral;
import org.apache.tamaya.spi.ConfigurationContext;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import org.apache.tamaya.spi.PropertyFilter;
import org.apache.tamaya.spi.PropertySource;
import org.apache.tamaya.spi.PropertySourceProvider;
@@ -47,7 +47,7 @@ public class DefaultConfigurationContext implements ConfigurationContext {
/** The logger used. */
private final static Logger LOG = Logger.getLogger(DefaultConfigurationContext.class.getName());
/**
- * Cubcomponent handling {@link org.apache.tamaya.PropertyConverter} instances.
+ * Cubcomponent handling {@link org.apache.tamaya.spi.PropertyConverter} instances.
*/
private PropertyConverterManager propertyConverterManager = new PropertyConverterManager();
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java7/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContextBuilder.java
----------------------------------------------------------------------
diff --git a/java7/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContextBuilder.java b/java7/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContextBuilder.java
index f89e8d1..85e3c7a 100644
--- a/java7/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContextBuilder.java
+++ b/java7/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContextBuilder.java
@@ -19,7 +19,7 @@
package org.apache.tamaya.core.internal;
import org.apache.tamaya.ConfigException;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import org.apache.tamaya.TypeLiteral;
import org.apache.tamaya.spi.ConfigurationContext;
import org.apache.tamaya.spi.ConfigurationContextBuilder;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java7/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
----------------------------------------------------------------------
diff --git a/java7/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java b/java7/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
index fa7d0d4..17d2293 100644
--- a/java7/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
+++ b/java7/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
@@ -36,11 +36,11 @@ import java.util.logging.Logger;
import org.apache.tamaya.ConfigException;
import org.apache.tamaya.TypeLiteral;
import org.apache.tamaya.core.internal.converters.EnumConverter;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import org.apache.tamaya.spi.ServiceContextManager;
/**
- * Manager that deals with {@link org.apache.tamaya.PropertyConverter} instances.
+ * Manager that deals with {@link org.apache.tamaya.spi.PropertyConverter} instances.
* This class is thread-safe.
*/
public class PropertyConverterManager {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/BigDecimalConverter.java
----------------------------------------------------------------------
diff --git a/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/BigDecimalConverter.java b/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/BigDecimalConverter.java
index 4b20071..53122f5 100644
--- a/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/BigDecimalConverter.java
+++ b/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/BigDecimalConverter.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.math.BigDecimal;
import java.math.BigInteger;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/BigIntegerConverter.java
----------------------------------------------------------------------
diff --git a/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/BigIntegerConverter.java b/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/BigIntegerConverter.java
index f32e793..4692606 100644
--- a/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/BigIntegerConverter.java
+++ b/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/BigIntegerConverter.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.math.BigInteger;
import java.util.Objects;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/BooleanConverter.java
----------------------------------------------------------------------
diff --git a/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/BooleanConverter.java b/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/BooleanConverter.java
index 0f28131..770eed6 100644
--- a/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/BooleanConverter.java
+++ b/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/BooleanConverter.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.util.Locale;
import java.util.Objects;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/ByteConverter.java
----------------------------------------------------------------------
diff --git a/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/ByteConverter.java b/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/ByteConverter.java
index d0de5e0..0d4652d 100644
--- a/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/ByteConverter.java
+++ b/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/ByteConverter.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.util.Locale;
import java.util.Objects;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/CharConverter.java
----------------------------------------------------------------------
diff --git a/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/CharConverter.java b/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/CharConverter.java
index 96a5aab..d905c39 100644
--- a/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/CharConverter.java
+++ b/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/CharConverter.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.util.Objects;
import java.util.logging.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/ClassConverter.java
----------------------------------------------------------------------
diff --git a/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/ClassConverter.java b/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/ClassConverter.java
index f895b26..25bf479 100644
--- a/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/ClassConverter.java
+++ b/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/ClassConverter.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.util.Objects;
import java.util.logging.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/CurrencyConverter.java
----------------------------------------------------------------------
diff --git a/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/CurrencyConverter.java b/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/CurrencyConverter.java
index e0b9de8..fbf7f25 100644
--- a/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/CurrencyConverter.java
+++ b/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/CurrencyConverter.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.util.Currency;
import java.util.Locale;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/DoubleConverter.java
----------------------------------------------------------------------
diff --git a/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/DoubleConverter.java b/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/DoubleConverter.java
index 15f0c18..82d673e 100644
--- a/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/DoubleConverter.java
+++ b/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/DoubleConverter.java
@@ -18,11 +18,10 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.util.Locale;
import java.util.Objects;
-import java.util.logging.Level;
import java.util.logging.Logger;
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/EnumConverter.java
----------------------------------------------------------------------
diff --git a/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/EnumConverter.java b/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/EnumConverter.java
index 94c1f92..1a05a7a 100644
--- a/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/EnumConverter.java
+++ b/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/EnumConverter.java
@@ -19,7 +19,7 @@
package org.apache.tamaya.core.internal.converters;
import org.apache.tamaya.ConfigException;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/FloatConverter.java
----------------------------------------------------------------------
diff --git a/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/FloatConverter.java b/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/FloatConverter.java
index d6d84f7..0485e68 100644
--- a/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/FloatConverter.java
+++ b/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/FloatConverter.java
@@ -18,11 +18,10 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.util.Locale;
import java.util.Objects;
-import java.util.logging.Level;
import java.util.logging.Logger;
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/IntegerConverter.java
----------------------------------------------------------------------
diff --git a/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/IntegerConverter.java b/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/IntegerConverter.java
index c1dbb93..64eba48 100644
--- a/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/IntegerConverter.java
+++ b/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/IntegerConverter.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.util.Locale;
import java.util.Objects;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/LongConverter.java
----------------------------------------------------------------------
diff --git a/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/LongConverter.java b/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/LongConverter.java
index 4bbee27..c81219f 100644
--- a/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/LongConverter.java
+++ b/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/LongConverter.java
@@ -18,11 +18,10 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.util.Locale;
import java.util.Objects;
-import java.util.logging.Level;
import java.util.logging.Logger;
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/NumberConverter.java
----------------------------------------------------------------------
diff --git a/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/NumberConverter.java b/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/NumberConverter.java
index bb5a348..acfaae1 100644
--- a/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/NumberConverter.java
+++ b/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/NumberConverter.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.math.BigDecimal;
import java.util.Locale;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/ShortConverter.java
----------------------------------------------------------------------
diff --git a/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/ShortConverter.java b/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/ShortConverter.java
index 15223dc..e9ab6da 100644
--- a/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/ShortConverter.java
+++ b/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/ShortConverter.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.util.Locale;
import java.util.Objects;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/URLConverter.java
----------------------------------------------------------------------
diff --git a/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/URLConverter.java b/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/URLConverter.java
index 272fdd8..34788c0 100644
--- a/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/URLConverter.java
+++ b/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/URLConverter.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.net.URL;
import java.util.Objects;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/URiConverter.java
----------------------------------------------------------------------
diff --git a/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/URiConverter.java b/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/URiConverter.java
index 14a7f1d..c3d3718 100644
--- a/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/URiConverter.java
+++ b/java7/core/src/main/java/org/apache/tamaya/core/internal/converters/URiConverter.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.net.URI;
import java.util.Objects;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java7/core/src/main/resources/META-INF/services/org.apache.tamaya.PropertyConverter
----------------------------------------------------------------------
diff --git a/java7/core/src/main/resources/META-INF/services/org.apache.tamaya.PropertyConverter b/java7/core/src/main/resources/META-INF/services/org.apache.tamaya.PropertyConverter
deleted file mode 100644
index 0f0cb26..0000000
--- a/java7/core/src/main/resources/META-INF/services/org.apache.tamaya.PropertyConverter
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# 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.internal.converters.BooleanConverter
-org.apache.tamaya.core.internal.converters.ByteConverter
-org.apache.tamaya.core.internal.converters.CharConverter
-org.apache.tamaya.core.internal.converters.DoubleConverter
-org.apache.tamaya.core.internal.converters.FloatConverter
-org.apache.tamaya.core.internal.converters.IntegerConverter
-org.apache.tamaya.core.internal.converters.LongConverter
-org.apache.tamaya.core.internal.converters.ShortConverter
-org.apache.tamaya.core.internal.converters.BigDecimalConverter
-org.apache.tamaya.core.internal.converters.BigIntegerConverter
-org.apache.tamaya.core.internal.converters.CurrencyConverter
-org.apache.tamaya.core.internal.converters.NumberConverter
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java7/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertyConverter
----------------------------------------------------------------------
diff --git a/java7/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertyConverter b/java7/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertyConverter
new file mode 100644
index 0000000..0f0cb26
--- /dev/null
+++ b/java7/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertyConverter
@@ -0,0 +1,30 @@
+#
+# 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.internal.converters.BooleanConverter
+org.apache.tamaya.core.internal.converters.ByteConverter
+org.apache.tamaya.core.internal.converters.CharConverter
+org.apache.tamaya.core.internal.converters.DoubleConverter
+org.apache.tamaya.core.internal.converters.FloatConverter
+org.apache.tamaya.core.internal.converters.IntegerConverter
+org.apache.tamaya.core.internal.converters.LongConverter
+org.apache.tamaya.core.internal.converters.ShortConverter
+org.apache.tamaya.core.internal.converters.BigDecimalConverter
+org.apache.tamaya.core.internal.converters.BigIntegerConverter
+org.apache.tamaya.core.internal.converters.CurrencyConverter
+org.apache.tamaya.core.internal.converters.NumberConverter
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java7/core/src/test/java/org/apache/tamaya/core/internal/PropertyConverterManagerTest.java
----------------------------------------------------------------------
diff --git a/java7/core/src/test/java/org/apache/tamaya/core/internal/PropertyConverterManagerTest.java b/java7/core/src/test/java/org/apache/tamaya/core/internal/PropertyConverterManagerTest.java
index 1a34d4b..bd9b97f 100644
--- a/java7/core/src/test/java/org/apache/tamaya/core/internal/PropertyConverterManagerTest.java
+++ b/java7/core/src/test/java/org/apache/tamaya/core/internal/PropertyConverterManagerTest.java
@@ -19,7 +19,7 @@
package org.apache.tamaya.core.internal;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import org.apache.tamaya.TypeLiteral;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java8/api/src/main/java/org/apache/tamaya/Configuration.java
----------------------------------------------------------------------
diff --git a/java8/api/src/main/java/org/apache/tamaya/Configuration.java b/java8/api/src/main/java/org/apache/tamaya/Configuration.java
index 6de3cb6..7830225 100644
--- a/java8/api/src/main/java/org/apache/tamaya/Configuration.java
+++ b/java8/api/src/main/java/org/apache/tamaya/Configuration.java
@@ -18,14 +18,11 @@
*/
package org.apache.tamaya;
-import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.OptionalDouble;
import java.util.OptionalInt;
import java.util.OptionalLong;
-import java.util.logging.Level;
-import java.util.logging.Logger;
/**
@@ -60,7 +57,7 @@ public interface Configuration {
/**
* Get the property keys as type T. This will implicitly require a corresponding {@link
- * PropertyConverter} to be available that is capable current providing type T
+ * org.apache.tamaya.spi.PropertyConverter} to be available that is capable current providing type T
* fromMap the given String keys.
*
* @param key the property's absolute, or relative path, e.g. @code
@@ -76,7 +73,7 @@ public interface Configuration {
/**
* Get the property keys as type T. This will implicitly require a corresponding {@link
- * PropertyConverter} to be available that is capable current providing type T
+ * org.apache.tamaya.spi.PropertyConverter} to be available that is capable current providing type T
* fromMap the given String keys.
*
* @param key the property's absolute, or relative path, e.g. @code
@@ -87,26 +84,7 @@ public interface Configuration {
* @throws ConfigException if the value could not be converted to the required target type by any of the
* registered converters.
*/
- default <T> T get(String key, TypeLiteral<T> type) {
- List<PropertyConverter<T>> converters = ConfigurationProvider.getConfigurationContext().getPropertyConverters(
- type);
- String value = get(key);
- if (value == null) {
- return null;
- }
- for (PropertyConverter<T> converter : converters) {
- try {
- T item = converter.convert(value);
- if (item != null) {
- return item;
- }
- } catch (Exception e) {
- Logger.getLogger(getClass().getName()).log(Level.WARNING, e, () -> "PropertyConverter was throwing " +
- "exception instead of returning null: " + converter.getClass().getName());
- }
- }
- throw new ConfigException("Unconvertible value: " + value + ", target: " + type);
- }
+ <T> T get(String key, TypeLiteral<T> type);
/**
* Access a property.
@@ -120,7 +98,7 @@ public interface Configuration {
/**
* Get the property keys as type T. This will implicitly require a corresponding {@link
- * PropertyConverter} to be available that is capable current providing type T
+ * org.apache.tamaya.spi.PropertyConverter} to be available that is capable current providing type T
* fromMap the given String keys.
*
* @param key the property's absolute, or relative path, e.g. @code
@@ -136,7 +114,7 @@ public interface Configuration {
/**
* Get the property keys as type T. This will implicitly require a corresponding {@link
- * PropertyConverter} to be available that is capable current providing type T
+ * org.apache.tamaya.spi.PropertyConverter} to be available that is capable current providing type T
* fromMap the given String keys.
*
* @param key the property's absolute, or relative path, e.g. @code
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java8/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java
----------------------------------------------------------------------
diff --git a/java8/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java b/java8/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java
index 856841e..af17a2d 100644
--- a/java8/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java
+++ b/java8/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java
@@ -67,17 +67,6 @@ public final class ConfigurationProvider {
}
/**
- * Method that allows to determine if a new {@link org.apache.tamaya.spi.ConfigurationContext} can be applied
- * programmatically.
- * @see #setConfigurationContext(org.apache.tamaya.spi.ConfigurationContext)
- * @return true, if {@link #setConfigurationContext(org.apache.tamaya.spi.ConfigurationContext)} is supported
- * by the current implementation.
- */
- public static boolean isConfigurationContextSettable() {
- return PROVIDER_SPI.isConfigurationContextSettable();
- }
-
- /**
* Create a new {@link org.apache.tamaya.spi.ConfigurationContextBuilder} instance. This method creates
* a new builder instance that is not related to any concrete {@link org.apache.tamaya.spi.ConfigurationContext}.
* You can use {@link #setConfigurationContext(org.apache.tamaya.spi.ConfigurationContext)} to change the
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java8/api/src/main/java/org/apache/tamaya/PropertyConverter.java
----------------------------------------------------------------------
diff --git a/java8/api/src/main/java/org/apache/tamaya/PropertyConverter.java b/java8/api/src/main/java/org/apache/tamaya/PropertyConverter.java
deleted file mode 100644
index 4f6ea80..0000000
--- a/java8/api/src/main/java/org/apache/tamaya/PropertyConverter.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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 of 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.
- */
-package org.apache.tamaya;
-
-
-/**
- * Interface for an property that converts a configured String into something else.
- * This is used for implementing type conversion from a property (String) to a certain target
- * type. Hereby the target type can be multivalued (eg collections) or complex if needed.
- * @param <T> the result/target type of the converter.
- */
-public interface PropertyConverter<T> {
-
- /**
- * Convert the given configuration keys from it's String representation into the required target type.
- * <b>IMPORTANT NOTE: </b> Multiple instances of this type are ordered in a chain of converters that
- * try to parse/convert a configured value. The first non-null result returned by a converter is
- * used as the final result of the conversion. As a consequence implementations of this class must
- * only return non-null values that are the result of a successful conversion of an entry.
- *
- * @param value the configuration value, not null.
- * @return the converted value, or {@code null} if the value could not be converted. Returning a non-null
- * value will stop the conversion process and return the value as result (converted value).
- */
- T convert(String value);
-
- //X TODO probably add some diagnostic info which explains what kind of
- //X format(s) is supported.
- //X This could be useful if e.g. no converter in the chain felt responsible
- //X because a wrongly formatted configuration string had been used.
- //X This could probably also be handled via an additional Annotation on the converter.
- //X Collection<String> getSupportedFormats();
-}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java8/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
----------------------------------------------------------------------
diff --git a/java8/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java b/java8/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
index 2a344f1..24efdeb 100644
--- a/java8/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
+++ b/java8/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
@@ -18,7 +18,6 @@
*/
package org.apache.tamaya.spi;
-import org.apache.tamaya.PropertyConverter;
import org.apache.tamaya.TypeLiteral;
import java.util.Collection;
@@ -30,7 +29,7 @@ import java.util.stream.Collectors;
/**
* Central SPI for programmatically dealing with the setup of the configuration system.
* This includes adding and enlisting {@link org.apache.tamaya.spi.PropertySource}s,
- * managing {@link org.apache.tamaya.PropertyConverter}s, ConfigFilters, etc.
+ * managing {@link PropertyConverter}s, ConfigFilters, etc.
*/
public interface ConfigurationContext {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java8/api/src/main/java/org/apache/tamaya/spi/ConfigurationContextBuilder.java
----------------------------------------------------------------------
diff --git a/java8/api/src/main/java/org/apache/tamaya/spi/ConfigurationContextBuilder.java b/java8/api/src/main/java/org/apache/tamaya/spi/ConfigurationContextBuilder.java
index d0ac2cf..e070450 100644
--- a/java8/api/src/main/java/org/apache/tamaya/spi/ConfigurationContextBuilder.java
+++ b/java8/api/src/main/java/org/apache/tamaya/spi/ConfigurationContextBuilder.java
@@ -18,7 +18,6 @@
*/
package org.apache.tamaya.spi;
-import org.apache.tamaya.PropertyConverter;
import org.apache.tamaya.TypeLiteral;
import java.util.Arrays;
@@ -147,7 +146,7 @@ public interface ConfigurationContextBuilder {
ConfigurationContextBuilder removePropertySources(Predicate<PropertySource> selector);
/**
- * This method can be used for programmatically adding {@link org.apache.tamaya.PropertyConverter}s.
+ * This method can be used for programmatically adding {@link PropertyConverter}s.
* It is not needed for normal 'usage' by end users, but only for Extension Developers!
*
* @param typeToConvert the type which the converter is for
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java8/api/src/main/java/org/apache/tamaya/spi/PropertyConverter.java
----------------------------------------------------------------------
diff --git a/java8/api/src/main/java/org/apache/tamaya/spi/PropertyConverter.java b/java8/api/src/main/java/org/apache/tamaya/spi/PropertyConverter.java
new file mode 100644
index 0000000..b69953e
--- /dev/null
+++ b/java8/api/src/main/java/org/apache/tamaya/spi/PropertyConverter.java
@@ -0,0 +1,49 @@
+/*
+ * 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 of 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.
+ */
+package org.apache.tamaya.spi;
+
+
+/**
+ * Interface for an property that converts a configured String into something else.
+ * This is used for implementing type conversion from a property (String) to a certain target
+ * type. Hereby the target type can be multivalued (eg collections) or complex if needed.
+ * @param <T> the result/target type of the converter.
+ */
+public interface PropertyConverter<T> {
+
+ /**
+ * Convert the given configuration keys from it's String representation into the required target type.
+ * <b>IMPORTANT NOTE: </b> Multiple instances of this type are ordered in a chain of converters that
+ * try to parse/convert a configured value. The first non-null result returned by a converter is
+ * used as the final result of the conversion. As a consequence implementations of this class must
+ * only return non-null values that are the result of a successful conversion of an entry.
+ *
+ * @param value the configuration value, not null.
+ * @return the converted value, or {@code null} if the value could not be converted. Returning a non-null
+ * value will stop the conversion process and return the value as result (converted value).
+ */
+ T convert(String value);
+
+ //X TODO probably add some diagnostic info which explains what kind of
+ //X format(s) is supported.
+ //X This could be useful if e.g. no converter in the chain felt responsible
+ //X because a wrongly formatted configuration string had been used.
+ //X This could probably also be handled via an additional Annotation on the converter.
+ //X Collection<String> getSupportedFormats();
+}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
----------------------------------------------------------------------
diff --git a/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java b/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
index d49f05d..fe0887f 100644
--- a/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
+++ b/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
@@ -22,7 +22,7 @@ import org.apache.tamaya.ConfigException;
import org.apache.tamaya.Configuration;
import org.apache.tamaya.TypeLiteral;
import org.apache.tamaya.spi.ConfigurationContext;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import org.apache.tamaya.spi.PropertyFilter;
import org.apache.tamaya.spi.PropertySource;
import org.apache.tamaya.spi.PropertyValueCombinationPolicy;
@@ -39,6 +39,8 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
+import static java.util.Map.*;
+
/**
* Implementation of the Configuration API. This class uses the current {@link ConfigurationContext} to evaluate the
* chain of {@link org.apache.tamaya.spi.PropertySource} and {@link org.apache.tamaya.spi.PropertyFilter}
@@ -197,12 +199,12 @@ public class DefaultConfiguration implements Configuration {
}
// Remove null values
return inputMap.entrySet().parallelStream().filter((e) -> e.getValue() != null).collect(
- Collectors.toMap((e) -> e.getKey(), (e) -> e.getValue()));
+ Collectors.toMap(Entry::getKey, Entry::getValue));
}
/**
* Accesses the current String value for the given key (see {@link #getOptional(String)}) and tries to convert it
- * using the {@link org.apache.tamaya.PropertyConverter} instances provided by the current
+ * using the {@link org.apache.tamaya.spi.PropertyConverter} instances provided by the current
* {@link org.apache.tamaya.spi.ConfigurationContext}.
*
* @param key the property's absolute, or relative path, e.g. @code
@@ -231,7 +233,7 @@ public class DefaultConfiguration implements Configuration {
throw new ConfigException("Unable to convert config value for key " +
key + " in type " + type.getType());
}
-
return null;
}
+
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java
----------------------------------------------------------------------
diff --git a/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java b/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java
index a74fb55..a7a6998 100644
--- a/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java
+++ b/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java
@@ -20,7 +20,7 @@ package org.apache.tamaya.core.internal;
import org.apache.tamaya.TypeLiteral;
import org.apache.tamaya.spi.ConfigurationContext;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import org.apache.tamaya.spi.ConfigurationContextBuilder;
import org.apache.tamaya.spi.PropertyFilter;
import org.apache.tamaya.spi.PropertySource;
@@ -45,7 +45,7 @@ public class DefaultConfigurationContext implements ConfigurationContext {
/** The logger used. */
private final static Logger LOG = Logger.getLogger(DefaultConfigurationContext.class.getName());
/**
- * Cubcomponent handling {@link org.apache.tamaya.PropertyConverter} instances.
+ * Cubcomponent handling {@link org.apache.tamaya.spi.PropertyConverter} instances.
*/
private PropertyConverterManager propertyConverterManager = new PropertyConverterManager();
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContextBuilder.java
----------------------------------------------------------------------
diff --git a/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContextBuilder.java b/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContextBuilder.java
index 122d4c7..0f3ce3d 100644
--- a/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContextBuilder.java
+++ b/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContextBuilder.java
@@ -19,7 +19,7 @@
package org.apache.tamaya.core.internal;
import org.apache.tamaya.ConfigException;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import org.apache.tamaya.TypeLiteral;
import org.apache.tamaya.spi.ConfigurationContext;
import org.apache.tamaya.spi.ConfigurationContextBuilder;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/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 fe62dc3..b4d1e75 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
@@ -36,11 +36,11 @@ import java.util.logging.Logger;
import org.apache.tamaya.ConfigException;
import org.apache.tamaya.TypeLiteral;
import org.apache.tamaya.core.internal.converters.EnumConverter;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import org.apache.tamaya.spi.ServiceContextManager;
/**
- * Manager that deals with {@link org.apache.tamaya.PropertyConverter} instances.
+ * Manager that deals with {@link org.apache.tamaya.spi.PropertyConverter} instances.
* This class is thread-safe.
*/
public class PropertyConverterManager {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/BigDecimalConverter.java
----------------------------------------------------------------------
diff --git a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/BigDecimalConverter.java b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/BigDecimalConverter.java
index be1a57a..9c90b18 100644
--- a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/BigDecimalConverter.java
+++ b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/BigDecimalConverter.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.math.BigDecimal;
import java.math.BigInteger;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/BigIntegerConverter.java
----------------------------------------------------------------------
diff --git a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/BigIntegerConverter.java b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/BigIntegerConverter.java
index 1f174ba..9a4571b 100644
--- a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/BigIntegerConverter.java
+++ b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/BigIntegerConverter.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.math.BigInteger;
import java.util.Objects;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/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 da8db3d..ebf0146 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
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.util.Locale;
import java.util.Objects;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/ByteConverter.java
----------------------------------------------------------------------
diff --git a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/ByteConverter.java b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/ByteConverter.java
index 7802d25..586cafb 100644
--- a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/ByteConverter.java
+++ b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/ByteConverter.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.util.Locale;
import java.util.Objects;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/CharConverter.java
----------------------------------------------------------------------
diff --git a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/CharConverter.java b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/CharConverter.java
index 3af8bb2..85b9a9a 100644
--- a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/CharConverter.java
+++ b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/CharConverter.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.util.Objects;
import java.util.logging.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/ClassConverter.java
----------------------------------------------------------------------
diff --git a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/ClassConverter.java b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/ClassConverter.java
index 75fb3fa..d0765f7 100644
--- a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/ClassConverter.java
+++ b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/ClassConverter.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.util.Objects;
import java.util.logging.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/CurrencyConverter.java
----------------------------------------------------------------------
diff --git a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/CurrencyConverter.java b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/CurrencyConverter.java
index c024158..e70a0b1 100644
--- a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/CurrencyConverter.java
+++ b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/CurrencyConverter.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.util.Currency;
import java.util.Locale;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/DoubleConverter.java
----------------------------------------------------------------------
diff --git a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/DoubleConverter.java b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/DoubleConverter.java
index 604e90b..9f3996e 100644
--- a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/DoubleConverter.java
+++ b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/DoubleConverter.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.util.Locale;
import java.util.Objects;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/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 e796152..e925ad2 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
@@ -19,7 +19,7 @@
package org.apache.tamaya.core.internal.converters;
import org.apache.tamaya.ConfigException;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/FloatConverter.java
----------------------------------------------------------------------
diff --git a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/FloatConverter.java b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/FloatConverter.java
index fbb6362..b2ae4cb 100644
--- a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/FloatConverter.java
+++ b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/FloatConverter.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.util.Locale;
import java.util.Objects;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/IntegerConverter.java
----------------------------------------------------------------------
diff --git a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/IntegerConverter.java b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/IntegerConverter.java
index 6358719..3c93349 100644
--- a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/IntegerConverter.java
+++ b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/IntegerConverter.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.util.Locale;
import java.util.Objects;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/LocalDateConverter.java
----------------------------------------------------------------------
diff --git a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/LocalDateConverter.java b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/LocalDateConverter.java
index c652732..7c223dd 100644
--- a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/LocalDateConverter.java
+++ b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/LocalDateConverter.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.time.LocalDate;
import java.util.Objects;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/LocalDateTimeConverter.java
----------------------------------------------------------------------
diff --git a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/LocalDateTimeConverter.java b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/LocalDateTimeConverter.java
index 5125231..0dd3351 100644
--- a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/LocalDateTimeConverter.java
+++ b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/LocalDateTimeConverter.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.time.LocalDateTime;
import java.util.Objects;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/LocalTimeConverter.java
----------------------------------------------------------------------
diff --git a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/LocalTimeConverter.java b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/LocalTimeConverter.java
index 5858546..047d6ff 100644
--- a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/LocalTimeConverter.java
+++ b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/LocalTimeConverter.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.time.LocalTime;
import java.util.Objects;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/LongConverter.java
----------------------------------------------------------------------
diff --git a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/LongConverter.java b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/LongConverter.java
index 149f66b..561c846 100644
--- a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/LongConverter.java
+++ b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/LongConverter.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.util.Locale;
import java.util.Objects;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/NumberConverter.java
----------------------------------------------------------------------
diff --git a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/NumberConverter.java b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/NumberConverter.java
index 4f9b01e..7ec7dff 100644
--- a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/NumberConverter.java
+++ b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/NumberConverter.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.math.BigDecimal;
import java.util.Locale;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/ShortConverter.java
----------------------------------------------------------------------
diff --git a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/ShortConverter.java b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/ShortConverter.java
index 9e28007..81ff510 100644
--- a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/ShortConverter.java
+++ b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/ShortConverter.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.util.Locale;
import java.util.Objects;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/URLConverter.java
----------------------------------------------------------------------
diff --git a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/URLConverter.java b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/URLConverter.java
index 27470a5..8401048 100644
--- a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/URLConverter.java
+++ b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/URLConverter.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.net.URL;
import java.util.Objects;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/URiConverter.java
----------------------------------------------------------------------
diff --git a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/URiConverter.java b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/URiConverter.java
index 2c29ecc..be8926f 100644
--- a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/URiConverter.java
+++ b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/URiConverter.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.net.URI;
import java.util.Objects;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/ZoneIdConverter.java
----------------------------------------------------------------------
diff --git a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/ZoneIdConverter.java b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/ZoneIdConverter.java
index fcbfbd4..efdd0f5 100644
--- a/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/ZoneIdConverter.java
+++ b/java8/core/src/main/java/org/apache/tamaya/core/internal/converters/ZoneIdConverter.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.time.ZoneId;
import java.util.Objects;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/513af214/java8/core/src/test/java/org/apache/tamaya/core/internal/PropertyConverterManagerTest.java
----------------------------------------------------------------------
diff --git a/java8/core/src/test/java/org/apache/tamaya/core/internal/PropertyConverterManagerTest.java b/java8/core/src/test/java/org/apache/tamaya/core/internal/PropertyConverterManagerTest.java
index 332105a..fb80e05 100644
--- a/java8/core/src/test/java/org/apache/tamaya/core/internal/PropertyConverterManagerTest.java
+++ b/java8/core/src/test/java/org/apache/tamaya/core/internal/PropertyConverterManagerTest.java
@@ -19,7 +19,7 @@
package org.apache.tamaya.core.internal;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import org.apache.tamaya.TypeLiteral;
import org.junit.Test;
[2/2] incubator-tamaya git commit: Moved PropertyConverter into SPI
package.
Posted by an...@apache.org.
Moved PropertyConverter into SPI package.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/f9695b59
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/f9695b59
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/f9695b59
Branch: refs/heads/master
Commit: f9695b59fe343c76c31ee3fb62f2b57fd749ab95
Parents: 513af21
Author: anatole <an...@apache.org>
Authored: Fri Apr 17 22:41:11 2015 +0200
Committer: anatole <an...@apache.org>
Committed: Fri Apr 17 22:41:11 2015 +0200
----------------------------------------------------------------------
.../tamaya/builder/ConfigurationBuilder.java | 20 ++++++++++----------
.../ProgrammaticConfigurationContext.java | 4 ++--
.../types/CustomTypeCPropertyConverter.java | 2 +-
.../org.apache.tamaya.PropertyConverter | 19 -------------------
.../org.apache.tamaya.spi.PropertyConverter | 19 +++++++++++++++++++
.../tamaya/inject/WithPropertyConverter.java | 2 +-
.../inject/internal/DefaultDynamicValue.java | 4 ++--
.../tamaya/inject/internal/InjectionUtils.java | 2 +-
8 files changed, 36 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f9695b59/modules/builder/src/main/java/org/apache/tamaya/builder/ConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/modules/builder/src/main/java/org/apache/tamaya/builder/ConfigurationBuilder.java b/modules/builder/src/main/java/org/apache/tamaya/builder/ConfigurationBuilder.java
index 21d6cf7..dfe821b 100644
--- a/modules/builder/src/main/java/org/apache/tamaya/builder/ConfigurationBuilder.java
+++ b/modules/builder/src/main/java/org/apache/tamaya/builder/ConfigurationBuilder.java
@@ -20,7 +20,7 @@ package org.apache.tamaya.builder;
import org.apache.tamaya.ConfigException;
import org.apache.tamaya.Configuration;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import org.apache.tamaya.TypeLiteral;
import org.apache.tamaya.core.internal.DefaultConfiguration;
import org.apache.tamaya.format.ConfigurationData;
@@ -326,7 +326,7 @@ public class ConfigurationBuilder {
*
* @return the builder instance currently used
*
- * @see org.apache.tamaya.PropertyConverter
+ * @see org.apache.tamaya.spi.PropertyConverter
* @see #enableProvidedPropertyConverters()
* @see #disableProvidedPropertyConverters()
*/
@@ -349,7 +349,7 @@ public class ConfigurationBuilder {
}
/**
- * Checks if the automatic loading of all {@link org.apache.tamaya.PropertyConverter
+ * Checks if the automatic loading of all {@link org.apache.tamaya.spi.PropertyConverter
* PropertyConverter} service providers is enabled or disabled.
*
* @return {@code true} if the automatic loading is enabled,
@@ -357,20 +357,20 @@ public class ConfigurationBuilder {
*
* @see #enableProvidedPropertyConverters()
* @see #disableProvidedPropertyConverters()
- * @see #addPropertyConverter(Class, org.apache.tamaya.PropertyConverter)
- * @see #addPropertyConverter(org.apache.tamaya.TypeLiteral, org.apache.tamaya.PropertyConverter)
+ * @see #addPropertyConverter(Class, org.apache.tamaya.spi.PropertyConverter)
+ * @see #addPropertyConverter(org.apache.tamaya.TypeLiteral, org.apache.tamaya.spi.PropertyConverter)
*/
public boolean isPropertyConverterLoadingEnabled() {
return loadProvidedPropertyConverters;
}
/**
- * Enables the loading of all {@link org.apache.tamaya.PropertyConverter}
+ * Enables the loading of all {@link org.apache.tamaya.spi.PropertyConverter}
* service providers.
*
* @return the builder instance currently used
*
- * @see org.apache.tamaya.PropertyConverter
+ * @see org.apache.tamaya.spi.PropertyConverter
* @see #disableProvidedPropertyConverters()
* @see #enableProvidedPropertyConverters()
*/
@@ -383,14 +383,14 @@ public class ConfigurationBuilder {
}
/**
- * Disables the automatic loading of all {@link org.apache.tamaya.PropertyConverter}
+ * Disables the automatic loading of all {@link org.apache.tamaya.spi.PropertyConverter}
* service providers.
*
* @return the builder instance currently used
*
- * @see org.apache.tamaya.PropertyConverter
+ * @see org.apache.tamaya.spi.PropertyConverter
* @see #enableProvidedPropertyConverters()
- * @see #addPropertyConverter(Class, org.apache.tamaya.PropertyConverter)
+ * @see #addPropertyConverter(Class, org.apache.tamaya.spi.PropertyConverter)
*/
public ConfigurationBuilder disableProvidedPropertyConverters() {
checkBuilderState();
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f9695b59/modules/builder/src/main/java/org/apache/tamaya/builder/ProgrammaticConfigurationContext.java
----------------------------------------------------------------------
diff --git a/modules/builder/src/main/java/org/apache/tamaya/builder/ProgrammaticConfigurationContext.java b/modules/builder/src/main/java/org/apache/tamaya/builder/ProgrammaticConfigurationContext.java
index 6c7e845..d867c3e 100644
--- a/modules/builder/src/main/java/org/apache/tamaya/builder/ProgrammaticConfigurationContext.java
+++ b/modules/builder/src/main/java/org/apache/tamaya/builder/ProgrammaticConfigurationContext.java
@@ -19,7 +19,7 @@
package org.apache.tamaya.builder;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import org.apache.tamaya.TypeLiteral;
import org.apache.tamaya.core.internal.PropertyConverterManager;
import org.apache.tamaya.spi.ConfigurationContext;
@@ -62,7 +62,7 @@ class ProgrammaticConfigurationContext implements ConfigurationContext {
*/
private final static Logger LOG = Logger.getLogger(ProgrammaticConfigurationContext.class.getName());
/**
- * Cubcomponent handling {@link org.apache.tamaya.PropertyConverter} instances.
+ * Cubcomponent handling {@link org.apache.tamaya.spi.PropertyConverter} instances.
*/
private PropertyConverterManager propertyConverterManager = new PropertyConverterManager();
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f9695b59/modules/builder/src/test/java/org/apache/tamaya/builder/util/types/CustomTypeCPropertyConverter.java
----------------------------------------------------------------------
diff --git a/modules/builder/src/test/java/org/apache/tamaya/builder/util/types/CustomTypeCPropertyConverter.java b/modules/builder/src/test/java/org/apache/tamaya/builder/util/types/CustomTypeCPropertyConverter.java
index 1754b30..c7d1490 100644
--- a/modules/builder/src/test/java/org/apache/tamaya/builder/util/types/CustomTypeCPropertyConverter.java
+++ b/modules/builder/src/test/java/org/apache/tamaya/builder/util/types/CustomTypeCPropertyConverter.java
@@ -18,7 +18,7 @@
*/
package org.apache.tamaya.builder.util.types;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
public class CustomTypeCPropertyConverter implements PropertyConverter<org.apache.tamaya.builder.util.types.CustomTypeC> {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f9695b59/modules/builder/src/test/resources/META-INF/services/org.apache.tamaya.PropertyConverter
----------------------------------------------------------------------
diff --git a/modules/builder/src/test/resources/META-INF/services/org.apache.tamaya.PropertyConverter b/modules/builder/src/test/resources/META-INF/services/org.apache.tamaya.PropertyConverter
deleted file mode 100644
index b9e0d44..0000000
--- a/modules/builder/src/test/resources/META-INF/services/org.apache.tamaya.PropertyConverter
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# 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.builder.util.types.CustomTypeCPropertyConverter
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f9695b59/modules/builder/src/test/resources/META-INF/services/org.apache.tamaya.spi.PropertyConverter
----------------------------------------------------------------------
diff --git a/modules/builder/src/test/resources/META-INF/services/org.apache.tamaya.spi.PropertyConverter b/modules/builder/src/test/resources/META-INF/services/org.apache.tamaya.spi.PropertyConverter
new file mode 100644
index 0000000..b9e0d44
--- /dev/null
+++ b/modules/builder/src/test/resources/META-INF/services/org.apache.tamaya.spi.PropertyConverter
@@ -0,0 +1,19 @@
+#
+# 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.builder.util.types.CustomTypeCPropertyConverter
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f9695b59/modules/injection/src/main/java/org/apache/tamaya/inject/WithPropertyConverter.java
----------------------------------------------------------------------
diff --git a/modules/injection/src/main/java/org/apache/tamaya/inject/WithPropertyConverter.java b/modules/injection/src/main/java/org/apache/tamaya/inject/WithPropertyConverter.java
index 2759cc3..f0c3796 100644
--- a/modules/injection/src/main/java/org/apache/tamaya/inject/WithPropertyConverter.java
+++ b/modules/injection/src/main/java/org/apache/tamaya/inject/WithPropertyConverter.java
@@ -19,7 +19,7 @@
package org.apache.tamaya.inject;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f9695b59/modules/injection/src/main/java/org/apache/tamaya/inject/internal/DefaultDynamicValue.java
----------------------------------------------------------------------
diff --git a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/DefaultDynamicValue.java b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/DefaultDynamicValue.java
index 0af7aa8..ce80dc0 100644
--- a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/DefaultDynamicValue.java
+++ b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/DefaultDynamicValue.java
@@ -20,7 +20,7 @@ package org.apache.tamaya.inject.internal;
import org.apache.tamaya.ConfigException;
import org.apache.tamaya.Configuration;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import org.apache.tamaya.TypeLiteral;
import org.apache.tamaya.inject.DynamicValue;
import org.apache.tamaya.inject.WithPropertyConverter;
@@ -77,7 +77,7 @@ public final class DefaultDynamicValue<T> implements DynamicValue<T>, Serializab
*/
private Configuration configuration;
/**
- * The target type of the property used to lookup a matching {@link org.apache.tamaya.PropertyConverter}.
+ * The target type of the property used to lookup a matching {@link org.apache.tamaya.spi.PropertyConverter}.
* If null, {@code propertyConverter} is set and used instead.
*/
private TypeLiteral<T> targetType;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/f9695b59/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionUtils.java
----------------------------------------------------------------------
diff --git a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionUtils.java b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionUtils.java
index 4f0516a..ab21089 100644
--- a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionUtils.java
+++ b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/InjectionUtils.java
@@ -38,7 +38,7 @@ import org.apache.tamaya.inject.DefaultValue;
import org.apache.tamaya.inject.WithLoadPolicy;
import org.apache.tamaya.inject.WithPropertyConverter;
import org.apache.tamaya.resolver.spi.ExpressionEvaluator;
-import org.apache.tamaya.PropertyConverter;
+import org.apache.tamaya.spi.PropertyConverter;
import org.apache.tamaya.spi.ServiceContext;