diff --git a/src/main/java/site/easystartup/web/domain/model/User.java b/src/main/java/site/easystartup/web/domain/model/User.java index 545fe03..a6ff8d1 100644 --- a/src/main/java/site/easystartup/web/domain/model/User.java +++ b/src/main/java/site/easystartup/web/domain/model/User.java @@ -53,7 +53,6 @@ public class User implements UserDetails { @ElementCollection(targetClass = String.class, fetch = FetchType.EAGER) @CollectionTable(name = "user_lang", joinColumns = @JoinColumn(name = "user_id")) - @Enumerated(EnumType.STRING) private Set langs; @ElementCollection diff --git a/src/main/java/site/easystartup/web/dto/UserDto.java b/src/main/java/site/easystartup/web/dto/UserDto.java index 83f0f7b..c360358 100644 --- a/src/main/java/site/easystartup/web/dto/UserDto.java +++ b/src/main/java/site/easystartup/web/dto/UserDto.java @@ -14,7 +14,7 @@ public class UserDto implements Serializable { private long id; private String username; private boolean active; - private String full_name; + private String fullName; private String status; private String iconPath; private String email; diff --git a/src/main/java/site/easystartup/web/forum/dto/DiscussionDto.java b/src/main/java/site/easystartup/web/forum/dto/DiscussionDto.java index 38fb834..7f99122 100644 --- a/src/main/java/site/easystartup/web/forum/dto/DiscussionDto.java +++ b/src/main/java/site/easystartup/web/forum/dto/DiscussionDto.java @@ -17,10 +17,9 @@ public class DiscussionDto implements Serializable { private String title; private String author; private Date date; - private Date last_update; + private Date lastUpdate; private boolean pinned; private DiscussionStatus status; private long topic; private List messages; - } diff --git a/src/main/java/site/easystartup/web/forum/dto/DiscussionMessageDto.java b/src/main/java/site/easystartup/web/forum/dto/DiscussionMessageDto.java index caf2c45..cc14e17 100644 --- a/src/main/java/site/easystartup/web/forum/dto/DiscussionMessageDto.java +++ b/src/main/java/site/easystartup/web/forum/dto/DiscussionMessageDto.java @@ -16,5 +16,5 @@ public class DiscussionMessageDto implements Serializable { private String sender; private Date date; private boolean edited; - private long discussion_id; + private long discussionId; } diff --git a/src/main/java/site/easystartup/web/forum/dto/TopicDto.java b/src/main/java/site/easystartup/web/forum/dto/TopicDto.java index dd6c4cb..8fbebff 100644 --- a/src/main/java/site/easystartup/web/forum/dto/TopicDto.java +++ b/src/main/java/site/easystartup/web/forum/dto/TopicDto.java @@ -16,5 +16,5 @@ public class TopicDto implements Serializable { private String author; private int size; private String description; - private Date last_update; + private Date lastUpdate; } diff --git a/src/main/java/site/easystartup/web/post/dto/PostDto.java b/src/main/java/site/easystartup/web/post/dto/PostDto.java index ab4ef90..d743d99 100644 --- a/src/main/java/site/easystartup/web/post/dto/PostDto.java +++ b/src/main/java/site/easystartup/web/post/dto/PostDto.java @@ -17,8 +17,8 @@ public class PostDto implements Serializable { private String sender; private Date date; private boolean edited; - private List liked_users; + private List likedUsers; private long like; private List answers; - private long answered_post; + private long answeredPost; } diff --git a/src/main/java/site/easystartup/web/project/domain/model/Project.java b/src/main/java/site/easystartup/web/project/domain/model/Project.java index dbdf96f..b4278ad 100644 --- a/src/main/java/site/easystartup/web/project/domain/model/Project.java +++ b/src/main/java/site/easystartup/web/project/domain/model/Project.java @@ -11,6 +11,7 @@ import javax.validation.constraints.Size; import java.time.LocalDateTime; import java.util.List; import java.util.Objects; +import java.util.Set; @Data @RequiredArgsConstructor @@ -43,7 +44,6 @@ public class Project { joinColumns = @JoinColumn(name = "project_id"), inverseJoinColumns = @JoinColumn(name = "tag_id") ) - @ToString.Exclude private List technology; @ManyToOne diff --git a/src/main/java/site/easystartup/web/project/domain/model/Tag.java b/src/main/java/site/easystartup/web/project/domain/model/Tag.java index ed0479f..ae8eae7 100644 --- a/src/main/java/site/easystartup/web/project/domain/model/Tag.java +++ b/src/main/java/site/easystartup/web/project/domain/model/Tag.java @@ -22,8 +22,7 @@ public class Tag { @Column(name = "tage_name") private String tagName; - @ManyToMany(mappedBy = "projects") - @ToString.Exclude + @ManyToMany(mappedBy = "technology") private Set projects; @Override diff --git a/src/main/java/site/easystartup/web/project/dto/UserDto.java b/src/main/java/site/easystartup/web/project/dto/UserDto.java index a1d8034..c0e2efd 100644 --- a/src/main/java/site/easystartup/web/project/dto/UserDto.java +++ b/src/main/java/site/easystartup/web/project/dto/UserDto.java @@ -14,7 +14,7 @@ public class UserDto implements Serializable { private String username; private String password; private boolean active; - private String full_name; + private String fullName; private String status; private String iconPath; private String email; diff --git a/src/main/java/site/easystartup/web/storage/controller/FileUploadController.java b/src/main/java/site/easystartup/web/storage/controller/FileUploadController.java index ec22aa8..5a95629 100644 --- a/src/main/java/site/easystartup/web/storage/controller/FileUploadController.java +++ b/src/main/java/site/easystartup/web/storage/controller/FileUploadController.java @@ -26,7 +26,7 @@ public class FileUploadController { } //@ - @GetMapping("/upload") + @GetMapping("/files/upload") public String listUploadedFiles(Model model) { if(storageService.loadAll() == null) { model.addAttribute("message", @@ -51,7 +51,7 @@ public class FileUploadController { .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + file.getFilename() + "\"").body(file); } - @PostMapping("/upload") + @PostMapping("/files/upload") //@ public String handleFileUpload(@RequestParam("file") MultipartFile file, Model model) {