summaryrefslogtreecommitdiff
path: root/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/utils/KeyValueUtils.java
diff options
context:
space:
mode:
Diffstat (limited to 'eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/utils/KeyValueUtils.java')
-rw-r--r--eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/utils/KeyValueUtils.java58
1 files changed, 31 insertions, 27 deletions
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/utils/KeyValueUtils.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/utils/KeyValueUtils.java
index f0a082c3..efc47337 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/utils/KeyValueUtils.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/utils/KeyValueUtils.java
@@ -36,6 +36,9 @@ import java.util.Map.Entry;
import java.util.Properties;
import java.util.Set;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -81,11 +84,11 @@ public class KeyValueUtils {
* @return Child key {String} if it exists or null
*/
public static String getFirstChildAfterPrefix(String key, String prefix) {
- String idAfterPrefix = removePrefixFromKey(key, prefix);
+ final String idAfterPrefix = removePrefixFromKey(key, prefix);
if (idAfterPrefix != null) {
- int index = idAfterPrefix.indexOf(KEY_DELIMITER);
+ final int index = idAfterPrefix.indexOf(KEY_DELIMITER);
if (index > 0) {
- String adding = idAfterPrefix.substring(0, index);
+ final String adding = idAfterPrefix.substring(0, index);
if (!(adding.isEmpty())) {
return adding;
@@ -108,7 +111,7 @@ public class KeyValueUtils {
*/
public static String getPrefixFromKey(String key, String suffix) {
if (key != null && key.endsWith(suffix)) {
- String idPreforeSuffix = key.substring(0, key.length()-suffix.length());
+ final String idPreforeSuffix = key.substring(0, key.length()-suffix.length());
if (idPreforeSuffix.endsWith(KEY_DELIMITER))
return idPreforeSuffix.substring(0, idPreforeSuffix.length()-1);
else
@@ -131,7 +134,7 @@ public class KeyValueUtils {
if (key!=null && key.startsWith(prefix)) {
String afterPrefix = key.substring(prefix.length());
- int index = afterPrefix.indexOf(KEY_DELIMITER);
+ final int index = afterPrefix.indexOf(KEY_DELIMITER);
if (index == 0) {
afterPrefix = afterPrefix.substring(1);
@@ -151,11 +154,11 @@ public class KeyValueUtils {
* @return {Map<String, String>} of key/value pairs without prefix in key, but never null
*/
public static Map<String, String> removePrefixFromKeys(Map<String, String> keys, String prefix) {
- Map<String, String> result = new HashMap<String, String>();
- Iterator<Entry<String, String>> interator = keys.entrySet().iterator();
+ final Map<String, String> result = new HashMap<String, String>();
+ final Iterator<Entry<String, String>> interator = keys.entrySet().iterator();
while(interator.hasNext()) {
- Entry<String, String> el = interator.next();
- String newKey = removePrefixFromKey(el.getKey(), prefix);
+ final Entry<String, String> el = interator.next();
+ final String newKey = removePrefixFromKey(el.getKey(), prefix);
if (StringUtils.isNotEmpty(newKey)) {
result.put(newKey, el.getValue());
}
@@ -186,10 +189,10 @@ public class KeyValueUtils {
* @return {Map<String, String>} of key/value pairs in which all keys are absolute but never null
*/
public static Map<String, String> makeKeysAbsolut(Map<String, String> input, String prefix, String absolutIdentifier) {
- Map<String, String> result = new HashMap<String, String>();
- Iterator<Entry<String, String>> interator = input.entrySet().iterator();
+ final Map<String, String> result = new HashMap<String, String>();
+ final Iterator<Entry<String, String>> interator = input.entrySet().iterator();
while(interator.hasNext()) {
- Entry<String, String> el = interator.next();
+ final Entry<String, String> el = interator.next();
if (!el.getKey().startsWith(absolutIdentifier)) {
//key is not absolute -> add prefix
result.put(prefix
@@ -213,7 +216,7 @@ public class KeyValueUtils {
*/
public static String getParentKey(String key) {
if (StringUtils.isNotEmpty(key)) {
- int index = key.lastIndexOf(KEY_DELIMITER);
+ final int index = key.lastIndexOf(KEY_DELIMITER);
if (index > 0) {
return key.substring(0, index);
@@ -232,13 +235,13 @@ public class KeyValueUtils {
*/
public static int findNextFreeListCounter(String[] input,
String listPrefix) {
- List<Integer> counters = new ArrayList<Integer>();
+ final List<Integer> counters = new ArrayList<Integer>();
if (input == null || input.length == 0)
return 0;
else {
- for (String key : input) {
- String listIndex = getFirstChildAfterPrefix(key, listPrefix);
+ for (final String key : input) {
+ final String listIndex = getFirstChildAfterPrefix(key, listPrefix);
counters.add(Integer.parseInt(listIndex));
}
@@ -259,7 +262,7 @@ public class KeyValueUtils {
if (keySet.isEmpty())
return 0;
- String[] array = new String[keySet.size()];
+ final String[] array = new String[keySet.size()];
keySet.toArray(array);
return findNextFreeListCounter(array, listPrefix);
}
@@ -278,8 +281,8 @@ public class KeyValueUtils {
public static String normalizeCSVValueString(String value) {
String normalizedCodes = null;
if (StringUtils.isNotEmpty(value)) {
- String[] codes = value.split(CSV_DELIMITER);
- for (String el: codes) {
+ final String[] codes = value.split(CSV_DELIMITER);
+ for (final String el: codes) {
if (normalizedCodes == null)
normalizedCodes = StringUtils.chomp(el.trim());
else
@@ -301,7 +304,7 @@ public class KeyValueUtils {
*/
public static boolean isCSVValueString(String value) {
if (StringUtils.isNotEmpty(value)) {
- String[] codes = value.split(CSV_DELIMITER);
+ final String[] codes = value.split(CSV_DELIMITER);
if (codes.length >= 2) {
if (StringUtils.isNotEmpty(codes[1].trim()))
return true;
@@ -322,11 +325,12 @@ public class KeyValueUtils {
* @param csv CSV encoded input data
* @return List of CSV normalized values, but never null
*/
- public static List<String> getListOfCSVValues(String csv) {
- List<String> list = new ArrayList<String>();
+ @Nonnull
+ public static List<String> getListOfCSVValues(@Nullable String csv) {
+ final List<String> list = new ArrayList<String>();
if (StringUtils.isNotEmpty(csv)) {
- String[] values = csv.split(CSV_DELIMITER);
- for (String el: values)
+ final String[] values = csv.split(CSV_DELIMITER);
+ for (final String el: values)
list.add(el.trim());
}
@@ -343,10 +347,10 @@ public class KeyValueUtils {
* @return Map of Key / Value pairs, but never null
*/
public static Map<String, String> convertListToMap(List<String> elements) {
- Map<String, String> map = new HashMap<String, String>();
- for (String el : elements) {
+ final Map<String, String> map = new HashMap<String, String>();
+ for (final String el : elements) {
if (el.contains(KEYVVALUEDELIMITER)) {
- String[] split = el.split(KEYVVALUEDELIMITER);
+ final String[] split = el.split(KEYVVALUEDELIMITER);
map.put(split[0], split[1]);
} else