diff --git a/common/source/java/ch/systemsx/cisd/common/compression/tiff/TiffCompressor.java b/common/source/java/ch/systemsx/cisd/common/compression/tiff/TiffCompressor.java index 7594f98f760b3833f1fe03b7fab1c955f099df1d..20bb4420edf30f49dd2daec07520e4e8e5cd4630 100644 --- a/common/source/java/ch/systemsx/cisd/common/compression/tiff/TiffCompressor.java +++ b/common/source/java/ch/systemsx/cisd/common/compression/tiff/TiffCompressor.java @@ -88,7 +88,7 @@ public class TiffCompressor extends Compressor for (FailureRecord r : failed) { errorMsgBuilder.append(String.format("%s (%s)\n", r.getFailedFile().getName(), r - .getFailureStatus().tryGetErrorMessage())); + .getFailureStatus())); } return errorMsgBuilder.toString(); } diff --git a/common/source/java/ch/systemsx/cisd/common/concurrent/ParallelizedExecutor.java b/common/source/java/ch/systemsx/cisd/common/concurrent/ParallelizedExecutor.java index 6c113c5c867f42bab2d9b75356c63a111237af02..fc51ffd0f85bb8f7e24594b086ad679d294039f6 100644 --- a/common/source/java/ch/systemsx/cisd/common/concurrent/ParallelizedExecutor.java +++ b/common/source/java/ch/systemsx/cisd/common/concurrent/ParallelizedExecutor.java @@ -191,7 +191,7 @@ public class ParallelizedExecutor for (FailureRecord<T> r : failureRecords) { errorMsgBuilder.append(String.format("%s (%s)\n", r.getFailedItem().toString(), r - .getFailureStatus().tryGetErrorMessage())); + .getFailureStatus())); } return errorMsgBuilder.toString(); } diff --git a/common/source/java/ch/systemsx/cisd/common/concurrent/ParallelizedWorker.java b/common/source/java/ch/systemsx/cisd/common/concurrent/ParallelizedWorker.java index 8da01fc9317aad14cbbefaef4f3d5c416389c74d..c7168864acb4e5ac5837d2b0e2196fe3e89646eb 100644 --- a/common/source/java/ch/systemsx/cisd/common/concurrent/ParallelizedWorker.java +++ b/common/source/java/ch/systemsx/cisd/common/concurrent/ParallelizedWorker.java @@ -160,7 +160,7 @@ class ParallelizedWorker<T> implements Runnable { if (status.isError()) { - operationLog.error(status.tryGetErrorMessage()); + operationLog.error(status); } } diff --git a/common/source/java/ch/systemsx/cisd/common/filesystem/AbstractCopyActivitySensor.java b/common/source/java/ch/systemsx/cisd/common/filesystem/AbstractCopyActivitySensor.java index 2c71022e49a72a97f81f7c91638c67a18b09baff..f0c4c21b25235f96c065372d267d9c16f1c34c41 100644 --- a/common/source/java/ch/systemsx/cisd/common/filesystem/AbstractCopyActivitySensor.java +++ b/common/source/java/ch/systemsx/cisd/common/filesystem/AbstractCopyActivitySensor.java @@ -140,7 +140,7 @@ public abstract class AbstractCopyActivitySensor implements IDescribingActivityS if (currentResult.isError()) { return "Error: Unable to determine the time of write activity on " - + getTargetDescription() + "\n" + currentResult.tryGetErrorMessage(); + + getTargetDescription() + "\n" + currentResult; } else { final String inactivityPeriod = diff --git a/common/source/java/ch/systemsx/cisd/common/filesystem/QuietPeriodFileFilter.java b/common/source/java/ch/systemsx/cisd/common/filesystem/QuietPeriodFileFilter.java index 6e517acbc58df11c87ea5926118ebce54e984488..f3914d8acb29a12cda1516525536b81a7a187867 100644 --- a/common/source/java/ch/systemsx/cisd/common/filesystem/QuietPeriodFileFilter.java +++ b/common/source/java/ch/systemsx/cisd/common/filesystem/QuietPeriodFileFilter.java @@ -176,7 +176,7 @@ public class QuietPeriodFileFilter implements IStoreItemFilter { conditionalNotificationLog.log(LogLevel.ERROR, String.format( "Cannot obtain \"last changed\" status of item '%s' in store '%s': %s", - item, fileStore, status.tryGetErrorMessage())); + item, fileStore, status)); return false; } else { @@ -225,7 +225,7 @@ public class QuietPeriodFileFilter implements IStoreItemFilter { conditionalNotificationLog.log(LogLevel.ERROR, String.format( "Cannot obtain \"last changed\" status of item '%s' in store '%s': %s", item, - fileStore, status.tryGetErrorMessage())); + fileStore, status)); } } diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/FileBasedFile.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/FileBasedFile.java index 5a4ebb47a2886c086467cd05fde858e73a95b631..755d153e9597d0d58aa1858be0036c9850d2eec7 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/FileBasedFile.java +++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/FileBasedFile.java @@ -91,7 +91,7 @@ public class FileBasedFile implements IFile throw new EnvironmentFailureException("Couldn't copy '" + sourceFile.getAbsolutePath() + "' using hard links to '" + destinationFile.getAbsolutePath() - + "': " + status.tryGetErrorMessage()); + + "': " + status); } } else { @@ -120,7 +120,7 @@ public class FileBasedFile implements IFile throw new EnvironmentFailureException("Couldn't copy '" + sourceDirectory.getAbsolutePath() + "' using hard links to '" + destinationDirectory.getAbsolutePath() - + "': " + status.tryGetErrorMessage()); + + "': " + status); } } else { diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ProcessDatasetsCommand.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ProcessDatasetsCommand.java index 89c1fb83aa432b4512d9bf57635dd8f085e24f07..0ef4f6db4e07887a09b63b05b54d7c0347803a47 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ProcessDatasetsCommand.java +++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ProcessDatasetsCommand.java @@ -276,7 +276,7 @@ public class ProcessDatasetsCommand extends AbstractDataSetDescriptionBasedComma sb.append("- processing of "); sb.append(unsuccessfullyProcessed.size()); sb.append(" data set(s) failed because: "); - sb.append(" " + errorStatus.tryGetErrorMessage() + ". Datasets: "); + sb.append(" " + errorStatus + ". Datasets: "); sb.append(getDataSetCodes(unsuccessfullyProcessed)); sb.append("\n"); } diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/Copier.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/Copier.java index a5e671f34c7e7a406f05e43adbe764d55e28712e..dca6c8f3c81b15833313d81f4cea3991d391e3c8 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/Copier.java +++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/Copier.java @@ -123,7 +123,7 @@ public class Copier implements Serializable, IPostRegistrationDatasetHandler + " to destination folder '" + destination + "'" + (host != null ? " on host '" + host + "'" : "") + (rsyncModule != null ? " for rsync module '" + rsyncModule + "'" : "") + ": " - + status.tryGetErrorMessage()); + + status); return Status.createError(DataSetCopier.COPYING_FAILED_MSG); } if (renameToDataSetCode) diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetFileOperationsManager.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetFileOperationsManager.java index 99c6b9c22733beff9eb98ce278c03401aef621b0..e7e1af50b51980003596a6b8e3dea707523f4932 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetFileOperationsManager.java +++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetFileOperationsManager.java @@ -229,7 +229,7 @@ public class DataSetFileOperationsManager implements IDataSetFileOperationsManag return resultStatus; } catch (ExceptionWithStatus ex) { - return BooleanStatus.createError(ex.getStatus().tryGetErrorMessage()); + return BooleanStatus.createError(ex.getStatus().toString()); } } @@ -251,7 +251,7 @@ public class DataSetFileOperationsManager implements IDataSetFileOperationsManag return resultStatus; } catch (ExceptionWithStatus ex) { - return BooleanStatus.createError(ex.getStatus().tryGetErrorMessage()); + return BooleanStatus.createError(ex.getStatus().toString()); } } diff --git a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeeder.java b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeeder.java index d407372250f5729f6cf6c79d56b2ba7928e33c22..52d2c58408fb7d626bc70888d6e4913403d82d64 100644 --- a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeeder.java +++ b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeeder.java @@ -425,7 +425,7 @@ class FlowLaneFeeder extends AbstractPostRegistrationDataSetHandlerForFileBasedU { throw new EnvironmentFailureException("Couldn't create a hard-link copy of '" + file.getAbsolutePath() + "' in folder '" + folder.getAbsolutePath() + "'. [" - + status.tryGetErrorMessage() + "]"); + + status + "]"); } } diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationAdvisor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationAdvisor.java index 56a54491163461856aed6b2ad37168f536724935..eb66eb30f0da3937168ed7d8d66e0d678211ee4f 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationAdvisor.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationAdvisor.java @@ -155,7 +155,7 @@ public final class AuthorizationAdvisor extends DefaultPointcutAdvisor if (StatusFlag.OK.equals(status.getFlag()) == false) { final String groupCode = session.tryGetHomeGroupCode(); - final String errorMessage = status.tryGetErrorMessage(); + final String errorMessage = status.toString(); authorizationLog.info(String.format( "[USER:'%s' SPACE:%s]: Authorization failure while " + "invoking method '%s': %s", session.getUserName(), diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/AbstractImageStorageProcessor.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/AbstractImageStorageProcessor.java index b829a8713af74a64a430e9a4a20ce473876d0f6e..c639f8cbf66bf053612a450bced0cddf1d3bf5be 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/AbstractImageStorageProcessor.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/AbstractImageStorageProcessor.java @@ -546,7 +546,7 @@ abstract class AbstractImageStorageProcessor extends AbstractStorageProcessor im if (status.isError()) { throw EnvironmentFailureException.fromTemplate("Cannot unzip '%s': %s", - incomingDataSetDirectory.getName(), status.tryGetErrorMessage()); + incomingDataSetDirectory.getName(), status); } return output; }