diff --git a/http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeTrade.java b/http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeTrade.java index b5d0012b16..17b6effb0f 100644 --- a/http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeTrade.java +++ b/http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeTrade.java @@ -24,7 +24,6 @@ */ package net.runelite.http.api.ge; -import java.time.Instant; import lombok.Data; @Data @@ -34,5 +33,4 @@ public class GrandExchangeTrade private int itemId; private int quantity; private int price; - private Instant time; } diff --git a/http-service/src/main/java/net/runelite/http/service/ge/GrandExchangeController.java b/http-service/src/main/java/net/runelite/http/service/ge/GrandExchangeController.java index 94c759b130..ba291385cf 100644 --- a/http-service/src/main/java/net/runelite/http/service/ge/GrandExchangeController.java +++ b/http-service/src/main/java/net/runelite/http/service/ge/GrandExchangeController.java @@ -69,7 +69,7 @@ public class GrandExchangeController } @GetMapping - public Collection get(HttpServletRequest request, HttpServletResponse response, + public Collection get(HttpServletRequest request, HttpServletResponse response, @RequestParam(required = false, defaultValue = "1024") int limit, @RequestParam(required = false, defaultValue = "0") int offset) throws IOException { @@ -85,9 +85,9 @@ public class GrandExchangeController .collect(Collectors.toList()); } - private static GrandExchangeTrade convert(TradeEntry tradeEntry) + private static GrandExchangeTradeHistory convert(TradeEntry tradeEntry) { - GrandExchangeTrade grandExchangeTrade = new GrandExchangeTrade(); + GrandExchangeTradeHistory grandExchangeTrade = new GrandExchangeTradeHistory(); grandExchangeTrade.setBuy(tradeEntry.getAction() == TradeAction.BUY); grandExchangeTrade.setItemId(tradeEntry.getItem()); grandExchangeTrade.setQuantity(tradeEntry.getQuantity()); diff --git a/http-service/src/main/java/net/runelite/http/service/ge/GrandExchangeTradeHistory.java b/http-service/src/main/java/net/runelite/http/service/ge/GrandExchangeTradeHistory.java new file mode 100644 index 0000000000..c45f5acf4f --- /dev/null +++ b/http-service/src/main/java/net/runelite/http/service/ge/GrandExchangeTradeHistory.java @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2020, Adam + * 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.http.service.ge; + +import java.time.Instant; +import lombok.Data; + +@Data +class GrandExchangeTradeHistory +{ + private boolean buy; + private int itemId; + private int quantity; + private int price; + private Instant time; +}