From 19e396d374d7c2ebbb587d7eddd614e14398bfe4 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Thu, 24 May 2018 15:13:16 +0000 Subject: [PATCH] Ultimated fixing by Francesco git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-dashboard-harvester-se-plugin@167722 82a268e6-3cf1-43bd-a215-b396298e98cf --- pom.xml | 27 +++++++++++++++++-- .../DataMethodDownloadHarvester.java | 15 +++++++++++ .../AccountingDataHarvesterPluginTest.java | 2 +- 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index caaf993..60f5cbd 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,13 @@ - + + maven-parent + org.gcube.tools + 1.0.0 + + + 4.0.0 org.gcube.accounting accounting-dashboard-harvester-se-plugin @@ -15,6 +21,11 @@ https://svn.d4science.research-infrastructures.eu/gcube/trunk/vre-management/smart-executor-${project.artifactId} + + UTF-8 + distro + + @@ -69,6 +80,14 @@ [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT) provided + + + org.gcube.data-catalogue + ckan-util-library + [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT) + compile + + org.gcube.resources.discovery ic-client @@ -154,6 +173,10 @@ maven-compiler-plugin 2.3.2 + + ${maven.compiler.source} + ${maven.compiler.target} + org.apache.maven.plugins 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 fa65688..d5b21d4 100644 --- a/src/main/java/org/gcube/dataharvest/harvester/sobigdata/DataMethodDownloadHarvester.java +++ b/src/main/java/org/gcube/dataharvest/harvester/sobigdata/DataMethodDownloadHarvester.java @@ -25,8 +25,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** + * The Class DataMethodDownloadHarvester. + * * @author Eric Perrone (ISTI - CNR) * @author Luca Frosini (ISTI - CNR) + * @author Francesco Mangiacrapa (ISTI - CNR) */ public class DataMethodDownloadHarvester extends SoBigDataHarvester { @@ -34,10 +37,22 @@ public class DataMethodDownloadHarvester extends SoBigDataHarvester { private int count = 0; + /** + * Instantiates a new data method download harvester. + * + * @param start the start + * @param end the end + * @param catalogueContext the catalogue context + * @param contexts the contexts + * @throws ParseException the parse exception + */ public DataMethodDownloadHarvester(Date start, Date end, String catalogueContext, SortedSet contexts) throws ParseException { super(start, end, catalogueContext, contexts); } + /* (non-Javadoc) + * @see org.gcube.dataharvest.harvester.BasicHarvester#getData() + */ @Override public List getData() throws Exception { String defaultContext = Utils.getCurrentContext(); diff --git a/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java b/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java index a30a87b..518fcd3 100644 --- a/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java +++ b/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java @@ -140,7 +140,7 @@ public class AccountingDataHarvesterPluginTest extends ContextTest { } - //@Test + @Test public void testResourceCatalogueHarvester() { try {