From 57e54caa6f78e5329c2bc203e373845882f52044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guilhem=20Semp=C3=A9r=C3=A9?= Date: Wed, 3 Jan 2024 18:55:13 +0100 Subject: [PATCH] Minor change --- .../cirad/web/controller/rest/BrapiRestController.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/fr/cirad/web/controller/rest/BrapiRestController.java b/src/fr/cirad/web/controller/rest/BrapiRestController.java index e3cdb70..e5c3c33 100644 --- a/src/fr/cirad/web/controller/rest/BrapiRestController.java +++ b/src/fr/cirad/web/controller/rest/BrapiRestController.java @@ -754,8 +754,7 @@ static public class GermplasmSearchRequest { } @ApiOperation(authorizations = { @Authorization(value = "AuthorizationToken") }, value = "germplasmAttributes") - @RequestMapping(value = "/{database:.+}" + URL_BASE_PREFIX + "/" - + URL_GERMPLASM_ATTRIBUTES, method = RequestMethod.GET, produces = "application/json") + @RequestMapping(value = "/{database:.+}" + URL_BASE_PREFIX + "/" + URL_GERMPLASM_ATTRIBUTES, method = RequestMethod.GET, produces = "application/json") public Map germplasmAttributes(HttpServletRequest request, HttpServletResponse response, @PathVariable String database, @PathVariable(name = "germplasmDbId") String germplasmDbId, @RequestParam(required = false) Integer pageSize, @RequestParam(required = false) Integer page) @@ -774,9 +773,7 @@ public Map germplasmAttributes(HttpServletRequest request, HttpS Authentication authentication = tokenManager.getAuthenticationFromToken(token); HashMap result = new HashMap<>(); - Individual ind = MgdbDao.getInstance().loadIndividualsWithAllMetadata(database, - authentication == null ? "anonymousUser" : authentication.getName(), null, Arrays.asList(germplasmDbId)) - .get(germplasmDbId); + Individual ind = MgdbDao.getInstance().loadIndividualsWithAllMetadata(database, authentication == null ? "anonymousUser" : authentication.getName(), null, Arrays.asList(germplasmDbId), null).get(germplasmDbId); if (ind == null) { build404Response(response); return null; @@ -923,7 +920,7 @@ public Map executeGermplasmSearch(HttpServletRequest request, Ht Authentication auth = tokenManager.getAuthenticationFromToken(tokenManager.readToken(request)); String sCurrentUser = auth == null || "anonymousUser".equals(auth.getName()) ? "anonymousUser" : auth.getName(); - for (Individual ind : MgdbDao.getInstance().loadIndividualsWithAllMetadata(database, sCurrentUser, null, indIDsForCurrentPage).values()) { + for (Individual ind : MgdbDao.getInstance().loadIndividualsWithAllMetadata(database, sCurrentUser, null, indIDsForCurrentPage, null).values()) { Map germplasm = new TreeMap<>(); germplasm.put(BrapiService.BRAPI_FIELD_germplasmDbId, ind.getId()); germplasm.put("germplasmName", ind.getId());