Merge remote-tracking branch 'origin/master' into bug2775

Conflicts:
	java/pom.xml
This commit is contained in:
Steffen Schaefer committed 2016-06-30 09:55:31 +02:00
commit bba6e4346c
309 files changed
+3812 -2112

No files matched your search

@@ -0,0 +1,4 @@
package com.sap.sse.common;
public interface NamedWithID extends Named, WithID {
}
@@ -2,6 +2,7 @@ package com.sap.sse.common;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
@@ -364,7 +365,11 @@ public class Util {
map.get(key).add(value);
}
public static String join(String separator, String...strings) {
public static String join(String separator, String... strings) {
return joinStrings(separator, Arrays.asList(strings));
}
public static String joinStrings(String separator, Iterable<String> strings) {
StringBuilder result = new StringBuilder();
boolean first = true;
for (String string : strings) {