From 6d4780e151e62f4eb00477080a4a3b8c4fa9373a Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Mon, 8 Jun 2015 15:23:39 +0000 Subject: [PATCH] refs #200: Create accouting-lib library https://support.d4science.org/issues/200 Fixing validators git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@115253 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../java/org/gcube/accounting/datamodel/RawUsageRecord.java | 6 +++--- .../datamodel/implementations/JobUsageRecord.java | 2 +- .../datamodel/implementations/PortletUsageRecord.java | 6 +++--- .../datamodel/implementations/ServiceUsageRecord.java | 6 +++--- .../datamodel/implementations/TaskUsageRecord.java | 6 +++--- .../datamodel/validations/{annotations => }/Aggregated.java | 2 +- .../validations/{annotations => }/DeprecatedField.java | 2 +- .../validations/{annotations => }/DeprecationAction.java | 2 +- .../validations/{validators => }/FieldValidator.java | 2 +- .../validations/{annotations => }/ValidityChecker.java | 4 +--- .../datamodel/validations/annotations/NotEmpty.java | 1 + .../validations/annotations/NotEmptyIfNotNull.java | 1 + .../datamodel/validations/annotations/NotNull.java | 1 + .../datamodel/validations/annotations/ValidIP.java | 1 + .../datamodel/validations/annotations/ValidInteger.java | 1 + .../datamodel/validations/annotations/ValidLong.java | 1 + .../validations/annotations/ValidOperationResult.java | 1 + .../validations/validators/ConvertToOperationResult.java | 2 +- .../datamodel/validations/validators/NotEmptyValidator.java | 1 + .../datamodel/validations/validators/NotNullValidator.java | 1 + .../datamodel/validations/validators/ValidIPValidator.java | 1 + .../validations/validators/ValidIntegerValidator.java | 1 + .../validations/validators/ValidLongValidator.java | 1 + .../validators/ValidOperationResultValidator.java | 1 + .../validators/{Ignore.java => WarningAlert.java} | 6 +++--- 25 files changed, 35 insertions(+), 24 deletions(-) rename src/main/java/org/gcube/accounting/datamodel/validations/{annotations => }/Aggregated.java (80%) rename src/main/java/org/gcube/accounting/datamodel/validations/{annotations => }/DeprecatedField.java (85%) rename src/main/java/org/gcube/accounting/datamodel/validations/{annotations => }/DeprecationAction.java (82%) rename src/main/java/org/gcube/accounting/datamodel/validations/{validators => }/FieldValidator.java (89%) rename src/main/java/org/gcube/accounting/datamodel/validations/{annotations => }/ValidityChecker.java (76%) rename src/main/java/org/gcube/accounting/datamodel/validations/validators/{Ignore.java => WarningAlert.java} (74%) diff --git a/src/main/java/org/gcube/accounting/datamodel/RawUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/RawUsageRecord.java index ce2237a..d340cbf 100644 --- a/src/main/java/org/gcube/accounting/datamodel/RawUsageRecord.java +++ b/src/main/java/org/gcube/accounting/datamodel/RawUsageRecord.java @@ -17,14 +17,14 @@ import java.util.Map.Entry; import java.util.Set; import java.util.UUID; +import org.gcube.accounting.datamodel.validations.Aggregated; +import org.gcube.accounting.datamodel.validations.FieldValidator; import org.gcube.accounting.datamodel.validations.Required; -import org.gcube.accounting.datamodel.validations.annotations.Aggregated; +import org.gcube.accounting.datamodel.validations.ValidityChecker; import org.gcube.accounting.datamodel.validations.annotations.NotEmpty; import org.gcube.accounting.datamodel.validations.annotations.NotEmptyIfNotNull; import org.gcube.accounting.datamodel.validations.annotations.ValidLong; import org.gcube.accounting.datamodel.validations.annotations.ValidOperationResult; -import org.gcube.accounting.datamodel.validations.annotations.ValidityChecker; -import org.gcube.accounting.datamodel.validations.validators.FieldValidator; import org.gcube.accounting.exception.InvalidValueException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/gcube/accounting/datamodel/implementations/JobUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/implementations/JobUsageRecord.java index 03e0696..01310e9 100644 --- a/src/main/java/org/gcube/accounting/datamodel/implementations/JobUsageRecord.java +++ b/src/main/java/org/gcube/accounting/datamodel/implementations/JobUsageRecord.java @@ -7,8 +7,8 @@ import java.util.Calendar; import org.gcube.accounting.datamodel.RawUsageRecord; import org.gcube.accounting.datamodel.SingleUsageRecord; +import org.gcube.accounting.datamodel.validations.DeprecatedField; import org.gcube.accounting.datamodel.validations.Required; -import org.gcube.accounting.datamodel.validations.annotations.DeprecatedField; import org.gcube.accounting.datamodel.validations.annotations.NotEmpty; import org.gcube.accounting.datamodel.validations.annotations.ValidInteger; import org.gcube.accounting.datamodel.validations.annotations.ValidLong; diff --git a/src/main/java/org/gcube/accounting/datamodel/implementations/PortletUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/implementations/PortletUsageRecord.java index a5f1e88..b4500d9 100644 --- a/src/main/java/org/gcube/accounting/datamodel/implementations/PortletUsageRecord.java +++ b/src/main/java/org/gcube/accounting/datamodel/implementations/PortletUsageRecord.java @@ -5,11 +5,11 @@ package org.gcube.accounting.datamodel.implementations; import org.gcube.accounting.datamodel.RawUsageRecord; import org.gcube.accounting.datamodel.SingleUsageRecord; +import org.gcube.accounting.datamodel.validations.DeprecatedField; import org.gcube.accounting.datamodel.validations.Required; -import org.gcube.accounting.datamodel.validations.annotations.DeprecatedField; import org.gcube.accounting.datamodel.validations.annotations.NotEmpty; import org.gcube.accounting.datamodel.validations.annotations.NotEmptyIfNotNull; -import org.gcube.accounting.datamodel.validations.validators.Ignore; +import org.gcube.accounting.datamodel.validations.validators.WarningAlert; import org.gcube.accounting.exception.InvalidValueException; /** @@ -23,7 +23,7 @@ public class PortletUsageRecord extends RawUsageRecord implements SingleUsageRec */ private static final long serialVersionUID = 8339324883678974869L; - @DeprecatedField(action=Ignore.class) @NotEmptyIfNotNull + @DeprecatedField(action=WarningAlert.class) @NotEmptyIfNotNull protected static final String USER_ID = "userId"; @Required @NotEmpty diff --git a/src/main/java/org/gcube/accounting/datamodel/implementations/ServiceUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/implementations/ServiceUsageRecord.java index 5aaa991..59b8f9c 100644 --- a/src/main/java/org/gcube/accounting/datamodel/implementations/ServiceUsageRecord.java +++ b/src/main/java/org/gcube/accounting/datamodel/implementations/ServiceUsageRecord.java @@ -5,12 +5,12 @@ package org.gcube.accounting.datamodel.implementations; import org.gcube.accounting.datamodel.RawUsageRecord; import org.gcube.accounting.datamodel.SingleUsageRecord; +import org.gcube.accounting.datamodel.validations.DeprecatedField; import org.gcube.accounting.datamodel.validations.Required; -import org.gcube.accounting.datamodel.validations.annotations.DeprecatedField; import org.gcube.accounting.datamodel.validations.annotations.NotEmpty; import org.gcube.accounting.datamodel.validations.annotations.ValidIP; import org.gcube.accounting.datamodel.validations.annotations.ValidInteger; -import org.gcube.accounting.datamodel.validations.validators.Ignore; +import org.gcube.accounting.datamodel.validations.validators.WarningAlert; import org.gcube.accounting.exception.InvalidValueException; /** @@ -32,7 +32,7 @@ public class ServiceUsageRecord extends RawUsageRecord implements SingleUsageRec public static final String REF_HOST = "refHost"; @Required @NotEmpty public static final String REF_VM = "refVM"; - @DeprecatedField(action=Ignore.class) @NotEmpty + @DeprecatedField(action=WarningAlert.class) @NotEmpty public static final String DOMAIN = "domain"; @ValidInteger protected static final String INVOCATION_COUNT = "invocationCount"; diff --git a/src/main/java/org/gcube/accounting/datamodel/implementations/TaskUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/implementations/TaskUsageRecord.java index 85a9f5d..29440ba 100644 --- a/src/main/java/org/gcube/accounting/datamodel/implementations/TaskUsageRecord.java +++ b/src/main/java/org/gcube/accounting/datamodel/implementations/TaskUsageRecord.java @@ -7,13 +7,13 @@ import java.util.Calendar; import org.gcube.accounting.datamodel.RawUsageRecord; import org.gcube.accounting.datamodel.SingleUsageRecord; +import org.gcube.accounting.datamodel.validations.DeprecatedField; import org.gcube.accounting.datamodel.validations.Required; -import org.gcube.accounting.datamodel.validations.annotations.DeprecatedField; import org.gcube.accounting.datamodel.validations.annotations.NotEmpty; import org.gcube.accounting.datamodel.validations.annotations.ValidInteger; import org.gcube.accounting.datamodel.validations.annotations.ValidLong; import org.gcube.accounting.datamodel.validations.validators.ConvertToOperationResult; -import org.gcube.accounting.datamodel.validations.validators.Ignore; +import org.gcube.accounting.datamodel.validations.validators.WarningAlert; import org.gcube.accounting.exception.InvalidValueException; /** @@ -37,7 +37,7 @@ public class TaskUsageRecord extends RawUsageRecord implements SingleUsageRecord public static final String REF_HOST = "refHost"; @Required @NotEmpty public static final String REF_VM = "refVM"; - @DeprecatedField(action=Ignore.class) + @DeprecatedField(action=WarningAlert.class) protected static final String DOMAIN = "domain"; @Required @ValidLong public static final String USAGE_START_TIME = "usageStartTime"; diff --git a/src/main/java/org/gcube/accounting/datamodel/validations/annotations/Aggregated.java b/src/main/java/org/gcube/accounting/datamodel/validations/Aggregated.java similarity index 80% rename from src/main/java/org/gcube/accounting/datamodel/validations/annotations/Aggregated.java rename to src/main/java/org/gcube/accounting/datamodel/validations/Aggregated.java index 6894615..02f67d2 100644 --- a/src/main/java/org/gcube/accounting/datamodel/validations/annotations/Aggregated.java +++ b/src/main/java/org/gcube/accounting/datamodel/validations/Aggregated.java @@ -1,4 +1,4 @@ -package org.gcube.accounting.datamodel.validations.annotations; +package org.gcube.accounting.datamodel.validations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/org/gcube/accounting/datamodel/validations/annotations/DeprecatedField.java b/src/main/java/org/gcube/accounting/datamodel/validations/DeprecatedField.java similarity index 85% rename from src/main/java/org/gcube/accounting/datamodel/validations/annotations/DeprecatedField.java rename to src/main/java/org/gcube/accounting/datamodel/validations/DeprecatedField.java index f78f708..5b44351 100644 --- a/src/main/java/org/gcube/accounting/datamodel/validations/annotations/DeprecatedField.java +++ b/src/main/java/org/gcube/accounting/datamodel/validations/DeprecatedField.java @@ -1,4 +1,4 @@ -package org.gcube.accounting.datamodel.validations.annotations; +package org.gcube.accounting.datamodel.validations; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; diff --git a/src/main/java/org/gcube/accounting/datamodel/validations/annotations/DeprecationAction.java b/src/main/java/org/gcube/accounting/datamodel/validations/DeprecationAction.java similarity index 82% rename from src/main/java/org/gcube/accounting/datamodel/validations/annotations/DeprecationAction.java rename to src/main/java/org/gcube/accounting/datamodel/validations/DeprecationAction.java index 969fec3..0c96a5b 100644 --- a/src/main/java/org/gcube/accounting/datamodel/validations/annotations/DeprecationAction.java +++ b/src/main/java/org/gcube/accounting/datamodel/validations/DeprecationAction.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.accounting.datamodel.validations.annotations; +package org.gcube.accounting.datamodel.validations; import java.io.Serializable; diff --git a/src/main/java/org/gcube/accounting/datamodel/validations/validators/FieldValidator.java b/src/main/java/org/gcube/accounting/datamodel/validations/FieldValidator.java similarity index 89% rename from src/main/java/org/gcube/accounting/datamodel/validations/validators/FieldValidator.java rename to src/main/java/org/gcube/accounting/datamodel/validations/FieldValidator.java index 105924b..cf6ced7 100644 --- a/src/main/java/org/gcube/accounting/datamodel/validations/validators/FieldValidator.java +++ b/src/main/java/org/gcube/accounting/datamodel/validations/FieldValidator.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.accounting.datamodel.validations.validators; +package org.gcube.accounting.datamodel.validations; import java.io.Serializable; diff --git a/src/main/java/org/gcube/accounting/datamodel/validations/annotations/ValidityChecker.java b/src/main/java/org/gcube/accounting/datamodel/validations/ValidityChecker.java similarity index 76% rename from src/main/java/org/gcube/accounting/datamodel/validations/annotations/ValidityChecker.java rename to src/main/java/org/gcube/accounting/datamodel/validations/ValidityChecker.java index dface4a..bc1d1fa 100644 --- a/src/main/java/org/gcube/accounting/datamodel/validations/annotations/ValidityChecker.java +++ b/src/main/java/org/gcube/accounting/datamodel/validations/ValidityChecker.java @@ -1,7 +1,7 @@ /** * */ -package org.gcube.accounting.datamodel.validations.annotations; +package org.gcube.accounting.datamodel.validations; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; @@ -9,8 +9,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.gcube.accounting.datamodel.validations.validators.FieldValidator; - /** * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ * diff --git a/src/main/java/org/gcube/accounting/datamodel/validations/annotations/NotEmpty.java b/src/main/java/org/gcube/accounting/datamodel/validations/annotations/NotEmpty.java index afea4df..29b6622 100644 --- a/src/main/java/org/gcube/accounting/datamodel/validations/annotations/NotEmpty.java +++ b/src/main/java/org/gcube/accounting/datamodel/validations/annotations/NotEmpty.java @@ -5,6 +5,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.gcube.accounting.datamodel.validations.ValidityChecker; import org.gcube.accounting.datamodel.validations.validators.NotEmptyValidator; @Target(ElementType.FIELD) diff --git a/src/main/java/org/gcube/accounting/datamodel/validations/annotations/NotEmptyIfNotNull.java b/src/main/java/org/gcube/accounting/datamodel/validations/annotations/NotEmptyIfNotNull.java index 6cee764..a5a2ef9 100644 --- a/src/main/java/org/gcube/accounting/datamodel/validations/annotations/NotEmptyIfNotNull.java +++ b/src/main/java/org/gcube/accounting/datamodel/validations/annotations/NotEmptyIfNotNull.java @@ -5,6 +5,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.gcube.accounting.datamodel.validations.ValidityChecker; import org.gcube.accounting.datamodel.validations.validators.NotEmptyIfNotNullValidator; @Target(ElementType.FIELD) diff --git a/src/main/java/org/gcube/accounting/datamodel/validations/annotations/NotNull.java b/src/main/java/org/gcube/accounting/datamodel/validations/annotations/NotNull.java index f370d72..188b83f 100644 --- a/src/main/java/org/gcube/accounting/datamodel/validations/annotations/NotNull.java +++ b/src/main/java/org/gcube/accounting/datamodel/validations/annotations/NotNull.java @@ -5,6 +5,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.gcube.accounting.datamodel.validations.ValidityChecker; import org.gcube.accounting.datamodel.validations.validators.NotNullValidator; @Target(ElementType.FIELD) diff --git a/src/main/java/org/gcube/accounting/datamodel/validations/annotations/ValidIP.java b/src/main/java/org/gcube/accounting/datamodel/validations/annotations/ValidIP.java index b69b81c..9d74f1a 100644 --- a/src/main/java/org/gcube/accounting/datamodel/validations/annotations/ValidIP.java +++ b/src/main/java/org/gcube/accounting/datamodel/validations/annotations/ValidIP.java @@ -5,6 +5,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.gcube.accounting.datamodel.validations.ValidityChecker; import org.gcube.accounting.datamodel.validations.validators.ValidIPValidator; @Target(ElementType.FIELD) diff --git a/src/main/java/org/gcube/accounting/datamodel/validations/annotations/ValidInteger.java b/src/main/java/org/gcube/accounting/datamodel/validations/annotations/ValidInteger.java index bc2c492..ff72601 100644 --- a/src/main/java/org/gcube/accounting/datamodel/validations/annotations/ValidInteger.java +++ b/src/main/java/org/gcube/accounting/datamodel/validations/annotations/ValidInteger.java @@ -5,6 +5,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.gcube.accounting.datamodel.validations.ValidityChecker; import org.gcube.accounting.datamodel.validations.validators.ValidIntegerValidator; @Target(ElementType.FIELD) diff --git a/src/main/java/org/gcube/accounting/datamodel/validations/annotations/ValidLong.java b/src/main/java/org/gcube/accounting/datamodel/validations/annotations/ValidLong.java index ef60c0c..c318dfa 100644 --- a/src/main/java/org/gcube/accounting/datamodel/validations/annotations/ValidLong.java +++ b/src/main/java/org/gcube/accounting/datamodel/validations/annotations/ValidLong.java @@ -5,6 +5,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.gcube.accounting.datamodel.validations.ValidityChecker; import org.gcube.accounting.datamodel.validations.validators.ValidLongValidator; @Target(ElementType.FIELD) diff --git a/src/main/java/org/gcube/accounting/datamodel/validations/annotations/ValidOperationResult.java b/src/main/java/org/gcube/accounting/datamodel/validations/annotations/ValidOperationResult.java index 09c6f86..8314565 100644 --- a/src/main/java/org/gcube/accounting/datamodel/validations/annotations/ValidOperationResult.java +++ b/src/main/java/org/gcube/accounting/datamodel/validations/annotations/ValidOperationResult.java @@ -5,6 +5,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.gcube.accounting.datamodel.validations.ValidityChecker; import org.gcube.accounting.datamodel.validations.validators.ValidOperationResultValidator; @Target(ElementType.FIELD) diff --git a/src/main/java/org/gcube/accounting/datamodel/validations/validators/ConvertToOperationResult.java b/src/main/java/org/gcube/accounting/datamodel/validations/validators/ConvertToOperationResult.java index 91ff321..6f8dc48 100644 --- a/src/main/java/org/gcube/accounting/datamodel/validations/validators/ConvertToOperationResult.java +++ b/src/main/java/org/gcube/accounting/datamodel/validations/validators/ConvertToOperationResult.java @@ -6,7 +6,7 @@ package org.gcube.accounting.datamodel.validations.validators; import java.io.Serializable; import org.gcube.accounting.datamodel.UsageRecord; -import org.gcube.accounting.datamodel.validations.annotations.DeprecationAction; +import org.gcube.accounting.datamodel.validations.DeprecationAction; /** * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ 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 ad0b40b..43d78c9 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 @@ -3,6 +3,7 @@ package org.gcube.accounting.datamodel.validations.validators; import java.io.Serializable; import java.util.Map; +import org.gcube.accounting.datamodel.validations.FieldValidator; import org.gcube.accounting.exception.InvalidValueException; public class NotEmptyValidator implements FieldValidator{ diff --git a/src/main/java/org/gcube/accounting/datamodel/validations/validators/NotNullValidator.java b/src/main/java/org/gcube/accounting/datamodel/validations/validators/NotNullValidator.java index a91f465..1297c16 100644 --- a/src/main/java/org/gcube/accounting/datamodel/validations/validators/NotNullValidator.java +++ b/src/main/java/org/gcube/accounting/datamodel/validations/validators/NotNullValidator.java @@ -2,6 +2,7 @@ package org.gcube.accounting.datamodel.validations.validators; import java.io.Serializable; +import org.gcube.accounting.datamodel.validations.FieldValidator; import org.gcube.accounting.exception.InvalidValueException; public class NotNullValidator implements FieldValidator { 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 004ef2c..334b133 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 @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.gcube.accounting.datamodel.validations.FieldValidator; import org.gcube.accounting.exception.InvalidValueException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/gcube/accounting/datamodel/validations/validators/ValidIntegerValidator.java b/src/main/java/org/gcube/accounting/datamodel/validations/validators/ValidIntegerValidator.java index 8dda460..70cd7f2 100644 --- a/src/main/java/org/gcube/accounting/datamodel/validations/validators/ValidIntegerValidator.java +++ b/src/main/java/org/gcube/accounting/datamodel/validations/validators/ValidIntegerValidator.java @@ -2,6 +2,7 @@ package org.gcube.accounting.datamodel.validations.validators; import java.io.Serializable; +import org.gcube.accounting.datamodel.validations.FieldValidator; import org.gcube.accounting.exception.InvalidValueException; 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 39f6c96..a8e3e0a 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 @@ -2,6 +2,7 @@ package org.gcube.accounting.datamodel.validations.validators; import java.io.Serializable; +import org.gcube.accounting.datamodel.validations.FieldValidator; import org.gcube.accounting.exception.InvalidValueException; 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 81c3675..08f1d44 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 @@ -3,6 +3,7 @@ package org.gcube.accounting.datamodel.validations.validators; import java.io.Serializable; import org.gcube.accounting.datamodel.UsageRecord.OperationResult; +import org.gcube.accounting.datamodel.validations.FieldValidator; import org.gcube.accounting.exception.InvalidValueException; public class ValidOperationResultValidator implements FieldValidator { diff --git a/src/main/java/org/gcube/accounting/datamodel/validations/validators/Ignore.java b/src/main/java/org/gcube/accounting/datamodel/validations/validators/WarningAlert.java similarity index 74% rename from src/main/java/org/gcube/accounting/datamodel/validations/validators/Ignore.java rename to src/main/java/org/gcube/accounting/datamodel/validations/validators/WarningAlert.java index 53d7426..25e2865 100644 --- a/src/main/java/org/gcube/accounting/datamodel/validations/validators/Ignore.java +++ b/src/main/java/org/gcube/accounting/datamodel/validations/validators/WarningAlert.java @@ -6,7 +6,7 @@ package org.gcube.accounting.datamodel.validations.validators; import java.io.Serializable; import org.gcube.accounting.datamodel.UsageRecord; -import org.gcube.accounting.datamodel.validations.annotations.DeprecationAction; +import org.gcube.accounting.datamodel.validations.DeprecationAction; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -14,9 +14,9 @@ import org.slf4j.LoggerFactory; * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ * */ -public class Ignore implements DeprecationAction { +public class WarningAlert implements DeprecationAction { - private static Logger logger = LoggerFactory.getLogger(Ignore.class); + private static Logger logger = LoggerFactory.getLogger(WarningAlert.class); /** * {@inheritDoc}