You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2015/03/03 09:51:37 UTC
svn commit: r1663549 - in /jackrabbit/oak/trunk/oak-core/src:
main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java
test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java
Author: angela
Date: Tue Mar 3 08:51:37 2015
New Revision: 1663549
URL: http://svn.apache.org/r1663549
Log:
minor improvement
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java?rev=1663549&r1=1663548&r2=1663549&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java Tue Mar 3 08:51:37 2015
@@ -159,6 +159,22 @@ public final class ConfigurationParamete
}
/**
+ * Creates new a configuration parameters instance from the
+ * given key and value pairs.
+ *
+ * @param key1 The key of the first pair.
+ * @param value1 The value of the first pair
+ * @param key2 The key of the second pair.
+ * @param value2 The value of the second pair.
+ * @return a new instance of configuration parameters.
+ */
+ @Nonnull
+ public static ConfigurationParameters of(@Nonnull String key1, @Nonnull Object value1,
+ @Nonnull String key2, @Nonnull Object value2) {
+ return new ConfigurationParameters(ImmutableMap.of(key1, value1, key2, value2));
+ }
+
+ /**
* Returns {@code true} if this instance contains a configuration entry with
* the specified key irrespective of the defined value; {@code false} otherwise.
*
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java?rev=1663549&r1=1663548&r2=1663549&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java Tue Mar 3 08:51:37 2015
@@ -52,7 +52,7 @@ public class ConfigurationParametersTest
ConfigurationParameters params = ConfigurationParameters.of(
ConfigurationParameters.EMPTY,
null,
- ConfigurationParameters.of(Collections.singletonMap("a", "a")));
+ ConfigurationParameters.of("a", "a"));
assertFalse(params.isEmpty());
assertEquals(1, params.size());
assertTrue(params.contains("a"));
@@ -137,7 +137,7 @@ public class ConfigurationParametersTest
assertEquals(0, result.length);
assertArrayEquals(testArray, ConfigurationParameters.EMPTY.getConfigValue("test", testArray));
- ConfigurationParameters options = ConfigurationParameters.of(Collections.singletonMap("test", testArray));
+ ConfigurationParameters options = ConfigurationParameters.of("test", testArray);
assertArrayEquals(testArray, options.getConfigValue("test", new TestObject[] {new TestObject("s")}));
}
@@ -151,7 +151,7 @@ public class ConfigurationParametersTest
assertArrayEquals(testArray, ConfigurationParameters.EMPTY.getConfigValue("test", testArray, null));
assertArrayEquals(testArray, ConfigurationParameters.EMPTY.getConfigValue("test", testArray, TestObject[].class));
- ConfigurationParameters options = ConfigurationParameters.of(Collections.singletonMap("test", testArray));
+ ConfigurationParameters options = ConfigurationParameters.of("test", testArray);
assertArrayEquals(testArray, (TestObject[]) options.getConfigValue("test", null, null));
assertArrayEquals(testArray, options.getConfigValue("test", null, TestObject[].class));
assertArrayEquals(testArray, options.getConfigValue("test", new TestObject[]{new TestObject("s")}, null));
@@ -161,7 +161,7 @@ public class ConfigurationParametersTest
@Test
public void testCollectionAsArray() throws Exception{
String[] testArray = {"t"};
- ConfigurationParameters options = ConfigurationParameters.of(Collections.singletonMap("test", Arrays.asList(testArray)));
+ ConfigurationParameters options = ConfigurationParameters.of("test", Arrays.asList(testArray));
assertArrayEquals(testArray, options.getConfigValue("test", null, String[].class));
}
@@ -298,7 +298,7 @@ public class ConfigurationParametersTest
if (value instanceof ConfigurationParameters) {
config = ConfigurationParameters.of((ConfigurationParameters) value);
} else {
- config = ConfigurationParameters.of(Collections.singletonMap("key", value));
+ config = ConfigurationParameters.of("key", value);
}
Set expected = configValues.get(value);
@@ -361,7 +361,7 @@ public class ConfigurationParametersTest
if (value instanceof ConfigurationParameters) {
config = ConfigurationParameters.of((ConfigurationParameters) value);
} else {
- config = ConfigurationParameters.of(Collections.singletonMap("key", value));
+ config = ConfigurationParameters.of("key", value);
}
Object[] expected = configValues.get(value);