petclinic-aplcache

Details

diff --git a/src/main/java/org/petclinic/owner/OwnerController.java b/src/main/java/org/petclinic/owner/OwnerController.java
index 7ccd33d..1b61d00 100644
--- a/src/main/java/org/petclinic/owner/OwnerController.java
+++ b/src/main/java/org/petclinic/owner/OwnerController.java
@@ -26,8 +26,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.servlet.ModelAndView;
 
-import br.ufrgs.inf.prosoft.aplcache.caching.APLCache;
-
 import javax.validation.Valid;
 import java.util.Collection;
 import java.util.Map;
@@ -121,8 +119,6 @@ class OwnerController {
         }
     }
 
-    public static APLCache<ModelAndView> showOwnerCache = new APLCache<>("OwnerController.showOwner");
-
     /**
      * Custom handler for displaying an owner.
      *
@@ -131,11 +127,9 @@ class OwnerController {
      */
     @GetMapping("/owners/{ownerId}")
     public ModelAndView showOwner(@PathVariable("ownerId") int ownerId) {
-        return showOwnerCache.computeIfAbsent(Thread.currentThread(), new Object[]{ownerId}, () -> {
-            ModelAndView mav = new ModelAndView("owners/ownerDetails");
-            mav.addObject(this.owners.findById(ownerId));
-            return mav;
-        }, 60000);
+        ModelAndView mav = new ModelAndView("owners/ownerDetails");
+        mav.addObject(this.owners.findById(ownerId));
+        return mav;
     }
 
 }
diff --git a/src/main/java/org/petclinic/owner/PetController.java b/src/main/java/org/petclinic/owner/PetController.java
index 060b843..ea6d5e6 100644
--- a/src/main/java/org/petclinic/owner/PetController.java
+++ b/src/main/java/org/petclinic/owner/PetController.java
@@ -23,7 +23,6 @@ import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.*;
 
-import br.ufrgs.inf.prosoft.aplcache.caching.APLCache;
 import br.ufrgs.inf.prosoft.cache.GetterCache;
 
 import javax.validation.Valid;
@@ -57,13 +56,9 @@ class PetController {
         }, 60000);
     }
 
-    public static APLCache<Owner> findOwnerCache = new APLCache<>("PetController.findOwner");
-
     @ModelAttribute("owner")
     public Owner findOwner(@PathVariable("ownerId") int ownerId) {
-        return findOwnerCache.computeIfAbsent(Thread.currentThread(), new Object[]{ownerId}, () -> {
-            return this.owners.findById(ownerId);
-        }, 60000);
+        return this.owners.findById(ownerId);
     }
 
     @InitBinder("owner")