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 2017/03/17 18:29:25 UTC
[1/2] incubator-tamaya-extensions git commit: [TAMAYA-244] Added
missing license headers.
Repository: incubator-tamaya-extensions
Updated Branches:
refs/heads/master 78415bc9b -> 27a78e287
[TAMAYA-244] Added missing license headers.
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/27a78e28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/27a78e28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/27a78e28
Branch: refs/heads/master
Commit: 27a78e287b4de4cf56ccda7d851603f3716208b9
Parents: fabf4a4
Author: Oliver B. Fischer <pl...@apache.org>
Authored: Fri Mar 17 19:29:18 2017 +0100
Committer: Oliver B. Fischer <pl...@apache.org>
Committed: Fri Mar 17 19:29:18 2017 +0100
----------------------------------------------------------------------
.../tamaya/functions/CombinedConfiguration.java | 7 ++++-
.../functions/CombinedConfigurationTest.java | 32 +++++++++++++++++++-
.../tamaya/functions/InMemoryConfiguration.java | 18 +++++++++++
.../functions/MappedConfigurationTest.java | 18 +++++++++++
4 files changed, 73 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/27a78e28/modules/functions/src/main/java/org/apache/tamaya/functions/CombinedConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/functions/src/main/java/org/apache/tamaya/functions/CombinedConfiguration.java b/modules/functions/src/main/java/org/apache/tamaya/functions/CombinedConfiguration.java
index 234e03c..02d88a1 100644
--- a/modules/functions/src/main/java/org/apache/tamaya/functions/CombinedConfiguration.java
+++ b/modules/functions/src/main/java/org/apache/tamaya/functions/CombinedConfiguration.java
@@ -73,10 +73,15 @@ class CombinedConfiguration implements Configuration{
@Override
public String getOrDefault(String key, String defaultValue) {
+ Objects.requireNonNull(key, "Key must be given.");
+ Objects.requireNonNull(defaultValue, "Value must be given.");
+
String val = get(key);
- if(val==null){
+
+ if (val == null) {
return defaultValue;
}
+
return val;
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/27a78e28/modules/functions/src/test/java/org/apache/tamaya/functions/CombinedConfigurationTest.java
----------------------------------------------------------------------
diff --git a/modules/functions/src/test/java/org/apache/tamaya/functions/CombinedConfigurationTest.java b/modules/functions/src/test/java/org/apache/tamaya/functions/CombinedConfigurationTest.java
index 497adf1..2275f7a 100644
--- a/modules/functions/src/test/java/org/apache/tamaya/functions/CombinedConfigurationTest.java
+++ b/modules/functions/src/test/java/org/apache/tamaya/functions/CombinedConfigurationTest.java
@@ -28,6 +28,7 @@ import org.apache.tamaya.spisupport.DefaultConfiguration;
import org.apache.tamaya.spisupport.DefaultConfigurationContext;
import org.apache.tamaya.spisupport.DefaultConfigurationContextBuilder;
import org.apache.tamaya.spisupport.SimplePropertySource;
+import org.assertj.core.api.ThrowableAssert;
import org.junit.Test;
import java.util.Collections;
@@ -36,6 +37,9 @@ import java.util.TreeMap;
import static java.util.Collections.singletonMap;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.CALLS_REAL_METHODS;
+import static org.mockito.Mockito.mock;
public class CombinedConfigurationTest {
@@ -110,7 +114,33 @@ public class CombinedConfigurationTest {
* Tests for getOrDefault(String, String)
*/
- // null, null
+ @Test
+ public void getOrDefaultWithSignatureStringStringThrowsNPEIfKeyIsNull() {
+ final CombinedConfiguration cc = mock(CombinedConfiguration.class, CALLS_REAL_METHODS);
+
+ assertThatThrownBy(new ThrowableAssert.ThrowingCallable() {
+ @Override
+ public void call() throws Throwable {
+ cc.getOrDefault(null, "d");
+ }
+ }).isInstanceOf(NullPointerException.class)
+ .hasMessage("Key must be given.");
+ }
+
+ @Test
+ public void getOrDefaultWithSignatureStringStringThrowsNPEIfValueIsNull() {
+ final CombinedConfiguration cc = mock(CombinedConfiguration.class, CALLS_REAL_METHODS);
+
+ assertThatThrownBy(new ThrowableAssert.ThrowingCallable() {
+ @Override
+ public void call() throws Throwable {
+ cc.getOrDefault("key", (String)null);
+ }
+ }).isInstanceOf(NullPointerException.class)
+ .hasMessage("Value must be given.");
+ }
+
+
// a, b
// a, null
// getOrDefault none one three
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/27a78e28/modules/functions/src/test/java/org/apache/tamaya/functions/InMemoryConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/functions/src/test/java/org/apache/tamaya/functions/InMemoryConfiguration.java b/modules/functions/src/test/java/org/apache/tamaya/functions/InMemoryConfiguration.java
index 5884b27..deb544c 100644
--- a/modules/functions/src/test/java/org/apache/tamaya/functions/InMemoryConfiguration.java
+++ b/modules/functions/src/test/java/org/apache/tamaya/functions/InMemoryConfiguration.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.functions;
import org.apache.tamaya.spi.ConfigurationContext;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/27a78e28/modules/functions/src/test/java/org/apache/tamaya/functions/MappedConfigurationTest.java
----------------------------------------------------------------------
diff --git a/modules/functions/src/test/java/org/apache/tamaya/functions/MappedConfigurationTest.java b/modules/functions/src/test/java/org/apache/tamaya/functions/MappedConfigurationTest.java
index 0dbba07..c31077a 100644
--- a/modules/functions/src/test/java/org/apache/tamaya/functions/MappedConfigurationTest.java
+++ b/modules/functions/src/test/java/org/apache/tamaya/functions/MappedConfigurationTest.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.functions;
import org.apache.tamaya.Configuration;
[2/2] incubator-tamaya-extensions git commit: [TAMAYA-244] Method
MappedCofiguration#getOrDefault(String,
String) is now compliant with its JavaDoc.
Posted by pl...@apache.org.
[TAMAYA-244] Method MappedCofiguration#getOrDefault(String, String) is now compliant with its JavaDoc.
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/fabf4a4b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/fabf4a4b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/fabf4a4b
Branch: refs/heads/master
Commit: fabf4a4b86762153103da375b293e8c03d301f26
Parents: 78415bc
Author: Oliver B. Fischer <pl...@apache.org>
Authored: Fri Mar 17 20:32:03 2017 +0100
Committer: Oliver B. Fischer <pl...@apache.org>
Committed: Fri Mar 17 20:32:03 2017 +0100
----------------------------------------------------------------------
modules/functions/pom.xml | 5 +++
.../tamaya/functions/MappedConfiguration.java | 3 ++
.../functions/CombinedConfigurationTest.java | 20 ++++------
.../tamaya/functions/InMemoryConfiguration.java | 17 +++++++++
.../functions/MappedConfigurationTest.java | 40 ++++++++++++++++++++
5 files changed, 72 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/fabf4a4b/modules/functions/pom.xml
----------------------------------------------------------------------
diff --git a/modules/functions/pom.xml b/modules/functions/pom.xml
index 0289465..b9f8bd1 100644
--- a/modules/functions/pom.xml
+++ b/modules/functions/pom.xml
@@ -69,6 +69,11 @@ under the License.
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/fabf4a4b/modules/functions/src/main/java/org/apache/tamaya/functions/MappedConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/functions/src/main/java/org/apache/tamaya/functions/MappedConfiguration.java b/modules/functions/src/main/java/org/apache/tamaya/functions/MappedConfiguration.java
index b93b9ca..dd2547f 100644
--- a/modules/functions/src/main/java/org/apache/tamaya/functions/MappedConfiguration.java
+++ b/modules/functions/src/main/java/org/apache/tamaya/functions/MappedConfiguration.java
@@ -53,7 +53,10 @@ class MappedConfiguration implements Configuration {
@Override
public String getOrDefault(String key, String defaultValue) {
+ Objects.requireNonNull(key, "Key must be given");
+ Objects.requireNonNull(defaultValue, "DefaultValue must be given.");
String val = get(key);
+
if(val==null){
return defaultValue;
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/fabf4a4b/modules/functions/src/test/java/org/apache/tamaya/functions/CombinedConfigurationTest.java
----------------------------------------------------------------------
diff --git a/modules/functions/src/test/java/org/apache/tamaya/functions/CombinedConfigurationTest.java b/modules/functions/src/test/java/org/apache/tamaya/functions/CombinedConfigurationTest.java
index e56c0cc..497adf1 100644
--- a/modules/functions/src/test/java/org/apache/tamaya/functions/CombinedConfigurationTest.java
+++ b/modules/functions/src/test/java/org/apache/tamaya/functions/CombinedConfigurationTest.java
@@ -106,6 +106,13 @@ public class CombinedConfigurationTest {
assertThat(cc.get("b")).isEqualTo("b");
}
+ /*
+ * Tests for getOrDefault(String, String)
+ */
+
+ // null, null
+ // a, b
+ // a, null
// getOrDefault none one three
// String getOrDefault(String var1, String var2); none one three
@@ -126,17 +133,4 @@ public class CombinedConfigurationTest {
// ConfigurationContext getContext(); none one three
-
- private static class InMemoryConfiguration extends DefaultConfiguration {
- public InMemoryConfiguration(ConfigurationContext configurationContext) {
- super(configurationContext);
- }
- // private Map<String, String> entries = new TreeMap<>();
-
-// public InMemoryConfiguration addEntry(String key, String value) {
-// entries.put(key, value);
-//
-// return this;
-// }
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/fabf4a4b/modules/functions/src/test/java/org/apache/tamaya/functions/InMemoryConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/functions/src/test/java/org/apache/tamaya/functions/InMemoryConfiguration.java b/modules/functions/src/test/java/org/apache/tamaya/functions/InMemoryConfiguration.java
new file mode 100644
index 0000000..5884b27
--- /dev/null
+++ b/modules/functions/src/test/java/org/apache/tamaya/functions/InMemoryConfiguration.java
@@ -0,0 +1,17 @@
+package org.apache.tamaya.functions;
+
+import org.apache.tamaya.spi.ConfigurationContext;
+import org.apache.tamaya.spisupport.DefaultConfiguration;
+
+class InMemoryConfiguration extends DefaultConfiguration {
+ public InMemoryConfiguration(ConfigurationContext configurationContext) {
+ super(configurationContext);
+ }
+ // private Map<String, String> entries = new TreeMap<>();
+
+// public InMemoryConfiguration addEntry(String key, String value) {
+// entries.put(key, value);
+//
+// return this;
+// }
+}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/fabf4a4b/modules/functions/src/test/java/org/apache/tamaya/functions/MappedConfigurationTest.java
----------------------------------------------------------------------
diff --git a/modules/functions/src/test/java/org/apache/tamaya/functions/MappedConfigurationTest.java b/modules/functions/src/test/java/org/apache/tamaya/functions/MappedConfigurationTest.java
new file mode 100644
index 0000000..0dbba07
--- /dev/null
+++ b/modules/functions/src/test/java/org/apache/tamaya/functions/MappedConfigurationTest.java
@@ -0,0 +1,40 @@
+package org.apache.tamaya.functions;
+
+import org.apache.tamaya.Configuration;
+import org.apache.tamaya.spi.ConfigurationContext;
+import org.apache.tamaya.spisupport.DefaultConfigurationContext;
+import org.junit.Test;
+import org.mockito.Matchers;
+import org.mockito.Mockito;
+import org.mockito.internal.matchers.Null;
+
+import static org.junit.Assert.*;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doCallRealMethod;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+
+public class MappedConfigurationTest {
+ /*
+ * Tests for getOrDefault(String, String)
+ */
+
+ @Test(expected = NullPointerException.class)
+ public void getOrDefaultWithTwoStringParametersThrowsNPEIfValueIsNull() throws Exception {
+ MappedConfiguration mc = mock(MappedConfiguration.class);
+ doReturn("z").when(mc).get(eq("a)"));
+ doCallRealMethod().when(mc).getOrDefault(anyString(), anyString());
+
+ mc.getOrDefault("a", (String)null);
+ }
+
+ @Test(expected = NullPointerException.class)
+ public void getOrDefaultWithTwoStringParametersThrowsNPEIfKeyIsNull() throws Exception {
+ MappedConfiguration mc = mock(MappedConfiguration.class);
+ doCallRealMethod().when(mc).getOrDefault(anyString(), anyString());
+
+ mc.getOrDefault(null, "z");
+ }
+
+}
\ No newline at end of file