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 2017/08/07 15:52:17 UTC
[1/2] incubator-tamaya-extensions git commit: TAMAYA-274: Moved to
Java 8.
Repository: incubator-tamaya-extensions
Updated Branches:
refs/heads/java8 [created] 5cb0e696e
TAMAYA-274: Moved to Java 8.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/6fdd34c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/6fdd34c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/6fdd34c7
Branch: refs/heads/java8
Commit: 6fdd34c759fb9dae915438b9fc9a75f93d131d1e
Parents: 46beb9a
Author: anatole <an...@apache.org>
Authored: Mon Aug 7 17:34:25 2017 +0200
Committer: anatole <an...@apache.org>
Committed: Mon Aug 7 17:34:25 2017 +0200
----------------------------------------------------------------------
.../org/apache/tamaya/events/ConfigEventListener.java | 1 +
.../java/org/apache/tamaya/functions/KeyMapper.java | 2 +-
.../java/org/apache/tamaya/functions/Predicate.java | 13 ++-----------
.../org/apache/tamaya/functions/PropertyMatcher.java | 2 +-
.../java/org/apache/tamaya/functions/Supplier.java | 10 ++--------
.../tamaya/mutableconfig/ChangePropagationPolicy.java | 1 +
.../java/org/apache/tamaya/optional/ValueProvider.java | 1 +
.../org/apache/tamaya/resource/ResourceLocator.java | 1 +
.../spisupport/DefaultConfigurationContextBuilder.java | 3 ++-
pom.xml | 2 +-
10 files changed, 13 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/6fdd34c7/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventListener.java
----------------------------------------------------------------------
diff --git a/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventListener.java b/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventListener.java
index 7fb32c8..fd08191 100644
--- a/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventListener.java
+++ b/modules/events/src/main/java/org/apache/tamaya/events/ConfigEventListener.java
@@ -21,6 +21,7 @@ package org.apache.tamaya.events;
/**
* Interface to be implemented for listening on changes on {@link org.apache.tamaya.Configuration} instances.
*/
+@FunctionalInterface
public interface ConfigEventListener {
/**
* Called if an event occurred.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/6fdd34c7/modules/functions/src/main/java/org/apache/tamaya/functions/KeyMapper.java
----------------------------------------------------------------------
diff --git a/modules/functions/src/main/java/org/apache/tamaya/functions/KeyMapper.java b/modules/functions/src/main/java/org/apache/tamaya/functions/KeyMapper.java
index 2666c1b..bf6e6d3 100644
--- a/modules/functions/src/main/java/org/apache/tamaya/functions/KeyMapper.java
+++ b/modules/functions/src/main/java/org/apache/tamaya/functions/KeyMapper.java
@@ -23,7 +23,7 @@ package org.apache.tamaya.functions;
* if mapped to null).
*
*/
-//@FunctionalInterface
+@FunctionalInterface
public interface KeyMapper {
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/6fdd34c7/modules/functions/src/main/java/org/apache/tamaya/functions/Predicate.java
----------------------------------------------------------------------
diff --git a/modules/functions/src/main/java/org/apache/tamaya/functions/Predicate.java b/modules/functions/src/main/java/org/apache/tamaya/functions/Predicate.java
index 3061746..5c8869e 100644
--- a/modules/functions/src/main/java/org/apache/tamaya/functions/Predicate.java
+++ b/modules/functions/src/main/java/org/apache/tamaya/functions/Predicate.java
@@ -26,17 +26,8 @@ package org.apache.tamaya.functions;
*
* @param <T> the type of the input to the predicate
*/
-//@FunctionalInterface
-public interface Predicate<T> {
-
- /**
- * Evaluates this predicate on the given argument.
- *
- * @param t the input argument
- * @return {@code true} if the input argument matches the predicate,
- * otherwise {@code false}
- */
- boolean test(T t);
+@FunctionalInterface
+public interface Predicate<T> extends java.util.function.Predicate<T>{
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/6fdd34c7/modules/functions/src/main/java/org/apache/tamaya/functions/PropertyMatcher.java
----------------------------------------------------------------------
diff --git a/modules/functions/src/main/java/org/apache/tamaya/functions/PropertyMatcher.java b/modules/functions/src/main/java/org/apache/tamaya/functions/PropertyMatcher.java
index 45d44ee..cfb207e 100644
--- a/modules/functions/src/main/java/org/apache/tamaya/functions/PropertyMatcher.java
+++ b/modules/functions/src/main/java/org/apache/tamaya/functions/PropertyMatcher.java
@@ -22,7 +22,7 @@ package org.apache.tamaya.functions;
* Represents a selector predicate for selecting configuration properties.
* This can be used as a functional interface in Java 8.
*/
-//@FunctionalInterface
+@FunctionalInterface
public interface PropertyMatcher {
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/6fdd34c7/modules/functions/src/main/java/org/apache/tamaya/functions/Supplier.java
----------------------------------------------------------------------
diff --git a/modules/functions/src/main/java/org/apache/tamaya/functions/Supplier.java b/modules/functions/src/main/java/org/apache/tamaya/functions/Supplier.java
index e32a266..dc9ced7 100644
--- a/modules/functions/src/main/java/org/apache/tamaya/functions/Supplier.java
+++ b/modules/functions/src/main/java/org/apache/tamaya/functions/Supplier.java
@@ -29,13 +29,7 @@ package org.apache.tamaya.functions;
*
* @param <T> the type of results supplied by this supplier
*/
-//@FunctionalInterface
-public interface Supplier<T> {
+@FunctionalInterface
+public interface Supplier<T> extends java.util.function.Supplier<T>{
- /**
- * Gets a result.
- *
- * @return a result
- */
- T get();
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/6fdd34c7/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ChangePropagationPolicy.java
----------------------------------------------------------------------
diff --git a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ChangePropagationPolicy.java b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ChangePropagationPolicy.java
index 44bbbcd..0cfd8b8 100644
--- a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ChangePropagationPolicy.java
+++ b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/ChangePropagationPolicy.java
@@ -39,6 +39,7 @@ import java.util.Collection;
* <li><b>NONE: </b>Do not apply any changes.</li>
* </ul>
*/
+@FunctionalInterface
public interface ChangePropagationPolicy {
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/6fdd34c7/modules/optional/src/main/java/org/apache/tamaya/optional/ValueProvider.java
----------------------------------------------------------------------
diff --git a/modules/optional/src/main/java/org/apache/tamaya/optional/ValueProvider.java b/modules/optional/src/main/java/org/apache/tamaya/optional/ValueProvider.java
index 4ca88b0..1423341 100644
--- a/modules/optional/src/main/java/org/apache/tamaya/optional/ValueProvider.java
+++ b/modules/optional/src/main/java/org/apache/tamaya/optional/ValueProvider.java
@@ -26,6 +26,7 @@ package org.apache.tamaya.optional;
* code with optional Tamaya configuration support to create a bridge between his code and the values optionally
* returned by Tamaya.
*/
+@FunctionalInterface
public interface ValueProvider {
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/6fdd34c7/modules/resources/src/main/java/org/apache/tamaya/resource/ResourceLocator.java
----------------------------------------------------------------------
diff --git a/modules/resources/src/main/java/org/apache/tamaya/resource/ResourceLocator.java b/modules/resources/src/main/java/org/apache/tamaya/resource/ResourceLocator.java
index c301eea..d094487 100644
--- a/modules/resources/src/main/java/org/apache/tamaya/resource/ResourceLocator.java
+++ b/modules/resources/src/main/java/org/apache/tamaya/resource/ResourceLocator.java
@@ -24,6 +24,7 @@ import java.util.Collection;
/**
* Delegate interface for loading URLs from a given data resource locator pattern String.
*/
+@FunctionalInterface
public interface ResourceLocator {
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/6fdd34c7/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfigurationContextBuilder.java
----------------------------------------------------------------------
diff --git a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfigurationContextBuilder.java b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfigurationContextBuilder.java
index d3b6930..023faf3 100644
--- a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfigurationContextBuilder.java
+++ b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfigurationContextBuilder.java
@@ -67,7 +67,8 @@ public class DefaultConfigurationContextBuilder implements ConfigurationContextB
}
/**
- * Creates a new builder instance.
+ * Creates a new builder instance initializing it with the given context.
+ * @param context the context to be used, not null.
*/
public DefaultConfigurationContextBuilder(ConfigurationContext context) {
this.propertyConverters.putAll(context.getPropertyConverters());
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/6fdd34c7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b663ae0..c506628 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@ under the License.
<commons-io.version>2.5</commons-io.version>
<findbugs.skip>false</findbugs.skip>
- <jdkVersion>1.7</jdkVersion>
+ <jdkVersion>1.8</jdkVersion>
<osgi.version>4.3.1</osgi.version>
<osgi.compendium.version>${osgi.version}</osgi.compendium.version>
<maven.compile.targetLevel>${jdkVersion}</maven.compile.targetLevel>
[2/2] incubator-tamaya-extensions git commit: TAMAYA-274: Moved to
Java 8, fixed Javadoc issues.
Posted by an...@apache.org.
TAMAYA-274: Moved to Java 8, fixed Javadoc issues.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/5cb0e696
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/5cb0e696
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/5cb0e696
Branch: refs/heads/java8
Commit: 5cb0e696ef63607f28600e129c8574293e7e1421
Parents: 6fdd34c
Author: anatole <an...@apache.org>
Authored: Mon Aug 7 17:51:55 2017 +0200
Committer: anatole <an...@apache.org>
Committed: Mon Aug 7 17:51:55 2017 +0200
----------------------------------------------------------------------
.../apache/tamaya/events/FrozenConfiguration.java | 2 +-
.../java/org/apache/tamaya/inject/api/Config.java | 15 ++++-----------
.../apache/tamaya/inject/spi/BaseDynamicValue.java | 2 +-
3 files changed, 6 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/5cb0e696/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java b/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java
index 295a609..61e8abe 100644
--- a/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java
+++ b/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java
@@ -209,7 +209,7 @@ public final class FrozenConfiguration implements Configuration, Serializable {
*
* <p>The time is taken from {@linkplain System#currentTimeMillis()}</p>
*
- * @see {@linkplain System#currentTimeMillis()}
+ * @see System#currentTimeMillis()
* @return the moment in time when this configruration has been created
*/
public long getFrozenAt() {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/5cb0e696/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/api/Config.java
----------------------------------------------------------------------
diff --git a/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/api/Config.java b/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/api/Config.java
index 6ce55ed..67a3bfc 100644
--- a/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/api/Config.java
+++ b/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/api/Config.java
@@ -34,15 +34,12 @@ import java.lang.annotation.Target;
* <h3>Simplest variant</h3>
* Below the most simple variant of a configured class is given:
* <pre>
- * {@code
* package a.b;
*
* public class ConfiguredItem {
- *
- * @Config
+ * &Config
* private String aValue;
* }
- * }
* </pre>
* Configuration resolution is implemented as follows:
* <ul>
@@ -57,14 +54,12 @@ import java.lang.annotation.Target;
* <h3>Explicit annotations</h3>
* In the next example we explicitly define the configuration keys to be used:
* <pre>
- * {@code
- * @ConfigDefaultSections("section1")
+ * &ConfigDefaultSections("section1")
* public class ConfiguredItem {
*
- * @Config(value = {"b", "[a.b.deprecated.keys]", "a"}, defaultValue = "myDefaultValue")
+ * &Config(value = {"b", "[a.b.deprecated.keys]", "a"}, defaultValue = "myDefaultValue")
* private String aValue;
* }
- * }
* </pre>
*
* Within this example we evaluate multiple possible keys: {@code section1.b, a.b.deprecated.keys, section1.a}.
@@ -76,15 +71,13 @@ import java.lang.annotation.Target;
* In the last example we explicitly define the configuration keys but omit the section part, letting the default
* section names to be taken:
* <pre>
- * {@code
* package a.b;
*
* public class ConfiguredItem {
*
- * @Config(value = {"b", "[a.b.deprecated.keys]", "a"}, defaultValue = "myDefaultValue")
+ * &Config(value = {"b", "[a.b.deprecated.keys]", "a"}, defaultValue = "myDefaultValue")
* private String aValue;
* }
- * }
* </pre>
*
* Key resolution is similar to above, but now the default package names are used, resulting in
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/5cb0e696/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/spi/BaseDynamicValue.java
----------------------------------------------------------------------
diff --git a/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/spi/BaseDynamicValue.java b/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/spi/BaseDynamicValue.java
index f9e2079..a23a85c 100644
--- a/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/spi/BaseDynamicValue.java
+++ b/modules/injection/injection-api/src/main/java/org/apache/tamaya/inject/spi/BaseDynamicValue.java
@@ -28,7 +28,7 @@ import java.io.Serializable;
* code), can apply a new value. Depending on the {@link org.apache.tamaya.inject.api.UpdatePolicy} the new value is applied immedeately, when the
* change has been identified, or it requires an programmatic commit by client code to
* activate the change in the {@link DynamicValue}. Similarly an instance also can ignore all
- * later changes to the value.</p>
+ * later changes to the value.
*
* <h3>Implementation Specification</h3>
* This class is