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

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@115378 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../accounting/datamodel/RawUsageRecord.java  | 48 ++++++++++++++++---
 1 file changed, 41 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/gcube/accounting/datamodel/RawUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/RawUsageRecord.java
index 95c2d93..24c5bb5 100644
--- a/src/main/java/org/gcube/accounting/datamodel/RawUsageRecord.java
+++ b/src/main/java/org/gcube/accounting/datamodel/RawUsageRecord.java
@@ -144,6 +144,30 @@ public class RawUsageRecord extends BasicUsageRecord {
 		super(properties);
 	}
 	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void setConsumerId(String consumerId) {
+		try{
+			setConsumerId(consumerId);
+		} catch(Exception e){
+			logger.error("Unable to Set {}", CONSUMER_ID);
+		}
+	}
+	
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void setResourceScope(String scope) {
+		try{
+			setResourceScope(scope);
+		}catch(Exception e){
+			logger.error("Unable to Set {}", RESOURCE_SCOPE);
+		}
+	}
+	
 	/**
 	 * Use {#getUsageRecordType} instead
 	 * @param resourceType
@@ -186,7 +210,7 @@ public class RawUsageRecord extends BasicUsageRecord {
 	 * @throws InvalidValueException
 	 */
 	@Deprecated
-	public void setCreateTime(Date createTime) throws InvalidValueException {
+	public void setCreateTime(Date createTime) {
 		/*
 		Calendar calendar = Calendar.getInstance();
 		calendar.setTime(createTime);
@@ -256,8 +280,12 @@ public class RawUsageRecord extends BasicUsageRecord {
 	 * @throws InvalidValueException
 	 */
 	@Deprecated
-	public void setResourceOwner(String owner) throws InvalidValueException {
-		setResourceProperty(RESOURCE_OWNER, owner);
+	public void setResourceOwner(String owner) {
+		try {
+			setResourceProperty(RESOURCE_OWNER, owner);
+		} catch (InvalidValueException e) {
+			logger.error("Unable to Set {}", RESOURCE_OWNER);
+		}
 	}
 	
 	/**
@@ -300,8 +328,9 @@ public class RawUsageRecord extends BasicUsageRecord {
 	 * Use {@link #setResourceSpecificProperties()}
 	 */
 	@Deprecated
-	public void setResourceSpecificProperties(Map<String, Serializable> properties) throws InvalidValueException {
-		setResourceProperties(properties);
+	public void setResourceSpecificProperties(Map<String, String> properties) throws InvalidValueException {
+		Map<String, Serializable> map = new HashMap<String, Serializable>(properties);
+		setResourceProperties(map);
 	}
 	
 	/**
@@ -322,8 +351,13 @@ public class RawUsageRecord extends BasicUsageRecord {
 	 * @param value the value of the given resource property
 	 */
 	@Deprecated
-	public void setResourceSpecificProperty(String key, Serializable value) throws InvalidValueException {
-		setResourceProperty(key, value);
+	public void setResourceSpecificProperty(String key, Serializable value) {
+		try {
+			setResourceProperty(key, value);
+		} catch (InvalidValueException e) {
+			logger.error("Unable to Set {}", key);
+		}
+		
 	}
 	
 	/**