From 7adca5bda253ef6c7463a56bd700e3a6dc6b4ac7 Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Sun, 7 Oct 2018 12:08:13 -0400
Subject: [PATCH] http-api: modify ItemPrice to contain id/name instead of Item

---
 .../net/runelite/http/api/item/ItemPrice.java |  3 ++-
 .../http/service/item/ItemController.java     | 19 ++++++-------------
 .../runelite/http/service/item/ItemEntry.java |  2 +-
 .../net/runelite/client/game/ItemManager.java |  2 +-
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/http-api/src/main/java/net/runelite/http/api/item/ItemPrice.java b/http-api/src/main/java/net/runelite/http/api/item/ItemPrice.java
index 147a90673b..001c63deb8 100644
--- a/http-api/src/main/java/net/runelite/http/api/item/ItemPrice.java
+++ b/http-api/src/main/java/net/runelite/http/api/item/ItemPrice.java
@@ -30,7 +30,8 @@ import lombok.Data;
 @Data
 public class ItemPrice
 {
-	private Item item;
+	private int id;
+	private String name;
 	private int price;
 	private Instant time;
 }
diff --git a/http-service/src/main/java/net/runelite/http/service/item/ItemController.java b/http-service/src/main/java/net/runelite/http/service/item/ItemController.java
index 82e283aa2a..9c05889330 100644
--- a/http-service/src/main/java/net/runelite/http/service/item/ItemController.java
+++ b/http-service/src/main/java/net/runelite/http/service/item/ItemController.java
@@ -28,7 +28,6 @@ import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
-import java.time.Duration;
 import java.time.Instant;
 import java.util.Arrays;
 import java.util.List;
@@ -50,7 +49,6 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/item")
 public class ItemController
 {
-	private static final Duration CACHE_DUATION = Duration.ofMinutes(30);
 	private static final String RUNELITE_CACHE = "RuneLite-Cache";
 	private static final int MAX_BATCH_LOOKUP = 1024;
 
@@ -70,12 +68,9 @@ public class ItemController
 		memorizedPrices = Suppliers.memoizeWithExpiration(() -> itemService.fetchPrices().stream()
 			.map(priceEntry ->
 			{
-				Item item = new Item();
-				item.setId(priceEntry.getItem()); // fake item
-				item.setName(priceEntry.getName());
-
 				ItemPrice itemPrice = new ItemPrice();
-				itemPrice.setItem(item);
+				itemPrice.setId(priceEntry.getItem());
+				itemPrice.setName(priceEntry.getName());
 				itemPrice.setPrice(priceEntry.getPrice());
 				itemPrice.setTime(priceEntry.getTime());
 				return itemPrice;
@@ -174,7 +169,8 @@ public class ItemController
 		}
 
 		ItemPrice itemPrice = new ItemPrice();
-		itemPrice.setItem(item.toItem());
+		itemPrice.setId(item.getId());
+		itemPrice.setName(item.getName());
 		itemPrice.setPrice(priceEntry.getPrice());
 		itemPrice.setTime(priceEntry.getTime());
 
@@ -210,12 +206,9 @@ public class ItemController
 		return prices.stream()
 			.map(priceEntry ->
 			{
-				Item item = new Item();
-				item.setId(priceEntry.getItem()); // fake item
-				item.setName(priceEntry.getName());
-
 				ItemPrice itemPrice = new ItemPrice();
-				itemPrice.setItem(item);
+				itemPrice.setId(priceEntry.getItem());
+				itemPrice.setName(priceEntry.getName());
 				itemPrice.setPrice(priceEntry.getPrice());
 				itemPrice.setTime(priceEntry.getTime());
 				return itemPrice;
diff --git a/http-service/src/main/java/net/runelite/http/service/item/ItemEntry.java b/http-service/src/main/java/net/runelite/http/service/item/ItemEntry.java
index b92f171cc7..634b2507c0 100644
--- a/http-service/src/main/java/net/runelite/http/service/item/ItemEntry.java
+++ b/http-service/src/main/java/net/runelite/http/service/item/ItemEntry.java
@@ -30,7 +30,7 @@ import net.runelite.http.api.item.Item;
 import net.runelite.http.api.item.ItemType;
 
 @Data
-public class ItemEntry
+class ItemEntry
 {
 	private int id;
 	private String name;
diff --git a/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java b/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java
index 2fc4a8f569..6d44d7d9c8 100644
--- a/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java
@@ -152,7 +152,7 @@ public class ItemManager
 				ImmutableMap.Builder<Integer, ItemPrice> map = ImmutableMap.builderWithExpectedSize(prices.length);
 				for (ItemPrice price : prices)
 				{
-					map.put(price.getItem().getId(), price);
+					map.put(price.getId(), price);
 				}
 				itemPrices = map.build();
 			}