From c1867e56ce3649d30fe5765814d10af9ae7a1cdd Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Mon, 13 Jul 2015 09:26:50 +0000
Subject: [PATCH] Added calledMethod field

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-lib@117179 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../ServiceUsageRecordAggregationStrategy.java |  1 +
 .../basetypes/ServiceUsageRecord.java          | 18 ++++++++++++++++--
 .../datamodel/basetypes/TestUsageRecord.java   |  6 ++++--
 .../usagerecords/ServiceUsageRecordTest.java   |  1 +
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/gcube/accounting/aggregation/strategy/ServiceUsageRecordAggregationStrategy.java b/src/main/java/org/gcube/accounting/aggregation/strategy/ServiceUsageRecordAggregationStrategy.java
index 6e5c882..d6da29c 100644
--- a/src/main/java/org/gcube/accounting/aggregation/strategy/ServiceUsageRecordAggregationStrategy.java
+++ b/src/main/java/org/gcube/accounting/aggregation/strategy/ServiceUsageRecordAggregationStrategy.java
@@ -22,6 +22,7 @@ public class ServiceUsageRecordAggregationStrategy extends AggregationStrategy<S
 		this.aggregationField.add(ServiceUsageRecord.HOST);
 		this.aggregationField.add(ServiceUsageRecord.SERVICE_CLASS);
 		this.aggregationField.add(ServiceUsageRecord.SERVICE_NAME);
+		this.aggregationField.add(ServiceUsageRecord.CALLED_METHOD);
 	}
 	
 	protected long durationWeightedAverage(ServiceUsageRecord record){
diff --git a/src/main/java/org/gcube/accounting/datamodel/basetypes/ServiceUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/basetypes/ServiceUsageRecord.java
index c3fa128..190e13a 100644
--- a/src/main/java/org/gcube/accounting/datamodel/basetypes/ServiceUsageRecord.java
+++ b/src/main/java/org/gcube/accounting/datamodel/basetypes/ServiceUsageRecord.java
@@ -27,7 +27,7 @@ public abstract class ServiceUsageRecord extends BasicUsageRecord {
 	 * KEY for : hostname:port of the Hosting Node made the service call
 	 */
 	@RequiredField @NotEmpty
-	public static final String CALLER_HOST = "callerHOST";
+	public static final String CALLER_HOST = "callerHost";
 	
 	/**
 	 * KEY for : hostname:port of the Hosting Node receiving the service call
@@ -47,6 +47,12 @@ public abstract class ServiceUsageRecord extends BasicUsageRecord {
 	@RequiredField @NotEmpty
 	public static final String SERVICE_NAME = "serviceName";
 	
+	/**
+	 * KEY for : Service Name
+	 */
+	@RequiredField @NotEmpty
+	public static final String CALLED_METHOD = "calledMethod";
+	
 	/**
 	 * KEY for : Service Name
 	 */
@@ -93,10 +99,18 @@ public abstract class ServiceUsageRecord extends BasicUsageRecord {
 		setResourceProperty(SERVICE_NAME, serviceName);
 	}
 	
+	public String getCalledMethod() {
+		return (String) this.resourceProperties.get(CALLED_METHOD);
+	}
+
+	public void setCalledMethod(String calledMethod) throws InvalidValueException {
+		setResourceProperty(CALLED_METHOD, calledMethod);
+	}
+	
 	public Long getDuration() {
 		return (Long) this.resourceProperties.get(DURATION);
 	}
-
+	
 	public void setDuration(Long duration) throws InvalidValueException {
 		setResourceProperty(DURATION, duration);
 	}
diff --git a/src/main/java/org/gcube/accounting/datamodel/basetypes/TestUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/basetypes/TestUsageRecord.java
index b92cf39..c261ca4 100644
--- a/src/main/java/org/gcube/accounting/datamodel/basetypes/TestUsageRecord.java
+++ b/src/main/java/org/gcube/accounting/datamodel/basetypes/TestUsageRecord.java
@@ -27,6 +27,7 @@ public class TestUsageRecord {
 
 	public final static String TEST_SERVICE_CLASS = "TestServiceClass";
 	public final static String TEST_SERVICE_NAME = "TestServiceName";
+	public final static String TEST_CALLED_METHOD = "TestCalledMethod";
 	
 	public final static String TEST_CALLER_HOST = "remotehost";
 	public final static String TEST_HOST = "localhost";
@@ -61,8 +62,9 @@ public class TestUsageRecord {
 			usageRecord.setHost(TEST_HOST);
 			
 			usageRecord.setServiceClass(TEST_SERVICE_CLASS);
-			usageRecord.setServiceName(TEST_SERVICE_NAME);			
-			
+			usageRecord.setServiceName(TEST_SERVICE_NAME);
+			usageRecord.setCalledMethod(TEST_CALLED_METHOD);
+						
 			usageRecord.setDuration(generateRandomLong(MIN_DURATION, MAX_DURATION));
 			
 			
diff --git a/src/test/java/org/gcube/accounting/datamodel/usagerecords/ServiceUsageRecordTest.java b/src/test/java/org/gcube/accounting/datamodel/usagerecords/ServiceUsageRecordTest.java
index 07b8e0d..c7de127 100644
--- a/src/test/java/org/gcube/accounting/datamodel/usagerecords/ServiceUsageRecordTest.java
+++ b/src/test/java/org/gcube/accounting/datamodel/usagerecords/ServiceUsageRecordTest.java
@@ -30,6 +30,7 @@ public class ServiceUsageRecordTest {
 		expectedRequiredFields.add(org.gcube.accounting.datamodel.basetypes.ServiceUsageRecord.HOST);
 		expectedRequiredFields.add(org.gcube.accounting.datamodel.basetypes.ServiceUsageRecord.SERVICE_CLASS);
 		expectedRequiredFields.add(org.gcube.accounting.datamodel.basetypes.ServiceUsageRecord.SERVICE_NAME);
+		expectedRequiredFields.add(org.gcube.accounting.datamodel.basetypes.ServiceUsageRecord.CALLED_METHOD);
 		expectedRequiredFields.add(org.gcube.accounting.datamodel.basetypes.ServiceUsageRecord.DURATION);
 		return expectedRequiredFields;
 	}