Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-07-04 10:45:15 +02:00
Code Issues Projects Releases Wiki Activity

Made Adapter its own annotation.

Browse Source
This commit is contained in:
tastybento 2018-02-05 11:35:50 -08:00
parent 26956d8386
commit 812594783e
9 changed files with 91 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/us/tastybento/bskyblock/Settings.java
View File

@ -14,10 +14,11 @@ import org.bukkit.potion.PotionEffectType;
import us.tastybento.bskyblock.Constants.GameType;
import us.tastybento.bskyblock.api.configuration.ConfigEntry;
import us.tastybento.bskyblock.api.configuration.ISettings;
import us.tastybento.bskyblock.api.configuration.PotionEffectListAdpater;
import us.tastybento.bskyblock.api.configuration.StoreAt;
import us.tastybento.bskyblock.api.flags.Flag;
import us.tastybento.bskyblock.database.BSBDatabase.DatabaseType;
import us.tastybento.bskyblock.database.objects.adapters.Adapter;
import us.tastybento.bskyblock.database.objects.adapters.PotionEffectListAdapter;
/**
* All the plugin settings are here
@ -237,7 +238,8 @@ public class Settings implements ISettings<Settings> {
@ConfigEntry(path = "acid.damage.rain", specificTo = GameType.ACIDISLAND)
private int acidRainDamage = 1;
@ConfigEntry(path = "acid.damage.effects", specificTo = GameType.ACIDISLAND, adapter = PotionEffectListAdpater.class)
@ConfigEntry(path = "acid.damage.effects", specificTo = GameType.ACIDISLAND)
@Adapter(PotionEffectListAdapter.class)
private List<PotionEffectType> acidEffects = new ArrayList<>(Arrays.asList(PotionEffectType.CONFUSION, PotionEffectType.SLOW));
/* SCHEMATICS */

3
src/main/java/us/tastybento/bskyblock/api/configuration/ConfigEntry.java
View File

@ -16,12 +16,11 @@ import us.tastybento.bskyblock.Constants.GameType;
@Target(ElementType.FIELD)
public @interface ConfigEntry {
String path() default "";
String path();
String since() default "1.0";
boolean overrideOnChange() default false;
boolean experimental() default false;
boolean needsReset() default false;
GameType specificTo() default GameType.BOTH;
Class<?> adapter() default Adapter.class;
}

62
src/main/java/us/tastybento/bskyblock/database/flatfile/FlatFileDatabaseHandler.java
View File

@ -26,11 +26,12 @@ import org.bukkit.plugin.Plugin;
import us.tastybento.bskyblock.Constants;
import us.tastybento.bskyblock.Constants.GameType;
import us.tastybento.bskyblock.api.configuration.Adapter;
import us.tastybento.bskyblock.api.configuration.ConfigEntry;
import us.tastybento.bskyblock.api.configuration.StoreAt;
import us.tastybento.bskyblock.database.DatabaseConnecter;
import us.tastybento.bskyblock.database.managers.AbstractDatabaseHandler;
import us.tastybento.bskyblock.database.objects.adapters.Adapter;
import us.tastybento.bskyblock.database.objects.adapters.AdapterInterface;
import us.tastybento.bskyblock.util.Util;
/**
@ -179,21 +180,24 @@ public class FlatFileDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
continue;
}
// TODO: Add handling of other ConfigEntry elements
if (!configEntry.adapter().equals(Adapter.class)) {
// A conversion adapter has been defined
Object value = config.get(storageLocation);
method.invoke(instance, ((Adapter<?,?>)configEntry.adapter().newInstance()).serialize(value));
if (DEBUG) {
plugin.getLogger().info("DEBUG: value = " + value);
plugin.getLogger().info("DEBUG: property type = " + propertyDescriptor.getPropertyType());
plugin.getLogger().info("DEBUG: " + value.getClass());
}
if (value != null && !value.getClass().equals(MemorySection.class)) {
method.invoke(instance, deserialize(value,propertyDescriptor.getPropertyType()));
}
// We are done here
continue;
}
Adapter adapterNotation = field.getAnnotation(Adapter.class);
if (adapterNotation != null && AdapterInterface.class.isAssignableFrom(adapterNotation.value())) {
if (DEBUG)
plugin.getLogger().info("DEBUG: there is an adapter");
// A conversion adapter has been defined
Object value = config.get(storageLocation);
method.invoke(instance, ((AdapterInterface<?,?>)adapterNotation.value().newInstance()).serialize(value));
if (DEBUG) {
plugin.getLogger().info("DEBUG: value = " + value);
plugin.getLogger().info("DEBUG: property type = " + propertyDescriptor.getPropertyType());
plugin.getLogger().info("DEBUG: " + value.getClass());
}
if (value != null && !value.getClass().equals(MemorySection.class)) {
method.invoke(instance, deserialize(value,propertyDescriptor.getPropertyType()));
}
// We are done here
continue;
}
// Look in the YAML Config to see if this field exists (it should)
@ -352,18 +356,24 @@ public class FlatFileDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
storageLocation = configEntry.path();
}
// TODO: add in game-specific saving
if (!configEntry.adapter().equals(Adapter.class)) {
// A conversion adapter has been defined
try {
config.set(storageLocation, ((Adapter<?,?>)configEntry.adapter().newInstance()).deserialize(value));
} catch (InstantiationException e) {
e.printStackTrace();
}
// We are done here
continue fields;
}
}
Adapter adapterNotation = field.getAnnotation(Adapter.class);
if (adapterNotation != null && AdapterInterface.class.isAssignableFrom(adapterNotation.value())) {
if (DEBUG)
plugin.getLogger().info("DEBUG: there is an adapter");
// A conversion adapter has been defined
// A conversion adapter has been defined
try {
config.set(storageLocation, ((AdapterInterface<?,?>)adapterNotation.value().newInstance()).deserialize(value));
} catch (InstantiationException e) {
e.printStackTrace();
}
// We are done here
continue fields;
}
//plugin.getLogger().info("DEBUG: property desc = " + propertyDescriptor.getPropertyType().getTypeName());
// Depending on the vale type, it'll need serializing differenty
// Check if this field is the mandatory UniqueId field. This is used to identify this instantiation of the class

40
src/main/java/us/tastybento/bskyblock/database/mysql/MySQLDatabaseHandler.java
View File

@ -32,10 +32,11 @@ import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.plugin.Plugin;
import us.tastybento.bskyblock.api.configuration.Adapter;
import us.tastybento.bskyblock.api.configuration.ConfigEntry;
import us.tastybento.bskyblock.database.DatabaseConnecter;
import us.tastybento.bskyblock.database.managers.AbstractDatabaseHandler;
import us.tastybento.bskyblock.database.objects.adapters.Adapter;
import us.tastybento.bskyblock.database.objects.adapters.AdapterInterface;
import us.tastybento.bskyblock.util.Util;
/**
@ -423,14 +424,15 @@ public class MySQLDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
if (configEntry != null) {
if (DEBUG)
plugin.getLogger().info("DEBUG: there is a configEntry");
if (!configEntry.adapter().equals(Adapter.class)) {
if (DEBUG)
plugin.getLogger().info("DEBUG: there is an adapter");
// A conversion adapter has been defined
value = ((Adapter<?,?>)configEntry.adapter().newInstance()).deserialize(value);
if (DEBUG)
plugin.getLogger().info("DEBUG: value now after deserialization = " + value);
}
}
Adapter adapterNotation = field.getAnnotation(Adapter.class);
if (adapterNotation != null && AdapterInterface.class.isAssignableFrom(adapterNotation.value())) {
if (DEBUG)
plugin.getLogger().info("DEBUG: there is an adapter");
// A conversion adapter has been defined
value = ((AdapterInterface<?,?>)adapterNotation.value().newInstance()).deserialize(value);
if (DEBUG)
plugin.getLogger().info("DEBUG: value now after deserialization = " + value);
}
// Create set and map table inserts if this is a Collection
if (propertyDescriptor.getPropertyType().equals(Set.class) ||
@ -485,7 +487,7 @@ public class MySQLDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
Entry<?,?> en = (Entry<?, ?>) it.next();
if (DEBUG)
plugin.getLogger().info("DEBUG: entry ket = " + en.getKey());
// Get the key and serialize it
Object key = serialize(en.getKey(), en.getKey().getClass());
if (DEBUG)
@ -789,14 +791,16 @@ public class MySQLDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
if (configEntry != null) {
if (DEBUG)
plugin.getLogger().info("DEBUG: there is a configEntry");
if (!configEntry.adapter().equals(Adapter.class)) {
if (DEBUG)
plugin.getLogger().info("DEBUG: there is an adapter");
// A conversion adapter has been defined
value = ((Adapter<?,?>)configEntry.adapter().newInstance()).serialize(value);
if (DEBUG)
plugin.getLogger().info("DEBUG: value now after serialization = " + value);
}
// TODO: add config entry handling
}
Adapter adapterNotation = field.getAnnotation(Adapter.class);
if (adapterNotation != null && AdapterInterface.class.isAssignableFrom(adapterNotation.value())) {
if (DEBUG)
plugin.getLogger().info("DEBUG: there is an adapter");
// A conversion adapter has been defined
value = ((AdapterInterface<?,?>)adapterNotation.value().newInstance()).serialize(value);
if (DEBUG)
plugin.getLogger().info("DEBUG: value now after deserialization = " + value);
}
if (DEBUG) {
plugin.getLogger().info("DEBUG: invoking method " + method.getName());

4
src/main/java/us/tastybento/bskyblock/database/objects/Island.java
View File

@ -23,6 +23,8 @@ import us.tastybento.bskyblock.api.events.island.IslandEvent.IslandLockEvent;
import us.tastybento.bskyblock.api.events.island.IslandEvent.IslandUnlockEvent;
import us.tastybento.bskyblock.api.events.island.IslandEvent.Reason;
import us.tastybento.bskyblock.api.flags.Flag;
import us.tastybento.bskyblock.database.objects.adapters.Adapter;
import us.tastybento.bskyblock.database.objects.adapters.FlagSerializer;
import us.tastybento.bskyblock.managers.RanksManager;
import us.tastybento.bskyblock.util.Util;
@ -80,7 +82,7 @@ public class Island implements DataObject {
private boolean purgeProtected = false;
//// Protection flags ////
@ConfigEntry(adapter = FlagSerializer.class)
@Adapter(FlagSerializer.class)
private HashMap<Flag, Integer> flags = new HashMap<>();
private int levelHandicap;

19
src/main/java/us/tastybento/bskyblock/database/objects/adapters/Adapter.java Normal file
View File

@ -0,0 +1,19 @@
package us.tastybento.bskyblock.database.objects.adapters;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
*
* Denotes which adapter should be used to serialize or deserialize this field
* @author tastybento
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
public @interface Adapter {
Class<?> value();
}

4
src/main/java/us/tastybento/bskyblock/api/configuration/Adapter.java → src/main/java/us/tastybento/bskyblock/database/objects/adapters/AdapterInterface.java
View File

@ -1,4 +1,4 @@
package us.tastybento.bskyblock.api.configuration;
package us.tastybento.bskyblock.database.objects.adapters;
/**
@ -8,7 +8,7 @@ package us.tastybento.bskyblock.api.configuration;
* @param <S>
* @param <V>
*/
public interface Adapter<S,V> {
public interface AdapterInterface<S,V> {
/**
* Serialize object

5
src/main/java/us/tastybento/bskyblock/database/objects/FlagSerializer.java → src/main/java/us/tastybento/bskyblock/database/objects/adapters/FlagSerializer.java
View File

@ -1,4 +1,4 @@
package us.tastybento.bskyblock.database.objects;
package us.tastybento.bskyblock.database.objects.adapters;
import java.util.HashMap;
import java.util.Map.Entry;
@ -7,7 +7,6 @@ import org.bukkit.Bukkit;
import org.bukkit.configuration.MemorySection;
import us.tastybento.bskyblock.BSkyBlock;
import us.tastybento.bskyblock.api.configuration.Adapter;
import us.tastybento.bskyblock.api.flags.Flag;
/**
@ -17,7 +16,7 @@ import us.tastybento.bskyblock.api.flags.Flag;
* @author tastybento
*
*/
public class FlagSerializer implements Adapter<HashMap<Flag, Integer>, HashMap<String, Integer>> {
public class FlagSerializer implements AdapterInterface<HashMap<Flag, Integer>, HashMap<String, Integer>> {
@Override
public HashMap<Flag, Integer> serialize(Object object) {

4
src/main/java/us/tastybento/bskyblock/api/configuration/PotionEffectListAdpater.java → src/main/java/us/tastybento/bskyblock/database/objects/adapters/PotionEffectListAdapter.java
View File

@ -1,11 +1,11 @@
package us.tastybento.bskyblock.api.configuration;
package us.tastybento.bskyblock.database.objects.adapters;
import java.util.ArrayList;
import java.util.List;
import org.bukkit.potion.PotionEffectType;
public class PotionEffectListAdpater implements Adapter<List<PotionEffectType>, List<String>> {
public class PotionEffectListAdapter implements AdapterInterface<List<PotionEffectType>, List<String>> {
@SuppressWarnings("unchecked")
@Override