Merge pull request #21 from KPMP/develop

Merge for v 3.0

src/main/java/org/kpmp/FailedPackageChecker.java

@@ -7,6 +7,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.kpmp.stateManager.DluPackageInventoryService;
 import org.kpmp.stateManager.State;
 import org.kpmp.stateManager.StateService;
 import org.springframework.beans.factory.annotation.Value;
@@ -21,6 +22,8 @@ public class FailedPackageChecker implements CommandLineRunner {
 
 	private StateService stateService;
 
+	private DluPackageInventoryService dluPackageInventoryService;
+
 	private static final Log log = LogFactory.getLog(FailedPackageChecker.class);
 
 	@Value("${state.service.host}")
@@ -40,9 +43,10 @@ public class FailedPackageChecker implements CommandLineRunner {
 
 	private RestTemplate restTemplate;
 
-	public FailedPackageChecker(StateService stateService, RestTemplate restTemplate) {
+	public FailedPackageChecker(StateService stateService, RestTemplate restTemplate, DluPackageInventoryService dluPackageInventoryService) {
 		this.stateService = stateService;
 		this.restTemplate = restTemplate;
+		this.dluPackageInventoryService = dluPackageInventoryService;
 	}
 
 	public static void main(String[] args) {
@@ -103,6 +107,7 @@ public void run(String... args) throws Exception {
 				failedState.setStateChangeDate(new Date());
 				failedState.setCodicil("Failed stale package check");
 				sendStateChange(failedState);
+				dluPackageInventoryService.setPackageInError(state.getPackageId());
 			}
 		}
 

src/main/java/org/kpmp/cache/CacheController.java

@@ -0,0 +1,34 @@
+package org.kpmp.cache;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.CacheManager;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.Collection;
+
+@Controller
+public class CacheController {
+
+    @Autowired
+    private CacheManager cacheManager;
+
+    @RequestMapping(value = "/v1/clearCache", method = RequestMethod.GET)
+    public @ResponseBody CacheResponse clearCache(){
+        Collection<String> cacheNames = cacheManager.getCacheNames();
+        CacheResponse clearCacheResponse = new CacheResponse();
+        clearCacheResponse.setMessage("Caches successfully cleared!");
+        for(String name:cacheNames){
+            if (cacheManager.getCache(name) != null) {
+                cacheManager.getCache(name).clear();
+            } else {
+                clearCacheResponse.setMessage("There was a problem getting the " + name + " cache.");
+                break;
+            }
+        }
+        clearCacheResponse.setCacheNames(cacheNames);
+        return clearCacheResponse;
+    }
+}

src/main/java/org/kpmp/cache/CacheResponse.java

@@ -0,0 +1,25 @@
+package org.kpmp.cache;
+
+import java.util.Collection;
+
+public class CacheResponse {
+
+        private String message;
+        private Collection<String> cacheNames;
+
+        public String getMessage() {
+            return message;
+        }
+
+        public void setMessage(String message) {
+            this.message = message;
+        }
+
+        public Collection<String> getCacheNames() {
+            return cacheNames;
+        }
+
+        public void setCacheNames(Collection<String> cacheNames) {
+            this.cacheNames = cacheNames;
+        }
+}

src/main/java/org/kpmp/stateManager/DluPackageInventoryService.java

@@ -0,0 +1,40 @@
+package org.kpmp.stateManager;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.HashMap;
+
+@Service
+public class DluPackageInventoryService {
+
+    @Value("${data-manager.service.host}")
+    private String dataManagerHost;
+    @Value("${data-manager.service.endpoint}")
+    private String dataManagerEndpoint;
+    private RestTemplate restTemplate;
+
+    private static final Log log = LogFactory.getLog(DluPackageInventoryService.class);
+
+    @Autowired
+    public DluPackageInventoryService(RestTemplate restTemplate) {
+        this.restTemplate = restTemplate;
+    }
+
+    public String setPackageInError(String packageId) {
+        HashMap payload = new HashMap<>();
+        payload.put("dlu_error", true);
+        String retPackageId = null;
+        String url = dataManagerHost + dataManagerEndpoint + "/package/" + packageId;
+        try {
+            retPackageId = restTemplate.postForObject(url, payload, String.class);
+        } catch (Exception e) {
+            log.error("URI: " + url + " | PKGID: " + packageId + " | MSG: Setting DMD package error");
+        }
+        return retPackageId;
+    }
+}

src/main/resources/application.properties

@@ -9,6 +9,9 @@ state.service.endpoint=/v1/state/host
 notification.service.host=http://eridanus-spring:3040
 notification.endpoint=/v2/notifications/package
 
+data-manager.service.host=http://data-manager-service:5000
+data-manager.service.endpoint=/v1/dlu
+
 spring.data.mongodb.uri=mongodb://mongodb:27017/dataLake
 
 package.state.metadata.received=METADATA_RECEIVED
@@ -19,4 +22,4 @@ package.state.upload.failed=UPLOAD_FAILED
 
 package.state.longpoll.timeout=60000
 package.state.checker.timeout=1800000
-package.state.checker.checkaftermillis=86400000
+package.state.checker.checkaftermillis=86400000

src/test/java/FailedPackageCheckerTest.java

@@ -2,6 +2,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.kpmp.FailedPackageChecker;
+import org.kpmp.stateManager.DluPackageInventoryService;
 import org.kpmp.stateManager.State;
 import org.kpmp.stateManager.StateService;
 import org.mockito.Mock;
@@ -16,6 +17,8 @@
 public class FailedPackageCheckerTest {
 
 
+    @Mock
+    DluPackageInventoryService dluPackageInventoryService;
     @Mock
     private StateService service;
     @Mock
@@ -27,7 +30,7 @@ public class FailedPackageCheckerTest {
     @Before
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
-        packageChecker = new FailedPackageChecker(service, restTemplate);
+        packageChecker = new FailedPackageChecker(service, restTemplate, dluPackageInventoryService);
     }
 
     @After