JsonNode: fixed searching date value

src/main/java/kz/arta/synergy/astdev/custom_bp/Main.java

@@ -96,15 +96,8 @@ public class Main implements MessageListener {
             String t26b1, t24b1, t22b1;
             String t32b1, t30b1, t28b1;
             
-            b2b1 = getDateKeyByFieldName2(sourceFormDataString, "b2-b1");
-            LOGGER.info("******* B2B1: " + b2b1);
-            
-//            b2b1 = getDateKeyByFieldName(sourceFormData, "b2-b1", fieldType.DATE);
-//            b4b1 = getDateKeyByFieldName(sourceFormData, "b4-b1", fieldType.DATE);
-//            b5b1 = getDateKeyByFieldName(sourceFormData, "b5-b1", fieldType.TEXTBOX);
-            
-//            LOGGER.info("************ Fields valued: " + b2b1 + " " + b4b1 + " " + b5b1);
-//            LOGGER.info("************ Fields valued: " + b5b1 + b4b1 + "ASFASF");
+            b2b1 = getDateKeyByFieldName(sourceFormDataString, "t10-b1-b1");
+            LOGGER.info("*** t10-b1-b1 (2017-01-31 00:00:00) *** " + b2b1);
             
             // Получение данных целевой карточки
             
@@ -121,61 +114,31 @@ public class Main implements MessageListener {
     }
 
 
-    private static String getDateKeyByFieldName2(final String formJson, final String fieldName) {
+    private static String getDateKeyByFieldName(final String formJson, final String fieldName) {
         ObjectMapper mapper = new ObjectMapper();
         String result = new String();
         try {
             JsonNode rootNode = mapper.readTree(formJson);
-            ArrayNode data = (ArrayNode) rootNode.get("data");
-            Iterator<JsonNode> dataNodesIterator = data.getElements();
-            
-            while (dataNodesIterator.hasNext()) {
+            ArrayNode rootDN = (ArrayNode) rootNode.get("data");
+            Iterator<JsonNode> rootDNIterator = rootDN.getElements();
 
-                JsonNode n = dataNodesIterator.next();
-                
-                if (n.has("id") && n.has("value")){
-                    if (n.get("id").toString() == "b2-b1") {
-                        result = n.get("value").toString();
+            while (rootDNIterator.hasNext()) {
+                ArrayNode childNode = (ArrayNode) rootDNIterator.next().get("data");
+                Iterator<JsonNode> childDNIterator = childNode.getElements();
+                while (childDNIterator.hasNext()) {
+                    JsonNode n = childDNIterator.next();
+                    if (n.has("id") && n.has("value")) {
+                        if (fieldName.equals(n.get("id").asText())) {
+                            result = n.get("value").asText();
                         }
                     }
                 }
-            return result;
-        } catch (Exception exc) {
-            LOGGER.error(exc.getMessage(), exc);
             }
             return result;
-    }
-    
-    private static String getDateKeyByFieldName(final JsonParser formJson, final String fieldName, fieldType fieldT) {
-        String value = new String();
-        try {
-            while (!formJson.isClosed()) {
-                if (JsonToken.FIELD_NAME.equals(formJson.nextToken())) {
-                    if ("id".equals(formJson.getCurrentName()) && fieldName.equals(formJson.nextTextValue())) {
-                        switch (fieldT) {
-                            case DATE:
-                                formJson.nextToken();
-                                formJson.nextToken();
-                                formJson.nextToken();
-                                formJson.nextToken();
-                                formJson.nextToken();
-                                value = formJson.nextTextValue();
-                                break;
-                            case TEXTBOX:
-                                formJson.nextToken();
-                                formJson.nextToken();
-                                formJson.nextToken();
-                                value = formJson.nextTextValue();
-                                break;
-                        }
-                    }
-
-                }
-            }
         } catch (Exception exc) {
             LOGGER.error(exc.getMessage(), exc);
         }
-        return value;
+        return result;
     }
         
     private static JsonParser synergyApiGet(final URL requestURL) {