centralized getCurrentItem

src/main/java/be/uantwerpen/mime_webapp/controller/AbstractController.java

+package be.uantwerpen.mime_webapp.controller;
+
+import java.util.Optional;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+import be.uantwerpen.mime_webapp.dao.ProjectRepository;
+import be.uantwerpen.mime_webapp.model.FileItem;
+import be.uantwerpen.mime_webapp.model.MySession;
+
+@RestController
+public abstract class AbstractController {
+	@Autowired
+	ProjectRepository repository;
+
+	protected FileItem getCurrentItem(HttpServletRequest request, Optional<String> id){
+		FileItem currentInput = null;
+		if(id.isPresent()) {
+			currentInput = repository.findItemById(id.get().trim());
+			if(currentInput != null) return currentInput;
+		}
+
+		MySession session = (MySession) request.getSession().getAttribute("mySession");
+		return repository.findItemById(session.getCurrentItem());
+	}
+}

src/main/java/be/uantwerpen/mime_webapp/controller/DataManagementController.java

@@ -19,7 +19,7 @@ import be.uantwerpen.mime_webapp.model.MySession;
 import be.uantwerpen.mime_webapp.model.Project;
 
 @RestController
-public class DataManagementController {
+public class DataManagementController extends AbstractController{
 
 	@RequestMapping("/")
 	public String index() {

src/main/java/be/uantwerpen/mime_webapp/controller/FileItemMetadataController.java

@@ -7,9 +7,7 @@ import java.util.Map;
 import java.util.Optional;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -20,15 +18,12 @@ import be.uantwerpen.ldataminining.preprocessing.ArffStatistics;
 import be.uantwerpen.ldataminining.preprocessing.ArffUtils;
 import be.uantwerpen.ldataminining.preprocessing.FindNullPattern;
 import be.uantwerpen.ldataminining.utils.CollectionUtils;
-import be.uantwerpen.mime_webapp.dao.ProjectRepository;
 import be.uantwerpen.mime_webapp.model.FileItem;
-import be.uantwerpen.mime_webapp.model.MySession;
 
 @RestController
-public class FileItemMetadataController {
+public class FileItemMetadataController extends AbstractController {
+
 
-	@Autowired
-	ProjectRepository repository;
 
 	/**
 	 * returns name/type for all attributes
@@ -39,13 +34,7 @@ public class FileItemMetadataController {
 	@RequestMapping(value="/rest/metadata/attributes", method=RequestMethod.GET)
 	public @ResponseBody List<Map<String,String>> getSchema(@RequestParam("id") Optional<String> id, HttpServletRequest request)
 	{
-		FileItem item = null;
-		if(id.isPresent()) {
-			item = repository.findItemById(id.get().trim());
-		}
-		if(item == null) {
-			item = getCurrentItem(request.getSession());
-		}
+		FileItem item = getCurrentItem(request, id);
 
 		if(item == null)
 			return new ArrayList<>();
@@ -68,16 +57,10 @@ public class FileItemMetadataController {
 		}
 	}
 
-	@RequestMapping(value="/rest/metadata/attribute-and-statistics", method=RequestMethod.GET)
+	@GetMapping(value="/rest/metadata/attribute-and-statistics")
 	public @ResponseBody List<Map<String,String>> getAttributeStatistics(@RequestParam("id") Optional<String> id, HttpServletRequest request)
 	{
-		FileItem currentItem = null;
-		if(id.isPresent()) {
-			currentItem = repository.findItemById(id.get().trim());
-		}
-		if(currentItem == null) {
-			currentItem = getCurrentItem(request.getSession());
-		}
+		FileItem currentItem = getCurrentItem(request, id);
 
 		if(currentItem == null) {
 			return null;
@@ -96,9 +79,9 @@ public class FileItemMetadataController {
 
 
 	@RequestMapping(value="/rest/metadata/nullpatterns", method=RequestMethod.GET)
-	public @ResponseBody List<List<String>> getNullPatterns(HttpServletRequest request)
+	public @ResponseBody List<List<String>> getNullPatterns(@RequestParam("id") Optional<String> id, HttpServletRequest request)
 	{
-		FileItem item = getCurrentItem(request.getSession());
+		FileItem item = getCurrentItem(request, id);
 		if(item == null)
 			return null;
 		if(!item.isArff()) {
@@ -114,23 +97,13 @@ public class FileItemMetadataController {
 	}
 
 	@RequestMapping(value="/rest/metadata/fileitem", method=RequestMethod.GET)
-	public @ResponseBody FileItem getFileItem(HttpServletRequest request)
+	public @ResponseBody FileItem getFileItem(@RequestParam("id") Optional<String> id, HttpServletRequest request)
 	{
-		FileItem item = getCurrentItem(request.getSession());
+		FileItem item = getCurrentItem(request, id);
 		if(item == null)
 			return null;
 		else
 			return item;
 	}
 
-
-
-	private FileItem getCurrentItem(HttpSession httpSession){
-		MySession session = (MySession) httpSession.getAttribute("mySession");
-		if(session == null)
-			return null;
-		String id = session.getCurrentItem();
-		return repository.findItemById(id);
-	}
-
 }

src/main/java/be/uantwerpen/mime_webapp/controller/FileItemUploadController.java

@@ -4,7 +4,6 @@ import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -16,16 +15,11 @@ import be.uantwerpen.ldataminining.preprocessing.ArffUtils;
 import be.uantwerpen.ldataminining.preprocessing.CSVUtils;
 import be.uantwerpen.ldataminining.utils.IOUtils;
 import be.uantwerpen.mime_webapp.Settings;
-import be.uantwerpen.mime_webapp.dao.ProjectRepository;
 import be.uantwerpen.mime_webapp.model.FileItem;
 import be.uantwerpen.mime_webapp.model.Project;
 
 @Controller
-public class FileItemUploadController {
-
-	@Autowired
-	private ProjectRepository repository;
-
+public class FileItemUploadController extends AbstractController{
 	@RequestMapping(value="/rest/upload", method=RequestMethod.GET)
 	public @ResponseBody String provideUploadInfo() {
 		return "You can upload a file by posting to this same URL.";

src/main/java/be/uantwerpen/mime_webapp/controller/PatternMiningController.java

@@ -17,7 +17,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.validation.constraints.NotNull;
 
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -43,7 +42,6 @@ import be.uantwerpen.ldataminining.utils.Timer;
 import be.uantwerpen.ldataminining.utils.Triple;
 import be.uantwerpen.ldataminining.utils.Utils;
 import be.uantwerpen.mime_webapp.Settings;
-import be.uantwerpen.mime_webapp.dao.ProjectRepository;
 import be.uantwerpen.mime_webapp.model.AnomalyScores;
 import be.uantwerpen.mime_webapp.model.FileItem;
 import be.uantwerpen.mime_webapp.model.MySession;
@@ -51,11 +49,7 @@ import be.uantwerpen.mime_webapp.model.PatternSet;
 import be.uantwerpen.mime_webapp.model.Project;
 
 @RestController
-public class PatternMiningController {
-
-	@Autowired
-	ProjectRepository repository;
-
+public class PatternMiningController extends AbstractController{
 	MakePatternOccurrences makePatternOccurrences = new MakePatternOccurrences();
 	MakePatternOccurrencesSpan makePatternOccurrencesSpan = new MakePatternOccurrencesSpan();
 	RunPBADEmbeddingOnly runPBADEmbeddingOnly = new RunPBADEmbeddingOnly();
@@ -744,16 +738,4 @@ public class PatternMiningController {
 			throw new RuntimeException(e);
 		}
 	}
-
-
-	private FileItem getCurrentItem(HttpServletRequest request, Optional<String> id){
-		FileItem currentInput = null;
-		if(id.isPresent()) {
-			currentInput = repository.findItemById(id.get().trim());
-			if(currentInput != null) return currentInput;
-		}
-
-		MySession session = (MySession) request.getSession().getAttribute("mySession");
-		return repository.findItemById(session.getCurrentItem());
-	}
 }

src/main/java/be/uantwerpen/mime_webapp/controller/TransformController.java

@@ -25,7 +25,6 @@ import javax.servlet.http.HttpSession;
 
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.type.TypeReference;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -55,16 +54,12 @@ import be.uantwerpen.ldataminining.utils.IOUtils;
 import be.uantwerpen.ldataminining.utils.MathUtils;
 import be.uantwerpen.ldataminining.utils.Triple;
 import be.uantwerpen.ldataminining.utils.Utils;
-import be.uantwerpen.mime_webapp.dao.ProjectRepository;
 import be.uantwerpen.mime_webapp.model.FileItem;
 import be.uantwerpen.mime_webapp.model.MySession;
 import be.uantwerpen.mime_webapp.model.Project;
 
 @RestController
-public class TransformController {
-
-	@Autowired
-	ProjectRepository repository;
+public class TransformController extends AbstractController{
 
 	@RequestMapping(value="/rest/transform/convert-to-arff", method=RequestMethod.POST)
 	public @ResponseBody void convertToArff(
@@ -1249,15 +1244,4 @@ public class TransformController {
 			throw new RuntimeException(e);
 		}
 	}
-
-	private FileItem getCurrentItem(HttpServletRequest request, Optional<String> id){
-		FileItem currentInput = null;
-		if(id.isPresent()) {
-			currentInput = repository.findItemById(id.get().trim());
-			if(currentInput != null) return currentInput;
-		}
-
-		MySession session = (MySession) request.getSession().getAttribute("mySession");
-		return repository.findItemById(session.getCurrentItem());
-	}
 }