cleaner code

Author: l-trotta

java-client/src/main/java/co/elastic/clients/json/JsonpUtils.java

@@ -243,21 +243,28 @@ public static Map.Entry<String, JsonParser> lookAheadFieldValue(
         } else {
             // Unbuffered path: parse the object into a JsonObject, then extract the value and parse it again
             JsonObject object = parser.getObject();
-            String result = object.getString(name, null);
 
-            if (result == null) {
-                // checking if instead of a string it's a boolean
-                try{
-                    result = String.valueOf(object.getBoolean(name));
-                } catch (NullPointerException e) {
-                    // suppressed in favor of JsonpMappingException below
+            String result = null;
+            JsonValue value = object.get(name);
+            // Handle enums and booleans promoted to enums
+            if (value != null) {
+                if (value.getValueType() == JsonValue.ValueType.STRING) {
+                    result = ((JsonString) value).getString();
+                } else if (value.getValueType() == JsonValue.ValueType.TRUE) {
+                    result = "true";
+                } else if (value.getValueType() == JsonValue.ValueType.FALSE) {
+                    result = "false";
                 }
             }
 
             if (result == null) {
                 result = defaultValue;
             }
 
+            if (result == null) {
+                result = defaultValue;
+            }
+
             if (result == null) {
                 throw new JsonpMappingException("Property '" + name + "' not found", location);
             }

java-client/src/main/java/co/elastic/clients/json/jackson/JacksonJsonpParser.java

@@ -336,27 +336,27 @@ public Map.Entry<String, JsonParser> lookAheadFieldValue(String name, String def
                 if (fieldName.equals(name)) {
                     // Found
                     tb.copyCurrentEvent(parser);
-                    try {
-                        expectNextEvent(JsonToken.VALUE_STRING);
-                    }
-                    catch (UnexpectedJsonEventException e) {
-                        // checking if instead of a string it's a boolean
-                        String details = e.getMessage();
-                        if (details.contains("VALUE_TRUE")){
-                            expectEvent(JsonToken.VALUE_TRUE);
-                        }
-                        else if (details.contains("VALUE_FALSE")){
-                            expectEvent(JsonToken.VALUE_FALSE);
-                        }
-                        // not a boolean either, can throw exception
-                        else{
-                            throw e;
-                        }
+
+                    String result = null;
+                    switch (parser.nextToken()) {
+                        case VALUE_STRING:
+                            result = parser.getText();
+                            break;
+                        // Handle booleans promoted to enums
+                        case VALUE_TRUE:
+                            result = "true";
+                            break;
+                        case VALUE_FALSE:
+                            result = "false";
+                            break;
+                        default:
+                            expectEvent(JsonToken.VALUE_STRING);
                     }
+
                     tb.copyCurrentEvent(parser);
 
                     return new AbstractMap.SimpleImmutableEntry<>(
-                        parser.getText(),
+                        result,
                         new JacksonJsonpParser(
                             JsonParserSequence.createFlattened(false, tb.asParser(), parser),
                             mapper