From dc3804ae7f1b68aea3bd6c60a5a41fc6eada7df3 Mon Sep 17 00:00:00 2001
From: Alessandro Pieve <alessandro.pieve@isti.cnr.it>
Date: Fri, 29 Jul 2016 13:25:30 +0000
Subject: [PATCH] git-svn-id:
 https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-aggregator-se-plugin@130910
 82a268e6-3cf1-43bd-a215-b396298e98cf

---
 pom.xml                                       | 26 ++++++++++++++++---
 .../plugin/AccountingAggregatorPlugin.java    |  7 ++++-
 .../accounting/aggregator/plugin/Tests.java   |  6 +++--
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index a1e1dec..7d4aa60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,7 @@
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.gcube.vremanagement</groupId>
@@ -43,9 +44,23 @@
 		</dependency>
 
 
+
+		<dependency>
+			<groupId>org.gcube.common</groupId>
+			<artifactId>common-authorization</artifactId>
+
+		</dependency>
+
+		<dependency>
+			<groupId>org.gcube.common</groupId>
+			<artifactId>authorization-client</artifactId>
+		</dependency>
+
+
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-scope</artifactId>
+			<scope>provided</scope>
 		</dependency>
 		<!-- Home Library -->
 		<dependency>
@@ -61,7 +76,7 @@
 			<scope>compile</scope>
 		</dependency>
 		<!-- END Home Library -->
-		
+
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>common-authorization</artifactId>
@@ -70,6 +85,7 @@
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>authorization-client</artifactId>
+			<scope>provided</scope>
 		</dependency>
 
 		<dependency>
@@ -92,19 +108,21 @@
 		</dependency>
 		<!-- END CouchBase libraries -->
 		<!-- Document Store and accounting lib -->
- 		<dependency>
+		<dependency>
 			<groupId>org.gcube.data.publishing</groupId>
 			<artifactId>document-store-lib-couchbase</artifactId>
 			<version>[1.0.1-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 		</dependency>
 		<dependency>
 			<artifactId>document-store-lib</artifactId>
-					<groupId>org.gcube.data.publishing</groupId>
-					<scope>provided</scope>
+			<groupId>org.gcube.data.publishing</groupId>
+			<scope>provided</scope>
 		</dependency>
+		
 		<dependency>
 			<groupId>org.gcube.accounting</groupId>
 			<artifactId>accounting-lib</artifactId>
+			<version>[2.2.0-SNAPSHOT,2.3.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
diff --git a/src/main/java/org/gcube/accounting/aggregator/plugin/AccountingAggregatorPlugin.java b/src/main/java/org/gcube/accounting/aggregator/plugin/AccountingAggregatorPlugin.java
index 94c850b..a4b3132 100644
--- a/src/main/java/org/gcube/accounting/aggregator/plugin/AccountingAggregatorPlugin.java
+++ b/src/main/java/org/gcube/accounting/aggregator/plugin/AccountingAggregatorPlugin.java
@@ -90,6 +90,9 @@ public class AccountingAggregatorPlugin extends Plugin<AccountingAggregatorPlugi
 	@Override
 	public void launch(Map<String, Object> inputs) throws Exception {
 
+		countInsert=0;
+		countDelete=0;
+		
 		if(inputs == null || inputs.isEmpty()){
 			logger.debug("{} inputs {}", this.getClass().getSimpleName(), inputs);
 			throw new Exception("Inputs null");
@@ -127,6 +130,8 @@ public class AccountingAggregatorPlugin extends Plugin<AccountingAggregatorPlugi
 		//String scopeDebug="/gcube/devNext";
 		//ScopeProvider.instance.set(scopeDebug);
 		// END FOR DEBUG
+	
+		
 		logger.trace("Launch with Type:{}, Interval:{}, startTime:{}, Scope:{}, Recovery:{}",aggType.toString(),interval,inputStartTime,scope,RecoveryMode);
 		
 		//Get Configuration from service end point
@@ -155,7 +160,7 @@ public class AccountingAggregatorPlugin extends Plugin<AccountingAggregatorPlugi
 			throw e;
 		}
 
-		
+
 		Cluster cluster = CouchbaseCluster.create(ENV, url);
 	
 		//Define a type for aggregate
diff --git a/src/test/java/org/gcube/accounting/aggregator/plugin/Tests.java b/src/test/java/org/gcube/accounting/aggregator/plugin/Tests.java
index 1884597..a778385 100644
--- a/src/test/java/org/gcube/accounting/aggregator/plugin/Tests.java
+++ b/src/test/java/org/gcube/accounting/aggregator/plugin/Tests.java
@@ -33,9 +33,11 @@ public class Tests {
 		//change to time
 		inputs.put("startTime", 10);
 		//specify bucket
-		inputs.put("bucket","accounting_service");
+		
+		//inputs.put("bucket","accounting_service");
+		
 		//current scope
-		inputs.put("currentScope",false);
+		inputs.put("currentScope",true);
 		//specify user for save to workspace
 		
 		//specify a recovery 0 default recovery and aggregate, 1 only aggregate, 2 only recovery