You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by an...@apache.org on 2016/02/27 22:40:39 UTC
[6/6] incubator-tamaya git commit: Moved collections module from
sandbox to modules.
Moved collections module from sandbox to modules.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/ebb7d90b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/ebb7d90b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/ebb7d90b
Branch: refs/heads/master
Commit: ebb7d90b0a7d63abd8d2012e0ac1383e4ec21f79
Parents: 03016f8
Author: anatole <an...@apache.org>
Authored: Sat Feb 27 22:40:03 2016 +0100
Committer: anatole <an...@apache.org>
Committed: Sat Feb 27 22:40:03 2016 +0100
----------------------------------------------------------------------
modules/collections/pom.xml | 2 +-
.../internal/AdaptiveCombinationPolicy.java | 7 +++----
.../collections/internal/ArrayListConverter.java | 4 +---
.../collections/internal/CollectionConverter.java | 10 +++++-----
.../internal/ConcurrentHashMapConverter.java | 4 +---
.../collections/internal/HashMapConverter.java | 3 +--
.../collections/internal/HashSetConverter.java | 5 +----
.../collections/internal/ItemTokenizer.java | 2 +-
.../collections/internal/LinkedListConverter.java | 3 +--
.../collections/internal/ListConverter.java | 6 +++---
.../tamaya/collections/internal/MapConverter.java | 11 +++++------
.../tamaya/collections/internal/SetConverter.java | 6 +++---
.../collections/internal/SortedMapConverter.java | 1 -
.../collections/internal/TreeMapConverter.java | 2 +-
.../collections/internal/TreeSetConverter.java | 3 +--
.../collections/CollectionAdvancedTests.java | 18 ++++++++++++++++++
16 files changed, 46 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ebb7d90b/modules/collections/pom.xml
----------------------------------------------------------------------
diff --git a/modules/collections/pom.xml b/modules/collections/pom.xml
index d5ed30b..45218d9 100644
--- a/modules/collections/pom.xml
+++ b/modules/collections/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
- <artifactId>tamaya-sandbox</artifactId>
+ <artifactId>tamaya-extensions</artifactId>
<version>0.2-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ebb7d90b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/AdaptiveCombinationPolicy.java
----------------------------------------------------------------------
diff --git a/modules/collections/src/main/java/org/apache/tamaya/collections/internal/AdaptiveCombinationPolicy.java b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/AdaptiveCombinationPolicy.java
index d86abe7..c0e9b9a 100644
--- a/modules/collections/src/main/java/org/apache/tamaya/collections/internal/AdaptiveCombinationPolicy.java
+++ b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/AdaptiveCombinationPolicy.java
@@ -49,7 +49,7 @@ public class AdaptiveCombinationPolicy implements PropertyValueCombinationPolicy
@Override
public Map<String, String> collect(Map<String, String> currentValue, String key, PropertySource propertySource) {
// check for default collection combination policies for lists, sets, maps etc.
- final String SEPARATOR = ConfigurationProvider.getConfiguration().getOrDefault('_' + key+".item-separator", ",");
+ final String separator = ConfigurationProvider.getConfiguration().getOrDefault('_' + key+".item-separator", ",");
PropertyValue newValue = propertySource.get(key);
if(newValue!=null){
Map<String,String> newMapValue = new HashMap<>();
@@ -59,7 +59,7 @@ public class AdaptiveCombinationPolicy implements PropertyValueCombinationPolicy
String oldVal = newMapValue.get(key);
newMapValue.putAll(newValue.getConfigEntries());
if(oldVal!=null){
- newMapValue.put(key,oldVal + SEPARATOR + newValue.getValue());
+ newMapValue.put(key,oldVal + separator + newValue.getValue());
}
return newMapValue;
}else{
@@ -114,8 +114,7 @@ public class AdaptiveCombinationPolicy implements PropertyValueCombinationPolicy
LOG.finest("Using custom combination policy "+adaptiveCombinationPolicyClass+" for " +
"key: " + key + "");
}
- }
- catch(Exception e){
+ } catch(Exception e){
LOG.log(Level.SEVERE, "Error loading configured PropertyValueCombinationPolicy for " +
"key: " + key + ", using default (overriding) policy.", e);
combinationPolicy = PropertyValueCombinationPolicy.DEFAULT_OVERRIDING_COLLECTOR;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ebb7d90b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/ArrayListConverter.java
----------------------------------------------------------------------
diff --git a/modules/collections/src/main/java/org/apache/tamaya/collections/internal/ArrayListConverter.java b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/ArrayListConverter.java
index 8281395..f337e26 100644
--- a/modules/collections/src/main/java/org/apache/tamaya/collections/internal/ArrayListConverter.java
+++ b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/ArrayListConverter.java
@@ -18,8 +18,6 @@
*/
package org.apache.tamaya.collections.internal;
-import org.apache.tamaya.ConfigurationProvider;
-import org.apache.tamaya.TypeLiteral;
import org.apache.tamaya.spi.ConversionContext;
import org.apache.tamaya.spi.PropertyConverter;
@@ -36,7 +34,7 @@ public class ArrayListConverter implements PropertyConverter<ArrayList> {
private static final Logger LOG = Logger.getLogger(ArrayListConverter.class.getName());
/** The shared instance, used by other collection converters in this package.*/
- private static ArrayListConverter INSTANCE = new ArrayListConverter();
+ private static final ArrayListConverter INSTANCE = new ArrayListConverter();
/**
* Provide a shared instance, used by other collection converters in this package.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ebb7d90b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/CollectionConverter.java
----------------------------------------------------------------------
diff --git a/modules/collections/src/main/java/org/apache/tamaya/collections/internal/CollectionConverter.java b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/CollectionConverter.java
index 0d9a799..343610a 100644
--- a/modules/collections/src/main/java/org/apache/tamaya/collections/internal/CollectionConverter.java
+++ b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/CollectionConverter.java
@@ -37,11 +37,6 @@ public class CollectionConverter implements PropertyConverter<Collection> {
}
Collection result = null;
switch(collectionType){
- case "List":
- case "ArrayList":
- default:
- result = ArrayListConverter.getInstance().convert(value, context);
- break;
case "LinkedList":
result = LinkedListConverter.getInstance().convert(value, context);
break;
@@ -53,6 +48,11 @@ public class CollectionConverter implements PropertyConverter<Collection> {
case "TreeSet":
result = TreeSetConverter.getInstance().convert(value, context);
break;
+ case "List":
+ case "ArrayList":
+ default:
+ result = ArrayListConverter.getInstance().convert(value, context);
+ break;
}
if(context.getConfiguration().getOrDefault('_' + context.getKey()+".read-only",
Boolean.class, Boolean.TRUE)){
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ebb7d90b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/ConcurrentHashMapConverter.java
----------------------------------------------------------------------
diff --git a/modules/collections/src/main/java/org/apache/tamaya/collections/internal/ConcurrentHashMapConverter.java b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/ConcurrentHashMapConverter.java
index 131b41c..7770fcf 100644
--- a/modules/collections/src/main/java/org/apache/tamaya/collections/internal/ConcurrentHashMapConverter.java
+++ b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/ConcurrentHashMapConverter.java
@@ -18,11 +18,9 @@
*/
package org.apache.tamaya.collections.internal;
-import org.apache.tamaya.TypeLiteral;
import org.apache.tamaya.spi.ConversionContext;
import org.apache.tamaya.spi.PropertyConverter;
-import java.util.HashMap;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
@@ -35,7 +33,7 @@ public class ConcurrentHashMapConverter implements PropertyConverter<ConcurrentH
private static final Logger LOG = Logger.getLogger(ConcurrentHashMapConverter.class.getName());
/** The shared instance, used by other collection converters in this package.*/
- private static ConcurrentHashMapConverter INSTANCE = new ConcurrentHashMapConverter();
+ private static final ConcurrentHashMapConverter INSTANCE = new ConcurrentHashMapConverter();
/**
* Provide a shared instance, used by other collection converters in this package.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ebb7d90b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/HashMapConverter.java
----------------------------------------------------------------------
diff --git a/modules/collections/src/main/java/org/apache/tamaya/collections/internal/HashMapConverter.java b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/HashMapConverter.java
index 6a3ac97..4e405e3 100644
--- a/modules/collections/src/main/java/org/apache/tamaya/collections/internal/HashMapConverter.java
+++ b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/HashMapConverter.java
@@ -18,7 +18,6 @@
*/
package org.apache.tamaya.collections.internal;
-import org.apache.tamaya.TypeLiteral;
import org.apache.tamaya.spi.ConversionContext;
import org.apache.tamaya.spi.PropertyConverter;
@@ -34,7 +33,7 @@ public class HashMapConverter implements PropertyConverter<HashMap> {
private static final Logger LOG = Logger.getLogger(HashMapConverter.class.getName());
/** The shared instance, used by other collection converters in this package.*/
- private static HashMapConverter INSTANCE = new HashMapConverter();
+ private static final HashMapConverter INSTANCE = new HashMapConverter();
/**
* Provide a shared instance, used by other collection converters in this package.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ebb7d90b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/HashSetConverter.java
----------------------------------------------------------------------
diff --git a/modules/collections/src/main/java/org/apache/tamaya/collections/internal/HashSetConverter.java b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/HashSetConverter.java
index 40b204f..dab1b82 100644
--- a/modules/collections/src/main/java/org/apache/tamaya/collections/internal/HashSetConverter.java
+++ b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/HashSetConverter.java
@@ -18,13 +18,10 @@
*/
package org.apache.tamaya.collections.internal;
-import org.apache.tamaya.TypeLiteral;
import org.apache.tamaya.spi.ConversionContext;
import org.apache.tamaya.spi.PropertyConverter;
-import java.util.ArrayList;
import java.util.HashSet;
-import java.util.LinkedList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -37,7 +34,7 @@ public class HashSetConverter implements PropertyConverter<HashSet> {
private static final Logger LOG = Logger.getLogger(HashSetConverter.class.getName());
/** The shared instance, used by other collection converters in this package.*/
- private static HashSetConverter INSTANCE = new HashSetConverter();
+ private static final HashSetConverter INSTANCE = new HashSetConverter();
/**
* Provide a shared instance, used by other collection converters in this package.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ebb7d90b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/ItemTokenizer.java
----------------------------------------------------------------------
diff --git a/modules/collections/src/main/java/org/apache/tamaya/collections/internal/ItemTokenizer.java b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/ItemTokenizer.java
index 7d213a4..658131f 100644
--- a/modules/collections/src/main/java/org/apache/tamaya/collections/internal/ItemTokenizer.java
+++ b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/ItemTokenizer.java
@@ -67,7 +67,7 @@ final class ItemTokenizer {
int start = 0;
int end = value.indexOf(separator,start);
while(end>0) {
- if (end>0 && (value.charAt(end - 1) != '\\')) {
+ if (value.charAt(end - 1) != '\\') {
result.add(value.substring(start, end));
start = end + separator.length();
end = value.indexOf(separator,start);
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ebb7d90b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/LinkedListConverter.java
----------------------------------------------------------------------
diff --git a/modules/collections/src/main/java/org/apache/tamaya/collections/internal/LinkedListConverter.java b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/LinkedListConverter.java
index 4389a54..2d35644 100644
--- a/modules/collections/src/main/java/org/apache/tamaya/collections/internal/LinkedListConverter.java
+++ b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/LinkedListConverter.java
@@ -18,7 +18,6 @@
*/
package org.apache.tamaya.collections.internal;
-import org.apache.tamaya.TypeLiteral;
import org.apache.tamaya.spi.ConversionContext;
import org.apache.tamaya.spi.PropertyConverter;
@@ -34,7 +33,7 @@ public class LinkedListConverter implements PropertyConverter<LinkedList> {
private static final Logger LOG = Logger.getLogger(LinkedListConverter.class.getName());
/** The shared instance, used by other collection converters in this package.*/
- private static LinkedListConverter INSTANCE = new LinkedListConverter();
+ private static final LinkedListConverter INSTANCE = new LinkedListConverter();
/**
* Provide a shared instance, used by other collection converters in this package.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ebb7d90b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/ListConverter.java
----------------------------------------------------------------------
diff --git a/modules/collections/src/main/java/org/apache/tamaya/collections/internal/ListConverter.java b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/ListConverter.java
index 65fc54e..64917f2 100644
--- a/modules/collections/src/main/java/org/apache/tamaya/collections/internal/ListConverter.java
+++ b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/ListConverter.java
@@ -37,14 +37,14 @@ public class ListConverter implements PropertyConverter<List> {
}
List result = null;
switch(collectionType){
+ case "LinkedList":
+ result = LinkedListConverter.getInstance().convert(value, context);
+ break;
case "List":
case "ArrayList":
default:
result = ArrayListConverter.getInstance().convert(value, context);
break;
- case "LinkedList":
- result = LinkedListConverter.getInstance().convert(value, context);
- break;
}
if(context.getConfiguration().getOrDefault('_' + context.getKey()+".read-only",
Boolean.class, Boolean.TRUE)){
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ebb7d90b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/MapConverter.java
----------------------------------------------------------------------
diff --git a/modules/collections/src/main/java/org/apache/tamaya/collections/internal/MapConverter.java b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/MapConverter.java
index 606e14f..8b9287e 100644
--- a/modules/collections/src/main/java/org/apache/tamaya/collections/internal/MapConverter.java
+++ b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/MapConverter.java
@@ -23,7 +23,6 @@ import org.apache.tamaya.spi.PropertyConverter;
import java.util.Collections;
import java.util.Map;
-import java.util.Set;
/**
* PropertyConverter for gnerating HashMap representation of a values.
@@ -38,17 +37,17 @@ public class MapConverter implements PropertyConverter<Map> {
}
Map result = null;
switch(collectionType){
- case "Map":
- case "HashMap":
- default:
- result = HashMapConverter.getInstance().convert(value, context);
- break;
case "TreeMap":
result = TreeMapConverter.getInstance().convert(value, context);
break;
case "ConcurrentHashMap":
result = ConcurrentHashMapConverter.getInstance().convert(value, context);
break;
+ case "Map":
+ case "HashMap":
+ default:
+ result = HashMapConverter.getInstance().convert(value, context);
+ break;
}
if(context.getConfiguration().getOrDefault('_' + context.getKey()+".read-only",
Boolean.class, Boolean.TRUE)){
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ebb7d90b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/SetConverter.java
----------------------------------------------------------------------
diff --git a/modules/collections/src/main/java/org/apache/tamaya/collections/internal/SetConverter.java b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/SetConverter.java
index 75301bc..d4fe1c6 100644
--- a/modules/collections/src/main/java/org/apache/tamaya/collections/internal/SetConverter.java
+++ b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/SetConverter.java
@@ -37,14 +37,14 @@ public class SetConverter implements PropertyConverter<Set> {
}
Set result = null;
switch(collectionType){
+ case "TreeSet":
+ result = TreeSetConverter.getInstance().convert(value, context);
+ break;
case "Set":
case "HashSet":
default:
result = HashSetConverter.getInstance().convert(value, context);
break;
- case "TreeSet":
- result = TreeSetConverter.getInstance().convert(value, context);
- break;
}
if(context.getConfiguration().getOrDefault('_' + context.getKey()+".read-only",
Boolean.class, Boolean.TRUE)){
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ebb7d90b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/SortedMapConverter.java
----------------------------------------------------------------------
diff --git a/modules/collections/src/main/java/org/apache/tamaya/collections/internal/SortedMapConverter.java b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/SortedMapConverter.java
index 1015751..c87006d 100644
--- a/modules/collections/src/main/java/org/apache/tamaya/collections/internal/SortedMapConverter.java
+++ b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/SortedMapConverter.java
@@ -23,7 +23,6 @@ import org.apache.tamaya.spi.PropertyConverter;
import java.util.Collections;
import java.util.SortedMap;
-import java.util.SortedSet;
/**
* PropertyConverter for gnerating a LIST representation of values.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ebb7d90b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/TreeMapConverter.java
----------------------------------------------------------------------
diff --git a/modules/collections/src/main/java/org/apache/tamaya/collections/internal/TreeMapConverter.java b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/TreeMapConverter.java
index fef25fe..c8a7c3a 100644
--- a/modules/collections/src/main/java/org/apache/tamaya/collections/internal/TreeMapConverter.java
+++ b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/TreeMapConverter.java
@@ -34,7 +34,7 @@ public class TreeMapConverter implements PropertyConverter<TreeMap> {
private static final Logger LOG = Logger.getLogger(HashMapConverter.class.getName());
/** The shared instance, used by other collection converters in this package.*/
- private static TreeMapConverter INSTANCE = new TreeMapConverter();
+ private static final TreeMapConverter INSTANCE = new TreeMapConverter();
/**
* Provide a shared instance, used by other collection converters in this package.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ebb7d90b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/TreeSetConverter.java
----------------------------------------------------------------------
diff --git a/modules/collections/src/main/java/org/apache/tamaya/collections/internal/TreeSetConverter.java b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/TreeSetConverter.java
index 9206f07..399a07b 100644
--- a/modules/collections/src/main/java/org/apache/tamaya/collections/internal/TreeSetConverter.java
+++ b/modules/collections/src/main/java/org/apache/tamaya/collections/internal/TreeSetConverter.java
@@ -18,7 +18,6 @@
*/
package org.apache.tamaya.collections.internal;
-import org.apache.tamaya.TypeLiteral;
import org.apache.tamaya.spi.ConversionContext;
import org.apache.tamaya.spi.PropertyConverter;
@@ -35,7 +34,7 @@ public class TreeSetConverter implements PropertyConverter<TreeSet> {
private static final Logger LOG = Logger.getLogger(TreeSetConverter.class.getName());
/** The shared instance, used by other collection converters in this package.*/
- private static TreeSetConverter INSTANCE = new TreeSetConverter();
+ private static final TreeSetConverter INSTANCE = new TreeSetConverter();
/**
* Provide a shared instance, used by other collection converters in this package.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ebb7d90b/modules/collections/src/test/java/org/apache/tamaya/collections/CollectionAdvancedTests.java
----------------------------------------------------------------------
diff --git a/modules/collections/src/test/java/org/apache/tamaya/collections/CollectionAdvancedTests.java b/modules/collections/src/test/java/org/apache/tamaya/collections/CollectionAdvancedTests.java
index ddabb23..43f1f4f 100644
--- a/modules/collections/src/test/java/org/apache/tamaya/collections/CollectionAdvancedTests.java
+++ b/modules/collections/src/test/java/org/apache/tamaya/collections/CollectionAdvancedTests.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.collections;
import org.apache.tamaya.Configuration;