Repository: incubator-tamaya Updated Branches: refs/heads/master 4b0015048 -> 909ec1616
TAMAYA-47: RAT and checkstyle fixes. Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/909ec161 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/909ec161 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/909ec161 Branch: refs/heads/master Commit: 909ec161631ff6e1fd6cfb6e93b53e2a3c63520a Parents: 4b00150 Author: anatole <anat...@apache.org> Authored: Mon Jan 5 10:14:50 2015 +0100 Committer: anatole <anat...@apache.org> Committed: Mon Jan 5 10:14:50 2015 +0100 ---------------------------------------------------------------------- .../internal/DefaultExpressionEvaluator.java | 6 ++++-- .../internal/ExpressionResolutionFilter.java | 6 ------ .../tamaya/resolver/spi/ExpressionEvaluator.java | 18 ++++++++++++++++++ .../services/org.apache.tamaya.spi.PropertyFilter | 2 +- 4 files changed, 23 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/909ec161/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/DefaultExpressionEvaluator.java ---------------------------------------------------------------------- diff --git a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/DefaultExpressionEvaluator.java b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/DefaultExpressionEvaluator.java index 5c538e1..82af73d 100644 --- a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/DefaultExpressionEvaluator.java +++ b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/DefaultExpressionEvaluator.java @@ -19,12 +19,14 @@ package org.apache.tamaya.resolver.internal; import org.apache.tamaya.resolver.spi.ExpressionEvaluator; -import org.apache.tamaya.spi.PropertyFilter; import org.apache.tamaya.spi.ServiceContext; import org.apache.tamaya.resolver.spi.ExpressionResolver; import javax.annotation.Priority; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.StringTokenizer; import java.util.function.Function; import java.util.logging.Level; import java.util.logging.Logger; http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/909ec161/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ExpressionResolutionFilter.java ---------------------------------------------------------------------- diff --git a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ExpressionResolutionFilter.java b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ExpressionResolutionFilter.java index e136225..f82b980 100644 --- a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ExpressionResolutionFilter.java +++ b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ExpressionResolutionFilter.java @@ -19,17 +19,11 @@ package org.apache.tamaya.resolver.internal; import org.apache.tamaya.resolver.spi.ExpressionEvaluator; -import org.apache.tamaya.resolver.spi.ExpressionResolver; import org.apache.tamaya.spi.PropertyFilter; import org.apache.tamaya.spi.ServiceContext; import javax.annotation.Priority; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.StringTokenizer; import java.util.function.Function; -import java.util.logging.Level; import java.util.logging.Logger; /** http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/909ec161/modules/resolver/src/main/java/org/apache/tamaya/resolver/spi/ExpressionEvaluator.java ---------------------------------------------------------------------- diff --git a/modules/resolver/src/main/java/org/apache/tamaya/resolver/spi/ExpressionEvaluator.java b/modules/resolver/src/main/java/org/apache/tamaya/resolver/spi/ExpressionEvaluator.java index 16f0b5b..b10ff23 100644 --- a/modules/resolver/src/main/java/org/apache/tamaya/resolver/spi/ExpressionEvaluator.java +++ b/modules/resolver/src/main/java/org/apache/tamaya/resolver/spi/ExpressionEvaluator.java @@ -1,3 +1,21 @@ +/* + * 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.resolver.spi; import java.util.function.Function; http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/909ec161/modules/resolver/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertyFilter ---------------------------------------------------------------------- diff --git a/modules/resolver/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertyFilter b/modules/resolver/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertyFilter index aa766b6..c8788b5 100644 --- a/modules/resolver/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertyFilter +++ b/modules/resolver/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertyFilter @@ -16,4 +16,4 @@ # specific language governing permissions and limitations # under the License. # -org.apache.tamaya.resolver.internal.DefaultExpressionEvaluator \ No newline at end of file +org.apache.tamaya.resolver.internal.ExpressionResolutionFilter \ No newline at end of file
