Merge remote-tracking branch 'origin/master'

src/main/java/com/finikes/oc/base/dto/NoticeCreateDto.java

@@ -11,13 +11,13 @@ public class NoticeCreateDto {
     @NotNull
     private Integer type;
     @NotBlank
-    @Max(256)
+    @Size(min = 1, max = 256)
     private String title;
     @NotBlank
-    @Max(256)
+    @Size(min = 1, max = 256)
     private String secondTitle;
     @NotBlank
-    @Max(256)
+    @Size(min = 1, max = 256)
     private String content;
 
     @Override

src/main/java/com/finikes/oc/base/dto/NoticeUpdateDto.java

@@ -13,13 +13,13 @@ public class NoticeUpdateDto {
     @NotNull
     private Integer type;
     @NotBlank
-    @Max(256)
+    @Size(min = 1, max = 256)
     private String title;
     @NotBlank
-    @Max(256)
+    @Size(min = 1, max = 256)
     private String secondTitle;
     @NotBlank
-    @Max(256)
+    @Size(min = 1, max = 256)
     private String content;
 
     @Override

src/main/java/com/finikes/oc/vote/dto/VoteActivityCreateDto.java

@@ -3,14 +3,15 @@ package com.finikes.oc.vote.dto;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.util.Date;
 
 public class VoteActivityCreateDto {
     @NotBlank
-    @Max(256)
+    @Size(min = 1, max = 256)
     private String title;
     @NotBlank
-    @Max(256)
+    @Size(min = 1, max = 256)
     private String content;
     @NotNull
     private Date launchTime;

src/main/java/com/finikes/oc/vote/dto/VoteActivityUpdateDto.java

@@ -3,16 +3,17 @@ package com.finikes.oc.vote.dto;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.util.Date;
 
 public class VoteActivityUpdateDto {
     @NotNull
     private Integer id;
     @NotBlank
-    @Max(256)
+    @Size(min = 1, max = 256)
     private String title;
     @NotBlank
-    @Max(256)
+    @Size(min = 1, max = 256)
     private String content;
     @NotNull
     private Date launchTime;

src/main/java/com/finikes/oc/vote/dto/VoteCreateDto.java

@@ -1,19 +1,16 @@
 package com.finikes.oc.vote.dto;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.*;
 import java.util.List;
 
 public class VoteCreateDto {
     @NotNull
     private Integer activityId;
     @NotBlank
-    @Max(256)
+    @Size(min = 1, max = 256)
     private String title;
     @NotBlank
-    @Max(256)
+    @Size(min = 1, max = 256)
     private String content;
     @NotEmpty
     private List<String> options;

src/main/java/com/finikes/oc/vote/dto/VoteUpdateDto.java

@@ -1,9 +1,6 @@
 package com.finikes.oc.vote.dto;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.*;
 import java.util.List;
 
 public class VoteUpdateDto {
@@ -14,10 +11,10 @@ public class VoteUpdateDto {
     @NotNull
     private Integer activityId;
     @NotBlank
-    @Max(256)
+    @Size(min = 1, max = 256)
     private String title;
     @NotBlank
-    @Max(256)
+    @Size(min = 1, max = 256)
     private String content;
     @NotEmpty
     private List<String> options;