Minor usability improvement

TcMenu · Oct 27, 2024 · 3be00a9 · 3be00a9
1 parent cf9d455
commit 3be00a9
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/tcMenuJavaApi/src/main/java/com/thecoderscorner/menu/domain/state/MenuTree.java b/tcMenuJavaApi/src/main/java/com/thecoderscorner/menu/domain/state/MenuTree.java
@@ -112,17 +112,24 @@ public Optional<SubMenuItem> getSubMenuById(int parentId) {
      * @param id the id of the object to find.
      * @return the menu at the given id
      */
-    public Optional<MenuItem> getMenuById(int id) {
+    @SuppressWarnings("unchecked")
+    public <T extends MenuItem> Optional<T> getMenuById(int id) {
         var state = menuStates.get(id);
         if(state != null) {
-            return Optional.of(state.getItem());
+            return Optional.of((T)state.getItem());
         }
 
         // shortcut to find the submenu by ID if possible before going through everything.
-        var maybeSubMenuId = getAllSubMenus().stream().filter(item -> item.getId() == id).findFirst();
-        if(maybeSubMenuId.isPresent()) return maybeSubMenuId;
+        var maybeItem = getAllSubMenus().stream().filter(item -> item.getId() == id).map(m -> (T)m).findFirst();
+        if(maybeItem.isEmpty()) {
+            maybeItem = getAllMenuItems().stream().filter(item -> item.getId() == id).map(m -> (T) m).findFirst();
+        }
+
+        // store a state object for the menu item, then we know for sure the next lookup is fast.
+        maybeItem.ifPresent(t -> menuStates.put(id, stateForMenuItem(t, MenuItemHelper.getDefaultFor(t),
+                false, false)));
 
-        return getAllMenuItems().stream().filter(item -> item.getId() == id).findFirst();
+        return maybeItem;
     }
 
     /**
@@ -159,8 +166,10 @@ public void replaceMenuById(SubMenuItem subMenu, MenuItem toReplace) {
 
                 // Now we update the "state" which also acts like a cache of menu items for lookup
                 if(menuStates.containsKey(toReplace.getId())) {
-                    var oldState = menuStates.get(toReplace.getId());
-                    menuStates.put(toReplace.getId(), stateForMenuItem(oldState, toReplace, oldState.getValue()));
+                    menuStates.compute(toReplace.getId(), (k, oldState) -> {
+                        var v = oldState != null ? oldState.getValue() : MenuItemHelper.getDefaultFor(toReplace);
+                        return stateForMenuItem(oldState, toReplace, v);
+                    });
                 }
 
                 // lastly if the item was a submenu, we need change the top level submenu list as well.