You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by pl...@apache.org on 2015/04/14 08:43:51 UTC
incubator-tamaya git commit: Establishing naming convention for
property filters.
Repository: incubator-tamaya
Updated Branches:
refs/heads/master 7bc788c73 -> e7d615155
Establishing naming convention for property filters.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/e7d61515
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/e7d61515
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/e7d61515
Branch: refs/heads/master
Commit: e7d615155f5b48dd9c2879f4a3fe877a6659da70
Parents: 7bc788c
Author: Oliver B. Fischer <pl...@apache.org>
Authored: Tue Apr 14 08:42:56 2015 +0200
Committer: Oliver B. Fischer <pl...@apache.org>
Committed: Tue Apr 14 08:42:56 2015 +0200
----------------------------------------------------------------------
.../testdata/TestPropertyFilterRemoving.java | 42 --------------------
.../testdata/TestRemovingPropertyFilter.java | 42 ++++++++++++++++++++
.../org.apache.tamaya.spi.PropertyFilter | 2 +-
.../core/internal/DefaultConfigurationTest.java | 20 +++++-----
.../testdata/TestPropertyFilterRemoving.java | 41 -------------------
.../testdata/TestRemovingPropertyFilter.java | 41 +++++++++++++++++++
.../org.apache.tamaya.spi.PropertyFilter | 2 +-
jqassistant/default.xml | 17 ++++++++
.../builder/ConfigurationBuilderTest.java | 16 ++++----
.../builder/TestANonSPIPropertyFilter.java | 34 ++++++++++++++++
.../builder/TestBNonSPIPropertyFilter.java | 34 ++++++++++++++++
.../builder/TestNonSPIPropertyFilterA.java | 34 ----------------
.../builder/TestNonSPIPropertyFilterB.java | 34 ----------------
13 files changed, 188 insertions(+), 171 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e7d61515/java7/core/src/test/java/org/apache/tamaya/core/testdata/TestPropertyFilterRemoving.java
----------------------------------------------------------------------
diff --git a/java7/core/src/test/java/org/apache/tamaya/core/testdata/TestPropertyFilterRemoving.java b/java7/core/src/test/java/org/apache/tamaya/core/testdata/TestPropertyFilterRemoving.java
deleted file mode 100644
index 948ff26..0000000
--- a/java7/core/src/test/java/org/apache/tamaya/core/testdata/TestPropertyFilterRemoving.java
+++ /dev/null
@@ -1,42 +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.core.testdata;
-
-import org.apache.tamaya.Configuration;
-import org.apache.tamaya.ConfigurationProvider;
-import org.apache.tamaya.spi.PropertyFilter;
-
-import javax.annotation.Priority;
-
-/**
- * Simple PropertyFilter that filters exact one value, registered using ServiceLoader.
- */
-@Priority(200)
-public class TestPropertyFilterRemoving implements PropertyFilter{
- @Override
- public String filterProperty(String key, String valueToBeFiltered) {
- if("name5".equals(key)){
- return null;
- }
- else if("name3".equals(key)){
- return "Mapped to name: " + ConfigurationProvider.getConfiguration().get("name");
- }
- return valueToBeFiltered;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e7d61515/java7/core/src/test/java/org/apache/tamaya/core/testdata/TestRemovingPropertyFilter.java
----------------------------------------------------------------------
diff --git a/java7/core/src/test/java/org/apache/tamaya/core/testdata/TestRemovingPropertyFilter.java b/java7/core/src/test/java/org/apache/tamaya/core/testdata/TestRemovingPropertyFilter.java
new file mode 100644
index 0000000..2cc0b9e
--- /dev/null
+++ b/java7/core/src/test/java/org/apache/tamaya/core/testdata/TestRemovingPropertyFilter.java
@@ -0,0 +1,42 @@
+/*
+ * 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.core.testdata;
+
+import org.apache.tamaya.Configuration;
+import org.apache.tamaya.ConfigurationProvider;
+import org.apache.tamaya.spi.PropertyFilter;
+
+import javax.annotation.Priority;
+
+/**
+ * Simple PropertyFilter that filters exact one value, registered using ServiceLoader.
+ */
+@Priority(200)
+public class TestRemovingPropertyFilter implements PropertyFilter{
+ @Override
+ public String filterProperty(String key, String valueToBeFiltered) {
+ if("name5".equals(key)){
+ return null;
+ }
+ else if("name3".equals(key)){
+ return "Mapped to name: " + ConfigurationProvider.getConfiguration().get("name");
+ }
+ return valueToBeFiltered;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e7d61515/java7/core/src/test/resources/META-INF/services/org.apache.tamaya.spi.PropertyFilter
----------------------------------------------------------------------
diff --git a/java7/core/src/test/resources/META-INF/services/org.apache.tamaya.spi.PropertyFilter b/java7/core/src/test/resources/META-INF/services/org.apache.tamaya.spi.PropertyFilter
index 59bbab3..18e61cb 100644
--- a/java7/core/src/test/resources/META-INF/services/org.apache.tamaya.spi.PropertyFilter
+++ b/java7/core/src/test/resources/META-INF/services/org.apache.tamaya.spi.PropertyFilter
@@ -17,4 +17,4 @@
# under the License.
#
org.apache.tamaya.core.testdata.TestPropertyFilter
-org.apache.tamaya.core.testdata.TestPropertyFilterRemoving
+org.apache.tamaya.core.testdata.TestRemovingPropertyFilter
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e7d61515/java8/core/src/test/java/org/apache/tamaya/core/internal/DefaultConfigurationTest.java
----------------------------------------------------------------------
diff --git a/java8/core/src/test/java/org/apache/tamaya/core/internal/DefaultConfigurationTest.java b/java8/core/src/test/java/org/apache/tamaya/core/internal/DefaultConfigurationTest.java
index 8b1c2e0..3ddec4f 100644
--- a/java8/core/src/test/java/org/apache/tamaya/core/internal/DefaultConfigurationTest.java
+++ b/java8/core/src/test/java/org/apache/tamaya/core/internal/DefaultConfigurationTest.java
@@ -42,10 +42,10 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
public class DefaultConfigurationTest {
- private FilterAppendingA FILTER_APPENDING_A = new FilterAppendingA();
- private FilterPrependingB FILTER_PREPENDING_B = new FilterPrependingB();
- private FilterPrependingC FILTER_PREPENDING_C = new FilterPrependingC();
- private FilterPrependingD FILTER_PREPENDING_D = new FilterPrependingD();
+ private AppendingAFilter FILTER_APPENDING_A = new AppendingAFilter();
+ private PrependingBFilter FILTER_PREPENDING_B = new PrependingBFilter();
+ private PrependingCFilter FILTER_PREPENDING_C = new PrependingCFilter();
+ private PrependingDFilter FILTER_PREPENDING_D = new PrependingDFilter();
/* =
* =- Section with tests for filtering properties with PropertyFilters
@@ -80,8 +80,8 @@ public class DefaultConfigurationTest {
public void filteringOfGivenValueWorksWithTwoFiltersWithoutPriority() {
List<PropertyFilter> filters = new ArrayList<>();
- FilterAppendingA filterA = spy(FILTER_APPENDING_A);
- FilterPrependingB filterB = spy(FILTER_PREPENDING_B);
+ AppendingAFilter filterA = spy(FILTER_APPENDING_A);
+ PrependingBFilter filterB = spy(FILTER_PREPENDING_B);
filters.add(filterA);
filters.add(filterB);
@@ -163,7 +163,7 @@ public class DefaultConfigurationTest {
assertThat(value, equalTo("$D$CV"));
}
- private static class FilterAppendingA implements PropertyFilter {
+ private static class AppendingAFilter implements PropertyFilter {
@Override
public String filterProperty(String key, String value) {
return value.endsWith("A$")
@@ -172,7 +172,7 @@ public class DefaultConfigurationTest {
}
}
- private static class FilterPrependingB implements PropertyFilter {
+ private static class PrependingBFilter implements PropertyFilter {
@Override
public String filterProperty(String key, String value) {
return value.startsWith("$B")
@@ -182,7 +182,7 @@ public class DefaultConfigurationTest {
}
@Priority(987)
- private static class FilterPrependingC implements PropertyFilter {
+ private static class PrependingCFilter implements PropertyFilter {
@Override
public String filterProperty(String key, String value) {
return value.contains("$C")
@@ -192,7 +192,7 @@ public class DefaultConfigurationTest {
}
@Priority(111)
- private static class FilterPrependingD implements PropertyFilter {
+ private static class PrependingDFilter implements PropertyFilter {
@Override
public String filterProperty(String key, String value) {
return value.contains("$D")
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e7d61515/java8/core/src/test/java/org/apache/tamaya/core/testdata/TestPropertyFilterRemoving.java
----------------------------------------------------------------------
diff --git a/java8/core/src/test/java/org/apache/tamaya/core/testdata/TestPropertyFilterRemoving.java b/java8/core/src/test/java/org/apache/tamaya/core/testdata/TestPropertyFilterRemoving.java
deleted file mode 100644
index 2cf76f1..0000000
--- a/java8/core/src/test/java/org/apache/tamaya/core/testdata/TestPropertyFilterRemoving.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.core.testdata;
-
-import org.apache.tamaya.ConfigurationProvider;
-import org.apache.tamaya.spi.PropertyFilter;
-
-import javax.annotation.Priority;
-
-/**
- * Simple PropertyFilter that filters exact one value, registered using ServiceLoader.
- */
-@Priority(200)
-public class TestPropertyFilterRemoving implements PropertyFilter{
- @Override
- public String filterProperty(String key, String valueToBeFiltered) {
- if("name5".equals(key)){
- return null;
- }
- else if("name3".equals(key)){
- return "Mapped to name: " + ConfigurationProvider.getConfiguration().getOptional("name").orElse("NoName found!");
- }
- return valueToBeFiltered;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e7d61515/java8/core/src/test/java/org/apache/tamaya/core/testdata/TestRemovingPropertyFilter.java
----------------------------------------------------------------------
diff --git a/java8/core/src/test/java/org/apache/tamaya/core/testdata/TestRemovingPropertyFilter.java b/java8/core/src/test/java/org/apache/tamaya/core/testdata/TestRemovingPropertyFilter.java
new file mode 100644
index 0000000..acd7ca3
--- /dev/null
+++ b/java8/core/src/test/java/org/apache/tamaya/core/testdata/TestRemovingPropertyFilter.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.core.testdata;
+
+import org.apache.tamaya.ConfigurationProvider;
+import org.apache.tamaya.spi.PropertyFilter;
+
+import javax.annotation.Priority;
+
+/**
+ * Simple PropertyFilter that filters exact one value, registered using ServiceLoader.
+ */
+@Priority(200)
+public class TestRemovingPropertyFilter implements PropertyFilter{
+ @Override
+ public String filterProperty(String key, String valueToBeFiltered) {
+ if("name5".equals(key)){
+ return null;
+ }
+ else if("name3".equals(key)){
+ return "Mapped to name: " + ConfigurationProvider.getConfiguration().getOptional("name").orElse("NoName found!");
+ }
+ return valueToBeFiltered;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e7d61515/java8/core/src/test/resources/META-INF/services/org.apache.tamaya.spi.PropertyFilter
----------------------------------------------------------------------
diff --git a/java8/core/src/test/resources/META-INF/services/org.apache.tamaya.spi.PropertyFilter b/java8/core/src/test/resources/META-INF/services/org.apache.tamaya.spi.PropertyFilter
index 4e7d068..44a8c98 100644
--- a/java8/core/src/test/resources/META-INF/services/org.apache.tamaya.spi.PropertyFilter
+++ b/java8/core/src/test/resources/META-INF/services/org.apache.tamaya.spi.PropertyFilter
@@ -17,4 +17,4 @@
# under the License.
#
org.apache.tamaya.core.testdata.TestPropertyFilter
-org.apache.tamaya.core.testdata.TestPropertyFilterRemoving
\ No newline at end of file
+org.apache.tamaya.core.testdata.TestRemovingPropertyFilter
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e7d61515/jqassistant/default.xml
----------------------------------------------------------------------
diff --git a/jqassistant/default.xml b/jqassistant/default.xml
index 854f4ff..574d2a9 100644
--- a/jqassistant/default.xml
+++ b/jqassistant/default.xml
@@ -35,6 +35,23 @@ under the License.
]]></cypher>
</constraint>
+ <constraint id="naming:namingOfPropertyConverters">
+ <requiresConcept refId="java:AnonymousInnerType"/>
+ <description>Class name of implementations of PropertyFilter must end with 'Filter'</description>
+ <cypher><![CDATA[
+ MATCH
+ (t:Type)-[:IMPLEMENTS*]->(i:Type)
+
+ WHERE
+ i.fqn='org.apache.tamaya.spi.PropertyFilter'
+ AND NOT t:Anonymous:Inner
+ AND NOT t.name =~ '.*Filter'
+
+ RETURN
+ t.fqn
+ ]]></cypher>
+ </constraint>
+
<group id="default">
<includeConstraint refId="naming:namingOfPropertyConverters"/>
</group>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e7d61515/modules/builder/src/test/java/org/apache/tamaya/builder/ConfigurationBuilderTest.java
----------------------------------------------------------------------
diff --git a/modules/builder/src/test/java/org/apache/tamaya/builder/ConfigurationBuilderTest.java b/modules/builder/src/test/java/org/apache/tamaya/builder/ConfigurationBuilderTest.java
index 5f33c24..e28f3ea 100644
--- a/modules/builder/src/test/java/org/apache/tamaya/builder/ConfigurationBuilderTest.java
+++ b/modules/builder/src/test/java/org/apache/tamaya/builder/ConfigurationBuilderTest.java
@@ -372,7 +372,7 @@ public class ConfigurationBuilderTest {
ConfigurationBuilder builder = new ConfigurationBuilder();
Configuration config = builder.addPropertySources(source)
- .addPropertyFilters(new TestNonSPIPropertyFilterA())
+ .addPropertyFilters(new TestANonSPIPropertyFilter())
.build();
String property = config.get("key");
@@ -391,8 +391,8 @@ public class ConfigurationBuilderTest {
ConfigurationBuilder builder = new ConfigurationBuilder();
Configuration config = builder.addPropertySources(source)
- .addPropertyFilters(new TestNonSPIPropertyFilterA())
- .addPropertyFilters(new TestNonSPIPropertyFilterB())
+ .addPropertyFilters(new TestANonSPIPropertyFilter())
+ .addPropertyFilters(new TestBNonSPIPropertyFilter())
.build();
String property = config.get("key");
@@ -412,9 +412,9 @@ public class ConfigurationBuilderTest {
ConfigurationBuilder builder = new ConfigurationBuilder();
Configuration config = builder.addPropertySources(source)
- .addPropertyFilters(new TestNonSPIPropertyFilterA(),
+ .addPropertyFilters(new TestANonSPIPropertyFilter(),
null,
- new TestNonSPIPropertyFilterB())
+ new TestBNonSPIPropertyFilter())
.build();
String property = config.get("key");
@@ -435,7 +435,7 @@ public class ConfigurationBuilderTest {
Configuration config = builder.addPropertySources(source)
.addPropertyFilters((PropertyFilter)null) // The cast is needed!
- .addPropertyFilters(new TestNonSPIPropertyFilterB())
+ .addPropertyFilters(new TestBNonSPIPropertyFilter())
.build();
String property = config.get("key");
@@ -454,8 +454,8 @@ public class ConfigurationBuilderTest {
ConfigurationBuilder builder = new ConfigurationBuilder();
Configuration config = builder.addPropertySources(source)
- .addPropertyFilters(new TestNonSPIPropertyFilterA(),
- new TestNonSPIPropertyFilterB())
+ .addPropertyFilters(new TestANonSPIPropertyFilter(),
+ new TestBNonSPIPropertyFilter())
.build();
String property = config.get("key");
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e7d61515/modules/builder/src/test/java/org/apache/tamaya/builder/TestANonSPIPropertyFilter.java
----------------------------------------------------------------------
diff --git a/modules/builder/src/test/java/org/apache/tamaya/builder/TestANonSPIPropertyFilter.java b/modules/builder/src/test/java/org/apache/tamaya/builder/TestANonSPIPropertyFilter.java
new file mode 100644
index 0000000..e113010
--- /dev/null
+++ b/modules/builder/src/test/java/org/apache/tamaya/builder/TestANonSPIPropertyFilter.java
@@ -0,0 +1,34 @@
+/*
+ * 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.builder;
+
+import org.apache.tamaya.spi.PropertyFilter;
+
+public class TestANonSPIPropertyFilter implements PropertyFilter {
+ @Override
+ public String filterProperty(String key, String value) {
+ String result = value;
+
+ if (!result.contains(("ABC"))) {
+ result = value + "ABC";
+ }
+
+ return result;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e7d61515/modules/builder/src/test/java/org/apache/tamaya/builder/TestBNonSPIPropertyFilter.java
----------------------------------------------------------------------
diff --git a/modules/builder/src/test/java/org/apache/tamaya/builder/TestBNonSPIPropertyFilter.java b/modules/builder/src/test/java/org/apache/tamaya/builder/TestBNonSPIPropertyFilter.java
new file mode 100644
index 0000000..2ce81fc
--- /dev/null
+++ b/modules/builder/src/test/java/org/apache/tamaya/builder/TestBNonSPIPropertyFilter.java
@@ -0,0 +1,34 @@
+/*
+ * 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.builder;
+
+import org.apache.tamaya.spi.PropertyFilter;
+
+public class TestBNonSPIPropertyFilter implements PropertyFilter {
+ @Override
+ public String filterProperty(String key, String value) {
+ String result = value;
+
+ if (!result.contains(("XYZ"))) {
+ result = value + "XYZ";
+ }
+
+ return result;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e7d61515/modules/builder/src/test/java/org/apache/tamaya/builder/TestNonSPIPropertyFilterA.java
----------------------------------------------------------------------
diff --git a/modules/builder/src/test/java/org/apache/tamaya/builder/TestNonSPIPropertyFilterA.java b/modules/builder/src/test/java/org/apache/tamaya/builder/TestNonSPIPropertyFilterA.java
deleted file mode 100644
index 4b9ae72..0000000
--- a/modules/builder/src/test/java/org/apache/tamaya/builder/TestNonSPIPropertyFilterA.java
+++ /dev/null
@@ -1,34 +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.builder;
-
-import org.apache.tamaya.spi.PropertyFilter;
-
-public class TestNonSPIPropertyFilterA implements PropertyFilter {
- @Override
- public String filterProperty(String key, String value) {
- String result = value;
-
- if (!result.contains(("ABC"))) {
- result = value + "ABC";
- }
-
- return result;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/e7d61515/modules/builder/src/test/java/org/apache/tamaya/builder/TestNonSPIPropertyFilterB.java
----------------------------------------------------------------------
diff --git a/modules/builder/src/test/java/org/apache/tamaya/builder/TestNonSPIPropertyFilterB.java b/modules/builder/src/test/java/org/apache/tamaya/builder/TestNonSPIPropertyFilterB.java
deleted file mode 100644
index 95112b0..0000000
--- a/modules/builder/src/test/java/org/apache/tamaya/builder/TestNonSPIPropertyFilterB.java
+++ /dev/null
@@ -1,34 +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.builder;
-
-import org.apache.tamaya.spi.PropertyFilter;
-
-public class TestNonSPIPropertyFilterB implements PropertyFilter {
- @Override
- public String filterProperty(String key, String value) {
- String result = value;
-
- if (!result.contains(("XYZ"))) {
- result = value + "XYZ";
- }
-
- return result;
- }
-}