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

item controller: add config for price cache time

Browse Source
This commit is contained in:
Adam
2021-03-09 14:15:00 -05:00
parent ded38ec99e
commit 1284429130
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
http-service/src/main/java/net/runelite/http/service/item/ItemController.java
View File

@@ -32,6 +32,7 @@ import com.google.common.hash.Hashing;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import net.runelite.http.api.item.ItemPrice; import net.runelite.http.api.item.ItemPrice;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.CacheControl; import org.springframework.http.CacheControl;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@@ -62,13 +63,18 @@ public class ItemController
} }
private final ItemService itemService; private final ItemService itemService;
private final int priceCache;
private final Supplier<MemoizedPrices> memoizedPrices; private final Supplier<MemoizedPrices> memoizedPrices;
@Autowired @Autowired
public ItemController(ItemService itemService) public ItemController(
ItemService itemService,
@Value("${runelite.price.cache}") int priceCache
)
{ {
this.itemService = itemService; this.itemService = itemService;
this.priceCache = priceCache;
memoizedPrices = Suppliers.memoizeWithExpiration(() -> new MemoizedPrices(itemService.fetchPrices().stream() memoizedPrices = Suppliers.memoizeWithExpiration(() -> new MemoizedPrices(itemService.fetchPrices().stream()
.map(priceEntry -> .map(priceEntry ->
@@ -79,7 +85,7 @@ public class ItemController
itemPrice.setPrice(priceEntry.getPrice()); itemPrice.setPrice(priceEntry.getPrice());
return itemPrice; return itemPrice;
}) })
.toArray(ItemPrice[]::new)), 30, TimeUnit.MINUTES); .toArray(ItemPrice[]::new)), priceCache, TimeUnit.MINUTES);
} }
@GetMapping("/prices") @GetMapping("/prices")
@@ -88,7 +94,7 @@ public class ItemController
MemoizedPrices memorizedPrices = this.memoizedPrices.get(); MemoizedPrices memorizedPrices = this.memoizedPrices.get();
return ResponseEntity.ok() return ResponseEntity.ok()
.eTag(memorizedPrices.hash) .eTag(memorizedPrices.hash)
.cacheControl(CacheControl.maxAge(30, TimeUnit.MINUTES).cachePublic()) .cacheControl(CacheControl.maxAge(priceCache, TimeUnit.MINUTES).cachePublic())
.body(memorizedPrices.prices); .body(memorizedPrices.prices);
} }
} }

2
http-service/src/main/resources/application.yaml
View File

@@ -47,3 +47,5 @@ runelite:
wiki: wiki:
poll.ms: 300000 # 5 minutes poll.ms: 300000 # 5 minutes
url: https://prices.runescape.wiki/osrs/latest url: https://prices.runescape.wiki/osrs/latest
price:
cache: 30 # minutes