From 0b8d2f3b4b26d483b8e6587fa617aa461b88caeb Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Thu, 2 Mar 2023 12:16:13 +0100
Subject: [PATCH] Added throw StepException

---
 .../cms/plugins/implementations/SimpleLifeCycleManager.java   | 2 +-
 .../plugins/implementations/executions/GuardedExecution.java  | 4 ++--
 .../implementations/executions/GuardedStepExecution.java      | 3 ++-
 3 files changed, 5 insertions(+), 4 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 7d25e96..e7fde22 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
@@ -143,7 +143,7 @@ public class SimpleLifeCycleManager extends AbstractLifeCycleManager implements
     	return new GuardedStepExecution(Steps.UNPUBLISH) {
             @Override
             protected StepExecutionReport run() throws Exception {
-            	
+            	log.info(Steps.UNPUBLISH+ " running...");
             	//DeMaterialize
             	JSONPathWrapper wrapper = new JSONPathWrapper(theReport.getTheRequest().getDocument().getTheDocument().toJson());
 				for (String s : wrapper.getMatchingPaths("$..[?(@." + RegisteredFileSet.PAYLOADS + ")]")){
diff --git a/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedExecution.java b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedExecution.java
index 2321da6..35688f5 100644
--- a/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedExecution.java
+++ b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedExecution.java
@@ -29,14 +29,14 @@ public abstract class GuardedExecution<R extends BaseExecutionRequest,T extends
 
     protected T theReport;
 
-    protected void checks() throws ConfigurationException, InsufficientPrivileges {
+    protected void checks() throws ConfigurationException, InsufficientPrivileges, StepException {
         if(theReport.getTheRequest()==null) throw new RuntimeException("Unexpected state : request cannot be null");
 
         // Check document phase
         if(op.getAppliableToPhases()!=null&&!op.getAppliableToPhases().isEmpty()) {
             String currentPhase = theReport.getTheRequest().getDocument().getLifecycleInformation().getPhase();
             if(!op.getAppliableToPhases().contains(currentPhase))
-                new StepException("Document must be in one of the following phases : "+ op.getAppliableToPhases());
+            	throw new StepException("Document must be in one of the following phases : "+ op.getAppliableToPhases());
         }
     }
 
diff --git a/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedStepExecution.java b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedStepExecution.java
index 32ccc8e..5d7a6b2 100644
--- a/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedStepExecution.java
+++ b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/executions/GuardedStepExecution.java
@@ -1,6 +1,7 @@
 package org.gcube.application.cms.plugins.implementations.executions;
 
 import org.gcube.application.cms.plugins.faults.InsufficientPrivileges;
+import org.gcube.application.cms.plugins.faults.StepException;
 import org.gcube.application.cms.plugins.implementations.RoleManager;
 import org.gcube.application.cms.plugins.reports.StepExecutionReport;
 import org.gcube.application.cms.plugins.requests.StepExecutionRequest;
@@ -17,7 +18,7 @@ public abstract class GuardedStepExecution extends GuardedExecution<StepExecutio
     }
 
     @Override
-    protected void checks() throws ConfigurationException, InsufficientPrivileges {
+    protected void checks() throws ConfigurationException, InsufficientPrivileges, StepException {
         super.checks();
         RoleManager r = new RoleManager(config);
         if(!r.canInvokeStep(theReport.getTheRequest().getStep(),theReport.getTheRequest().getCaller()))