cache: split item exporter from dumper

cache/src/main/java/net/runelite/cache/Cache.java

@@ -188,10 +188,10 @@ public class Cache
 
 	private static void dumpItems(Store store, File itemdir) throws IOException
 	{
-		ItemDumper dumper = new ItemDumper(store, itemdir, itemdir);
+		ItemManager dumper = new ItemManager(store);
 		dumper.load();
-		dumper.dump();
-		dumper.java();
+		dumper.export(itemdir);
+		dumper.java(itemdir);
 	}
 
 	private static void dumpNpcs(Store store, File npcdir) throws IOException

cache/src/main/java/net/runelite/cache/ItemManager.java

@@ -24,39 +24,28 @@
  */
 package net.runelite.cache;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
 import net.runelite.cache.definitions.ItemDefinition;
+import net.runelite.cache.definitions.exporters.ItemExporter;
 import net.runelite.cache.definitions.loaders.ItemLoader;
 import net.runelite.cache.fs.Archive;
 import net.runelite.cache.fs.Index;
 import net.runelite.cache.fs.Store;
-import net.runelite.cache.io.InputStream;
 import net.runelite.cache.util.Namer;
 
-public class ItemDumper
+public class ItemManager
 {
 	private final Store store;
-	private final File out, java;
-	private final Gson gson;
 	private final List<ItemDefinition> items = new ArrayList<>();
 	private final Namer namer = new Namer();
 
-	public ItemDumper(Store store, File out, File java)
+	public ItemManager(Store store)
 	{
 		this.store = store;
-		this.out = out;
-		this.java = java;
-
-		GsonBuilder builder = new GsonBuilder()
-			.setPrettyPrinting();
-		gson = builder.create();
 	}
 
 	public void load()
@@ -73,20 +62,25 @@ public class ItemDumper
 		}
 	}
 
-	public void dump() throws IOException
+	public List<ItemDefinition> getItems()
 	{
+		return items;
+	}
+
+	public void export(File out) throws IOException
+	{
+		out.mkdirs();
+
 		for (ItemDefinition def : items)
 		{
-			out.mkdirs();
-			java.io.File targ = new java.io.File(out, def.id + ".json");
-			try (FileWriter fw = new FileWriter(targ))
-			{
-				fw.write(gson.toJson(def));
-			}
+			ItemExporter exporter = new ItemExporter(def);
+			
+			File targ = new File(out, def.id + ".json");
+			exporter.exportTo(targ);
 		}
 	}
 
-	public void java() throws IOException
+	public void java(File java) throws IOException
 	{
 		java.mkdirs();
 		java.io.File targ = new java.io.File(java, "ItemID.java");

cache/src/main/java/net/runelite/cache/definitions/exporters/ItemExporter.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2016-2017, Adam <Adam@sigterm.info>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.runelite.cache.definitions.exporters;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import net.runelite.cache.definitions.ItemDefinition;
+
+public class ItemExporter
+{
+	private final ItemDefinition item;
+	private final Gson gson;
+
+	public ItemExporter(ItemDefinition item)
+	{
+		this.item = item;
+
+		GsonBuilder builder = new GsonBuilder()
+			.setPrettyPrinting();
+		gson = builder.create();
+	}
+
+	public String export()
+	{
+		return gson.toJson(item);
+	}
+
+	public void exportTo(File file) throws IOException
+	{
+		try (FileWriter fw = new FileWriter(file))
+		{
+			fw.write(export());
+		}
+	}
+}

cache/src/test/java/net/runelite/cache/ItemManagerTest.java

@@ -34,9 +34,9 @@ import org.junit.rules.TemporaryFolder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ItemDumperTest
+public class ItemManagerTest
 {
-	private static final Logger logger = LoggerFactory.getLogger(ItemDumperTest.class);
+	private static final Logger logger = LoggerFactory.getLogger(ItemManagerTest.class);
 
 	@Rule
 	public TemporaryFolder folder = StoreLocation.getTemporaryFolder();
@@ -50,14 +50,12 @@ public class ItemDumperTest
 		Store store = new Store(StoreLocation.LOCATION);
 		store.load();
 
-		ItemDumper dumper = new ItemDumper(
-			store,
-			dumpDir,
-			javaDir
+		ItemManager dumper = new ItemManager(
+			store
 		);
 		dumper.load();
-		dumper.dump();
-		dumper.java();
+		dumper.export(dumpDir);
+		dumper.java(javaDir);
 
 		logger.info("Dumped to {}, java {}", dumpDir, javaDir);
 	}