Minor change

GuilhemSempere · Jan 3, 2024 · 57e54ca · 57e54ca
1 parent dcc7be5
commit 57e54ca
Showing 1 changed file with 3 additions and 6 deletions.
diff --git 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<String, Object> 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<String, Object> germplasmAttributes(HttpServletRequest request, HttpS
 
 		Authentication authentication = tokenManager.getAuthenticationFromToken(token);
 		HashMap<String, Object> 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<String, Object> 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<String, Object> germplasm = new TreeMap<>();
             germplasm.put(BrapiService.BRAPI_FIELD_germplasmDbId, ind.getId());
             germplasm.put("germplasmName", ind.getId());