Skip to content
Snippets Groups Projects
Commit 1eb8eb8e authored by Lars Johansson's avatar Lars Johansson
Browse files

Refactor response beans and add field attribute

parent c4f9b407
No related branches found
No related tags found
No related merge requests found
......@@ -34,6 +34,7 @@ public class Response {
private String message = null;
private String details = null;
private String field = null;
/**
* Constructor.
......@@ -52,6 +53,7 @@ public class Response {
this.message = message;
this.details = "";
this.field = "";
}
/**
......@@ -59,12 +61,14 @@ public class Response {
*
* @param message response message
* @param details response details
* @param field response field
*/
public Response(String message, String details) {
public Response(String message, String details, String field) {
this();
this.message = message;
this.details = details;
this.field = field;
}
/**
......@@ -103,4 +107,22 @@ public class Response {
this.details = details;
}
/**
* Return response field.
*
* @return response field
*/
public String getField() {
return this.field;
}
/**
* Set response field.
*
* @param field response field
*/
public void setField(String field) {
this.field = field;
}
}
......@@ -31,7 +31,7 @@ public class ResponseBoolean extends Response {
* Constructor.
*/
public ResponseBoolean() {
super("", "");
super("", "", "");
}
/**
......@@ -51,7 +51,7 @@ public class ResponseBoolean extends Response {
* @param message response message
*/
public ResponseBoolean(Boolean value, String message) {
super(message, "");
super(message, "", "");
this.value = value;
}
......@@ -63,7 +63,20 @@ public class ResponseBoolean extends Response {
* @param details response details
*/
public ResponseBoolean(Boolean value, String message, String details) {
super(message, details);
super(message, details, "");
this.value = value;
}
/**
* Constructor.
*
* @param value response value
* @param message response message
* @param details response details
* @param field response field
*/
public ResponseBoolean(Boolean value, String message, String details, String field) {
super(message, details, field);
this.value = value;
}
......
......@@ -68,6 +68,18 @@ public class ResponseBooleanList extends ResponseBoolean {
super(value, message, details);
}
/**
*Constructor.
*
* @param value response value
* @param message response message
* @param details response details
* @param field response field
*/
public ResponseBooleanList(Boolean value, String message, String details, String field) {
super(value, message, details, field);
}
/**
* Constructor.
*
......@@ -104,6 +116,20 @@ public class ResponseBooleanList extends ResponseBoolean {
this.list = list;
}
/**
* Constructor.
*
* @param list list of response boolean objects
* @param value response value
* @param message response message
* @param details response details
* @param field response field
*/
public ResponseBooleanList(List<ResponseBoolean> list, Boolean value, String message, String details, String field) {
super(value, message, details, field);
this.list = list;
}
/**
* Return list of response boolean objects.
*
......
......@@ -25,9 +25,9 @@ package org.openepics.names.rest.beans.response;
*/
public abstract class ResponsePage extends Response {
// note
// offset - page
// limit - page size
// note
// offset - page
// limit - page size
private Long totalCount;
private Integer listSize;
......@@ -38,7 +38,7 @@ public abstract class ResponsePage extends Response {
* Constructor.
*/
public ResponsePage() {
super("", "");
super("", "", "");
}
/**
......@@ -47,7 +47,7 @@ public abstract class ResponsePage extends Response {
* @param message response message
*/
public ResponsePage(String message) {
super(message, "");
super(message, "", "");
}
/**
......@@ -57,7 +57,18 @@ public abstract class ResponsePage extends Response {
* @param details response details
*/
public ResponsePage(String message, String details) {
super(message, details);
super(message, details, "");
}
/**
* Constructor.
*
* @param message response message
* @param details response details
* @param field response field
*/
public ResponsePage(String message, String details, String field) {
super(message, details, field);
}
/**
......@@ -65,71 +76,71 @@ public abstract class ResponsePage extends Response {
*
* @return total count
*/
public Long getTotalCount() {
return totalCount;
}
/**
* Set total count.
*
* @param totalCount total count
*/
public void setTotalCount(Long totalCount) {
this.totalCount = totalCount;
}
/**
* Return list size.
*
* @return list size
*/
public Integer getListSize() {
return listSize;
}
/**
* Set list size.
*
* @param listSize list size
*/
public void setListSize(Integer listSize) {
this.listSize = listSize;
}
/**
* Return page.
*
* @return page
*/
public Integer getPage() {
return page;
}
/**
* Set page.
*
* @param page page
*/
public void setPage(Integer page) {
this.page = page;
}
/**
* Return page size.
*
* @return page size
*/
public Integer getPageSize() {
return pageSize;
}
/**
* Set page size.
*
* @param pageSize page size
*/
public void setPageSize(Integer pageSize) {
this.pageSize = pageSize;
}
public Long getTotalCount() {
return totalCount;
}
/**
* Set total count.
*
* @param totalCount total count
*/
public void setTotalCount(Long totalCount) {
this.totalCount = totalCount;
}
/**
* Return list size.
*
* @return list size
*/
public Integer getListSize() {
return listSize;
}
/**
* Set list size.
*
* @param listSize list size
*/
public void setListSize(Integer listSize) {
this.listSize = listSize;
}
/**
* Return page.
*
* @return page
*/
public Integer getPage() {
return page;
}
/**
* Set page.
*
* @param page page
*/
public void setPage(Integer page) {
this.page = page;
}
/**
* Return page size.
*
* @return page size
*/
public Integer getPageSize() {
return pageSize;
}
/**
* Set page size.
*
* @param pageSize page size
*/
public void setPageSize(Integer pageSize) {
this.pageSize = pageSize;
}
}
......@@ -31,11 +31,11 @@ import com.google.common.collect.Lists;
*/
public class ResponsePageNameElements extends ResponsePage {
private List<NameElement> list = Lists.newArrayList();
private List<NameElement> list = Lists.newArrayList();
/**
* Constructor.
*/
/**
* Constructor.
*/
public ResponsePageNameElements() {
super("", "");
}
......@@ -73,6 +73,19 @@ public class ResponsePageNameElements extends ResponsePage {
this.list = list;
}
/**
* Constructor.
*
* @param list list of name elements
* @param message response message
* @param details response details
* @param field response field
*/
public ResponsePageNameElements(List<NameElement> list, String message, String details, String field) {
super(message, details, field);
this.list = list;
}
/**
* Constructor.
*
......@@ -105,6 +118,7 @@ public class ResponsePageNameElements extends ResponsePage {
sb.append("{");
sb.append("\"message\": " + getMessage());
sb.append(", \"details\": " + getDetails());
sb.append(", \"field\": " + getField());
sb.append(", \"totalCount\": " + getTotalCount());
sb.append(", \"listSize\": " + getListSize());
sb.append(", \"page\": " + getPage());
......
......@@ -31,11 +31,11 @@ import com.google.common.collect.Lists;
*/
public class ResponsePageStructureElements extends ResponsePage {
private List<StructureElement> list = Lists.newArrayList();
private List<StructureElement> list = Lists.newArrayList();
/**
* Constructor.
*/
/**
* Constructor.
*/
public ResponsePageStructureElements() {
super("", "");
super.setTotalCount(0L);
......@@ -50,7 +50,7 @@ public class ResponsePageStructureElements extends ResponsePage {
* @param list list of structure elements
*/
public ResponsePageStructureElements(List<StructureElement> list) {
super("", "");
super("", "");
this.list = list;
}
......@@ -77,6 +77,19 @@ public class ResponsePageStructureElements extends ResponsePage {
this.list = list;
}
/**
* Constructor.
*
* @param list list of structure elements
* @param message response message
* @param details response details
* @param field response field
*/
public ResponsePageStructureElements(List<StructureElement> list, String message, String details, String field) {
super(message, details, field);
this.list = list;
}
/**
* Constructor.
*
......@@ -109,6 +122,7 @@ public class ResponsePageStructureElements extends ResponsePage {
sb.append("{");
sb.append("\"message\": " + getMessage());
sb.append(", \"details\": " + getDetails());
sb.append(", \"field\": " + getField());
sb.append(", \"totalCount\": " + getTotalCount());
sb.append(", \"listSize\": " + getListSize());
sb.append(", \"page\": " + getPage());
......
......@@ -49,7 +49,7 @@ public class GlobalControllerExceptionHandler extends ResponseEntityExceptionHan
protected ResponseEntity<Response> handleConflict(RuntimeException ex, WebRequest request) {
LOGGER.log(Level.INFO, "handleConflict, ex.getMessage: " + ex.getMessage());
Response response = new Response("", "");
Response response = new Response("", "", "");
response.setMessage(ExceptionUtil.OPERATION_COULD_NOT_BE_PERFORMED);
HttpStatus resultStatus = HttpStatus.INTERNAL_SERVER_ERROR;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment