From 87e0ba1ba01fcb57f51672b6d51a9b64e2e77ba0 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 14 Apr 2016 12:50:56 +0000 Subject: [PATCH] Removed unused keys git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@128083 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../MoveToJobWallDurationAction.java | 5 ----- .../MoveToTaskWallDurationAction.java | 5 ----- .../datamodel/basetypes/AbstractJobUsageRecord.java | 5 ----- .../datamodel/basetypes/AbstractTaskUsageRecord.java | 9 +-------- 4 files changed, 1 insertion(+), 23 deletions(-) diff --git a/src/main/java/org/gcube/accounting/datamodel/backwardcompatibility/MoveToJobWallDurationAction.java b/src/main/java/org/gcube/accounting/datamodel/backwardcompatibility/MoveToJobWallDurationAction.java index 8bbc4f2..8ee3cac 100644 --- a/src/main/java/org/gcube/accounting/datamodel/backwardcompatibility/MoveToJobWallDurationAction.java +++ b/src/main/java/org/gcube/accounting/datamodel/backwardcompatibility/MoveToJobWallDurationAction.java @@ -5,19 +5,14 @@ package org.gcube.accounting.datamodel.backwardcompatibility; import java.io.Serializable; -import org.gcube.accounting.datamodel.usagerecords.JobUsageRecord; import org.gcube.documentstore.exception.InvalidValueException; import org.gcube.documentstore.records.Record; import org.gcube.documentstore.records.implementation.FieldAction; -import org.gcube.documentstore.records.implementation.validations.validators.NotEmptyIfNotNullValidator; public class MoveToJobWallDurationAction implements FieldAction { @Override public Serializable validate(String key, Serializable value, Record record) throws InvalidValueException { - NotEmptyIfNotNullValidator neinnv = new NotEmptyIfNotNullValidator(); - value = neinnv.validate(key, value, record); - record.setResourceProperty(JobUsageRecord.WALL_DURATION, (String) value); return null; //Returning null the initial key is removed from Record } diff --git a/src/main/java/org/gcube/accounting/datamodel/backwardcompatibility/MoveToTaskWallDurationAction.java b/src/main/java/org/gcube/accounting/datamodel/backwardcompatibility/MoveToTaskWallDurationAction.java index 56a3c29..f082650 100644 --- a/src/main/java/org/gcube/accounting/datamodel/backwardcompatibility/MoveToTaskWallDurationAction.java +++ b/src/main/java/org/gcube/accounting/datamodel/backwardcompatibility/MoveToTaskWallDurationAction.java @@ -5,19 +5,14 @@ package org.gcube.accounting.datamodel.backwardcompatibility; import java.io.Serializable; -import org.gcube.accounting.datamodel.usagerecords.TaskUsageRecord; import org.gcube.documentstore.exception.InvalidValueException; import org.gcube.documentstore.records.Record; import org.gcube.documentstore.records.implementation.FieldAction; -import org.gcube.documentstore.records.implementation.validations.validators.NotEmptyIfNotNullValidator; public class MoveToTaskWallDurationAction implements FieldAction { @Override public Serializable validate(String key, Serializable value, Record record) throws InvalidValueException { - NotEmptyIfNotNullValidator neinnv = new NotEmptyIfNotNullValidator(); - value = neinnv.validate(key, value, record); - record.setResourceProperty(TaskUsageRecord.WALL_DURATION, (String) value); return null; //Returning null the initial key is removed from Record } diff --git a/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractJobUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractJobUsageRecord.java index f3917a7..79a6131 100644 --- a/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractJobUsageRecord.java +++ b/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractJobUsageRecord.java @@ -8,8 +8,6 @@ import java.util.Calendar; import java.util.Map; import org.gcube.accounting.datamodel.BasicUsageRecord; -import org.gcube.accounting.datamodel.backwardcompatibility.MoveToJobWallDuration; -import org.gcube.accounting.datamodel.deprecationmanagement.DeprecatedWarning; import org.gcube.documentstore.exception.InvalidValueException; import org.gcube.documentstore.records.implementation.ComputedField; import org.gcube.documentstore.records.implementation.RequiredField; @@ -41,9 +39,6 @@ public abstract class AbstractJobUsageRecord extends BasicUsageRecord { @ValidLong public static final String JOB_END_TIME = "jobEndTime"; - @DeprecatedWarning @MoveToJobWallDuration - protected static final String _WALL_DURATION = "_wallDuration"; - @RequiredField @ComputedField(action=CalculateJobWallDurationAction.class) @ValidLong public static final String WALL_DURATION = "wallDuration"; diff --git a/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractTaskUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractTaskUsageRecord.java index a11ac82..66edd95 100644 --- a/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractTaskUsageRecord.java +++ b/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractTaskUsageRecord.java @@ -9,8 +9,6 @@ import java.util.HashMap; import java.util.Map; import org.gcube.accounting.datamodel.BasicUsageRecord; -import org.gcube.accounting.datamodel.backwardcompatibility.MoveToTaskWallDuration; -import org.gcube.accounting.datamodel.deprecationmanagement.DeprecatedWarning; import org.gcube.documentstore.exception.InvalidValueException; import org.gcube.documentstore.records.implementation.ComputedField; import org.gcube.documentstore.records.implementation.RequiredField; @@ -43,15 +41,10 @@ public abstract class AbstractTaskUsageRecord extends BasicUsageRecord { public static final String TASK_START_TIME = "taskStartTime"; @ValidLong public static final String TASK_END_TIME = "taskEndTime"; - - @DeprecatedWarning @MoveToTaskWallDuration - protected static final String _WALL_DURATION = "_wallDuration"; - + @RequiredField @ComputedField(action=CalculateTaskWallDurationAction.class) @ValidLong public static final String WALL_DURATION = "wallDuration"; - - @NotEmptyIfNotNull public static final String INPUT_PARAMETERS = "inputParameters";