From bc49f6e2800398e059caf13334c3e7dd57d45dc5 Mon Sep 17 00:00:00 2001 From: "michele.artini" Date: Tue, 23 Feb 2021 09:33:37 +0100 Subject: [PATCH] inspector: max number of md records --- .../mdstore/manager/controller/MDInspectorController.java | 6 +++++- .../src/main/resources/application.properties | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/controller/MDInspectorController.java b/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/controller/MDInspectorController.java index 51f03b0b..2aa6a64d 100644 --- a/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/controller/MDInspectorController.java +++ b/apps/dhp-mdstore-manager/src/main/java/eu/dnetlib/data/mdstore/manager/controller/MDInspectorController.java @@ -4,6 +4,7 @@ import org.apache.commons.lang3.exception.ExceptionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; @@ -26,6 +27,9 @@ public class MDInspectorController { private static final Logger log = LoggerFactory.getLogger(MDInspectorController.class); + @Value("${dhp.mdstore-manager.inspector.records.max}") + private Long MAX_MD_RECORDS; + @RequestMapping("/mdrecords/{id}/{limit}") public String mdstoreInspector(final ModelMap map, @PathVariable final String id, @PathVariable final long limit) throws MDStoreManagerException { @@ -57,7 +61,7 @@ public class MDInspectorController { map.addAttribute("lastUpdate", ver.getLastUpdate()); map.addAttribute("size", ver.getSize()); - map.addAttribute("limit", limit); + map.addAttribute("limit", Math.min(limit, MAX_MD_RECORDS)); if (md.getCurrentVersion().equals(ver.getId())) { map.addAttribute("status", "current"); diff --git a/apps/dhp-mdstore-manager/src/main/resources/application.properties b/apps/dhp-mdstore-manager/src/main/resources/application.properties index d0ccecbe..bd25907d 100644 --- a/apps/dhp-mdstore-manager/src/main/resources/application.properties +++ b/apps/dhp-mdstore-manager/src/main/resources/application.properties @@ -27,3 +27,5 @@ logging.level.io.swagger.models.parameters.AbstractSerializableParameter = error dhp.mdstore-manager.hadoop.cluster = MOCK dhp.mdstore-manager.hdfs.base-path = /data/dnet.dev/mdstore dhp.mdstore-manager.hadoop.user = dnet.dev + +dhp.mdstore-manager.inspector.records.max = 1000