diff --git a/src/main/java/org/gcube/accounting/aggregation/strategy/ServiceUsageRecordAggregationStrategy.java b/src/main/java/org/gcube/accounting/aggregation/strategy/ServiceUsageRecordAggregationStrategy.java index d6da29c..1ba5a85 100644 --- a/src/main/java/org/gcube/accounting/aggregation/strategy/ServiceUsageRecordAggregationStrategy.java +++ b/src/main/java/org/gcube/accounting/aggregation/strategy/ServiceUsageRecordAggregationStrategy.java @@ -51,7 +51,7 @@ public class ServiceUsageRecordAggregationStrategy extends AggregationStrategy, messageDigest.update(concatenation.getBytes()); return new String(messageDigest.digest()); }catch(NoSuchAlgorithmException e){ - throw new UnsupportedOperationException(e.getCause()); + throw new UnsupportedOperationException(e); } } @@ -121,7 +121,7 @@ public abstract class AggregationStrategy, convertedRecord = t.getAggregatedUsageRecord(record); return aggregate(convertedRecord); } catch (InvalidValueException e) { - throw new NotAggregatableRecordsExceptions(e.getCause()); + throw new NotAggregatableRecordsExceptions(e); } } diff --git a/src/main/java/org/gcube/accounting/datamodel/basetypes/JobUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/basetypes/JobUsageRecord.java index d87a795..0f8feec 100644 --- a/src/main/java/org/gcube/accounting/datamodel/basetypes/JobUsageRecord.java +++ b/src/main/java/org/gcube/accounting/datamodel/basetypes/JobUsageRecord.java @@ -168,7 +168,7 @@ public abstract class JobUsageRecord extends BasicUsageRecord { return wallDuration; }catch(Exception e){ throw new InvalidValueException(String.format("To calculate Wall Duration both %s and %s must be set", - START_TIME, END_TIME), e.getCause()); + START_TIME, END_TIME), e); } } diff --git a/src/main/java/org/gcube/accounting/datamodel/basetypes/TestUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/basetypes/TestUsageRecord.java index 18c5fc4..c9ff477 100644 --- a/src/main/java/org/gcube/accounting/datamodel/basetypes/TestUsageRecord.java +++ b/src/main/java/org/gcube/accounting/datamodel/basetypes/TestUsageRecord.java @@ -57,7 +57,7 @@ public class TestUsageRecord { try { usageRecord.setScope(TEST_SCOPE); } catch (InvalidValueException e) { - logger.error(" ------ You SHOULD NOT SEE THIS MESSAGE. Error Setting the Scope", e.getCause()); + logger.error(" ------ You SHOULD NOT SEE THIS MESSAGE. Error Setting the Scope", e); throw e; } return usageRecord; @@ -86,8 +86,8 @@ public class TestUsageRecord { } catch (InvalidValueException e) { - logger.error(" ------ You SHOULD NOT SEE THIS MESSAGE. Error Creating a test Usage Record", e.getCause()); - throw new RuntimeException(e.getCause()); + logger.error(" ------ You SHOULD NOT SEE THIS MESSAGE. Error Creating a test Usage Record", e); + throw new RuntimeException(e); } return usageRecord; @@ -109,8 +109,8 @@ public class TestUsageRecord { try { usageRecord.setScope(TEST_SCOPE); } catch (InvalidValueException e) { - logger.error(" ------ You SHOULD NOT SEE THIS MESSAGE. Error Setting the Scope", e.getCause()); - throw new RuntimeException(e.getCause()); + logger.error(" ------ You SHOULD NOT SEE THIS MESSAGE. Error Setting the Scope", e); + throw new RuntimeException(e); } return usageRecord; @@ -141,8 +141,8 @@ public class TestUsageRecord { } catch (InvalidValueException | URISyntaxException e) { - logger.error(" ------ You SHOULD NOT SEE THIS MESSAGE. Error Creating a test Usage Record", e.getCause()); - throw new RuntimeException(e.getCause()); + logger.error(" ------ You SHOULD NOT SEE THIS MESSAGE. Error Creating a test Usage Record", e); + throw new RuntimeException(e); } return usageRecord; @@ -157,8 +157,8 @@ public class TestUsageRecord { try { usageRecord.setScope(TEST_SCOPE); } catch (InvalidValueException e) { - logger.error(" ------ You SHOULD NOT SEE THIS MESSAGE. Error Setting the Scope", e.getCause()); - throw new RuntimeException(e.getCause()); + logger.error(" ------ You SHOULD NOT SEE THIS MESSAGE. Error Setting the Scope", e); + throw new RuntimeException(e); } return usageRecord; } @@ -175,7 +175,7 @@ public class TestUsageRecord { } catch (InvalidValueException e) { - logger.error(" ------ You SHOULD NOT SEE THIS MESSAGE. Error Creating a test Usage Record", e.getCause()); + logger.error(" ------ You SHOULD NOT SEE THIS MESSAGE. Error Creating a test Usage Record", e); } return usageRecord; } diff --git a/src/main/java/org/gcube/accounting/datamodel/validations/validators/NotEmptyValidator.java b/src/main/java/org/gcube/accounting/datamodel/validations/validators/NotEmptyValidator.java index 12d63e0..8412370 100644 --- a/src/main/java/org/gcube/accounting/datamodel/validations/validators/NotEmptyValidator.java +++ b/src/main/java/org/gcube/accounting/datamodel/validations/validators/NotEmptyValidator.java @@ -34,7 +34,7 @@ public class NotEmptyValidator implements FieldAction{ return value; } }catch(Exception e){ - throw new InvalidValueException(ERROR, e.getCause()); + throw new InvalidValueException(ERROR, e); } throw new InvalidValueException(ERROR); } diff --git a/src/main/java/org/gcube/accounting/datamodel/validations/validators/ValidDataTypeValidator.java b/src/main/java/org/gcube/accounting/datamodel/validations/validators/ValidDataTypeValidator.java index 49ee526..d89f1d5 100644 --- a/src/main/java/org/gcube/accounting/datamodel/validations/validators/ValidDataTypeValidator.java +++ b/src/main/java/org/gcube/accounting/datamodel/validations/validators/ValidDataTypeValidator.java @@ -51,7 +51,7 @@ public class ValidDataTypeValidator implements FieldAction { } }catch(Exception e){ - throw new InvalidValueException(ERROR, e.getCause()); + throw new InvalidValueException(ERROR, e); } throw new InvalidValueException(ERROR); diff --git a/src/main/java/org/gcube/accounting/datamodel/validations/validators/ValidIPValidator.java b/src/main/java/org/gcube/accounting/datamodel/validations/validators/ValidIPValidator.java index 45f02f1..107ee6d 100644 --- a/src/main/java/org/gcube/accounting/datamodel/validations/validators/ValidIPValidator.java +++ b/src/main/java/org/gcube/accounting/datamodel/validations/validators/ValidIPValidator.java @@ -29,7 +29,7 @@ public class ValidIPValidator implements FieldAction{ IPV6_PATTERN = Pattern.compile(ipv6Regex, Pattern.CASE_INSENSITIVE); } catch(Exception e) { - logger.error("Unable to compile pattern", e.getCause()); + logger.error("Unable to compile pattern", e); } } @@ -53,7 +53,7 @@ public class ValidIPValidator implements FieldAction{ return (String) value; } }catch (Exception e) { - throw new InvalidValueException(ERROR, e.getCause()); + throw new InvalidValueException(ERROR, e); } throw new InvalidValueException(ERROR); } diff --git a/src/main/java/org/gcube/accounting/datamodel/validations/validators/ValidLongValidator.java b/src/main/java/org/gcube/accounting/datamodel/validations/validators/ValidLongValidator.java index 4e34eae..2201ab5 100644 --- a/src/main/java/org/gcube/accounting/datamodel/validations/validators/ValidLongValidator.java +++ b/src/main/java/org/gcube/accounting/datamodel/validations/validators/ValidLongValidator.java @@ -25,7 +25,7 @@ public class ValidLongValidator implements FieldAction { return longObj; } }catch (Exception e) { - throw new InvalidValueException(ERROR, e.getCause()); + throw new InvalidValueException(ERROR, e); } throw new InvalidValueException(ERROR); } diff --git a/src/main/java/org/gcube/accounting/datamodel/validations/validators/ValidOperationResultValidator.java b/src/main/java/org/gcube/accounting/datamodel/validations/validators/ValidOperationResultValidator.java index eccdf2d..abbea80 100644 --- a/src/main/java/org/gcube/accounting/datamodel/validations/validators/ValidOperationResultValidator.java +++ b/src/main/java/org/gcube/accounting/datamodel/validations/validators/ValidOperationResultValidator.java @@ -51,7 +51,7 @@ public class ValidOperationResultValidator implements FieldAction { } }catch(Exception e){ - throw new InvalidValueException(ERROR, e.getCause()); + throw new InvalidValueException(ERROR, e); } throw new InvalidValueException(ERROR); diff --git a/src/main/java/org/gcube/accounting/datamodel/validations/validators/ValidOperationTypeValidator.java b/src/main/java/org/gcube/accounting/datamodel/validations/validators/ValidOperationTypeValidator.java index a44389d..03748fc 100644 --- a/src/main/java/org/gcube/accounting/datamodel/validations/validators/ValidOperationTypeValidator.java +++ b/src/main/java/org/gcube/accounting/datamodel/validations/validators/ValidOperationTypeValidator.java @@ -52,7 +52,7 @@ public class ValidOperationTypeValidator implements FieldAction { } }catch(Exception e){ - throw new InvalidValueException(ERROR, e.getCause()); + throw new InvalidValueException(ERROR, e); } throw new InvalidValueException(ERROR); diff --git a/src/main/java/org/gcube/accounting/datamodel/validations/validators/ValidURIValidator.java b/src/main/java/org/gcube/accounting/datamodel/validations/validators/ValidURIValidator.java index b23c7a6..bb90729 100644 --- a/src/main/java/org/gcube/accounting/datamodel/validations/validators/ValidURIValidator.java +++ b/src/main/java/org/gcube/accounting/datamodel/validations/validators/ValidURIValidator.java @@ -24,7 +24,7 @@ public class ValidURIValidator implements FieldAction { return new URI((String) value); } }catch (Exception e) { - throw new InvalidValueException(ERROR, e.getCause()); + throw new InvalidValueException(ERROR, e); } throw new InvalidValueException(ERROR); } diff --git a/src/main/java/org/gcube/accounting/messaging/ResourceAccounting.java b/src/main/java/org/gcube/accounting/messaging/ResourceAccounting.java index 9137eb8..d8069d4 100644 --- a/src/main/java/org/gcube/accounting/messaging/ResourceAccounting.java +++ b/src/main/java/org/gcube/accounting/messaging/ResourceAccounting.java @@ -31,7 +31,7 @@ public class ResourceAccounting { try { persistence.account(message); } catch (InvalidValueException e) { - logger.error("The Record you are going to account is not valid", e.getCause()); + logger.error("The Record you are going to account is not valid", e); } } diff --git a/src/main/java/org/gcube/accounting/persistence/AccountingPersistence.java b/src/main/java/org/gcube/accounting/persistence/AccountingPersistence.java index 2949e20..69b91ae 100644 --- a/src/main/java/org/gcube/accounting/persistence/AccountingPersistence.java +++ b/src/main/java/org/gcube/accounting/persistence/AccountingPersistence.java @@ -111,9 +111,9 @@ public abstract class AccountingPersistence { } } catch (InvalidValueException e) { - logger.error("Error validating UsageRecord", e.getCause()); + logger.error("Error validating UsageRecord", e); } catch (Exception e) { - logger.error("Error accounting UsageRecord", e.getCause()); + logger.error("Error accounting UsageRecord", e); } } diff --git a/src/main/java/org/gcube/accounting/persistence/AccountingPersistenceFactory.java b/src/main/java/org/gcube/accounting/persistence/AccountingPersistenceFactory.java index 9e02098..8aee69c 100644 --- a/src/main/java/org/gcube/accounting/persistence/AccountingPersistenceFactory.java +++ b/src/main/java/org/gcube/accounting/persistence/AccountingPersistenceFactory.java @@ -107,7 +107,7 @@ public abstract class AccountingPersistenceFactory { } } catch(Exception e){ logger.error("Unable to instance a Persistence Implementation. Using fallback as default", - e.getCause()); + e); persistence = fallbackPersistence; } persistence.setAggregationScheduler(AggregationScheduler.getInstance());