Move check exception is Serializable into ResultHolder implementations

Author: jonathanaustin

taskmaster-service-helper/src/main/java/com/github/bordertech/taskmaster/service/impl/ResultHolderDefault.java

@@ -1,6 +1,7 @@
 package com.github.bordertech.taskmaster.service.impl;
 
 import com.github.bordertech.taskmaster.service.ResultHolder;
+import com.github.bordertech.taskmaster.service.util.ExceptionUtil;
 import java.io.Serializable;
 
 /**
@@ -63,7 +64,8 @@ public ResultHolderDefault(final M metaData, final Exception exception) {
 		}
 		this.metaData = metaData;
 		this.result = null;
-		this.exception = exception;
+		// Check exception is serializable (sometimes they arent)
+		this.exception = ExceptionUtil.getSerializableException(exception);
 	}
 
 	/**

taskmaster-service-helper/src/main/java/com/github/bordertech/taskmaster/service/impl/ResultHolderMutable.java

@@ -1,6 +1,7 @@
 package com.github.bordertech.taskmaster.service.impl;
 
 import com.github.bordertech.taskmaster.service.ResultHolder;
+import com.github.bordertech.taskmaster.service.util.ExceptionUtil;
 import java.io.Serializable;
 
 /**
@@ -68,7 +69,8 @@ public Exception getException() {
 	 * @param exception the exception when calling the service
 	 */
 	public void setException(final Exception exception) {
-		this.exception = exception;
+		// Check exception is serializable (sometimes they arent)
+		this.exception = ExceptionUtil.getSerializableException(exception);
 		this.result = null;
 	}
 

taskmaster-service-helper/src/main/java/com/github/bordertech/taskmaster/service/impl/ServiceActionRunnable.java

@@ -1,7 +1,6 @@
 package com.github.bordertech.taskmaster.service.impl;
 
 import com.github.bordertech.taskmaster.service.ServiceAction;
-import com.github.bordertech.taskmaster.service.util.ExceptionUtil;
 import java.io.Serializable;
 
 /**
@@ -33,8 +32,7 @@ public void run() {
 			T resp = getAction().service(getCriteria());
 			result.setResult(resp);
 		} catch (Exception e) {
-			// Check exception is serializable to be held in the cache (sometimes they arent)
-			result.setException(ExceptionUtil.getSerializableException(e));
+			result.setException(e);
 		}
 	}
 

taskmaster-service-helper/src/main/java/com/github/bordertech/taskmaster/service/impl/ServiceHelperProviderDefault.java

@@ -11,7 +11,6 @@
 import com.github.bordertech.taskmaster.service.ServiceHelperProvider;
 import com.github.bordertech.taskmaster.service.exception.RejectedServiceException;
 import com.github.bordertech.taskmaster.service.exception.ServiceException;
-import com.github.bordertech.taskmaster.service.util.ExceptionUtil;
 import java.io.Serializable;
 import java.util.concurrent.TimeUnit;
 import javax.cache.Cache;
@@ -143,7 +142,7 @@ public <S extends Serializable, T extends Serializable> ResultHolder<S, T> invok
 			T resp = action.service(criteria);
 			return new ResultHolderDefault<>(criteria, resp);
 		} catch (Exception e) {
-			return new ResultHolderDefault(criteria, ExceptionUtil.getSerializableException(e));
+			return new ResultHolderDefault(criteria, e);
 		}
 	}