diff --git a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/AbstractHarvester.java b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/AbstractHarvester.java index 2398aa96c10b..24b3ec0e5a37 100644 --- a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/AbstractHarvester.java +++ b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/AbstractHarvester.java @@ -118,7 +118,12 @@ public abstract class AbstractHarvester errors = Collections.synchronizedList(new LinkedList<>()); protected ServiceContext context; @@ -145,10 +150,6 @@ public Logger getLogger() { * Exception that aborted the harvesting */ private Throwable error; - /** - * Contains all the warnings and errors that didn't abort the execution, but were thrown during harvesting - */ - private List errors = Collections.synchronizedList(new LinkedList<>()); private volatile boolean running = false; public static AbstractHarvester create(String type, ServiceContext context) throws BadParameterEx, OperationAbortedEx { @@ -538,7 +539,7 @@ public Status getStatus() { * Nested class to handle harvesting with fast indexing. */ public class HarvestWithIndexProcessor extends MetadataIndexerProcessor { - Logger logger; + private final Logger logger; public HarvestWithIndexProcessor(DataManager dm, Logger logger) { super(dm); @@ -657,11 +658,6 @@ protected OperResult harvest() { logger.error(t); error = t; errors.add(new HarvestError(context, t)); - } finally { - List harvesterErrors = getErrors(); - if (harvesterErrors != null) { - errors.addAll(harvesterErrors); - } } long elapsedTime = TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis() - startTime); @@ -758,14 +754,8 @@ private Element toElement(List errors) { return res; } - /** - * Should be overriden to get a better insight on harvesting - *

- * Returns the list of exceptions that ocurred during the harvesting but - * didn't really stop and abort the harvest. - */ public List getErrors() { - return Collections.synchronizedList(errors); + return Collections.unmodifiableList(errors); } public final String getType() { diff --git a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/IHarvester.java b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/IHarvester.java index bffb20b6f7c3..54bf8daef48a 100644 --- a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/IHarvester.java +++ b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/IHarvester.java @@ -34,11 +34,6 @@ */ public interface IHarvester { - /** - * Returns all the (important?) exceptions that were thrown during the execution - */ - List getErrors(); - /** * Actual harvest function. */ diff --git a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/csw/CswHarvester.java b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/csw/CswHarvester.java index 97a5b2fae7d5..6c62c9a34dae 100644 --- a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/csw/CswHarvester.java +++ b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/csw/CswHarvester.java @@ -91,7 +91,7 @@ protected void storeNodeExtra(CswParams params, String path, String siteId, Stri * @throws Exception */ public void doHarvest(Logger log) throws Exception { - Harvester h = new Harvester(cancelMonitor, log, context, params); + Harvester h = new Harvester(cancelMonitor, log, context, params, errors); result = h.harvest(log); } } diff --git a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/csw/Harvester.java b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/csw/Harvester.java index fa088a5a4cb8..86a2f5a4a7dc 100644 --- a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/csw/Harvester.java +++ b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/csw/Harvester.java @@ -77,24 +77,25 @@ class Harvester implements IHarvester { private static String CONSTRAINT_LANGUAGE_VERSION = "1.1.0"; //FIXME version should be parametrized - private static String GETCAPABILITIES_PARAMETERS = "SERVICE=CSW&REQUEST=GetCapabilities&VERSION=2.0.2"; + private static final String GETCAPABILITIES_PARAMETERS = "SERVICE=CSW&REQUEST=GetCapabilities&VERSION=2.0.2"; private final AtomicBoolean cancelMonitor; private Logger log; - private CswParams params; - private ServiceContext context; + private final CswParams params; + private final ServiceContext context; /** * Contains a list of accumulated errors during the executing of this harvest. */ - private List errors = new LinkedList(); + private final List errors; - public Harvester(AtomicBoolean cancelMonitor, Logger log, ServiceContext context, CswParams params) { + public Harvester(AtomicBoolean cancelMonitor, Logger log, ServiceContext context, CswParams params, List errors) { this.cancelMonitor = cancelMonitor; this.log = log; this.context = context; this.params = params; + this.errors = errors; } public HarvestResult harvest(Logger log) throws Exception { @@ -734,8 +735,4 @@ private RecordInfo getRecordInfo(Element record) { return null; } - - public List getErrors() { - return errors; - } } diff --git a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/geoPREST/GeoPRESTHarvester.java b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/geoPREST/GeoPRESTHarvester.java index c042e2a7f376..fce96135056b 100644 --- a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/geoPREST/GeoPRESTHarvester.java +++ b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/geoPREST/GeoPRESTHarvester.java @@ -70,7 +70,7 @@ protected void storeNodeExtra(GeoPRESTParams params, String path, //--------------------------------------------------------------------------- public void doHarvest(Logger log) throws Exception { - Harvester h = new Harvester(cancelMonitor, log, context, params); + Harvester h = new Harvester(cancelMonitor, log, context, params, errors); result = h.harvest(log); } } diff --git a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/geoPREST/Harvester.java b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/geoPREST/Harvester.java index 8d519a1b2d5e..5ba9d802a53d 100644 --- a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/geoPREST/Harvester.java +++ b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/geoPREST/Harvester.java @@ -81,24 +81,23 @@ class Harvester implements IHarvester { //--- API methods //--- //--------------------------------------------------------------------------- - private GeoPRESTParams params; + private final GeoPRESTParams params; //--------------------------------------------------------------------------- - private ServiceContext context; + private final ServiceContext context; //--------------------------------------------------------------------------- /** * Contains a list of accumulated errors during the executing of this harvest. */ - private List errors = new LinkedList(); - - public Harvester(AtomicBoolean cancelMonitor, Logger log, ServiceContext context, GeoPRESTParams params) { + private final List errors; + public Harvester(AtomicBoolean cancelMonitor, Logger log, ServiceContext context, GeoPRESTParams params, List errors) { this.cancelMonitor = cancelMonitor; this.log = log; this.context = context; this.params = params; - + this.errors = errors; } public HarvestResult harvest(Logger log) throws Exception { @@ -307,10 +306,6 @@ protected Date parseDate(String pubDate) throws ParseException { throw new ParseException("Can't parse date '" + pubDate + "'", 0); } - - public List getErrors() { - return errors; - } } // ============================================================================= diff --git a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/geonet/GeonetHarvester.java b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/geonet/GeonetHarvester.java index b7c42e7d36ad..41ca25917add 100644 --- a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/geonet/GeonetHarvester.java +++ b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/geonet/GeonetHarvester.java @@ -91,7 +91,7 @@ public void addHarvestInfo(Element info, String id, String uuid) { } public void doHarvest(Logger log) throws Exception { - Harvester h = new Harvester(cancelMonitor, log, context, params); + Harvester h = new Harvester(cancelMonitor, log, context, params, errors); result = h.harvest(log); } } diff --git a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/geonet/Harvester.java b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/geonet/Harvester.java index 96ac8c5660b7..59a450c8c37b 100644 --- a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/geonet/Harvester.java +++ b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/geonet/Harvester.java @@ -71,21 +71,22 @@ class Harvester implements IHarvester { private final AtomicBoolean cancelMonitor; private Logger log; - private GeonetParams params; - private ServiceContext context; + private final GeonetParams params; + private final ServiceContext context; /** * Contains a list of accumulated errors during the executing of this harvest. */ - private List errors = new LinkedList(); + private final List errors; //--------------------------------------------------------------------------- - public Harvester(AtomicBoolean cancelMonitor, Logger log, ServiceContext context, GeonetParams params) { + public Harvester(AtomicBoolean cancelMonitor, Logger log, ServiceContext context, GeonetParams params, List errors) { this.cancelMonitor = cancelMonitor; this.log = log; this.context = context; this.params = params; + this.errors = errors; } public HarvestResult harvest(Logger log) throws Exception { @@ -426,8 +427,4 @@ private void retrieveLogo(ServiceContext context, final Resources resources, Str resources.copyUnknownLogo(context, uuid); } } - - public List getErrors() { - return errors; - } } diff --git a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/oaipmh/Harvester.java b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/oaipmh/Harvester.java index 79bc1fb174b7..2166274c81ab 100644 --- a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/oaipmh/Harvester.java +++ b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/oaipmh/Harvester.java @@ -101,13 +101,14 @@ class Harvester extends BaseAligner implements IHarvester errors = new LinkedList<>(); + private final List errors; - public Harvester(AtomicBoolean cancelMonitor, Logger log, ServiceContext context, OaiPmhParams params) { + public Harvester(AtomicBoolean cancelMonitor, Logger log, ServiceContext context, OaiPmhParams params, List errors) { super(cancelMonitor); this.log = log; this.context = context; this.params = params; + this.errors = errors; result = new HarvestResult(); @@ -621,8 +622,4 @@ public void apply(@Nonnull AbstractMetadata entity) { result.updatedMetadata++; } } - - public List getErrors() { - return errors; - } } diff --git a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/oaipmh/OaiPmhHarvester.java b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/oaipmh/OaiPmhHarvester.java index acf3afd0a7b1..062bc38ff17a 100644 --- a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/oaipmh/OaiPmhHarvester.java +++ b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/oaipmh/OaiPmhHarvester.java @@ -77,7 +77,7 @@ protected void storeNodeExtra(OaiPmhParams params, String path, //--------------------------------------------------------------------------- public void doHarvest(Logger log) throws Exception { - Harvester h = new Harvester(cancelMonitor, log, context, params); + Harvester h = new Harvester(cancelMonitor, log, context, params, errors); result = h.harvest(log); } } diff --git a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/ogcwxs/Harvester.java b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/ogcwxs/Harvester.java index b023b9fc6667..71ba29032715 100644 --- a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/ogcwxs/Harvester.java +++ b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/ogcwxs/Harvester.java @@ -1045,14 +1045,6 @@ private String getBaseUrl(String url) { } } - /* (non-Javadoc) - * @see org.fao.geonet.kernel.harvest.harvester.IHarvester#getErrors() - */ - @Override - public List getErrors() { - return new ArrayList<>(); - } - private static class WxSLayerRegistry { public String uuid; public String id; diff --git a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/simpleurl/Harvester.java b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/simpleurl/Harvester.java index 254fac91f840..83445bd0ef82 100644 --- a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/simpleurl/Harvester.java +++ b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/simpleurl/Harvester.java @@ -78,8 +78,8 @@ class Harvester implements IHarvester { private final AtomicBoolean cancelMonitor; private Logger log; - private SimpleUrlParams params; - private ServiceContext context; + private final SimpleUrlParams params; + private final ServiceContext context; @Autowired GeonetHttpRequestFactory requestFactory; @@ -87,13 +87,14 @@ class Harvester implements IHarvester { /** * Contains a list of accumulated errors during the executing of this harvest. */ - private List errors = new LinkedList<>(); + private final List errors; - public Harvester(AtomicBoolean cancelMonitor, Logger log, ServiceContext context, SimpleUrlParams params) { + public Harvester(AtomicBoolean cancelMonitor, Logger log, ServiceContext context, SimpleUrlParams params, List errors) { this.cancelMonitor = cancelMonitor; this.log = log; this.context = context; this.params = params; + this.errors = errors; } public HarvestResult harvest(Logger log) throws Exception { @@ -429,8 +430,4 @@ private String retrieveUrl(String url) throws Exception { private URI createUrl(String jsonUrl) throws URISyntaxException { return new URI(jsonUrl); } - - public List getErrors() { - return errors; - } } diff --git a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/simpleurl/SimpleUrlHarvester.java b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/simpleurl/SimpleUrlHarvester.java index f1c458a5a295..c366e86c387a 100644 --- a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/simpleurl/SimpleUrlHarvester.java +++ b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/simpleurl/SimpleUrlHarvester.java @@ -61,7 +61,7 @@ protected void storeNodeExtra(SimpleUrlParams params, String path, String siteId } public void doHarvest(Logger log) throws Exception { - Harvester h = new Harvester(cancelMonitor, log, context, params); + Harvester h = new Harvester(cancelMonitor, log, context, params, errors); result = h.harvest(log); } } diff --git a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/thredds/Harvester.java b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/thredds/Harvester.java index 80304603e62c..3b503a850e32 100644 --- a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/thredds/Harvester.java +++ b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/thredds/Harvester.java @@ -191,7 +191,7 @@ class Harvester extends BaseAligner implements IHarvester harvestUris = new HashSet(); private Map services = new HashMap(); private InvCatalogImpl catalog; - private List errors = new LinkedList(); + private List errors; private LatLonRect globalLatLonBox = null; private DateRange globalDateRange = null; @@ -226,11 +226,12 @@ class Harvester extends BaseAligner implements IHarvester errors) { super(cancelMonitor); this.log = log; this.context = context; this.params = params; + this.errors = errors; result = new HarvestResult(); @@ -320,11 +321,6 @@ public HarvestResult harvest(Logger log) throws Exception { return result; } - @Override - public List getErrors() { - return errors; - } - //--------------------------------------------------------------------------- //--- //--- Private methods diff --git a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/thredds/ThreddsHarvester.java b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/thredds/ThreddsHarvester.java index 32ca2ff5296d..580a2d40213c 100644 --- a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/thredds/ThreddsHarvester.java +++ b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/thredds/ThreddsHarvester.java @@ -72,7 +72,7 @@ protected void storeNodeExtra(ThreddsParams params, String path, //--------------------------------------------------------------------------- public void doHarvest(Logger log) throws Exception { - Harvester h = new Harvester(cancelMonitor, log, context, params); + Harvester h = new Harvester(cancelMonitor, log, context, params, errors); result = h.harvest(log); } } diff --git a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/webdav/Harvester.java b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/webdav/Harvester.java index cf8717e52133..85f569455fde 100644 --- a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/webdav/Harvester.java +++ b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/webdav/Harvester.java @@ -83,15 +83,16 @@ class Harvester extends BaseAligner implements IHarvester errors = new LinkedList<>(); + private List errors; private String processName; private Map processParams = new HashMap<>(); - public Harvester(AtomicBoolean cancelMonitor, Logger log, ServiceContext context, WebDavParams params) { + public Harvester(AtomicBoolean cancelMonitor, Logger log, ServiceContext context, WebDavParams params, List errors) { super(cancelMonitor); this.log = log; this.context = context; this.params = params; + this.errors = errors; result = new HarvestResult(); result.addedMetadata = 0; @@ -291,7 +292,7 @@ private void addMetadata(RemoteFile rf) throws Exception { if (StringUtils.isNotEmpty(params.xslfilter)) { md = HarvesterUtil.processMetadata(dataMan.getSchema(schema), md, processName, processParams); - + schema = dataMan.autodetectSchema(md); } @@ -525,10 +526,6 @@ private void updateMetadata(RemoteFile rf, RecordInfo recordInfo, boolean force) dataMan.indexMetadata(recordInfo.id, true); } } - - public List getErrors() { - return errors; - } } //============================================================================= diff --git a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/webdav/WebDavHarvester.java b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/webdav/WebDavHarvester.java index e745a5b33115..078eee21d2a7 100644 --- a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/webdav/WebDavHarvester.java +++ b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/webdav/WebDavHarvester.java @@ -47,7 +47,7 @@ protected void storeNodeExtra(WebDavParams params, String path, String siteId, S public void doHarvest(Logger log) throws Exception { log.info("WebDav doHarvest start"); - Harvester h = new Harvester(cancelMonitor, log, context, params); + Harvester h = new Harvester(cancelMonitor, log, context, params, errors); result = h.harvest(log); log.info("WebDav doHarvest end"); } diff --git a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/wfsfeatures/Harvester.java b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/wfsfeatures/Harvester.java index a0d72818fac2..12b6af754236 100644 --- a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/wfsfeatures/Harvester.java +++ b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/wfsfeatures/Harvester.java @@ -145,7 +145,8 @@ class Harvester implements IHarvester { /** * Contains a list of accumulated errors during the executing of this harvest. */ - private List errors = new LinkedList(); + private List errors; + /** * Constructor * @@ -153,11 +154,12 @@ class Harvester implements IHarvester { * @param params harvesting configuration for the node * @return null */ - public Harvester(AtomicBoolean cancelMonitor, Logger log, ServiceContext context, WfsFeaturesParams params) { + public Harvester(AtomicBoolean cancelMonitor, Logger log, ServiceContext context, WfsFeaturesParams params, List errors) { this.cancelMonitor = cancelMonitor; this.log = log; this.context = context; this.params = params; + this.errors = errors; result = new HarvestResult(); @@ -381,8 +383,4 @@ private FragmentParams getFragmentHarvesterParams() { fragmentParams.owner = params.getOwnerId(); return fragmentParams; } - - public List getErrors() { - return errors; - } } diff --git a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/wfsfeatures/WfsFeaturesHarvester.java b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/wfsfeatures/WfsFeaturesHarvester.java index 70bca6e99a8a..b24a3739d13c 100644 --- a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/wfsfeatures/WfsFeaturesHarvester.java +++ b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/wfsfeatures/WfsFeaturesHarvester.java @@ -68,7 +68,7 @@ protected void storeNodeExtra(WfsFeaturesParams params, String path, //--------------------------------------------------------------------------- public void doHarvest(Logger log) throws Exception { - Harvester h = new Harvester(cancelMonitor, log, context, params); + Harvester h = new Harvester(cancelMonitor, log, context, params, errors); result = h.harvest(log); } } diff --git a/harvesters/src/test/java/org/fao/geonet/kernel/harvest/harvester/geoPREST/HarvesterTest.java b/harvesters/src/test/java/org/fao/geonet/kernel/harvest/harvester/geoPREST/HarvesterTest.java index 35c2ad6e3754..0a47ae09fb4e 100644 --- a/harvesters/src/test/java/org/fao/geonet/kernel/harvest/harvester/geoPREST/HarvesterTest.java +++ b/harvesters/src/test/java/org/fao/geonet/kernel/harvest/harvester/geoPREST/HarvesterTest.java @@ -17,6 +17,7 @@ package org.fao.geonet.kernel.harvest.harvester.geoPREST; import java.text.ParseException; +import java.util.ArrayList; import java.util.Date; import org.apache.commons.lang3.SystemUtils; @@ -38,7 +39,7 @@ public HarvesterTest() { @Ignore("see https://github.com/georchestra/geonetwork/pull/191#issuecomment-1014424757") public void testParseDate() throws Exception { - Harvester h = new Harvester(null, Log.createLogger("TEST"), null, null); + Harvester h = new Harvester(null, Log.createLogger("TEST"), null, null, new ArrayList<>()); // test EN date h.parseDate("Mon, 04 Feb 2013 10:19:00 +1000"); @@ -55,7 +56,7 @@ public void testJDK8136539Workaround() throws Exception { assumeTrue(SystemUtils.IS_JAVA_1_8); - Harvester h = new Harvester(null, Log.createLogger("TEST"), null, null); + Harvester h = new Harvester(null, Log.createLogger("TEST"), null, null, new ArrayList<>()); Date p0 = h.parseDate("Fr, 24 Mär 2017 10:58:59 +0100"); Date p1 = h.parseDate("Fr, 24 Mrz 2017 10:58:59 +0100"); @@ -65,7 +66,7 @@ public void testJDK8136539Workaround() throws Exception { @Test public void testUnparsableDate() throws Exception { - Harvester h = new Harvester(null, Log.createLogger("TEST"), null, null); + Harvester h = new Harvester(null, Log.createLogger("TEST"), null, null, new ArrayList<>()); try { h.parseDate("Xyz, 04 Feb 2013 10:19:00 +1000"); diff --git a/harvesters/src/test/java/org/fao/geonet/kernel/harvest/harvester/simpleurl/HarvesterTest.java b/harvesters/src/test/java/org/fao/geonet/kernel/harvest/harvester/simpleurl/HarvesterTest.java index 06e2998bfd45..f4fd70ba5d36 100644 --- a/harvesters/src/test/java/org/fao/geonet/kernel/harvest/harvester/simpleurl/HarvesterTest.java +++ b/harvesters/src/test/java/org/fao/geonet/kernel/harvest/harvester/simpleurl/HarvesterTest.java @@ -3,6 +3,7 @@ import org.fao.geonet.utils.Log; import org.junit.Test; +import java.util.ArrayList; import java.util.List; import static org.junit.Assert.*; @@ -18,7 +19,7 @@ public void test_buildPagesUrl() { int numberOfResult = 21; - final Harvester harvester = new Harvester(null, Log.createLogger("TEST"), null, params); + final Harvester harvester = new Harvester(null, Log.createLogger("TEST"), null, params, new ArrayList<>()); List list = harvester.buildListOfUrl(params, numberOfResult); assertEquals(3, list.size()); assertEquals("http://dados.gov.br/api/3/action/package_search?q=&rows=10&start=1", list.get(0));