Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 12898200D1F for ; Thu, 28 Sep 2017 22:06:32 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 10EFA1609EC; Thu, 28 Sep 2017 20:06:32 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 112C81609B4 for ; Thu, 28 Sep 2017 22:06:30 +0200 (CEST) Received: (qmail 45324 invoked by uid 500); 28 Sep 2017 20:06:30 -0000 Mailing-List: contact commits-help@tamaya.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tamaya.incubator.apache.org Delivered-To: mailing list commits@tamaya.incubator.apache.org Received: (qmail 45309 invoked by uid 99); 28 Sep 2017 20:06:30 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Sep 2017 20:06:30 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id BB8A6180FC4 for ; Thu, 28 Sep 2017 20:06:29 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.222 X-Spam-Level: X-Spam-Status: No, score=-4.222 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id ZpvuEpnX5woa for ; Thu, 28 Sep 2017 20:06:27 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 4679D5F3CF for ; Thu, 28 Sep 2017 20:06:27 +0000 (UTC) Received: (qmail 44997 invoked by uid 99); 28 Sep 2017 20:06:26 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Sep 2017 20:06:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BE608F5BE8; Thu, 28 Sep 2017 20:06:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anatole@apache.org To: commits@tamaya.incubator.apache.org Date: Thu, 28 Sep 2017 20:06:26 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [01/14] incubator-tamaya-extensions git commit: TAMAYA-274: Moved to Java 8. archived-at: Thu, 28 Sep 2017 20:06:32 -0000 Repository: incubator-tamaya-extensions Updated Branches: refs/heads/master 2d32caaa7 -> a9552da35 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/master Commit: 6fdd34c759fb9dae915438b9fc9a75f93d131d1e Parents: 46beb9a Author: anatole Authored: Mon Aug 7 17:34:25 2017 +0200 Committer: anatole 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 the type of the input to the predicate */ -//@FunctionalInterface -public interface Predicate { - - /** - * 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 extends java.util.function.Predicate{ } 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 the type of results supplied by this supplier */ -//@FunctionalInterface -public interface Supplier { +@FunctionalInterface +public interface Supplier extends java.util.function.Supplier{ - /** - * 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; *
  • NONE: Do not apply any changes.
    • * */ +@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. 2.5 false - 1.7 + 1.8 4.3.1 ${osgi.version} ${jdkVersion}