From 40b3ff6b7cd2804a9f1e162d22b42d70d47876b8 Mon Sep 17 00:00:00 2001 From: Katerina Date: Wed, 26 Jul 2023 14:19:44 +0300 Subject: [PATCH] Remove set parameter when empty in requests --- .../controllers/ValidationController.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/eu/dnetlib/validatorapi/controllers/ValidationController.java b/src/main/java/eu/dnetlib/validatorapi/controllers/ValidationController.java index 2ae6f31..cdd28b5 100644 --- a/src/main/java/eu/dnetlib/validatorapi/controllers/ValidationController.java +++ b/src/main/java/eu/dnetlib/validatorapi/controllers/ValidationController.java @@ -182,7 +182,7 @@ public class ValidationController { public ValidationJob validateWithApacheCamel(@RequestParam(name = "guidelines") String guidelinesProfileName, @RequestParam(name = "baseUrl", defaultValue = "http://repositorium.sdum.uminho.pt/oai/request") String baseURL, //not in use now @RequestParam(name="numberOfRecords", defaultValue = "10") int numberOfRecords, - @RequestParam(name="set", required = false) String set + @RequestParam(name="set", required = false) Optional set ) { AbstractOpenAireProfile profile = initializeOpenAireProfile(guidelinesProfileName); @@ -212,16 +212,18 @@ public class ValidationController { RouteBuilder oaiPmhRouteBuilder; + String oaiEndpoint= "oaipmh://" + baseURL + "?verb=ListRecords&metadataPrefix=" + metadataPrefix; + if (set.isPresent()) + oaiEndpoint += "&set="+set.get(); + if (fairProfile == null) { oaiPmhRouteBuilder = - new SimpleOaiPmhRoute("oaipmh://" + baseURL + "?verb=ListRecords&metadataPrefix=" - + metadataPrefix + "&set=" + set, profile, validationJob, numberOfRecords, uuid.toString()); + new SimpleOaiPmhRoute(oaiEndpoint, profile, validationJob, numberOfRecords, uuid.toString()); } else { System.out.println("THERE"); oaiPmhRouteBuilder = - new FairOaiPmhRoute2("oaipmh://" + baseURL + "?verb=ListRecords&metadataPrefix=" - + metadataPrefix + "&set=" + set, profile, validationJob, numberOfRecords, uuid.toString()); + new FairOaiPmhRoute2(oaiEndpoint, profile, validationJob, numberOfRecords, uuid.toString()); } camelContext.addRoutes(oaiPmhRouteBuilder);