Siphalor/tweed5
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects 1 Releases Wiki Activity

[weaver-pojo] TypedMultimap fixes and test fixes

Browse Source
This commit is contained in:
Siphalor
2024-11-03 00:14:43 +01:00
parent a3c33ee4a8
commit 60aba0ee80
2 changed files with 59 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tweed5-core/src/main/java/de/siphalor/tweed5/core/api/collection/TypedMultimap.java
View File

@@ -60,7 +60,7 @@ public class TypedMultimap<T> implements Collection<T> {
keptAnyElementInList = true;
}
if (listIterator == null || !listIterator.hasNext()) {
if (!keptAnyElementInList) {
if (listIterator != null && !keptAnyElementInList) {
classIterator.remove();
}
listIterator = classIterator.next().getValue().iterator();
@@ -157,9 +157,9 @@ public class TypedMultimap<T> implements Collection<T> {
@Override
public boolean retainAll(@NotNull Collection<?> values) {
Map<? extends Class<?>, ? extends List<?>> valuesByClass = values.stream()
Map<Class<?>, ? extends List<?>> valuesByClass = values.stream()
.collect(Collectors.groupingBy(Object::getClass));
delegate.putAll((Map<Class<? extends T>, List<T>>) valuesByClass);
delegate.putAll((Map<Class<? extends T>, List<T>>)(Object) valuesByClass);
delegate.keySet().removeIf(key -> !valuesByClass.containsKey(key));
return true;
}