merge issues

rest-api/src/main/java/lcsb/mapviewer/api/projects/ProjectController.java

@@ -106,8 +106,9 @@ public class ProjectController extends BaseController {
 
   @Autowired
   public ProjectController(ServletContext context, IUserService userService, IProjectService projectService,
-      IMeshService meshService, List<Converter> modelConverters, IFileService fileService, IElementService elementService, IReactionService reactionService,
-      IModelService modelService, IConfigurationService configurationService, IProjectBackgroundService projectBackgroundService) {
+      IMeshService meshService, List<Converter> modelConverters, IFileService fileService, IElementService elementService,
+      IReactionService reactionService, IModelService modelService, IConfigurationService configurationService,
+      IProjectBackgroundService projectBackgroundService) {
     this.context = context;
     this.userService = userService;
     this.projectService = projectService;

web/src/test/java/lcsb/mapviewer/web/ProjectControllerIntegrationTest.java

@@ -1147,7 +1147,8 @@ public class ProjectControllerIntegrationTest extends ControllerIntegrationTest
     Project project = projectService.getProjectByProjectId(TEST_PROJECT);
     List<ProjectBackground> backgrounds = projectBackgroundService.getProjectBackgroundsByProject(project);
     ProjectBackground background = backgrounds.get(0);
-    String path = "src/main/webapp/../map_images/" + project.getDirectory() + "/" + background.getProjectBackgroundImageLayer().iterator().next().getDirectory();
+    String path = "src/main/webapp/../map_images/" + project.getDirectory() + "/"
+        + background.getProjectBackgroundImageLayer().iterator().next().getDirectory();
     assertTrue(new File(path).exists());
 
     request = delete("/api/projects/{projectId}/backgrounds/{backgroundId}", TEST_PROJECT,