Skip to content

armgit / floci

Public Imported from GitHub
0

Light, fluffy, and always free - The AWS Local Emulator alternative

refactor(core): deduplicate KMS and XML parsing (#3670)

Aniket Shukla8c61a01c8dbb
diff --git a/src/main/java/io/github/hectorvent/floci/core/common/XmlParser.java b/src/main/java/io/github/hectorvent/floci/core/common/XmlParser.java
index 0151fbfa45..3bdc586d8c 100644
--- a/src/main/java/io/github/hectorvent/floci/core/common/XmlParser.java
+++ b/src/main/java/io/github/hectorvent/floci/core/common/XmlParser.java
@@ -298,44 +298,8 @@ public final class XmlParser {
* tags inside a single {@code <QueueConfiguration>}).
*/
public static List<Map<String, List<String>>> extractGroupsMulti(String xml, String parentElement) {
- List<Map<String, List<String>>> result = new ArrayList<>();
- if (xml == null || xml.isEmpty()) {
- return result;
- }
- try {
- XMLStreamReader r = FACTORY.createXMLStreamReader(new StringReader(xml));
- Map<String, List<String>> current = null;
- int depth = 0;
- while (r.hasNext()) {
- int event = r.next();
- if (event == XMLStreamConstants.START_ELEMENT) {
- String local = r.getLocalName();
- if (parentElement.equals(local)) {
- current = new LinkedHashMap<>();
- depth = 1;
- } else if (current != null && depth == 1) {
- String text = readLeafText(r);
- if (text != null) {
- current.computeIfAbsent(local, k -> new ArrayList<>()).add(text);
- }
- } else if (current != null) {
- depth++;
- }
- } else if (event == XMLStreamConstants.END_ELEMENT) {
- if (current != null && parentElement.equals(r.getLocalName())) {
- result.add(current);
- current = null;
- depth = 0;
- } else if (current != null) {
- depth--;
- }
- }
- }
- r.close();
- } catch (Exception e) {
- LOG.debugv("Ignoring malformed XML during parse: {0}", e.getMessage());
- }
- return result;
+ return extractLeafGroups(xml, parentElement,
+ (group, name, text) -> group.computeIfAbsent(name, k -> new ArrayList<>()).add(text));
}
/**
@@ -350,13 +314,18 @@ public final class XmlParser {
* }</pre>
*/
public static List<Map<String, String>> extractGroups(String xml, String parentElement) {
- List<Map<String, String>> result = new ArrayList<>();
+ return extractLeafGroups(xml, parentElement, Map::put);
+ }
+
+ private static <T> List<Map<String, T>> extractLeafGroups(
+ String xml, String parentElement, LeafCollector<T> leafCollector) {
+ List<Map<String, T>> result = new ArrayList<>();
if (xml == null || xml.isEmpty()) {
return result;
}
try {
XMLStreamReader r = FACTORY.createXMLStreamReader(new StringReader(xml));
- Map<String, String> current = null;
+ Map<String, T> current = null;
int depth = 0;
while (r.hasNext()) {
int event = r.next();
@@ -368,7 +337,7 @@ public final class XmlParser {
} else if (current != null && depth == 1) {
String text = readLeafText(r);
if (text != null) {
- current.put(local, text);
+ leafCollector.add(current, local, text);
}
} else if (current != null) {
depth++;
@@ -390,6 +359,11 @@ public final class XmlParser {
return result;
}
+ @FunctionalInterface
+ private interface LeafCollector<T> {
+ void add(Map<String, T> group, String name, String text);
+ }
+
/**
* Returns the local names of the direct child elements of the first
* {@code parentElement}, in document order, or an empty list when the
diff --git a/src/main/java/io/github/hectorvent/floci/services/kms/KmsJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/kms/KmsJsonHandler.java
index 2945ea75ea..354a9c514f 100644
--- a/src/main/java/io/github/hectorvent/floci/services/kms/KmsJsonHandler.java
+++ b/src/main/java/io/github/hectorvent/floci/services/kms/KmsJsonHandler.java
@@ -147,36 +147,7 @@ public class KmsJsonHandler {
String granteePrincipal = request.path("GranteePrincipal").isMissingNode() ? null : request.path("GranteePrincipal").asText(null);
Map<String, Object> result = service.listGrants(keyId, region, marker, limit, grantId, granteePrincipal);
-
- ObjectNode response = objectMapper.createObjectNode();
- @SuppressWarnings("unchecked")
- List<Map<String, Object>> grants = (List<Map<String, Object>>) result.get("Grants");
- ArrayNode array = response.putArray("Grants");
- for (Map<String, Object> grant : grants) {
- ObjectNode entry = array.addObject();
- entry.put("GrantId", (String) grant.get("GrantId"));
- entry.put("KeyId", (String) grant.get("KeyId"));
- entry.put("GranteePrincipal", (String) grant.get("GranteePrincipal"));
- entry.put("CreationDate", ((Number) grant.get("CreationDate")).longValue());
- if (grant.get("Name") != null) {
- entry.put("Name", (String) grant.get("Name"));
- }
- if (grant.get("Constraints") != null) {
- entry.set("Constraints", objectMapper.valueToTree(grant.get("Constraints")));
- }
- ArrayNode operations = entry.putArray("Operations");
- @SuppressWarnings("unchecked")
- List<String> operationValues = (List<String>) grant.get("Operations");
- operationValues.forEach(operations::add);
- if (grant.get("RetiringPrincipal") != null) {
- entry.put("RetiringPrincipal", (String) grant.get("RetiringPrincipal"));
- }
- }
- response.put("Truncated", (boolean) result.get("Truncated"));
- if (Boolean.TRUE.equals(result.get("Truncated"))) {
- response.put("NextMarker", (String) result.get("NextMarker"));
- }
- return Response.ok(response).build();
+ return grantListResponse(result);
}
private Response handleListRetirableGrants(JsonNode request, String region) {
@@ -186,6 +157,10 @@ public class KmsJsonHandler {
Map<String, Object> result = service.listRetirableGrants(retiringPrincipal, region, marker, limit);
+ return grantListResponse(result);
+ }
+
+ private Response grantListResponse(Map<String, Object> result) {
ObjectNode response = objectMapper.createObjectNode();
@SuppressWarnings("unchecked")
List<Map<String, Object>> grants = (List<Map<String, Object>>) result.get("Grants");