From e11a9a49dcf3222dca9d9c603798fe96c97f48f3 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Fri, 10 May 2024 11:52:36 +0200 Subject: [PATCH] added getOrDefault value for IGNORE_ERRORS --- .../implementations/SimpleLifeCycleManager.java | 4 ++-- .../cms/sdi/plugins/SDIMaterializerPlugin.java | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java index fb51301..f269d22 100644 --- a/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java +++ b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/SimpleLifeCycleManager.java @@ -203,9 +203,9 @@ public class SimpleLifeCycleManager extends AbstractLifeCycleManager implements log.info("Requesting dematerialization for {} ",s); for(MaterializationPlugin mat : getMaterializers(report.getTheRequest())) { Document params = new Document("fileSetPath",s); - Boolean ignoreErrors = false; + Boolean ignoreErrors; try { - ignoreErrors = (Boolean) report.getTheRequest().getCallParameters().get(InterfaceConstants.Parameters.IGNORE_ERRORS); + ignoreErrors = (Boolean) report.getTheRequest().getCallParameters().getOrDefault(InterfaceConstants.Parameters.IGNORE_ERRORS, false); }catch (Exception e) { ignoreErrors = false; } diff --git a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/plugins/SDIMaterializerPlugin.java b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/plugins/SDIMaterializerPlugin.java index 1b4e668..cf910f6 100644 --- a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/plugins/SDIMaterializerPlugin.java +++ b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/plugins/SDIMaterializerPlugin.java @@ -219,12 +219,11 @@ public class SDIMaterializerPlugin extends AbstractPlugin implements Materializa log.info("Serving DeMaterialize {} : request CallParameters {}, request Context {}: ",this.getDescriptor().getId(), request.getCallParameters(), request.getContext()); log.debug("DeMaterialize request {}",request); MaterializationReport report= new MaterializationReport(request); - Boolean ignoreErrors = false; - try { - ignoreErrors = (Boolean) request.getCallParameters().get(InterfaceConstants.Parameters.IGNORE_ERRORS); - log.info("Serving DeMaterialize with {} as: {} ",InterfaceConstants.Parameters.IGNORE_ERRORS, ignoreErrors); - }catch (Exception e) { - ignoreErrors = false; + Boolean ignoreErrors; + try { + ignoreErrors = (Boolean) report.getTheRequest().getCallParameters().getOrDefault(InterfaceConstants.Parameters.IGNORE_ERRORS, false); + }catch (Exception e) { + ignoreErrors = false; } try{ SDIManagerWrapper sdi=getSDIManager();