Cache MakerRecipe, move stimulant to MakerInfoProvider

src/main/java/database/maker/MakerInfoProvider.java

@@ -1,19 +1,23 @@
 package database.maker;
 
+import net.jcip.annotations.ThreadSafe;
+
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 
+@ThreadSafe
 public class MakerInfoProvider {
     private final MakerDao makerDao;
-    private final Map<Integer, MakerReagent> reagents = new ConcurrentHashMap<>();
+    private final Map<Integer, MakerReagent> reagentCache = new ConcurrentHashMap<>();
+    private final Map<Integer, MakerRecipe> recipeCache = new ConcurrentHashMap<>();
 
     public MakerInfoProvider(MakerDao makerDao) {
         this.makerDao = makerDao;
     }
 
     public Optional<MakerReagent> getMakerReagent(int itemId) {
-        final MakerReagent cachedReagent = reagents.get(itemId);
+        final MakerReagent cachedReagent = reagentCache.get(itemId);
         if (cachedReagent != null) {
             return Optional.of(cachedReagent);
         }
@@ -22,7 +26,25 @@ public class MakerInfoProvider {
         if (reagentFromDb.isEmpty()) {
             return Optional.empty();
         }
-        reagents.put(itemId, reagentFromDb.get());
+        reagentCache.put(itemId, reagentFromDb.get());
         return reagentFromDb;
     }
+
+    public Optional<MakerRecipe> getMakerRecipe(int itemId) {
+        final MakerRecipe cachedRecipe = recipeCache.get(itemId);
+        if (cachedRecipe != null) {
+            return Optional.of(cachedRecipe);
+        }
+
+        final Optional<MakerRecipe> recipeFromDb = makerDao.getRecipe(itemId);
+        if (recipeFromDb.isEmpty()) {
+            return Optional.empty();
+        }
+        recipeCache.put(itemId, recipeFromDb.get());
+        return recipeFromDb;
+    }
+
+    public Optional<Integer> getStimulant(int itemId) {
+        return getMakerRecipe(itemId).map(MakerRecipe::catalyst);
+    }
 }