# HG changeset patch
# User Torsten Irländer <torsten.irlaender@intevation.de>
# Date 1370444015 -7200
# Node ID 354deea8e738ad0a099ff6bf8c79d53524bb133a
# Parent  ccfcdb404f9a347d4687e128da538c2a104f4347
Fixed generating return value for Create and Update.

diff -r ccfcdb404f9a -r 354deea8e738 src/main/java/de/intevation/lada/rest/LProbeService.java
--- a/src/main/java/de/intevation/lada/rest/LProbeService.java	Wed Jun 05 16:52:56 2013 +0200
+++ b/src/main/java/de/intevation/lada/rest/LProbeService.java	Wed Jun 05 16:53:35 2013 +0200
@@ -9,6 +9,7 @@
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
@@ -93,33 +94,42 @@
         return repository.filter(mstId, uwbId, begin);
     }
 
+    @PUT
+    @Path("/{id}")
+    @Produces("text/json")
+    @Consumes("application/json")
+    public String update(LProbe probe) {
+        return "{success: false, errors: {probeId: \"Client not found\"}}";
+    }
+
     @POST
     @Produces("text/json")
     @Consumes("application/json")
     public String create(LProbe probe) {
         boolean success = repository.create(probe);
+        int generalError = repository.getGeneralError();
         if(success) {
-            return "[{" +
-                   "returncode: 200," +
-                   "errorfields: []," +
-                   createWarningFields() +
-                   "}]";
+            return "{" +
+                   "success: true, " +
+                   "message: " + generalError + ", " +
+                   "errors: {" + createErrorFields() + "}, " +
+                   "warnings: {" + createWarningFields() + "}" +
+                   "}";
         }
         else {
-            int generalError = repository.getGeneralError();
-            String response = "[{ \"returncode\": " + generalError + ", ";
-            response += "\"errors\": {" + createErrorFields() + "}, ";
-            response += "\"warnings\": {" + createWarningFields() + "}";
-            response += "}]";
-            return response;
+            return "{" +
+                   "success: false, " +
+                   "message: " + generalError + ", " +
+                   "errors: {" + createErrorFields() + "}, " +
+                   "warnings: {" + createWarningFields() + "}" +
+                   "}";
         }
     }
 
     private String createWarningFields() {
         Map<String, Integer> warnings = repository.getWarnings();
-        String response = "\"fields\": [";
+        String response = "";
         if (warnings == null || warnings.isEmpty()) {
-            response += "]";
             return response;
         }
         boolean first = true;
@@ -127,19 +137,16 @@
             if (!first) {
                 response +=",";
             }
-            response += "{" + "\"" + entry.getKey() +
-                "\": " + entry.getValue() + "}";
+            response += entry.getKey() + ":" + "\"" + entry.getValue() + "\"";
             first = false;
         }
-        response += "]";
         return response;
     }
 
     private String createErrorFields() {
         Map<String, Integer> errors = repository.getErrors();
-        String response = "\"fields\": [";
+        String response = "";
         if (errors.isEmpty()) {
-            response += "]";
             return response;
         }
         boolean first = true;
@@ -147,11 +154,9 @@
             if (!first) {
                 response +=",";
             }
-            response += "{" + "\"" + entry.getKey() +
-                "\": " + entry.getValue() + "}";
+            response += entry.getKey() + ":" + "\"" + entry.getValue() + "\"";
             first = false;
         }
-        response += "]";
         return response;
     }
 }