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

item controller: add etag to bulk prices

Browse Source
This commit is contained in:
Adam
2019-09-27 22:15:46 -04:00
parent 740697fd49
commit 1e58a77683
1 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,9 @@ import com.google.common.base.Supplier;
import com.google.common.base.Suppliers; import com.google.common.base.Suppliers;
import com.google.common.cache.Cache; import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheBuilder;
import com.google.common.hash.HashCode;
import com.google.common.hash.Hasher;
import com.google.common.hash.Hashing;
import java.time.Instant; import java.time.Instant;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@@ -53,20 +56,39 @@ public class ItemController
private static final String RUNELITE_CACHE = "RuneLite-Cache"; private static final String RUNELITE_CACHE = "RuneLite-Cache";
private static final int MAX_BATCH_LOOKUP = 1024; private static final int MAX_BATCH_LOOKUP = 1024;
private static class MemoizedPrices
{
final ItemPrice[] prices;
final String hash;
MemoizedPrices(ItemPrice[] prices)
{
this.prices = prices;
Hasher hasher = Hashing.sha256().newHasher();
for (ItemPrice itemPrice : prices)
{
hasher.putInt(itemPrice.getId()).putInt(itemPrice.getPrice());
}
HashCode code = hasher.hash();
hash = code.toString();
}
}
private final Cache<Integer, Integer> cachedEmpty = CacheBuilder.newBuilder() private final Cache<Integer, Integer> cachedEmpty = CacheBuilder.newBuilder()
.maximumSize(1024L) .maximumSize(1024L)
.build(); .build();
private final ItemService itemService; private final ItemService itemService;
private final Supplier<ItemPrice[]> memorizedPrices; private final Supplier<MemoizedPrices> memoizedPrices;
@Autowired @Autowired
public ItemController(ItemService itemService) public ItemController(ItemService itemService)
{ {
this.itemService = itemService; this.itemService = itemService;
memorizedPrices = Suppliers.memoizeWithExpiration(() -> itemService.fetchPrices().stream() memoizedPrices = Suppliers.memoizeWithExpiration(() -> new MemoizedPrices(itemService.fetchPrices().stream()
.map(priceEntry -> .map(priceEntry ->
{ {
ItemPrice itemPrice = new ItemPrice(); ItemPrice itemPrice = new ItemPrice();
@@ -76,7 +98,7 @@ public class ItemController
itemPrice.setTime(priceEntry.getTime()); itemPrice.setTime(priceEntry.getTime());
return itemPrice; return itemPrice;
}) })
.toArray(ItemPrice[]::new), 30, TimeUnit.MINUTES); .toArray(ItemPrice[]::new)), 30, TimeUnit.MINUTES);
} }
@GetMapping("/{itemId}") @GetMapping("/{itemId}")
@@ -220,8 +242,10 @@ public class ItemController
@GetMapping("/prices") @GetMapping("/prices")
public ResponseEntity<ItemPrice[]> prices() public ResponseEntity<ItemPrice[]> prices()
{ {
MemoizedPrices memorizedPrices = this.memoizedPrices.get();
return ResponseEntity.ok() return ResponseEntity.ok()
.eTag(memorizedPrices.hash)
.cacheControl(CacheControl.maxAge(30, TimeUnit.MINUTES).cachePublic()) .cacheControl(CacheControl.maxAge(30, TimeUnit.MINUTES).cachePublic())
.body(memorizedPrices.get()); .body(memorizedPrices.prices);
} }
} }