peculater closed pull request #9: TAMAYA-345 Associative array default
separator to ':'
URL: https://github.com/apache/incubator-tamaya-sandbox/pull/9
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/collections/src/main/java/org/apache/tamaya/collections/ItemTokenizer.java
b/collections/src/main/java/org/apache/tamaya/collections/ItemTokenizer.java
index 26410da..3b4f291 100644
--- a/collections/src/main/java/org/apache/tamaya/collections/ItemTokenizer.java
+++ b/collections/src/main/java/org/apache/tamaya/collections/ItemTokenizer.java
@@ -91,7 +91,7 @@ private ItemTokenizer(){}
*/
public static String[] splitMapEntry(String mapEntry, ConversionContext
context){
return splitMapEntry(mapEntry,
ConfigurationProvider.getConfiguration().getOrDefault(
- '_' + context.getKey()+".map-entry-separator", "::"));
+ '_' + context.getKey()+".map-entry-separator", ":"));
}
/**
diff --git
a/collections/src/test/java/org/apache/tamaya/collections/CollectionsBaseTests.java
b/collections/src/test/java/org/apache/tamaya/collections/CollectionsBaseTests.java
index 34c82cb..cfc4788 100644
---
a/collections/src/test/java/org/apache/tamaya/collections/CollectionsBaseTests.java
+++
b/collections/src/test/java/org/apache/tamaya/collections/CollectionsBaseTests.java
@@ -32,7 +32,7 @@
/**
* Basic tests for Tamaya collection support. Relevant configs for this tests:
* <pre>base.items=1,2,3,4,5,6,7,8,9,0
- * base.map=1::a, 2::b, 3::c, [4:: ]
+ * base.map=1:a, 2:b, 3:c, [4: ]
* </pre>
*/
public class CollectionsBaseTests {
diff --git
a/collections/src/test/java/org/apache/tamaya/collections/CollectionsTypedReadOnlyTests.java
b/collections/src/test/java/org/apache/tamaya/collections/CollectionsTypedReadOnlyTests.java
index 7882512..bab574c 100644
---
a/collections/src/test/java/org/apache/tamaya/collections/CollectionsTypedReadOnlyTests.java
+++
b/collections/src/test/java/org/apache/tamaya/collections/CollectionsTypedReadOnlyTests.java
@@ -31,7 +31,7 @@
/**
* Basic tests for Tamaya collection support. Relevant configs for this tests:
* <pre>base.items=1,2,3,4,5,6,7,8,9,0
- * base.map=1::a, 2::b, 3::c, [4:: ]
+ * base.map=1:a, 2:b, 3:c, [4: ]
* </pre>
*/
public class CollectionsTypedReadOnlyTests {
diff --git
a/collections/src/test/java/org/apache/tamaya/collections/CollectionsTypedTests.java
b/collections/src/test/java/org/apache/tamaya/collections/CollectionsTypedTests.java
index b4e4d52..29d651e 100644
---
a/collections/src/test/java/org/apache/tamaya/collections/CollectionsTypedTests.java
+++
b/collections/src/test/java/org/apache/tamaya/collections/CollectionsTypedTests.java
@@ -33,7 +33,7 @@
/**
* Basic tests for Tamaya collection support. Relevant configs for this tests:
* <pre>base.items=1,2,3,4,5,6,7,8,9,0
- * base.map=1::a, 2::b, 3::c, [4:: ]
+ * base.map=1:a, 2:b, 3:c, [4: ]
* </pre>
*/
public class CollectionsTypedTests {
diff --git
a/collections/src/test/resources/META-INF/javaconfiguration.properties
b/collections/src/test/resources/META-INF/javaconfiguration.properties
index 787d0d4..3ddeb7f 100644
--- a/collections/src/test/resources/META-INF/javaconfiguration.properties
+++ b/collections/src/test/resources/META-INF/javaconfiguration.properties
@@ -20,7 +20,7 @@
# Config for base tests (no combination policy)
base.items=1,2,3,4,5,6,7,8,9,0
-base.map=1::a, 2::b, 3::c, [4:: ]
+base.map=1:a, 2:b, 3:c, [4: ]
# Config for tests with explcit implementation types
typed2.arraylist=1,2,3,4,5,6,7,8,9,0
@@ -35,10 +35,10 @@ _typed2.hashset.read-only=false
typed2.treeset=1,2,3,4,5,6,7,8,9,0
_typed2.treeset.collection-type=TreeSet
_typed2.treeset.read-only=false
-typed2.hashmap=1::a, 2::b, 3::c, [4:: ]
+typed2.hashmap=1:a, 2:b, 3:c, [4: ]
_typed2.hashmap.collection-type=java.util.HashMap
_typed2.hashmap.read-only=false
-typed2.treemap=1::a, 2::b, 3::c, [4:: ]
+typed2.treemap=1:a, 2:b, 3:c, [4: ]
_typed2.treemap.collection-type=TreeMap
_typed2.treemap.read-only=false
@@ -51,9 +51,9 @@ typed.hashset=1,2,3,4,5,6,7,8,9,0
_typed.hashset.collection-type=HashSet
typed.treeset=1,2,3,4,5,6,7,8,9,0
_typed.treeset.collection-type=TreeSet
-typed.hashmap=1::a, 2::b, 3::c, [4:: ]
+typed.hashmap=1:a, 2:b, 3:c, [4: ]
_typed.hashmap.collection-type=java.util.HashMap
-typed.treemap=1::a, 2::b, 3::c, [4:: ]
+typed.treemap=1:a, 2:b, 3:c, [4: ]
_typed.treemap.collection-type=TreeMap
# Config for advanced tests
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
