Merge pull request #427 from netgrif/NAE-2400

[NAE-2400] Prevent Caching of Null Results in Process Cache

Author: machacjozef

application-engine/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.netgrif</groupId>
         <artifactId>application-engine-parent</artifactId>
-        <version>7.0.0-RC10.1</version>
+        <version>7.0.0-RC10.2</version>
     </parent>
 
     <artifactId>application-engine</artifactId>

application-engine/src/main/java/com/netgrif/application/engine/petrinet/service/PetriNetService.java

@@ -138,6 +138,15 @@ public void evictAllCaches() {
         requireNonNull(cacheManager.getCache(cacheProperties.getPetriNetByIdentifier()), cacheProperties.getPetriNetByIdentifier()).clear();
     }
 
+    @Override
+    public void evictCache(String id, String identifier, String version) {
+        requireNonNull(cacheManager.getCache(cacheProperties.getPetriNetById()), cacheProperties.getPetriNetById()).evict(id);
+        requireNonNull(cacheManager.getCache(cacheProperties.getPetriNetDefault()), cacheProperties.getPetriNetDefault()).evict(identifier);
+        requireNonNull(cacheManager.getCache(cacheProperties.getPetriNetLatest()), cacheProperties.getPetriNetLatest()).evict(identifier);
+        requireNonNull(cacheManager.getCache(cacheProperties.getPetriNetCache()), cacheProperties.getPetriNetCache()).evict(new ObjectId(id));
+        requireNonNull(cacheManager.getCache(cacheProperties.getPetriNetByIdentifier()), cacheProperties.getPetriNetByIdentifier()).evict(identifier + version);
+    }
+
     public void evictCache(PetriNet net) {
         requireNonNull(cacheManager.getCache(cacheProperties.getPetriNetById()), cacheProperties.getPetriNetById()).evict(net.getStringId());
         requireNonNull(cacheManager.getCache(cacheProperties.getPetriNetDefault()), cacheProperties.getPetriNetDefault()).evict(net.getIdentifier());
@@ -150,7 +159,7 @@ public void evictCache(PetriNet net) {
      * Get read only Petri net.
      */
     @Override
-    @Cacheable(value = "petriNetCache")
+    @Cacheable(value = "petriNetCache", unless = "#result == null")
     public PetriNet get(ObjectId petriNetId) {
         Optional<PetriNet> optional = repository.findById(petriNetId.toString());
         if (optional.isEmpty()) {
@@ -301,7 +310,7 @@ protected final Optional<PetriNet> doSaveInternal(PetriNet petriNet) {
     }
 
     @Override
-    @Cacheable(value = "petriNetById")
+    @Cacheable(value = "petriNetById", unless = "#result == null")
     public PetriNet getPetriNet(String id) {
         Optional<PetriNet> net = repository.findById(id);
         if (net.isEmpty()) {

application-engine/src/main/java/com/netgrif/application/engine/petrinet/service/interfaces/IPetriNetService.java

@@ -257,6 +257,8 @@ ImportPetriNetEventOutcome importPetriNet(ImportPetriNetParams importPetriNetPar
      */
     void evictAllCaches();
 
+    void evictCache(String id, String identifier, String version);
+
     /**
      * Evicts the cache for the given {@link PetriNet}.
      *

application-engine/src/main/java/com/netgrif/application/engine/workflow/service/FieldActionsCacheService.java

@@ -54,6 +54,8 @@ public void cachePetriNetFunctions(PetriNet petriNet) {
             return;
         }
 
+        log.info("Caching functions for PetriNet id={}", petriNet.getIdentifier());
+
         List<CachedFunction> functions = petriNet.getFunctions(FunctionScope.GLOBAL).stream()
                 .map(function -> CachedFunction.build(shell, function))
                 .collect(Collectors.toList());
@@ -66,6 +68,7 @@ public void cachePetriNetFunctions(PetriNet petriNet) {
         } else {
             globalFunctionsCache.evictIfPresent(petriNet.getIdentifier());
         }
+        log.info("Finished caching functions for PetriNet id={}", petriNet.getIdentifier());
     }
 
     @Override

nae-object-library/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.netgrif</groupId>
         <artifactId>application-engine-parent</artifactId>
-        <version>7.0.0-RC10.1</version>
+        <version>7.0.0-RC10.2</version>
     </parent>
 
     <artifactId>nae-object-library</artifactId>

nae-spring-core-adapter/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.netgrif</groupId>
         <artifactId>application-engine-parent</artifactId>
-        <version>7.0.0-RC10.1</version>
+        <version>7.0.0-RC10.2</version>
     </parent>
 
     <artifactId>nae-spring-core-adapter</artifactId>

nae-user-ce/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.netgrif</groupId>
         <artifactId>application-engine-parent</artifactId>
-        <version>7.0.0-RC10.1</version>
+        <version>7.0.0-RC10.2</version>
     </parent>
 
     <artifactId>nae-user-ce</artifactId>

nae-user-common/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.netgrif</groupId>
         <artifactId>application-engine-parent</artifactId>
-        <version>7.0.0-RC10.1</version>
+        <version>7.0.0-RC10.2</version>
     </parent>
 
     <artifactId>nae-user-common</artifactId>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.netgrif</groupId>
     <artifactId>application-engine-parent</artifactId>
-    <version>7.0.0-RC10.1</version>
+    <version>7.0.0-RC10.2</version>
     <packaging>pom</packaging>
 
     <name>NETGRIF Application Engine parent</name>