From a4ade07f8b19ca56fa09bc86f7e6915557931d89 Mon Sep 17 00:00:00 2001
From: Abraham Elmahrek <abraham@elmahrek.com>
Date: Thu, 6 Nov 2014 10:56:48 -0800
Subject: [PATCH] SQOOP-1688: Sqoop2: Fix the Validation Response JSON for
 configs

(Veena Basavaraj via Abraham Elmahrek)
---
 .../sqoop/json/ValidationResultBean.java      | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/common/src/main/java/org/apache/sqoop/json/ValidationResultBean.java b/common/src/main/java/org/apache/sqoop/json/ValidationResultBean.java
index 4b3fc37b..e9b48999 100644
--- a/common/src/main/java/org/apache/sqoop/json/ValidationResultBean.java
+++ b/common/src/main/java/org/apache/sqoop/json/ValidationResultBean.java
@@ -33,10 +33,10 @@
  */
 public class ValidationResultBean implements JsonBean {
 
-  private static final String ROOT = "ROOT";
-  private static final String ID = "ID";
-  private static final String STATUS = "STATUS";
-  private static final String TEXT = "TEXT";
+  private static final String VALIDATION_RESULT = "validation-result";
+  private static final String ID = "id";
+  private static final String STATUS = "status";
+  private static final String MESSAGE = "message";
 
   private ConfigValidationResult[] results;
   private Long id;
@@ -61,6 +61,7 @@ public Long getId() {
     return id;
   }
 
+  @SuppressWarnings("unchecked")
   @Override
   public JSONObject extract(boolean skipSensitive) {
     JSONArray array = new JSONArray();
@@ -71,16 +72,16 @@ public JSONObject extract(boolean skipSensitive) {
     }
 
     JSONObject object = new JSONObject();
-    object.put(ROOT, array);
+    object.put(VALIDATION_RESULT, array);
     if(id != null) {
       object.put(ID, id);
     }
     return object;
   }
 
+  @SuppressWarnings("unchecked")
   private JSONObject extractValidationResult(ConfigValidationResult result) {
     JSONObject ret = new JSONObject();
-
     for(Map.Entry<String, List<Message>> entry : result.getMessages().entrySet()) {
       ret.put(entry.getKey(), extractMessageList(entry.getValue()));
     }
@@ -88,6 +89,7 @@ private JSONObject extractValidationResult(ConfigValidationResult result) {
     return ret;
   }
 
+  @SuppressWarnings("unchecked")
   private Object extractMessageList(List<Message> messages) {
     JSONArray array = new JSONArray();
 
@@ -98,34 +100,32 @@ private Object extractMessageList(List<Message> messages) {
     return array;
   }
 
+  @SuppressWarnings("unchecked")
   private Object extractMessage(Message message) {
     JSONObject ret = new JSONObject();
-
     ret.put(STATUS, message.getStatus().toString());
-    ret.put(TEXT, message.getMessage());
+    ret.put(MESSAGE, message.getMessage());
 
     return ret;
   }
 
   @Override
   public void restore(JSONObject jsonObject) {
-    JSONArray array = (JSONArray) jsonObject.get(ROOT);
+    JSONArray array = (JSONArray) jsonObject.get(VALIDATION_RESULT);
     results = new ConfigValidationResult[array.size()];
-
     int i = 0;
     for(Object item : array) {
       results[i++] = restoreValidationResult((JSONObject) item);
     }
-
     if(jsonObject.containsKey(ID)) {
       id = (Long) jsonObject.get(ID);
     }
   }
 
+  @SuppressWarnings("unchecked")
   private ConfigValidationResult restoreValidationResult(JSONObject item) {
     ConfigValidationResult result  = new ConfigValidationResult();
     Set<Map.Entry<String, JSONArray>> entrySet = item.entrySet();
-
     for(Map.Entry<String, JSONArray> entry : entrySet) {
       result.addMessages(entry.getKey(), restoreMessageList(entry.getValue()));
     }
@@ -136,18 +136,16 @@ private ConfigValidationResult restoreValidationResult(JSONObject item) {
 
   private List<Message> restoreMessageList(JSONArray array) {
     List<Message> messages = new LinkedList<Message>();
-
     for(Object item : array) {
       messages.add(restoreMessage((JSONObject)item));
     }
-
     return messages;
   }
 
   private Message restoreMessage(JSONObject item) {
     return new Message(
       Status.valueOf((String) item.get(STATUS)),
-      (String) item.get(TEXT)
+      (String) item.get(MESSAGE)
     );
   }
 }