fix: storage name in view (#285)

wearefrank · Aug 27, 2024 · e24d746 · e24d746
1 parent 1794990
commit e24d746
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 19 deletions.
diff --git a/src/main/java/nl/nn/testtool/filter/View.java b/src/main/java/nl/nn/testtool/filter/View.java
@@ -123,24 +123,6 @@ public String toString() {
 		return getName();
 	}
 
-	public Map<String, Object> toMap(boolean isDefaultView) {
-		Map<String, String> metadataTypes = new HashMap<>();
-		for (String metadataName : getMetadataNames()) {
-			metadataTypes.put(metadataName, metadataExtractor.getType(metadataName));
-		}
-
-		return new HashMap<String, Object>() {{
-			put("storageName", debugStorage.getName());
-			put("defaultView", isDefaultView);
-			put("metadataNames", metadataNames);
-			put("metadataLabels", getMetadataLabels());
-			put("crudStorage", debugStorage instanceof CrudStorage);
-			put("nodeLinkStrategy", nodeLinkStrategy);
-			put("name", getName());
-			put("metadataTypes", metadataTypes);
-		}};
-	}
-
 	public List<String> getMetadataLabels() {
 		List<String> metadataLabels = new ArrayList<>();
 		for (String metadataName : getMetadataNames()) {

diff --git a/src/main/java/nl/nn/testtool/web/api/TestToolApi.java b/src/main/java/nl/nn/testtool/web/api/TestToolApi.java
@@ -233,7 +233,20 @@ public Response getViewsResponse() {
 		// ExtendedBeanInfo isn't used anymore with newer CXF versions)
 		Map<String, Map<String, Object>> response = new LinkedHashMap<>();
 		for (View view : views) {
-			response.put(view.getName(), view.toMap(view == views.getDefaultView()));
+			Map<String, Object> map = new HashMap<>();
+			map.put("name", view.getName());
+			map.put("storageName", view.getDebugStorage().getName());
+			map.put("defaultView", view == views.getDefaultView());
+			map.put("metadataNames", view.getMetadataNames());
+			map.put("metadataLabels", view.getMetadataLabels());
+			map.put("crudStorage", view.getDebugStorage() instanceof CrudStorage);
+			map.put("nodeLinkStrategy", view.getNodeLinkStrategy());
+			Map<String, String> metadataTypes = new HashMap<>();
+			for (String metadataName : view.getMetadataNames()) {
+				metadataTypes.put(metadataName, metadataExtractor.getType(metadataName));
+			}
+			map.put("metadataTypes", metadataTypes);
+			response.put(view.getName(), map);
 		}
 		return Response.ok(response).build();
 	}