From 3c4c1a6b93f8c61128c1e0f74e9d4916d7c9b412 Mon Sep 17 00:00:00 2001
From: "luca.frosini" <luca.frosini@isti.cnr.it>
Date: Fri, 18 May 2018 14:13:10 +0000
Subject: [PATCH] Code redesign

Refs #11756: Refactor DataHArvesterPlugin to support scheduled execution from smart-executor

Task-Url: https://support.d4science.org/issues/11756

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-dashboard-harvester-se-plugin@167600 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../gcube/dataharvest/AccountingDataHarvesterPlugin.java | 5 +----
 src/main/java/org/gcube/dataharvest/dao/Dao.java         | 6 +++---
 .../harvester/sobigdata/DataMethodDownloadHarvester.java | 5 +++--
 src/main/java/org/gcube/dataharvest/utils/DateUtils.java | 7 +++++++
 src/main/java/org/gcube/dataharvest/utils/Utils.java     | 9 ---------
 5 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/main/java/org/gcube/dataharvest/AccountingDataHarvesterPlugin.java b/src/main/java/org/gcube/dataharvest/AccountingDataHarvesterPlugin.java
index 0367065..5e73ec9 100644
--- a/src/main/java/org/gcube/dataharvest/AccountingDataHarvesterPlugin.java
+++ b/src/main/java/org/gcube/dataharvest/AccountingDataHarvesterPlugin.java
@@ -144,7 +144,6 @@ public class AccountingDataHarvesterPlugin extends Plugin<DataHarvestPluginDecla
 				logger.error("Error harvesting Scoial Interactions for {}", context, e);
 			}
 			
-			
 			try {
 				// Collecting info on VRE users
 				VREUsersHarvester vreUsersHarvester = new VREUsersHarvester(start, end);
@@ -154,7 +153,6 @@ public class AccountingDataHarvesterPlugin extends Plugin<DataHarvestPluginDecla
 				logger.error("Error harvesting Context Users for {}", context, e);
 			}
 			
-			
 			try {
 				// Collecting info on Res. Catalogue (Dataset, Application, Deliverables, Methods)
 				ResourceCatalogueHarvester resourceCatalogueHarvester = new ResourceCatalogueHarvester(start, end);
@@ -173,8 +171,6 @@ public class AccountingDataHarvesterPlugin extends Plugin<DataHarvestPluginDecla
 				logger.error("Error harvesting Data Method Download for {}", context, e);
 			}
 			
-			
-			
 			try {
 				// Collecting info on method invocation
 				MethodInvocationHarvester methodInvocationHarvester = new MethodInvocationHarvester(start, end);
@@ -183,6 +179,7 @@ public class AccountingDataHarvesterPlugin extends Plugin<DataHarvestPluginDecla
 			} catch(Exception e) {
 				logger.error("Error harvesting Method Invocations for {}", context, e);
 			}
+			
 		}
 		
 		if(!dryRun) {
diff --git a/src/main/java/org/gcube/dataharvest/dao/Dao.java b/src/main/java/org/gcube/dataharvest/dao/Dao.java
index 8c53a32..c029121 100644
--- a/src/main/java/org/gcube/dataharvest/dao/Dao.java
+++ b/src/main/java/org/gcube/dataharvest/dao/Dao.java
@@ -10,7 +10,7 @@ import java.util.Calendar;
 import java.util.List;
 
 import org.gcube.dataharvest.datamodel.HarvestedData;
-import org.gcube.dataharvest.utils.Utils;
+import org.gcube.dataharvest.utils.DateUtils;
 import org.postgresql.util.PSQLException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -145,8 +145,8 @@ public class Dao {
 		// first of all: check if data of the same type are already in the
 		// database.
 		// In this case data will be updated.
-		Calendar cFrom = Utils.dateToCalendar(from);
-		Calendar cTo = Utils.dateToCalendar(to);
+		Calendar cFrom = DateUtils.dateToCalendar(from);
+		Calendar cTo = DateUtils.dateToCalendar(to);
 		int monthFrom = cFrom.get(Calendar.MONTH);
 		int yearFrom = cFrom.get(Calendar.YEAR);
 		int monthTo = cTo.get(Calendar.MONTH);
diff --git a/src/main/java/org/gcube/dataharvest/harvester/sobigdata/DataMethodDownloadHarvester.java b/src/main/java/org/gcube/dataharvest/harvester/sobigdata/DataMethodDownloadHarvester.java
index d137548..8e2dc81 100644
--- a/src/main/java/org/gcube/dataharvest/harvester/sobigdata/DataMethodDownloadHarvester.java
+++ b/src/main/java/org/gcube/dataharvest/harvester/sobigdata/DataMethodDownloadHarvester.java
@@ -18,6 +18,7 @@ import org.gcube.common.homelibrary.jcr.workspace.JCRWorkspace;
 import org.gcube.common.homelibrary.jcr.workspace.JCRWorkspaceItem;
 import org.gcube.dataharvest.datamodel.HarvestedData;
 import org.gcube.dataharvest.harvester.BasicHarvester;
+import org.gcube.dataharvest.utils.DateUtils;
 import org.gcube.dataharvest.utils.Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -90,8 +91,8 @@ public class DataMethodDownloadHarvester extends BasicHarvester {
 						case UPDATE:
 						case READ:
 							Calendar calendar = entry.getDate();
-							if(calendar.after(Utils.dateToCalendar(start))
-									&& calendar.before(Utils.dateToCalendar(end))) {
+							if(calendar.after(DateUtils.dateToCalendar(start))
+									&& calendar.before(DateUtils.dateToCalendar(end))) {
 								count++;
 							}
 							
diff --git a/src/main/java/org/gcube/dataharvest/utils/DateUtils.java b/src/main/java/org/gcube/dataharvest/utils/DateUtils.java
index bf99383..79f3937 100644
--- a/src/main/java/org/gcube/dataharvest/utils/DateUtils.java
+++ b/src/main/java/org/gcube/dataharvest/utils/DateUtils.java
@@ -97,4 +97,11 @@ public class DateUtils {
 		return aggregationEndDate.getTime();
 	}
 	
+	public static Calendar dateToCalendar(Date date) {
+		Calendar cal = null;
+		cal = Calendar.getInstance();
+		cal.setTime(date);
+		return cal;
+	}
+	
 }
diff --git a/src/main/java/org/gcube/dataharvest/utils/Utils.java b/src/main/java/org/gcube/dataharvest/utils/Utils.java
index 706ae94..1fecd57 100644
--- a/src/main/java/org/gcube/dataharvest/utils/Utils.java
+++ b/src/main/java/org/gcube/dataharvest/utils/Utils.java
@@ -8,7 +8,6 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
 import java.util.Date;
 
 import org.gcube.common.authorization.client.Constants;
@@ -27,14 +26,6 @@ public class Utils {
 	
 	private static Logger logger = LoggerFactory.getLogger(Utils.class);
 
-	public static Calendar dateToCalendar(Date date) {
-		Calendar cal = null;
-		cal = Calendar.getInstance();
-		cal.setTime(date);
-		return cal;
-	}
-
-
 	public static String dateToStringWithTZ(Date date) {
 		DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
 		return formatter.format(date) + "Z";