42 src/main/java/org/bukkit/permissions/Permission.java
View file
@@ -6,6 +6,8 @@
import java.util.Map;
import java.util.Set;
import java.util.logging.Level;

import org.apache.commons.lang.Validate;
import org.bukkit.Bukkit;
import org.bukkit.plugin.PluginManager;

@@ -204,12 +206,12 @@ public void addParent(Permission perm, boolean value) {
* @param def Default permission value to use if missing
* @return Permission object
*/
public static List<Permission> loadPermissions(Map<String, Map<String, Object>> data, String error, PermissionDefault def) {
public static List<Permission> loadPermissions(Map<?, ?> data, String error, PermissionDefault def) {
List<Permission> result = new ArrayList<Permission>();

for (Map.Entry<String, Map<String, Object>> entry : data.entrySet()) {
for (Map.Entry<?, ?> entry : data.entrySet()) {
try {
result.add(Permission.loadPermission(entry.getKey(), entry.getValue(), def, result));
result.add(Permission.loadPermission(entry.getKey().toString(), (Map<?, ?>) entry.getValue(), def, result));
} catch (Throwable ex) {
Bukkit.getServer().getLogger().log(Level.SEVERE, String.format(error, entry.getKey()), ex);
}
@@ -248,13 +250,10 @@ public static Permission loadPermission(String name, Map<String, Object> data) {
* @param output A list to append any created child-Permissions to, may be null
* @return Permission object
*/
public static Permission loadPermission(String name, Map<String, Object> data, PermissionDefault def, List<Permission> output) {
if (name == null) {
throw new IllegalArgumentException("Name cannot be null");
}
if (data == null) {
throw new IllegalArgumentException("Data cannot be null");
}
public static Permission loadPermission(String name, Map<?, ?> data, PermissionDefault def, List<Permission> output) {
Validate.notNull(name, "Name cannot be null");
Validate.notNull(data, "Data cannot be null");

String desc = null;
Map<String, Boolean> children = null;

@@ -280,11 +279,7 @@ public static Permission loadPermission(String name, Map<String, Object> data, P
}

if (data.containsKey("description")) {
try {
desc = (String) data.get("description");
} catch (ClassCastException ex) {
throw new IllegalArgumentException("'description' key is of wrong type", ex);
}
desc = data.get("description").toString();
}

Permission result = new Permission(name, desc, def, children);
@@ -304,31 +299,30 @@ public static Permission loadPermission(String name, Map<String, Object> data, P
return result;
}

@SuppressWarnings("unchecked")
private static Map<String, Boolean> extractChildren(Map<String, Object> data, String name, PermissionDefault def, List<Permission> output) {
Map<String, Object> input = (Map<String, Object>) data.get("children");
private static Map<String, Boolean> extractChildren(Map<?, ?> data, String name, PermissionDefault def, List<Permission> output) {
Map<?, ?> input = (Map<?, ?>) data.get("children");
Map<String, Boolean> children = new LinkedHashMap<String, Boolean>();

for (Map.Entry<String, Object> entry : input.entrySet()) {
for (Map.Entry<?, ?> entry : input.entrySet()) {
if ((entry.getValue() instanceof Boolean)) {
children.put(entry.getKey(), (Boolean) entry.getValue());
children.put(entry.getKey().toString(), (Boolean) entry.getValue());
} else if ((entry.getValue() instanceof Map)) {
try {
try {
Permission perm = loadPermission((String) entry.getKey(), (Map<String, Object>) entry.getValue(), def, output);
Permission perm = loadPermission(entry.getKey().toString(), (Map<?, ?>) entry.getValue(), def, output);
children.put(perm.getName(), Boolean.valueOf(true));

if (output != null) {
output.add(perm);
}
} catch (Throwable ex) {
Bukkit.getServer().getLogger().log(Level.SEVERE, "Permission node '" + (String) entry.getKey() + "' in child of " + name + " is invalid", ex);
Bukkit.getServer().getLogger().log(Level.SEVERE, "Permission node '" + entry.getKey().toString() + "' in child of " + name + " is invalid", ex);
}
} catch (ClassCastException ex) {
throw new IllegalArgumentException("Child '" + (String) entry.getKey() + "' contains invalid map type");
throw new IllegalArgumentException("Child '" + entry.getKey().toString() + "' contains invalid map type");
}
} else {
throw new IllegalArgumentException("Child '" + (String) entry.getKey() + "' contains invalid value");
throw new IllegalArgumentException("Child '" + entry.getKey().toString() + "' contains invalid value");
}
}

108 src/main/java/org/bukkit/plugin/PluginDescriptionFile.java
View file
@@ -3,15 +3,18 @@
import java.io.InputStream;
import java.io.Reader;
import java.io.Writer;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.bukkit.permissions.Permission;
import org.bukkit.permissions.PermissionDefault;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.SafeConstructor;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;

/**
* Provides access to a Plugins description file, plugin.yaml
*/
@@ -20,21 +23,20 @@ public final class PluginDescriptionFile {
private String name = null;
private String main = null;
private String classLoaderOf = null;
private ArrayList<String> depend = null;
private ArrayList<String> softDepend = null;
private List<String> depend = null;
private List<String> softDepend = null;
private String version = null;
private Object commands = null;
private Map<String, Map<String, Object>> commands = null;
private String description = null;
private ArrayList<String> authors = new ArrayList<String>();
private List<String> authors = null;
private String website = null;
private boolean database = false;
private PluginLoadOrder order = PluginLoadOrder.POSTWORLD;
private List<Permission> permissions = new ArrayList<Permission>();
private List<Permission> permissions = null;
private PermissionDefault defaultPerm = PermissionDefault.OP;

@SuppressWarnings("unchecked")
public PluginDescriptionFile(final InputStream stream) throws InvalidDescriptionException {
loadMap((Map<String, Object>) yaml.load(stream));
loadMap((Map<?, ?>) yaml.load(stream));
}

/**
@@ -43,9 +45,8 @@ public PluginDescriptionFile(final InputStream stream) throws InvalidDescription
* @param reader The reader
* @throws InvalidDescriptionException If the PluginDescriptionFile is invalid
*/
@SuppressWarnings("unchecked")
public PluginDescriptionFile(final Reader reader) throws InvalidDescriptionException {
loadMap((Map<String, Object>) yaml.load(reader));
loadMap((Map<?, ?>) yaml.load(reader));
}

/**
@@ -106,15 +107,15 @@ public String getMain() {
return main;
}

public Object getCommands() {
public Map<String, Map<String, Object>> getCommands() {
return commands;
}

public Object getDepend() {
public List<String> getDepend() {
return depend;
}

public Object getSoftDepend() {
public List<String> getSoftDepend() {
return softDepend;
}

@@ -131,7 +132,7 @@ public String getDescription() {
return description;
}

public ArrayList<String> getAuthors() {
public List<String> getAuthors() {
return authors;
}

@@ -159,8 +160,7 @@ public String getClassLoaderOf() {
return classLoaderOf;
}

@SuppressWarnings("unchecked")
private void loadMap(Map<String, Object> map) throws InvalidDescriptionException {
private void loadMap(Map<?, ?> map) throws InvalidDescriptionException {
try {
name = map.get("name").toString();

@@ -193,31 +193,56 @@ private void loadMap(Map<String, Object> map) throws InvalidDescriptionException
}

if (map.containsKey("commands")) {
ImmutableMap.Builder<String, Map<String, Object>> commandsBuilder = ImmutableMap.<String, Map<String, Object>>builder();
try {
commands = map.get("commands");
for (Map.Entry<?, ?> command : ((Map<?, ?>) map.get("commands")).entrySet()) {

This comment has been minimized.

Sign in to view
Copy link
@dredhorse

dredhorse Mar 1, 2012

don't know why yet but this breaks the plugin dwarfforge which I'm keeping alive.. https://github.com/dredhorse/DwarfForge/issues/12

will look into it, just letting you know.
ImmutableMap.Builder<String, Object> commandBuilder = ImmutableMap.<String, Object>builder();
for (Map.Entry<?, ?> commandEntry : ((Map<?, ?>) command.getValue()).entrySet()) {
if (commandEntry.getValue() instanceof Iterable) {
// This prevents internal alias list changes
ImmutableList.Builder<Object> commandSubList = ImmutableList.<Object>builder();
for (Object commandSubListItem : (Iterable<?>) commandEntry.getValue()) {
commandSubList.add(commandSubListItem);
}
commandBuilder.put(commandEntry.getKey().toString(), commandSubList.build());
} else {
commandBuilder.put(commandEntry.getKey().toString(), commandEntry.getValue());
}
}
commandsBuilder.put(command.getKey().toString(), commandBuilder.build());
}
} catch (ClassCastException ex) {
throw new InvalidDescriptionException(ex, "commands are of wrong type");
}
commands = commandsBuilder.build();
}

if (map.containsKey("class-loader-of")) {
classLoaderOf = map.get("class-loader-of").toString();
}

if (map.containsKey("depend")) {
ImmutableList.Builder<String> dependBuilder = ImmutableList.<String>builder();
try {
depend = (ArrayList<String>) map.get("depend");
for (Object dependency : (Iterable<?>) map.get("depend")) {
dependBuilder.add(dependency.toString());
}
} catch (ClassCastException ex) {
throw new InvalidDescriptionException(ex, "depend is of wrong type");
}
depend = dependBuilder.build();
}

if (map.containsKey("softdepend")) {
ImmutableList.Builder<String> softDependBuilder = ImmutableList.<String>builder();
try {
softDepend = (ArrayList<String>) map.get("softdepend");
for (Object dependency : (Iterable<?>) map.get("softdepend")) {
softDependBuilder.add(dependency.toString());
}
} catch (ClassCastException ex) {
throw new InvalidDescriptionException(ex, "softdepend is of wrong type");
}
softDepend = softDependBuilder.build();
}

if (map.containsKey("database")) {
@@ -229,19 +254,11 @@ private void loadMap(Map<String, Object> map) throws InvalidDescriptionException
}

if (map.containsKey("website")) {
try {
website = (String) map.get("website");
} catch (ClassCastException ex) {
throw new InvalidDescriptionException(ex, "website is of wrong type");
}
website = map.get("website").toString();
}

if (map.containsKey("description")) {
try {
description = (String) map.get("description");
} catch (ClassCastException ex) {
throw new InvalidDescriptionException(ex, "description is of wrong type");
}
description = map.get("description").toString();
}

if (map.containsKey("load")) {
@@ -254,29 +271,28 @@ private void loadMap(Map<String, Object> map) throws InvalidDescriptionException
}
}

if (map.containsKey("author")) {
try {
String extra = (String) map.get("author");

authors.add(extra);
} catch (ClassCastException ex) {
throw new InvalidDescriptionException(ex, "author is of wrong type");
}
}

if (map.containsKey("authors")) {
ImmutableList.Builder<String> authorsBuilder = ImmutableList.<String>builder();
if (map.containsKey("author")) {
authorsBuilder.add(map.get("author").toString());
}
try {
ArrayList<String> extra = (ArrayList<String>) map.get("authors");

authors.addAll(extra);
for (Object o : (Iterable<?>) map.get("authors")) {
authorsBuilder.add(o.toString());
}
} catch (ClassCastException ex) {
throw new InvalidDescriptionException(ex, "authors are of wrong type");
}
authors = authorsBuilder.build();
} else if (map.containsKey("author")) {
authors = ImmutableList.of(map.get("author").toString());
} else {
authors = ImmutableList.<String>of();
}

if (map.containsKey("default-permission")) {
try {
defaultPerm = PermissionDefault.getByName((String) map.get("default-permission"));
defaultPerm = PermissionDefault.getByName(map.get("default-permission").toString());
} catch (ClassCastException ex) {
throw new InvalidDescriptionException(ex, "default-permission is of wrong type");
} catch (IllegalArgumentException ex) {
@@ -286,12 +302,14 @@ private void loadMap(Map<String, Object> map) throws InvalidDescriptionException

if (map.containsKey("permissions")) {
try {
Map<String, Map<String, Object>> perms = (Map<String, Map<String, Object>>) map.get("permissions");
Map<?, ?> perms = (Map<?, ?>) map.get("permissions");

permissions = Permission.loadPermissions(perms, "Permission node '%s' in plugin description file for " + getFullName() + " is invalid", defaultPerm);
permissions = ImmutableList.copyOf(Permission.loadPermissions(perms, "Permission node '%s' in plugin description file for " + getFullName() + " is invalid", defaultPerm));
} catch (ClassCastException ex) {
throw new InvalidDescriptionException(ex, "permissions are of wrong type");
}
} else {
permissions = ImmutableList.<Permission>of();
}
}

5 src/main/java/org/bukkit/plugin/SimplePluginManager.java
View file
@@ -99,7 +99,6 @@ public void registerInterface(Class<? extends PluginLoader> loader) throws Illeg
* @param directory Directory to check for plugins
* @return A list of all plugins loaded
*/
@SuppressWarnings("unchecked")
public Plugin[] loadPlugins(File directory) {
Validate.notNull(directory, "Directory cannot be null");
Validate.isTrue(directory.isDirectory(), "Directory must be a directory");
@@ -138,12 +137,12 @@ public Plugin[] loadPlugins(File directory) {

plugins.put(description.getName(), file);

Collection<? extends String> softDependencySet = (Collection<? extends String>) description.getSoftDepend();
Collection<String> softDependencySet = description.getSoftDepend();
if (softDependencySet != null) {
softDependencies.put(description.getName(), new LinkedList<String>(softDependencySet));
}

Collection<? extends String> dependencySet = (Collection<? extends String>) description.getDepend();
Collection<String> dependencySet = description.getDepend();
if (dependencySet != null) {
dependencies.put(description.getName(), new LinkedList<String>(dependencySet));
}
23 src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
View file
@@ -8,9 +8,9 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.jar.JarEntry;
@@ -40,6 +40,8 @@
import org.bukkit.plugin.UnknownDependencyException;
import org.yaml.snakeyaml.error.YAMLException;

import com.google.common.collect.ImmutableList;

/**
* Represents a Java plugin loader, allowing plugins in the form of .jar
*/
@@ -53,7 +55,6 @@ public JavaPluginLoader(Server instance) {
server = instance;
}

@SuppressWarnings("unchecked")
public Plugin loadPlugin(File file) throws InvalidPluginException {
Validate.notNull(file, "File cannot be null");

@@ -104,15 +105,9 @@ public Plugin loadPlugin(File file) throws InvalidPluginException {
));
}

ArrayList<String> depend;

try {
depend = (ArrayList<String>) description.getDepend();
if (depend == null) {
depend = new ArrayList<String>();
}
} catch (ClassCastException ex) {
throw new InvalidPluginException(ex);
List<String> depend = description.getDepend();
if (depend == null) {
depend = ImmutableList.<String>of();
}

for (String pluginName : depend) {
@@ -251,8 +246,7 @@ public void setClass(final String name, final Class<?> clazz) {
classes.put(name, clazz);

if (ConfigurationSerializable.class.isAssignableFrom(clazz)) {
@SuppressWarnings("unchecked")
Class<? extends ConfigurationSerializable> serializable = (Class<? extends ConfigurationSerializable>) clazz;
Class<? extends ConfigurationSerializable> serializable = clazz.asSubclass(ConfigurationSerializable.class);
ConfigurationSerialization.registerClass(serializable);
}
}
@@ -263,8 +257,7 @@ public void removeClass(String name) {

try {
if ((clazz != null) && (ConfigurationSerializable.class.isAssignableFrom(clazz))) {
@SuppressWarnings("unchecked")
Class<? extends ConfigurationSerializable> serializable = (Class<? extends ConfigurationSerializable>) clazz;
Class<? extends ConfigurationSerializable> serializable = clazz.asSubclass(ConfigurationSerializable.class);
ConfigurationSerialization.unregisterClass(serializable);
}
} catch (NullPointerException ex) {
6 src/main/java/org/bukkit/potion/Potion.java
View file
@@ -1,13 +1,14 @@
package org.bukkit.potion;

import java.util.Collection;
import java.util.Collections;

import org.apache.commons.lang.Validate;
import org.bukkit.Material;
import org.bukkit.entity.LivingEntity;
import org.bukkit.inventory.ItemStack;

import com.google.common.collect.ImmutableList;

/**
* Represents a minecraft potion
*/
@@ -170,9 +171,8 @@ public boolean equals(Object obj) {
* @see Potion#toDamageValue()
* @return The effects that this potion applies
*/
@SuppressWarnings("unchecked")
public Collection<PotionEffect> getEffects() {
if(type == null) return Collections.EMPTY_SET;
if (type == null) return ImmutableList.<PotionEffect>of();
return getBrewer().getEffectsFromDamage(toDamageValue());
}

2 src/test/java/org/bukkit/configuration/file/YamlConfigurationTest.java
View file
@@ -93,7 +93,7 @@ public void testSaveRestoreCompositeList() throws InvalidConfigurationException

YamlConfiguration in = new YamlConfiguration();
in.loadFromString(yaml);
List<Object> raw = in.getList("composite-list.abc.def");
List<?> raw = in.getList("composite-list.abc.def");

assertEquals(stacks.size(), raw.size());
assertEquals(stacks.get(0), raw.get(0));