src/main/java/ru/ulstu/file/model/FileDataDto.java

@@ -8,7 +8,6 @@ public class FileDataDto {
     private String name;
     private String fileName;
     private String tmpFileName;
-
     private boolean deleted;
 
     public FileDataDto() {

src/main/java/ru/ulstu/file/service/FileService.java

@@ -95,17 +95,14 @@ public class FileService {
     @Transactional
     public FileData update(FileDataDto fileDataDto) {
         FileData file = fileRepository.findOne(fileDataDto.getId());
-        fileRepository.save(copyFromDto(file, fileDataDto));
+        return fileRepository.save(copyFromDto(file, fileDataDto));
-        return file;
     }
 
     @Transactional
     public FileData create(FileDataDto fileDataDto) throws IOException {
-        FileData newFile = null;
+        FileData newFile = createFileFromTmp(fileDataDto.getTmpFileName());
-        newFile = createFileFromTmp(fileDataDto.getTmpFileName());
         copyFromDto(newFile, fileDataDto);
-        newFile = fileRepository.save(newFile);
+        return fileRepository.save(newFile);
-        return newFile;
     }
 
     private FileData copyFromDto(FileData fileData, FileDataDto fileDataDto) {

src/main/java/ru/ulstu/paper/model/PaperDto.java

@@ -31,9 +31,7 @@ public class PaperDto {
     private List<Deadline> deadlines = new ArrayList<>();
     private String comment;
     private Boolean locked;
-
     private List<FileDataDto> files = new ArrayList<>();
-
     private Set<Integer> authorIds;
     private Set<UserDto> authors;
     private Integer filterAuthorId;
@@ -75,9 +73,7 @@ public class PaperDto {
         this.deadlines = paper.getDeadlines();
         this.comment = paper.getComment();
         this.locked = paper.getLocked();
-
         this.files = convert(paper.getFiles(), FileDataDto::new);
-
         this.authorIds = convert(paper.getAuthors(), user -> user.getId());
         this.authors = convert(paper.getAuthors(), UserDto::new);
     }

src/main/java/ru/ulstu/paper/service/PaperService.java

@@ -30,7 +30,6 @@ import static ru.ulstu.paper.model.Paper.PaperStatus.DRAFT;
 import static ru.ulstu.paper.model.Paper.PaperStatus.FAILED;
 import static ru.ulstu.paper.model.Paper.PaperStatus.ON_PREPARATION;
 
-
 @Service
 public class PaperService {
     private final static int MAX_DISPLAY_SIZE = 40;