Merge branch 'develop'

Author: guFalcon

pom.xml

@@ -10,7 +10,7 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jre-utils</artifactId>
-	<version>0.3.10</version>
+	<version>0.3.11</version>
 	<name>JreUtils</name>
 	<packaging>jar</packaging>
 

src/main/java/info/unterrainer/commons/jreutils/DoubleBufferedFile.java

@@ -6,6 +6,7 @@
 import java.nio.file.Files;
 import java.nio.file.LinkOption;
 import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.time.LocalDateTime;
 import java.util.Objects;
@@ -116,7 +117,9 @@ DoubleBufferedFileData withCheckedRead() throws IOException {
 		}
 
 		BufferedWriter getBufferedWriter() throws IOException {
-			return Files.newBufferedWriter(path, Charset.forName("UTF-8"));
+			Files.createDirectories(path.getParent());
+			return Files.newBufferedWriter(path, Charset.forName("UTF-8"), StandardOpenOption.CREATE,
+					StandardOpenOption.WRITE, StandardOpenOption.APPEND);
 		}
 	}
 

src/main/java/info/unterrainer/commons/jreutils/collections/DataTable.java

@@ -9,6 +9,9 @@
 import java.util.Set;
 import java.util.function.Function;
 
+import org.apache.commons.collections4.MultiValuedMap;
+import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
+
 import lombok.Getter;
 import lombok.experimental.Accessors;
 
@@ -33,6 +36,10 @@ public class DataTable<T> {
 	private HashMap<String, Function<T, Boolean>> filters = new HashMap<>();
 	private HashMap<String, DataMap<Object, T>> maps = new HashMap<>();
 
+	private HashMap<String, Function<T, Object>> multiKeySuppliers = new HashMap<>();
+	private HashMap<String, Function<T, Boolean>> multiFilters = new HashMap<>();
+	private HashMap<String, MultiValuedMap<Object, T>> multiMaps = new HashMap<>();
+
 	public DataTable(final Class<T> clazz, final int maxEntries) {
 		this.clazz = clazz;
 		this.maxEntries = maxEntries;
@@ -43,13 +50,27 @@ public <K> DataTable<T> addIndex(final String name, final Function<T, K> keySupp
 		return addIndex(name, keySupplier, null);
 	}
 
+	public <K> DataTable<T> addMultiIndex(final String name, final Function<T, K> keySupplier) {
+		return addMultiIndex(name, keySupplier, null);
+	}
+
 	@SuppressWarnings("unchecked")
 	public <K> DataTable<T> addIndex(final String name, final Function<T, K> keySupplier,
 			final Function<T, Boolean> filter) {
 		keySuppliers.put(name, (Function<T, Object>) keySupplier);
 		if (filter != null)
 			filters.put(name, filter);
-		maps.put(name, new DataMap<Object, T>(maxEntries));
+		maps.put(name, new DataMap<>(maxEntries));
+		return this;
+	}
+
+	@SuppressWarnings("unchecked")
+	public <K> DataTable<T> addMultiIndex(final String name, final Function<T, K> keySupplier,
+			final Function<T, Boolean> filter) {
+		multiKeySuppliers.put(name, (Function<T, Object>) keySupplier);
+		if (filter != null)
+			multiFilters.put(name, filter);
+		multiMaps.put(name, new ArrayListValuedHashMap<>(maxEntries));
 		return this;
 	}
 
@@ -77,6 +98,11 @@ public synchronized T poll() {
 			DataMap<Object, T> map = maps.get(name);
 			map.remove(func.apply(e));
 		}
+		for (String name : multiKeySuppliers.keySet()) {
+			Function<T, ?> func = multiKeySuppliers.get(name);
+			MultiValuedMap<Object, T> map = multiMaps.get(name);
+			map.removeMapping(func.apply(e), e);
+		}
 		return e;
 	}
 
@@ -92,6 +118,18 @@ public synchronized <K> T get(final String name, final K key) {
 		return maps.get(name).get(key);
 	}
 
+	/**
+	 * Gets elements by a specified multi-index.
+	 *
+	 * @param <K>  the type of the key used by the given multi-index
+	 * @param name the name of the multi-index
+	 * @param key  the key of the element to retrieve using the given multi-index
+	 * @return the collection of elements to retrieve, that may be empty
+	 */
+	public synchronized <K> Collection<T> multiGet(final String name, final K key) {
+		return multiMaps.get(name).get(key);
+	}
+
 	/**
 	 * Adds one or more elements to the DataTable.
 	 * <p>
@@ -113,6 +151,14 @@ public synchronized void add(final T... elements) {
 					map.put(key, element);
 				}
 			}
+			for (Entry<String, Function<T, Object>> entry : multiKeySuppliers.entrySet()) {
+				Function<T, Boolean> filter = multiFilters.get(entry.getKey());
+				MultiValuedMap<Object, T> map = multiMaps.get(entry.getKey());
+				if (filter == null || filter.apply(element)) {
+					Object key = entry.getValue().apply(element);
+					map.put(key, element);
+				}
+			}
 		}
 	}
 
@@ -128,6 +174,18 @@ public synchronized <K> Set<K> keySet(final String name) {
 		return (Set<K>) maps.get(name).keySet();
 	}
 
+	/**
+	 * Get a set of keys for a given multi-index.
+	 *
+	 * @param <K>  the type of the key for the given multi-index
+	 * @param name the name of the multi-index to get the keys from
+	 * @return a set of keys
+	 */
+	@SuppressWarnings("unchecked")
+	public synchronized <K> Set<K> multiKeySet(final String name) {
+		return (Set<K>) multiMaps.get(name).keySet();
+	}
+
 	/**
 	 * Get a list of keys for a given index.
 	 *
@@ -142,6 +200,20 @@ public synchronized <K> List<K> keyList(final String name) {
 		return list;
 	}
 
+	/**
+	 * Get a list of keys for a given multi-index.
+	 *
+	 * @param <K>  the type of the key for the given multi-index
+	 * @param name the name of the multi-index to get the keys from
+	 * @return a list of keys
+	 */
+	@SuppressWarnings("unchecked")
+	public synchronized <K> List<K> multiKeyList(final String name) {
+		List<K> list = new ArrayList<>();
+		list.addAll((Set<K>) multiMaps.get(name).keySet());
+		return list;
+	}
+
 	public synchronized Collection<T> values(final String name) {
 		return maps.get(name).values();
 	}
@@ -174,6 +246,14 @@ public synchronized DataTable<T> load(T[] backingArray) {
 				if (filter == null || filter.apply(s))
 					map.put(entry.getValue().apply(s), s);
 		}
+		for (Entry<String, Function<T, Object>> entry : multiKeySuppliers.entrySet()) {
+			MultiValuedMap<Object, T> map = new ArrayListValuedHashMap<>(maxEntries);
+			multiMaps.put(entry.getKey(), map);
+			Function<T, Boolean> filter = multiFilters.get(entry.getKey());
+			for (T s : backingArray)
+				if (filter == null || filter.apply(s))
+					map.put(entry.getValue().apply(s), s);
+		}
 		return this;
 	}