From d2174296d6f68f014897179f4d2d03ee994d73b1 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Fri, 5 Jun 2015 09:06:17 +0000
Subject: [PATCH] refs #200: Create accouting-lib library
 https://support.d4science.org/issues/200 Fixing data model

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@115234 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../accounting/datamodel/validators/ValidIPValidator.java   | 3 ++-
 .../datamodel/validators/ValidIntegerValidator.java         | 4 ++++
 .../accounting/datamodel/validators/ValidLongValidator.java | 4 ++++
 .../datamodel/validators/ValidOperationResultValidator.java | 6 ++++--
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/gcube/accounting/datamodel/validators/ValidIPValidator.java b/src/main/java/org/gcube/accounting/datamodel/validators/ValidIPValidator.java
index 7e7dd8a..4bda414 100644
--- a/src/main/java/org/gcube/accounting/datamodel/validators/ValidIPValidator.java
+++ b/src/main/java/org/gcube/accounting/datamodel/validators/ValidIPValidator.java
@@ -1,5 +1,6 @@
 package org.gcube.accounting.datamodel.validators;
 
+import java.io.Serializable;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -43,7 +44,7 @@ public class ValidIPValidator implements FieldValidator<ValidLong>{
 	}
 	
 	public boolean isValid(Object toValidate) {
-		if(toValidate instanceof String){
+		if(toValidate instanceof String || toValidate instanceof Serializable){
 			return isIpAddress((String) toValidate);
 		}
 		return false;
diff --git a/src/main/java/org/gcube/accounting/datamodel/validators/ValidIntegerValidator.java b/src/main/java/org/gcube/accounting/datamodel/validators/ValidIntegerValidator.java
index dd6c40c..020ad72 100644
--- a/src/main/java/org/gcube/accounting/datamodel/validators/ValidIntegerValidator.java
+++ b/src/main/java/org/gcube/accounting/datamodel/validators/ValidIntegerValidator.java
@@ -12,6 +12,10 @@ public class ValidIntegerValidator implements FieldValidator<ValidLong>{
 		if(toValidate instanceof Integer){
 			return true;
 		}
+		Integer integerObj = Integer.getInteger((String) toValidate);
+		if(integerObj!=null){
+			return true;
+		}
 		return false;
 	}
 
diff --git a/src/main/java/org/gcube/accounting/datamodel/validators/ValidLongValidator.java b/src/main/java/org/gcube/accounting/datamodel/validators/ValidLongValidator.java
index 563d033..3658c33 100644
--- a/src/main/java/org/gcube/accounting/datamodel/validators/ValidLongValidator.java
+++ b/src/main/java/org/gcube/accounting/datamodel/validators/ValidLongValidator.java
@@ -12,6 +12,10 @@ public class ValidLongValidator implements FieldValidator<ValidLong>{
 		if(toValidate instanceof Long){
 			return true;
 		}
+		Long longObj = Long.getLong((String) toValidate);
+		if(longObj!=null){
+			return true;
+		}
 		return false;
 	}
 
diff --git a/src/main/java/org/gcube/accounting/datamodel/validators/ValidOperationResultValidator.java b/src/main/java/org/gcube/accounting/datamodel/validators/ValidOperationResultValidator.java
index 0e6db5d..a29e3df 100644
--- a/src/main/java/org/gcube/accounting/datamodel/validators/ValidOperationResultValidator.java
+++ b/src/main/java/org/gcube/accounting/datamodel/validators/ValidOperationResultValidator.java
@@ -17,8 +17,10 @@ public class ValidOperationResultValidator implements FieldValidator<ValidOperat
 		}
 		if(toValidate instanceof String || toValidate instanceof Serializable){
 			try {
-				OperationResult.valueOf((String) toValidate);
-				return true;
+				OperationResult operationResult = OperationResult.valueOf((String) toValidate);
+				if(operationResult !=null){
+					return true;
+				}
 			}catch(Exception e){}
 		}
 		return false;