External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 04:52:07 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improved watchers to support SortedSet fields correctly (related to #10092, #10192)

Browse source
This commit is contained in:
Oleg Agafonov 2023-04-09 08:06:58 +04:00
parent 4301030628
commit f7b32cadd7
2 changed files with 30 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Mage/src/main/java/mage/watchers/Watcher.java
View file

@ -91,6 +91,7 @@ public abstract class Watcher implements Serializable {
Constructor<? extends Watcher> constructor = (Constructor<? extends Watcher>) constructors.get(0);
// collect all fields
constructor.setAccessible(true);
Object[] args = new Object[constructor.getParameterCount()];
for (int index = 0; index < constructor.getParameterTypes().length; index++) {
@ -108,17 +109,32 @@ public abstract class Watcher implements Serializable {
List<Field> allFields = new ArrayList<>();
allFields.addAll(Arrays.asList(getClass().getDeclaredFields()));
allFields.addAll(Arrays.asList(getClass().getSuperclass().getDeclaredFields()));
// copy field's values
for (Field field : allFields) {
if (!Modifier.isStatic(field.getModifiers())) {
field.setAccessible(true);
if (field.getType() == Set.class) {
// Set<UUID, xxx>
((Set) field.get(watcher)).clear();
((Set) field.get(watcher)).addAll((Set) field.get(this));
} else if (field.getType() == Map.class || field.getType() == HashMap.class) {
// Map<UUID, xxx>
ParameterizedType parameterizedType = (ParameterizedType) field.getGenericType();
Type valueType = parameterizedType.getActualTypeArguments()[1];
if (valueType.getTypeName().contains("Set")) {
if (valueType.getTypeName().contains("SortedSet")) {
// Map<UUID, SortedSet<Object>>
Map<Object, Set<Object>> source = (Map<Object, Set<Object>>) field.get(this);
Map<Object, Set<Object>> target = (Map<Object, Set<Object>>) field.get(watcher);
target.clear();
for (Map.Entry<Object, Set<Object>> e : source.entrySet()) {
Set<Object> set = new TreeSet<>();
set.addAll(e.getValue());
target.put(e.getKey(), set);
}
} else if (valueType.getTypeName().contains("Set")) {
// Map<UUID, Set<Object>>
Map<Object, Set<Object>> source = (Map<Object, Set<Object>>) field.get(this);
Map<Object, Set<Object>> target = (Map<Object, Set<Object>>) field.get(watcher);
target.clear();
@ -128,6 +144,7 @@ public abstract class Watcher implements Serializable {
target.put(e.getKey(), set);
}
} else if (valueType.getTypeName().contains("PlayerList")) {
// Map<UUID, PlayerList>
Map<Object, PlayerList> source = (Map<Object, PlayerList>) field.get(this);
Map<Object, PlayerList> target = (Map<Object, PlayerList>) field.get(watcher);
target.clear();
@ -136,6 +153,7 @@ public abstract class Watcher implements Serializable {
target.put(e.getKey(), list);
}
} else if (valueType.getTypeName().endsWith("Cards")) {
// Map<UUID, Cards>
Map<Object, Cards> source = (Map<Object, Cards>) field.get(this);
Map<Object, Cards> target = (Map<Object, Cards>) field.get(watcher);
target.clear();
@ -144,6 +162,7 @@ public abstract class Watcher implements Serializable {
target.put(e.getKey(), list);
}
} else if (valueType instanceof Class && Arrays.stream(((Class) valueType).getInterfaces()).anyMatch(c -> c.equals(Copyable.class))) {
// Map<UUID, Copyable>
Map<Object, Copyable> source = (Map<Object, Copyable>) field.get(this);
Map<Object, Copyable> target = (Map<Object, Copyable>) field.get(watcher);
target.clear();
@ -152,6 +171,7 @@ public abstract class Watcher implements Serializable {
target.put(e.getKey(), object);
}
} else if (valueType.getTypeName().contains("List")) {
// Map<UUID, List<Object>>
Map<Object, List<Object>> source = (Map<Object, List<Object>>) field.get(this);
Map<Object, List<Object>> target = (Map<Object, List<Object>>) field.get(watcher);
target.clear();
@ -161,6 +181,7 @@ public abstract class Watcher implements Serializable {
target.put(e.getKey(), list);
}
} else if (valueType.getTypeName().contains("Map")) {
// Map<UUID, Map<UUID, Object>>
Map<Object, Map<Object, Object>> source = (Map<Object, Map<Object, Object>>) field.get(this);
Map<Object, Map<Object, Object>> target = (Map<Object, Map<Object, Object>>) field.get(watcher);
target.clear();
@ -170,14 +191,17 @@ public abstract class Watcher implements Serializable {
target.put(e.getKey(), map);
}
} else {
// Map<UUID, Object>
// TODO: add additional tests to find unsupported watcher data
((Map) field.get(watcher)).putAll((Map) field.get(this));
}
} else if (field.getType() == List.class) {
// List<Object>
((List) field.get(watcher)).clear();
((List) field.get(watcher)).addAll((List) field.get(this));
} else {
// Object
field.set(watcher, field.get(this));
}
}

4
Mage/src/test/java/mage/WatcherTest.java
View file

@ -72,6 +72,7 @@ public class WatcherTest {
Map<String, List<String>> copyListInMap = copy.getListInMapField();
assertEquals(2, copyListInMap.size());
assertTrue(copyListInMap.containsKey("k1"));
assertEquals(copyListInMap.get("k1").getClass(), listInMapField.get("k1").getClass());
assertEquals(ImmutableList.of("v1", "v1.1"), copyListInMap.get("k1"));
assertTrue(copyListInMap.containsKey("k2"));
assertEquals(ImmutableList.of("v2"), copyListInMap.get("k2"));
@ -103,6 +104,7 @@ public class WatcherTest {
Map<String, Set<String>> copySetInMap = copy.getSetInMapField();
assertEquals(3, copySetInMap.size());
assertTrue(copySetInMap.containsKey("k3"));
assertEquals(copySetInMap.get("k3").getClass(), copySetInMap.get("k3").getClass());
assertEquals(ImmutableSet.of("v3"), copySetInMap.get("k3"));
assertTrue(copySetInMap.containsKey("k4"));
assertEquals(ImmutableSet.of("v4", "v4.1"), copySetInMap.get("k4"));
@ -136,6 +138,7 @@ public class WatcherTest {
Map<String, Map<String, String>> copyMapInMap = copy.getMapInMapField();
assertEquals(2, copyMapInMap.size());
assertTrue(copyMapInMap.containsKey("k1"));
assertEquals(copyMapInMap.get("k1").getClass(), mapInMapField.get("k1").getClass());
assertEquals(ImmutableMap.of("k1.1", "v1.1", "k1.2", "v1.2"), copyMapInMap.get("k1"));
assertTrue(copyMapInMap.containsKey("k2"));
assertEquals(ImmutableMap.of("k2.1", "v2.1"), copyMapInMap.get("k2"));
@ -163,6 +166,7 @@ public class WatcherTest {
Map<String, SortedSet<String>> copySortedSetInMapField = copy.getSortedSetInMapField();
assertEquals(2, copySortedSetInMapField.size());
assertTrue(copySortedSetInMapField.containsKey("k1"));
assertEquals(copySortedSetInMapField.get("k1").getClass(), sortedSetInMapField.get("k1").getClass());
assertEquals(ImmutableSortedSet.of("v1_1", "v1_2"), copySortedSetInMapField.get("k1"));
assertTrue(copySortedSetInMapField.containsKey("k2"));
assertEquals(ImmutableSortedSet.of("v2_1", "v2_2"), copySortedSetInMapField.get("k2"));