AF-889: 'Reimport' doesn't invalidate LRUPomModelCache (#1266)

kie-wb-common-services/kie-wb-common-services-backend/src/main/java/org/kie/workbench/common/services/backend/builder/core/LRUPomModelCache.java

@@ -18,33 +18,40 @@
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.event.Observes;
+import javax.inject.Inject;
 import javax.inject.Named;
 
 import org.appformer.maven.support.PomModel;
 import org.guvnor.common.services.backend.cache.LRUCache;
-import org.guvnor.common.services.builder.ObservablePOMFile;
 import org.guvnor.common.services.project.builder.events.InvalidateDMOProjectCacheEvent;
 import org.guvnor.common.services.project.model.Project;
 import org.kie.soup.commons.validation.PortablePreconditions;
+import org.kie.workbench.common.services.shared.project.KieProject;
+import org.kie.workbench.common.services.shared.project.KieProjectService;
+import org.uberfire.backend.vfs.Path;
 
 @ApplicationScoped
 @Named("LRUPomModelCache")
 public class LRUPomModelCache extends LRUCache<Project, PomModel> {
 
-    private ObservablePOMFile observablePOMFile;
+    private KieProjectService projectService;
 
     public LRUPomModelCache() {
-        observablePOMFile = new ObservablePOMFile();
+        //CDI proxy
+    }
+
+    @Inject
+    public LRUPomModelCache(final KieProjectService projectService) {
+        this.projectService = projectService;
     }
 
     public synchronized void invalidateProjectCache(@Observes final InvalidateDMOProjectCacheEvent event) {
         PortablePreconditions.checkNotNull("event",
                                            event);
-
-        if (event.getResourcePath() != null
-                && event.getProject() != null
-                && observablePOMFile.accept(event.getResourcePath())) {
-            invalidateCache(event.getProject());
+        final Path resourcePath = event.getResourcePath();
+        final KieProject project = projectService.resolveProject(resourcePath);
+        if (project != null) {
+            invalidateCache(project);
         }
     }
 }

kie-wb-common-services/kie-wb-common-services-backend/src/test/java/org/kie/workbench/common/services/backend/builder/core/LRUPomModelCacheTest.java

@@ -0,0 +1,73 @@
+/*
+ * Copyright 2017 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.kie.workbench.common.services.backend.builder.core;
+
+import org.guvnor.common.services.project.builder.events.InvalidateDMOProjectCacheEvent;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.kie.workbench.common.services.shared.project.KieProject;
+import org.kie.workbench.common.services.shared.project.KieProjectService;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.uberfire.backend.vfs.Path;
+import org.uberfire.rpc.SessionInfo;
+
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+@RunWith(MockitoJUnitRunner.class)
+public class LRUPomModelCacheTest {
+
+    @Mock
+    private KieProjectService projectService;
+
+    @Mock
+    private SessionInfo sessionInfo;
+
+    @Mock
+    private KieProject project;
+
+    @Mock
+    private KieProject otherProject;
+
+    @Mock
+    private Path resourcePath;
+
+    private LRUPomModelCache cache;
+
+    @Before
+    public void setup() {
+        this.cache = spy(new LRUPomModelCache(projectService));
+    }
+
+    @Test
+    public void testCacheIsInvalidatedWhenResourceThatMapsToProject() {
+        final InvalidateDMOProjectCacheEvent event = new InvalidateDMOProjectCacheEvent(sessionInfo,
+                                                                                        project,
+                                                                                        resourcePath);
+        doReturn(project).when(projectService).resolveProject(resourcePath);
+
+        cache.invalidateProjectCache(event);
+
+        verify(cache).invalidateCache(eq(project));
+        verify(cache,
+               never()).invalidateCache(eq(otherProject));
+    }
+}