SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests 1 Aktivität

Relax generic types for ConfigurationSerialization

Quellcode durchsuchen 
The method signatures are unnecessarily strict for the generic signatures.
This change may cause a compile-time error for extending classes overriding
methods, but no byte signature or compile time call signatures change.

By: Wesley Wolfe <weswolf@aol.com>
Dieser Commit ist enthalten in:
Bukkit/Spigot 2013-04-25 03:53:54 -05:00
Ursprung 7589be7e78
Commit bdc0f04ee3
1 geänderte Dateien mit 5 neuen und 5 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

10
paper-api/src/main/java/org/bukkit/configuration/serialization/ConfigurationSerialization.java
Datei anzeigen

@ -68,7 +68,7 @@ public class ConfigurationSerialization {
} }
} }
protected ConfigurationSerializable deserializeViaMethod(Method method, Map<String, Object> args) { protected ConfigurationSerializable deserializeViaMethod(Method method, Map<String, ?> args) {
try { try {
ConfigurationSerializable result = (ConfigurationSerializable) method.invoke(null, args); ConfigurationSerializable result = (ConfigurationSerializable) method.invoke(null, args);
@ -87,7 +87,7 @@ public class ConfigurationSerialization {
return null; return null;
} }
protected ConfigurationSerializable deserializeViaCtor(Constructor<? extends ConfigurationSerializable> ctor, Map<String, Object> args) { protected ConfigurationSerializable deserializeViaCtor(Constructor<? extends ConfigurationSerializable> ctor, Map<String, ?> args) {
try { try {
return ctor.newInstance(args); return ctor.newInstance(args);
} catch (Throwable ex) { } catch (Throwable ex) {
@ -100,7 +100,7 @@ public class ConfigurationSerialization {
return null; return null;
} }
public ConfigurationSerializable deserialize(Map<String, Object> args) { public ConfigurationSerializable deserialize(Map<String, ?> args) {
Validate.notNull(args, "Args must not be null"); Validate.notNull(args, "Args must not be null");
ConfigurationSerializable result = null; ConfigurationSerializable result = null;
@ -146,7 +146,7 @@ public class ConfigurationSerialization {
* @param clazz Class to deserialize into * @param clazz Class to deserialize into
* @return New instance of the specified class * @return New instance of the specified class
*/ */
public static ConfigurationSerializable deserializeObject(Map<String, Object> args, Class<? extends ConfigurationSerializable> clazz) { public static ConfigurationSerializable deserializeObject(Map<String, ?> args, Class<? extends ConfigurationSerializable> clazz) {
return new ConfigurationSerialization(clazz).deserialize(args); return new ConfigurationSerialization(clazz).deserialize(args);
} }
@ -162,7 +162,7 @@ public class ConfigurationSerialization {
* @param args Arguments for deserialization * @param args Arguments for deserialization
* @return New instance of the specified class * @return New instance of the specified class
*/ */
public static ConfigurationSerializable deserializeObject(Map<String, Object> args) { public static ConfigurationSerializable deserializeObject(Map<String, ?> args) {
Class<? extends ConfigurationSerializable> clazz = null; Class<? extends ConfigurationSerializable> clazz = null;
if (args.containsKey(SERIALIZED_TYPE_KEY)) { if (args.containsKey(SERIALIZED_TYPE_KEY)) {