Skip to content

Commit 9f132f4

Browse files
committed
update MultiResponse & update version 1.2.0
1 parent c7c6dcc commit 9f132f4

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

Diff for: springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/response/MultiResponse.java

+8-12
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
@Getter
1515
public class MultiResponse<T> extends Response {
1616

17-
1817
private Content<T> data;
1918

2019
@Setter
@@ -24,13 +23,15 @@ public static class Content<T>{
2423
private Collection<T> list;
2524
}
2625

26+
public MultiResponse() {
27+
this.data = new Content<>();
28+
}
29+
2730
public static <T> MultiResponse<T> of(Collection<T> data, long total) {
2831
MultiResponse<T> multiResponse = new MultiResponse<>();
2932
multiResponse.setSuccess(true);
30-
Content<T> content = new Content<>();
31-
content.setTotal(total);
32-
content.setList(data);
33-
multiResponse.setData(content);
33+
multiResponse.getData().setTotal(total);
34+
multiResponse.getData().setList(data);
3435
return multiResponse;
3536
}
3637

@@ -43,10 +44,6 @@ public static <T> MultiResponse<T> of(Page<T> page) {
4344
public static <T> MultiResponse<T> empty() {
4445
MultiResponse<T> multiResponse = new MultiResponse<>();
4546
multiResponse.setSuccess(true);
46-
multiResponse.setData(null);
47-
Content<T> content = new Content<>();
48-
content.setTotal(0);
49-
content.setList(null);
5047
return multiResponse;
5148
}
5249

@@ -58,9 +55,8 @@ public static <T> MultiResponse<T> of(Collection<T> data) {
5855
if(data!=null){
5956
total = data.size();
6057
}
61-
Content<T> content = new Content<>();
62-
content.setTotal(total);
63-
content.setList(data);
58+
multiResponse.getData().setTotal(total);
59+
multiResponse.getData().setList(data);
6460
return multiResponse;
6561
}
6662

Diff for: springboot-starter/src/test/java/com/codingapi/springboot/framework/dto/ResponseTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ void multi(){
2323

2424
MultiResponse<String> multiResponse = MultiResponse.of(list);
2525
Assert.isTrue(multiResponse.getData().equals(list),"return data error.");
26-
Assert.isTrue(multiResponse.getTotal()==list.size(),"return data error.");
26+
Assert.isTrue(multiResponse.getData().getTotal()==list.size(),"return data error.");
2727

2828
}
2929

@@ -35,7 +35,7 @@ void multiSize(){
3535

3636
MultiResponse<String> multiResponse = MultiResponse.of(list,10);
3737
Assert.isTrue(multiResponse.getData().equals(list),"return data error.");
38-
Assert.isTrue(multiResponse.getTotal()==10,"return data error.");
38+
Assert.isTrue(multiResponse.getData().getTotal()==10,"return data error.");
3939

4040
}
4141

0 commit comments

Comments
 (0)