ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

http-api: use separate class for ge trade history

Browse Source
This commit is contained in:
Adam
2020-05-29 13:25:20 -04:00
parent f0cef4589b
commit 2622cc2ac6
3 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeTrade.java
View File

@@ -24,7 +24,6 @@
*/ */
package net.runelite.http.api.ge; package net.runelite.http.api.ge;
import java.time.Instant;
import lombok.Data; import lombok.Data;
@Data @Data
@@ -34,5 +33,4 @@ public class GrandExchangeTrade
private int itemId; private int itemId;
private int quantity; private int quantity;
private int price; private int price;
private Instant time;
} }

6
http-service/src/main/java/net/runelite/http/service/ge/GrandExchangeController.java
View File

@@ -69,7 +69,7 @@ public class GrandExchangeController
} }
@GetMapping @GetMapping
public Collection<GrandExchangeTrade> get(HttpServletRequest request, HttpServletResponse response, public Collection<GrandExchangeTradeHistory> get(HttpServletRequest request, HttpServletResponse response,
@RequestParam(required = false, defaultValue = "1024") int limit, @RequestParam(required = false, defaultValue = "1024") int limit,
@RequestParam(required = false, defaultValue = "0") int offset) throws IOException @RequestParam(required = false, defaultValue = "0") int offset) throws IOException
{ {
@@ -85,9 +85,9 @@ public class GrandExchangeController
.collect(Collectors.toList()); .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.setBuy(tradeEntry.getAction() == TradeAction.BUY);
grandExchangeTrade.setItemId(tradeEntry.getItem()); grandExchangeTrade.setItemId(tradeEntry.getItem());
grandExchangeTrade.setQuantity(tradeEntry.getQuantity()); grandExchangeTrade.setQuantity(tradeEntry.getQuantity());

38
http-service/src/main/java/net/runelite/http/service/ge/GrandExchangeTradeHistory.java Normal file
View File

@@ -0,0 +1,38 @@
/*
* Copyright (c) 2020, 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.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;
}