Replace snake case
This commit is contained in:
1 parent
60f2de1b5b
commit
7d661c52f8
10 files changed
+11
-14
No files matched your search
@@ -53,7 +53,6 @@ public class User implements UserDetails {
|
|||||||
|
|
||||||
@ElementCollection(targetClass = String.class, fetch = FetchType.EAGER)
|
@ElementCollection(targetClass = String.class, fetch = FetchType.EAGER)
|
||||||
@CollectionTable(name = "user_lang", joinColumns = @JoinColumn(name = "user_id"))
|
@CollectionTable(name = "user_lang", joinColumns = @JoinColumn(name = "user_id"))
|
||||||
@Enumerated(EnumType.STRING)
|
|
||||||
private Set<String> langs;
|
private Set<String> langs;
|
||||||
|
|
||||||
@ElementCollection
|
@ElementCollection
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ public class UserDto implements Serializable {
|
|||||||
private long id;
|
private long id;
|
||||||
private String username;
|
private String username;
|
||||||
private boolean active;
|
private boolean active;
|
||||||
private String full_name;
|
private String fullName;
|
||||||
private String status;
|
private String status;
|
||||||
private String iconPath;
|
private String iconPath;
|
||||||
private String email;
|
private String email;
|
||||||
|
|||||||
@@ -17,10 +17,9 @@ public class DiscussionDto implements Serializable {
|
|||||||
private String title;
|
private String title;
|
||||||
private String author;
|
private String author;
|
||||||
private Date date;
|
private Date date;
|
||||||
private Date last_update;
|
private Date lastUpdate;
|
||||||
private boolean pinned;
|
private boolean pinned;
|
||||||
private DiscussionStatus status;
|
private DiscussionStatus status;
|
||||||
private long topic;
|
private long topic;
|
||||||
private List<Long> messages;
|
private List<Long> messages;
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -16,5 +16,5 @@ public class DiscussionMessageDto implements Serializable {
|
|||||||
private String sender;
|
private String sender;
|
||||||
private Date date;
|
private Date date;
|
||||||
private boolean edited;
|
private boolean edited;
|
||||||
private long discussion_id;
|
private long discussionId;
|
||||||
}
|
}
|
||||||
@@ -16,5 +16,5 @@ public class TopicDto implements Serializable {
|
|||||||
private String author;
|
private String author;
|
||||||
private int size;
|
private int size;
|
||||||
private String description;
|
private String description;
|
||||||
private Date last_update;
|
private Date lastUpdate;
|
||||||
}
|
}
|
||||||
@@ -17,8 +17,8 @@ public class PostDto implements Serializable {
|
|||||||
private String sender;
|
private String sender;
|
||||||
private Date date;
|
private Date date;
|
||||||
private boolean edited;
|
private boolean edited;
|
||||||
private List<String> liked_users;
|
private List<String> likedUsers;
|
||||||
private long like;
|
private long like;
|
||||||
private List<Long> answers;
|
private List<Long> answers;
|
||||||
private long answered_post;
|
private long answeredPost;
|
||||||
}
|
}
|
||||||
@@ -11,6 +11,7 @@ import javax.validation.constraints.Size;
|
|||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@@ -43,7 +44,6 @@ public class Project {
|
|||||||
joinColumns = @JoinColumn(name = "project_id"),
|
joinColumns = @JoinColumn(name = "project_id"),
|
||||||
inverseJoinColumns = @JoinColumn(name = "tag_id")
|
inverseJoinColumns = @JoinColumn(name = "tag_id")
|
||||||
)
|
)
|
||||||
@ToString.Exclude
|
|
||||||
private List<Tag> technology;
|
private List<Tag> technology;
|
||||||
|
|
||||||
@ManyToOne
|
@ManyToOne
|
||||||
|
|||||||
@@ -22,8 +22,7 @@ public class Tag {
|
|||||||
@Column(name = "tage_name")
|
@Column(name = "tage_name")
|
||||||
private String tagName;
|
private String tagName;
|
||||||
|
|
||||||
@ManyToMany(mappedBy = "projects")
|
@ManyToMany(mappedBy = "technology")
|
||||||
@ToString.Exclude
|
|
||||||
private Set<Project> projects;
|
private Set<Project> projects;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ public class UserDto implements Serializable {
|
|||||||
private String username;
|
private String username;
|
||||||
private String password;
|
private String password;
|
||||||
private boolean active;
|
private boolean active;
|
||||||
private String full_name;
|
private String fullName;
|
||||||
private String status;
|
private String status;
|
||||||
private String iconPath;
|
private String iconPath;
|
||||||
private String email;
|
private String email;
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ public class FileUploadController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
//@
|
//@
|
||||||
@GetMapping("/upload")
|
@GetMapping("/files/upload")
|
||||||
public String listUploadedFiles(Model model) {
|
public String listUploadedFiles(Model model) {
|
||||||
if(storageService.loadAll() == null) {
|
if(storageService.loadAll() == null) {
|
||||||
model.addAttribute("message",
|
model.addAttribute("message",
|
||||||
@@ -51,7 +51,7 @@ public class FileUploadController {
|
|||||||
.header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + file.getFilename() + "\"").body(file);
|
.header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + file.getFilename() + "\"").body(file);
|
||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping("/upload")
|
@PostMapping("/files/upload")
|
||||||
//@
|
//@
|
||||||
public String handleFileUpload(@RequestParam("file") MultipartFile file,
|
public String handleFileUpload(@RequestParam("file") MultipartFile file,
|
||||||
Model model) {
|
Model model) {
|
||||||
|
|||||||
Reference in new issue
Block a user