diff --git a/rest-api/src/main/java/lcsb/mapviewer/api/projects/ProjectRestImpl.java b/rest-api/src/main/java/lcsb/mapviewer/api/projects/ProjectRestImpl.java index 6f4f9a1d17c8a19eb9d1a9963ea161389d02424a..d0305b99707f88bd3f73fdab2387c5453b25d705 100644 --- a/rest-api/src/main/java/lcsb/mapviewer/api/projects/ProjectRestImpl.java +++ b/rest-api/src/main/java/lcsb/mapviewer/api/projects/ProjectRestImpl.java @@ -58,7 +58,6 @@ import lcsb.mapviewer.services.SecurityException; import lcsb.mapviewer.services.interfaces.ILayoutService; import lcsb.mapviewer.services.interfaces.IModelService; import lcsb.mapviewer.services.interfaces.IProjectService; -import lcsb.mapviewer.services.interfaces.IUserService; import lcsb.mapviewer.services.utils.ColorSchemaReader; import lcsb.mapviewer.services.utils.data.BuildInLayout; import lcsb.mapviewer.services.utils.gmap.CoordinationConverter; @@ -82,15 +81,6 @@ public class ProjectRestImpl extends BaseRestImpl { */ private Logger logger = Logger.getLogger(ProjectRestImpl.class); - @Autowired - private IUserService userService; - - @Autowired - private IProjectService projectService; - - @Autowired - private IModelService modelService; - @Autowired private PublicationsRestImpl publicationsRestImpl; @@ -101,8 +91,8 @@ public class ProjectRestImpl extends BaseRestImpl { private OverviewImageViewFactory factory; public ProjectMetaData getMetaData(String projectId, String token) throws SecurityException, ObjectNotFoundException { - AuthenticationToken authenticationToken = userService.getToken(token); - Project project = projectService.getProjectByProjectId(projectId, authenticationToken); + AuthenticationToken authenticationToken = getUserService().getToken(token); + Project project = getProjectService().getProjectByProjectId(projectId, authenticationToken); if (project == null) { throw new ObjectNotFoundException("Project with given id doesn't exist"); } @@ -118,7 +108,7 @@ public class ProjectRestImpl extends BaseRestImpl { private ProjectMetaData createData(Project project, AuthenticationToken token) { ProjectMetaData result = new ProjectMetaData(); - Model model = modelService.getLastModelByProjectId(project.getProjectId(), token); + Model model = getModelService().getLastModelByProjectId(project.getProjectId(), token); result.setName(project.getName()); result.setProjectId(project.getProjectId()); @@ -149,40 +139,6 @@ public class ProjectRestImpl extends BaseRestImpl { return result; } - /** - * @return the userService - * @see #userService - */ - public IUserService getUserService() { - return userService; - } - - /** - * @param userService - * the userService to set - * @see #userService - */ - public void setUserService(IUserService userService) { - this.userService = userService; - } - - /** - * @return the modelService - * @see #modelService - */ - public IModelService getModelService() { - return modelService; - } - - /** - * @param modelService - * the modelService to set - * @see #modelService - */ - public void setModelService(IModelService modelService) { - this.modelService = modelService; - } - /** * @return the factory * @see #factory @@ -201,8 +157,8 @@ public class ProjectRestImpl extends BaseRestImpl { } public FileEntry getSource(String token, String projectId) throws SecurityException, QueryException { - AuthenticationToken authenticationToken = userService.getToken(token); - Project project = projectService.getProjectByProjectId(projectId, authenticationToken); + AuthenticationToken authenticationToken = getUserService().getToken(token); + Project project = getProjectService().getProjectByProjectId(projectId, authenticationToken); if (project == null) { throw new ObjectNotFoundException("Project with given id doesn't exist"); } @@ -215,10 +171,10 @@ public class ProjectRestImpl extends BaseRestImpl { public FileEntry getModelAsImage(String token, String projectId, String modelId, String handlerClass, String backgroundOverlayId, String overlayIds, String zoomLevel, String polygonString) throws SecurityException, QueryException, IOException, InvalidColorSchemaException, CommandExecutionException, DrawingException { - AuthenticationToken authenticationToken = userService.getToken(token); - User user = userService.getUserByToken(authenticationToken); + AuthenticationToken authenticationToken = getUserService().getToken(token); + User user = getUserService().getUserByToken(authenticationToken); - Model topModel = modelService.getLastModelByProjectId(projectId, authenticationToken); + Model topModel = getModelService().getLastModelByProjectId(projectId, authenticationToken); if (topModel == null) { throw new ObjectNotFoundException("Project with given id doesn't exist"); } @@ -248,7 +204,7 @@ public class ProjectRestImpl extends BaseRestImpl { ColorSchemaReader reader = new ColorSchemaReader(); Collection<ColorSchema> schemas = reader.readColorSchema(overlay.getInputData().getFileContent()); - new ColorModelCommand(colorModel, schemas, userService.getColorExtractorForUser(user)).execute(); + new ColorModelCommand(colorModel, schemas, getUserService().getColorExtractorForUser(user)).execute(); } else if (overlay.getTitle().equals(BuildInLayout.CLEAN.getTitle())) { // this might not return true if we change CLEAN.title in future... @@ -295,7 +251,7 @@ public class ProjectRestImpl extends BaseRestImpl { scale /= 2; } - ColorExtractor colorExtractor = userService.getColorExtractorForUser(user); + ColorExtractor colorExtractor = getUserService().getColorExtractorForUser(user); Params params = new Params().// x(minX).// @@ -345,9 +301,9 @@ public class ProjectRestImpl extends BaseRestImpl { public FileEntry getModelAsModelFile(String token, String projectId, String modelId, String handlerClass, String backgroundOverlayId, String overlayIds, String zoomLevel, String polygonString) throws SecurityException, QueryException, IOException, InvalidColorSchemaException, CommandExecutionException, ConverterException, InconsistentModelException { - AuthenticationToken authenticationToken = userService.getToken(token); + AuthenticationToken authenticationToken = getUserService().getToken(token); - Model topModel = modelService.getLastModelByProjectId(projectId, authenticationToken); + Model topModel = getModelService().getLastModelByProjectId(projectId, authenticationToken); if (topModel == null) { throw new ObjectNotFoundException("Project with given id doesn't exist"); } @@ -386,9 +342,9 @@ public class ProjectRestImpl extends BaseRestImpl { public Map<String, Object> getStatistics(String projectId, String token) throws SecurityException, ObjectNotFoundException { Map<String, Object> result = new HashMap<String, Object>(); - AuthenticationToken authenticationToken = userService.getToken(token); + AuthenticationToken authenticationToken = getUserService().getToken(token); - Model model = modelService.getLastModelByProjectId(projectId, authenticationToken); + Model model = getModelService().getLastModelByProjectId(projectId, authenticationToken); if (model == null) { throw new ObjectNotFoundException("Project with given id doesn't exist"); } @@ -427,7 +383,7 @@ public class ProjectRestImpl extends BaseRestImpl { } result.put("reactionAnnotations", reactionAnnotations); - + result.put("publications", publicationsRestImpl.getPublications(models).size()); return result;