chore: Bump version to 1.6.9 and enhance JsonAgentResponseHandler with prefixFields and array of objects support
This commit is contained in:
2
pom.xml
2
pom.xml
@@ -4,7 +4,7 @@
|
||||
<artifactId>lm-lib</artifactId>
|
||||
<groupId>de.extio</groupId>
|
||||
<name>lm-lib</name>
|
||||
<version>1.6.8</version>
|
||||
<version>1.6.9</version>
|
||||
|
||||
<properties>
|
||||
<java.version>21</java.version>
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
package de.extio.lmlib.agent.responsehandler;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@@ -23,7 +25,15 @@ public class JsonAgentResponseHandler implements AgentResponseHandler {
|
||||
|
||||
private final ObjectMapper objectMapper;
|
||||
|
||||
private final String prefixFields;
|
||||
|
||||
public JsonAgentResponseHandler() {
|
||||
this(null);
|
||||
}
|
||||
|
||||
public JsonAgentResponseHandler(final String prefixFields) {
|
||||
this.prefixFields = prefixFields == null ? "" : prefixFields;
|
||||
|
||||
this.objectMapper = new ObjectMapper();
|
||||
this.objectMapper.configure(DeserializationFeature.FAIL_ON_IGNORED_PROPERTIES, false);
|
||||
this.objectMapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, false);
|
||||
@@ -59,28 +69,36 @@ public class JsonAgentResponseHandler implements AgentResponseHandler {
|
||||
return false;
|
||||
}
|
||||
|
||||
boolean hasResponse = false;
|
||||
final Iterator<Map.Entry<String, JsonNode>> fields = jsonNode.fields();
|
||||
final var items = new LinkedHashMap<String, List<String>>();
|
||||
final Iterator<Map.Entry<String, JsonNode>> fields = jsonNode.properties().iterator();
|
||||
while (fields.hasNext()) {
|
||||
final var entry = fields.next();
|
||||
if (entry.getValue().isArray()) {
|
||||
final var items = new LinkedHashSet<>();
|
||||
entry.getValue().elements().forEachRemaining(item -> items.add(item.asText()));
|
||||
context.getContext().put(entry.getKey(), List.copyOf(items));
|
||||
hasResponse = true;
|
||||
LOGGER.debug("Response: {} {}", entry.getKey(), items);
|
||||
entry.getValue().elements().forEachRemaining(nestedArray -> nestedArray.properties().forEach(nestedProperty -> this.parseProperty(items, nestedProperty)));
|
||||
}
|
||||
else if (entry.getValue().isTextual() || entry.getValue().isNumber() || entry.getValue().isBoolean()) {
|
||||
context.setStringValue(entry.getKey(), entry.getValue().asText());
|
||||
hasResponse = true;
|
||||
LOGGER.debug("Response: {} {}", entry.getKey(), entry.getValue().asText());
|
||||
else {
|
||||
this.parseProperty(items, entry);
|
||||
}
|
||||
}
|
||||
LOGGER.debug("Response: {} {}", items.size(), items);
|
||||
context.getContext().putAll(items);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
if (!hasResponse) {
|
||||
addJsonResponseErrorPrompt(context);
|
||||
private void parseProperty(final LinkedHashMap<String, List<String>> items, final Entry<String, JsonNode> nestedProperty) {
|
||||
if (nestedProperty.getValue().isObject()) {
|
||||
final var nestedValuesIter = nestedProperty.getValue().values();
|
||||
while (nestedValuesIter.hasNext()) {
|
||||
final var v = nestedValuesIter.next();
|
||||
if (v.isTextual() || v.isNumber() || v.isBoolean()) {
|
||||
items.computeIfAbsent(this.prefixFields + nestedProperty.getKey(), k -> new ArrayList<>()).add(v.asText());
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
items.computeIfAbsent(this.prefixFields + nestedProperty.getKey(), k -> new ArrayList<>()).add(nestedProperty.getValue().asText());
|
||||
}
|
||||
return hasResponse;
|
||||
}
|
||||
|
||||
private void addJsonResponseErrorPrompt(final AgentContext context) {
|
||||
|
||||
Reference in New Issue
Block a user