Various updates to DataStore module. Begain implementing BinaryUsinNIO

implementation.

Modules/DataStore/BinaryUsingNIO/src/org/moparscape/msc/gs/persistence/impl/BinaryUsingNIO.java

@@ -0,0 +1,533 @@
+package org.moparscape.msc.gs.persistence.impl;
+
+import java.io.File;
+import java.util.List;
+import java.util.Map;
+
+import org.moparscape.msc.gs.external.*;
+import org.moparscape.msc.gs.model.InvItem;
+import org.moparscape.msc.gs.model.Point;
+import org.moparscape.msc.gs.model.Shop;
+import org.moparscape.msc.gs.model.TelePoint;
+import org.moparscape.msc.gs.npchandler.NpcHandlerDef;
+import org.moparscape.msc.gs.persistence.DataStore;
+import org.moparscape.msc.gs.persistence.impl.bun.CodecLookupService;
+import org.moparscape.msc.gs.persistence.impl.bun.FileLookupService;
+import org.moparscape.msc.gs.persistence.impl.bun.IO;
+import org.moparscape.msc.gs.phandler.PacketHandlerDef;
+
+@ThreadSafe
+public class BinaryUsingNIO implements DataStore {
+	
+	protected BinaryUsingNIO() {}
+
+	@Override
+	public PacketHandlerDef[] loadPacketHandlerDefs() throws Exception {
+		String cls = PacketHandlerDef.class.getName();
+		File f = FileLookupService.lookup(cls);
+		return (PacketHandlerDef[]) CodecLookupService.lookup(cls).decode(IO.read(f));
+	}
+
+	@Override
+	public void savePacketHandlerDefs(PacketHandlerDef[] defs) throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public PacketHandlerDef[] loadLSPacketHandlerDefs() throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveLSPacketHandlerDefs(PacketHandlerDef[] defs)
+			throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public NpcHandlerDef[] loadNpcHandlers() throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveNpcHandlers(NpcHandlerDef[] defs) throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<Point, TelePoint> loadTelePoints() throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveTelePoints(Map<Point, TelePoint> points) throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public List<Shop> loadShops() throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveShops(List<Shop> shops) throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<Integer, CerterDef> loadCerterDefs() throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveCerterDefs(Map<Integer, CerterDef> certers)
+			throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public List<GameObjectLoc> loadGameObjectLocs() throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveGameObjectLocs(List<GameObjectLoc> locs) throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public List<ItemLoc> loadItemLocs() throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveItemLocs(List<ItemLoc> locs) throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public List<NPCLoc> loadNPCLocs() throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveNPCLocs(List<NPCLoc> locs) throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public TileDef[] loadTileDefs() throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveTileDefs(TileDef[] defs) throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public GameObjectDef[] loadGameObjectDefs() throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveGameObjectDefs(GameObjectDef[] defs) throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public DoorDef[] loadDoorDefs() throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveDoorDefs(DoorDef[] defs) throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public ItemDef[] loadItemDefs() throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveItemDefs(ItemDef[] defs) throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public PrayerDef[] loadPrayerDefs() throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void savePrayerDefs(PrayerDef[] defs) throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public SpellDef[] loadSpellDefs() throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveSpellDefs(SpellDef[] defs) throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public NPCDef[] loadNPCDefs() throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveNPCDefs(NPCDef[] defs) throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public ItemCraftingDef[] loadItemCraftingDefs() throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveItemCraftingDefs(ItemCraftingDef[] defs) throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public ItemHerbSecond[] loadItemHerbSeconds() throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveItemHerbSeconds(ItemHerbSecond[] seconds) throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<Integer, ItemDartTipDef> loadItemDartTipDefs() throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveItemDartTipDefs(Map<Integer, ItemDartTipDef> defs)
+			throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<Integer, ItemGemDef> loadGemDefs() throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveGemDefs(Map<Integer, ItemGemDef> defs) throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<Integer, ItemLogCutDef> loadItemLogCutDefs() throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveItemLogCutDefs(Map<Integer, ItemLogCutDef> defs)
+			throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<Integer, ItemBowStringDef> loadItemBowStringDefs()
+			throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveItemBowStringDefs(Map<Integer, ItemBowStringDef> defs)
+			throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<Integer, ItemArrowHeadDef> loadItemArrowHeadDefs()
+			throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveItemArrowHeadDefs(Map<Integer, ItemArrowHeadDef> defs)
+			throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<Integer, FiremakingDef> loadFiremakingDefs() throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveFiremakingDefs(Map<Integer, FiremakingDef> defs)
+			throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<Integer, int[]> loadItemAffectedTypes() throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveItemAffectedTypes(Map<Integer, int[]> types)
+			throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<Integer, ItemWieldableDef> loadItemWieldableDefs()
+			throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveItemWieldableDefs(Map<Integer, ItemWieldableDef> defs)
+			throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<Integer, ItemUnIdentHerbDef> loadItemUnIdentHerbDefs()
+			throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveItemUnIdentHerbDefs(Map<Integer, ItemUnIdentHerbDef> defs)
+			throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<Integer, ItemHerbDef> loadItemHerbDefs() throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveItemHerbDefs(Map<Integer, ItemHerbDef> defs)
+			throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<Integer, Integer> loadItemEdibleHeals() throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveItemEdibleHeals(Map<Integer, Integer> defs)
+			throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<Integer, ItemCookingDef> loadItemCookingDefs() throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveItemCookingDefs(Map<Integer, ItemCookingDef> defs)
+			throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<Integer, ItemSmeltingDef> loadItemSmeltingDefs()
+			throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveItemSmeltingDefs(Map<Integer, ItemSmeltingDef> defs)
+			throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public ItemSmithingDef[] loadItemSmithingDefs() throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveItemSmithingDefs(ItemSmithingDef[] defs) throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<Integer, ObjectMiningDef> loadObjectMiningDefs()
+			throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveObjectMiningDefs(Map<Integer, ObjectMiningDef> defs)
+			throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<Integer, ObjectWoodcuttingDef> loadObjectWoodcuttingDefs()
+			throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveObjectWoodcuttingDefs(
+			Map<Integer, ObjectWoodcuttingDef> defs) throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<Integer, ObjectFishingDef[]> loadObjectFishDefs()
+			throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveObjectFishingDefs(Map<Integer, ObjectFishingDef> defs)
+			throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<Integer, Integer> loadSpellAgressiveLevel() throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveSpellAgressiveLevel(Map<Integer, Integer> defs)
+			throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<Integer, AgilityDef> loadAgilityDefs() throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveAgilityDefs(Map<Integer, AgilityDef> defs) throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<Integer, AgilityCourseDef> loadAgilityCourseDefs()
+			throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveAgilityCourseDef(Map<Integer, AgilityCourseDef> defs)
+			throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public List<InvItem>[] loadKeyChestLoots() throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void saveKeyChestLoots(List<InvItem>[] loots) throws Exception {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public Map<Integer, ItemDartTipDef> loadDartTips() throws Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void dispose() {
+		// TODO Auto-generated method stub
+		
+	}
+
+}

Modules/DataStore/BinaryUsingNIO/src/org/moparscape/msc/gs/persistence/impl/bun/Codec.java

@@ -0,0 +1,8 @@
+package org.moparscape.msc.gs.persistence.impl.bun;
+
+import java.nio.ByteBuffer;
+
+public interface Codec<T> {
+	public ByteBuffer encode(T t);
+	public T decode(ByteBuffer buf);
+}

Modules/DataStore/BinaryUsingNIO/src/org/moparscape/msc/gs/persistence/impl/bun/CodecLookupService.java

@@ -0,0 +1,26 @@
+package org.moparscape.msc.gs.persistence.impl.bun;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import net.jcip.annotations.ThreadSafe;
+
+@ThreadSafe
+public class CodecLookupService {
+	private static final Map<String, Codec<?>> codecs = new ConcurrentHashMap<String, Codec<?>>();
+
+	public static Codec<?> lookup(String className) {
+		return codecs.get(className);
+	}
+
+	public static boolean register(String className, Codec<?> codec) {
+		synchronized (codecs) {
+			Codec<?> prev = codecs.put(className, codec);
+			if (prev == null) {
+				codecs.put(className, prev);
+				return false;
+			}
+		}
+		return true;
+	}
+}

Modules/DataStore/BinaryUsingNIO/src/org/moparscape/msc/gs/persistence/impl/bun/FileLookupService.java

@@ -0,0 +1,27 @@
+package org.moparscape.msc.gs.persistence.impl.bun;
+
+import java.io.File;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import net.jcip.annotations.ThreadSafe;
+
+@ThreadSafe
+public class FileLookupService {
+	private static Map<String, File> files = new ConcurrentHashMap<String, File>();
+
+	public static File lookup(String className) {
+		return files.get(className);
+	}
+
+	public static boolean register(String className, File file) {
+		synchronized (files) {
+			File prev = files.put(className, file);
+			if (prev == null) {
+				files.put(className, prev);
+				return false;
+			}
+		}
+		return true;
+	}
+}

Modules/DataStore/BinaryUsingNIO/src/org/moparscape/msc/gs/persistence/impl/bun/IO.java

@@ -0,0 +1,45 @@
+package org.moparscape.msc.gs.persistence.impl.bun;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+
+public class IO {
+	public static void write(File file, ByteBuffer buf) throws Exception {
+		if(!file.exists()) {
+			file.createNewFile();
+		}
+		
+		FileOutputStream fos = new FileOutputStream(file);
+		
+		FileChannel chan = fos.getChannel();
+		
+		chan.write(buf);
+		
+		chan.close();
+		fos.close();
+	}
+	
+	public static ByteBuffer read(File file) throws Exception {
+		FileInputStream fis = new FileInputStream(file);
+		FileChannel chan = fis.getChannel();
+		
+		long size = chan.size();
+		if(size > Integer.MAX_VALUE) {
+			throw new IndexOutOfBoundsException("File too large");
+		}
+		
+		ByteBuffer buf = ByteBuffer.allocate((int) size);
+		
+		chan.read(buf);
+		
+		chan.close();
+		fis.close();
+		
+		buf.flip();
+
+		return buf;		
+	}
+}

Modules/DataStore/BinaryUsingNIO/src/org/moparscape/msc/gs/persistence/impl/bun/codec/NpcDefCodec.java

@@ -0,0 +1,21 @@
+package org.moparscape.msc.gs.persistence.impl.bun.codec;
+
+import java.nio.ByteBuffer;
+
+import org.moparscape.msc.gs.external.NPCDef;
+import org.moparscape.msc.gs.persistence.impl.bun.Codec;
+
+public class NpcDefCodec implements Codec<NPCDef[]> {
+
+	@Override
+	public ByteBuffer encode(NPCDef[] t) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public NPCDef[] decode(ByteBuffer buf) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+}

Modules/DataStore/XMLUsingXStream/src/org/moparscape/msc/gs/persistence/impl/XMLUsingXStream.java

@@ -302,7 +302,7 @@ public class XMLUsingXStream implements DataStore {
 	}
 
 	@Override
-	public HashMap<Integer, ItemDartTipDef> loadDartTips() {
+	public Map<Integer, ItemDartTipDef> loadDartTips() {
 		return (HashMap<Integer, ItemDartTipDef>) load("defs/extras/ItemDartTipDef.xml.gz");
 	}
 

Modules/DataStore/src/org/moparscape/msc/gs/persistence/DataStore.java

@@ -1,6 +1,5 @@
 package org.moparscape.msc.gs.persistence;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -196,7 +195,7 @@ public abstract interface DataStore {
 	
 	public void saveKeyChestLoots(List<InvItem>[] loots) throws Exception;
 
-	public HashMap<Integer, ItemDartTipDef> loadDartTips() throws Exception;
+	public Map<Integer, ItemDartTipDef> loadDartTips() throws Exception;
 
 	public void dispose();