Merge pull request #61 from exadel-inc/feature/ELI-60

[ELI_60] Cache refactoring

Author: aliakseiTraihel

core/src/main/java/com/exadel/etoolbox/linkinspector/core/models/ui/PaginationModel.java

@@ -1,11 +1,12 @@
 package com.exadel.etoolbox.linkinspector.core.models.ui;
 
-import com.exadel.etoolbox.linkinspector.core.services.cache.GridResourcesCache;
-import com.exadel.etoolbox.linkinspector.core.services.data.models.GridResource;
+import com.exadel.etoolbox.linkinspector.core.services.data.DataFeedService;
+import com.exadel.etoolbox.linkinspector.core.services.data.models.DataFilter;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.request.RequestParameter;
+import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.models.annotations.DefaultInjectionStrategy;
 import org.apache.sling.models.annotations.Model;
@@ -15,7 +16,6 @@
 
 import javax.annotation.PostConstruct;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * Represents the model with pagination logic.
@@ -33,7 +33,7 @@ public class PaginationModel {
     private static final int DEFAULT_PAGE_SIZE = 500;
 
     @OSGiService
-    private GridResourcesCache cache;
+    private DataFeedService dataFeedService;
 
     @SlingObject
     private ResourceResolver resourceResolver;
@@ -57,12 +57,8 @@ private void init() {
         String type = requestParameterToString(request.getRequestParameter(REQUEST_PARAMETER_TYPE));
         String substring = requestParameterToString(request.getRequestParameter(REQUEST_PARAMETER_SUBSTRING));
 
-        List<GridResource> resources = cache
-                .getGridResourcesList()
-                .stream()
-                .filter(gridResource -> StringUtils.isBlank(type) || StringUtils.equals(gridResource.getLink().getType(), type))
-                .filter(gridResource -> StringUtils.isBlank(substring) || gridResource.getLink().getHref().contains(substring))
-                .collect(Collectors.toList());
+        List<Resource> resources = dataFeedService
+                .dataFeedToResources(new DataFilter(type, substring));
 
         size = resources.size() / DEFAULT_PAGE_SIZE + (resources.size() % DEFAULT_PAGE_SIZE == 0 ? 0 : 1);
     }

core/src/main/java/com/exadel/etoolbox/linkinspector/core/services/cache/GridResourcesCache.java

@@ -21,6 +21,7 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * Provides the service responsible for managing the data feed based on the set of resources generated

core/src/main/java/com/exadel/etoolbox/linkinspector/core/services/cache/impl/GridResourcesCacheImpl.java

@@ -16,7 +16,6 @@
 
 import com.adobe.granite.ui.components.ds.ValueMapResource;
 import com.exadel.etoolbox.linkinspector.core.models.ui.GridViewItem;
-import com.exadel.etoolbox.linkinspector.core.services.cache.GridResourcesCache;
 import com.exadel.etoolbox.linkinspector.core.services.data.DataFeedService;
 import com.exadel.etoolbox.linkinspector.core.services.data.GridResourcesGenerator;
 import com.exadel.etoolbox.linkinspector.core.services.data.models.DataFilter;
@@ -48,6 +47,7 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -60,6 +60,8 @@
 public class DataFeedServiceImpl implements DataFeedService {
     private static final Logger LOG = LoggerFactory.getLogger(DataFeedServiceImpl.class);
 
+    private final CopyOnWriteArrayList<GridResource> GRID_RESOURCE = new CopyOnWriteArrayList<>();
+
     @Reference
     private RepositoryHelper repositoryHelper;
 
@@ -69,9 +71,6 @@ public class DataFeedServiceImpl implements DataFeedService {
     @Reference
     private LinkHelper linkHelper;
 
-    @Reference
-    private GridResourcesCache gridResourcesCache;
-
     /**
      * The sling resource type of grid row items
      */
@@ -115,7 +114,7 @@ public void generateDataFeed() {
             }
             Optional.ofNullable(gridResourcesGenerator.generateGridResources(GRID_RESOURCE_TYPE, resourceResolver))
                     .ifPresent(gridResources -> {
-                        gridResourcesCache.setGridResourcesList(gridResources);
+                        setGridResourcesList(gridResources);
                         gridResourcesToDataFeed(gridResources, resourceResolver);
                         generateCsvReport(gridResources, resourceResolver);
                     });
@@ -134,11 +133,11 @@ public List<Resource> dataFeedToResources(DataFilter filter) {
                 LOG.warn("ResourceResolver is null, data feed to resources conversion is stopped");
                 return Collections.emptyList();
             }
-            if (CollectionUtils.isEmpty(gridResourcesCache.getGridResourcesList())) {
-                gridResourcesCache.setGridResourcesList(dataFeedToGridResources(serviceResourceResolver));
+            if (CollectionUtils.isEmpty(getGridResourcesList())) {
+                setGridResourcesList(dataFeedToGridResources(serviceResourceResolver));
             }
             List<Resource> resources = toSlingResourcesStream(
-                    doFiltering(gridResourcesCache.getGridResourcesList(), filter),
+                    doFiltering(getGridResourcesList(), filter),
                     repositoryHelper.getThreadResourceResolver())
                     .collect(Collectors.toList());
             LOG.info("EToolbox Link Inspector - the number of items shown is {}", resources.size());
@@ -162,7 +161,7 @@ public List<GridResource> dataFeedToGridResources() {
 
     @Override
     public void modifyDataFeed(Map<String, String> valuesMap) {
-        List<GridResource> gridResources = gridResourcesCache.getGridResourcesList();
+        List<GridResource> gridResources = getGridResourcesList();
         try (ResourceResolver serviceResourceResolver = repositoryHelper.getServiceResourceResolver()) {
             for (GridResource gridResource : gridResources) {
                 String propertyAddress = gridResource.getResourcePath() +"@" + gridResource.getPropertyName();
@@ -178,7 +177,7 @@ public void modifyDataFeed(Map<String, String> valuesMap) {
                             gridResource.setLink(link);
                         });
             }
-            gridResourcesCache.setGridResourcesList(gridResources);
+            setGridResourcesList(gridResources);
             gridResourcesToDataFeed(gridResources, serviceResourceResolver);
         }
     }
@@ -189,14 +188,29 @@ public void deleteDataFeed() throws DataFeedException {
             removePreviousDataFeed(serviceResourceResolver);
             removeCsvReport(serviceResourceResolver);
             removePendingNode(serviceResourceResolver);
-            gridResourcesCache.clearCache();
+            clearStaticDataFeed();
             serviceResourceResolver.commit();
         } catch (PersistenceException e) {
             LOG.error("Failed to delete data feed", e);
             throw new DataFeedException("Exception Deleting Data Feed");
         }
     }
 
+    private List<GridResource> getGridResourcesList() {
+        return GRID_RESOURCE;
+    }
+
+    private void setGridResourcesList(List<GridResource> gridResources) {
+        synchronized (this) {
+            GRID_RESOURCE.clear();
+            GRID_RESOURCE.addAll(gridResources);
+        }
+    }
+
+    private void clearStaticDataFeed() {
+        GRID_RESOURCE.clear();
+    }
+
     private List<GridResource> dataFeedToGridResources(ResourceResolver resourceResolver) {
         List<GridResource> gridResources = new ArrayList<>();
         JSONArray jsonArray = JsonUtil.getJsonArrayFromFile(JSON_FEED_PATH, resourceResolver);