gCubeSystem
/
accounting-lib
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed unused keys 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@128083 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Luca Frosini 2016-04-14 12:50:56 +00:00
parent 56738c036a
commit 87e0ba1ba0
4 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/gcube/accounting/datamodel/backwardcompatibility/MoveToJobWallDurationAction.java
View File

@ -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
}

5
src/main/java/org/gcube/accounting/datamodel/backwardcompatibility/MoveToTaskWallDurationAction.java
View File

@ -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
}

5
src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractJobUsageRecord.java
View File

@ -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";

9
src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractTaskUsageRecord.java
View File

@ -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";