From 248bb98b88ecdcd742fc4706332f9f08e0b1034e Mon Sep 17 00:00:00 2001 From: "luca.frosini" Date: Thu, 14 Jun 2018 13:30:46 +0000 Subject: [PATCH] Integrated VREAccessesHarvester git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-dashboard-harvester-se-plugin@169205 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../gcube/dataharvest/AccountingDataHarvesterPlugin.java | 8 +++----- .../dataharvest/AccountingDataHarvesterPluginTest.java | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/gcube/dataharvest/AccountingDataHarvesterPlugin.java b/src/main/java/org/gcube/dataharvest/AccountingDataHarvesterPlugin.java index 361c46d..948504f 100644 --- a/src/main/java/org/gcube/dataharvest/AccountingDataHarvesterPlugin.java +++ b/src/main/java/org/gcube/dataharvest/AccountingDataHarvesterPlugin.java @@ -184,11 +184,9 @@ public class AccountingDataHarvesterPlugin extends Plugin harvested = vreAccessesHarvester.getData(); - data.addAll(harvested); - } + // Collecting Google Analytics Data for VREs Accesses + List harvested = vreAccessesHarvester.getData(); + data.addAll(harvested); } catch(Exception e) { logger.error("Error harvesting Social Interactions for {}", context, e); } diff --git a/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java b/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java index 6077ad6..246042e 100644 --- a/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java +++ b/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java @@ -147,11 +147,9 @@ public class AccountingDataHarvesterPluginTest extends ContextTest { } try { - if(scopeBean.is(Type.VRE)) { - // Collecting Google Analytics Data for VREs Accesses - List harvested = vreAccessesHarvester.getData(); - data.addAll(harvested); - } + // Collecting Google Analytics Data for VREs Accesses + List harvested = vreAccessesHarvester.getData(); + data.addAll(harvested); } catch(Exception e) { logger.error("Error harvesting Social Interactions for {}", context, e); }