diff --git a/src/main/java/org/openepics/names/rest/beans/response/Response.java b/src/main/java/org/openepics/names/rest/beans/response/Response.java
index d095d30aa607d6abfb0b0c9ac724e5e367f253d9..32cebcbc53d8f8a1bb82e8b1e3365bcda0fbb958 100644
--- a/src/main/java/org/openepics/names/rest/beans/response/Response.java
+++ b/src/main/java/org/openepics/names/rest/beans/response/Response.java
@@ -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;
+ }
+
}
diff --git a/src/main/java/org/openepics/names/rest/beans/response/ResponseBoolean.java b/src/main/java/org/openepics/names/rest/beans/response/ResponseBoolean.java
index bd839f573faa6e3cd3cb067709699727d5d14f2a..4eaf1a0eee5ecda4ddc7d91a650ea53307542e35 100644
--- a/src/main/java/org/openepics/names/rest/beans/response/ResponseBoolean.java
+++ b/src/main/java/org/openepics/names/rest/beans/response/ResponseBoolean.java
@@ -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;
}
diff --git a/src/main/java/org/openepics/names/rest/beans/response/ResponseBooleanList.java b/src/main/java/org/openepics/names/rest/beans/response/ResponseBooleanList.java
index ea83217f0bb9937b81b02b562ab83cd24b550284..6f0561dc4fe6a1bd75d1d33476cc9a17015714f7 100644
--- a/src/main/java/org/openepics/names/rest/beans/response/ResponseBooleanList.java
+++ b/src/main/java/org/openepics/names/rest/beans/response/ResponseBooleanList.java
@@ -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.
*
diff --git a/src/main/java/org/openepics/names/rest/beans/response/ResponsePage.java b/src/main/java/org/openepics/names/rest/beans/response/ResponsePage.java
index 368127873c79fb3d4811fd5d9b4ec47037dde219..6fe92e8d07f30752830b6fc1294950285c0e5d70 100644
--- a/src/main/java/org/openepics/names/rest/beans/response/ResponsePage.java
+++ b/src/main/java/org/openepics/names/rest/beans/response/ResponsePage.java
@@ -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;
+ }
}
diff --git a/src/main/java/org/openepics/names/rest/beans/response/ResponsePageNameElements.java b/src/main/java/org/openepics/names/rest/beans/response/ResponsePageNameElements.java
index 3e1845f9fc520bb3fad5e19a9bcd8eaefe6f1377..9d5b361bf4d26a62dbc9b1789201e089769347bd 100644
--- a/src/main/java/org/openepics/names/rest/beans/response/ResponsePageNameElements.java
+++ b/src/main/java/org/openepics/names/rest/beans/response/ResponsePageNameElements.java
@@ -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());
diff --git a/src/main/java/org/openepics/names/rest/beans/response/ResponsePageStructureElements.java b/src/main/java/org/openepics/names/rest/beans/response/ResponsePageStructureElements.java
index 18399234b46843a5081314cf567986f1849c69c8..564315f7619a7898b8e68b92f6c24ddc37239b7a 100644
--- a/src/main/java/org/openepics/names/rest/beans/response/ResponsePageStructureElements.java
+++ b/src/main/java/org/openepics/names/rest/beans/response/ResponsePageStructureElements.java
@@ -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());
diff --git a/src/main/java/org/openepics/names/rest/controller/GlobalControllerExceptionHandler.java b/src/main/java/org/openepics/names/rest/controller/GlobalControllerExceptionHandler.java
index 529d9be2542f24fdf86e0d96f839a5b076521ea8..cc6dc3c9b53aa26158b797576e402ba59f972cce 100644
--- a/src/main/java/org/openepics/names/rest/controller/GlobalControllerExceptionHandler.java
+++ b/src/main/java/org/openepics/names/rest/controller/GlobalControllerExceptionHandler.java
@@ -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;