From 996150a31568b23f4121ec9db9c29f607b8f3d9a Mon Sep 17 00:00:00 2001 From: Enrico Ottonello Date: Fri, 3 Apr 2020 11:58:04 +0200 Subject: [PATCH] modified access protocol parameter name (mandatory for aat and periodo), it is the name of the root node, inside the metadata record, that is generated converting original json record --- .../ariadneplus/ads/FileJSONCollectorPlugin.java | 12 ++++++------ ...torPlugin.java => FolderCollectorPlugin.java} | 8 ++++---- ...tionContext-ariadneplus-collector-plugins.xml | 16 ++++++++++++++-- 3 files changed, 24 insertions(+), 12 deletions(-) rename dnet-ariadneplus/src/main/java/eu/dnetlib/data/collector/plugins/ariadneplus/ads/{AATCollectorPlugin.java => FolderCollectorPlugin.java} (87%) diff --git a/dnet-ariadneplus/src/main/java/eu/dnetlib/data/collector/plugins/ariadneplus/ads/FileJSONCollectorPlugin.java b/dnet-ariadneplus/src/main/java/eu/dnetlib/data/collector/plugins/ariadneplus/ads/FileJSONCollectorPlugin.java index 3e4adaf..89ff446 100644 --- a/dnet-ariadneplus/src/main/java/eu/dnetlib/data/collector/plugins/ariadneplus/ads/FileJSONCollectorPlugin.java +++ b/dnet-ariadneplus/src/main/java/eu/dnetlib/data/collector/plugins/ariadneplus/ads/FileJSONCollectorPlugin.java @@ -35,7 +35,7 @@ public class FileJSONCollectorPlugin extends FileCollectorPlugin { public Iterable collect(final InterfaceDescriptor interfaceDescriptor, final String fromDate, final String untilDate) throws CollectorServiceException { log.info("FileJSONCollectorPlugin"); - final String identifierFieldKey = interfaceDescriptor.getParams().get("identifierFieldKey"); + final String metadataRootNodeName = interfaceDescriptor.getParams().get("metadataRootNodeName"); URL u = null; try { @@ -54,7 +54,7 @@ public class FileJSONCollectorPlugin extends FileCollectorPlugin { @Override public Iterator iterator() { - return new FileJSONIterator(fileReader, identifierFieldKey); + return new FileJSONIterator(fileReader, metadataRootNodeName); } }; } catch (Exception e) { @@ -66,12 +66,12 @@ public class FileJSONCollectorPlugin extends FileCollectorPlugin { class FileJSONIterator implements Iterator { private String next; - private String identifierFieldKey; + private String metadataRootNodeName; private Iterator aatInfosIterator; private JsonReader jsonReader; - public FileJSONIterator(final FileReader fileReader, final String identifierFieldKey) { - this.identifierFieldKey = identifierFieldKey; + public FileJSONIterator(final FileReader fileReader, final String metadataRootNodeName) { + this.metadataRootNodeName = metadataRootNodeName; jsonReader = new JsonReader(fileReader); JsonElement jsonElement = new JsonParser().parse(jsonReader); JsonArray jsonArrays = jsonElement.getAsJsonArray(); @@ -94,7 +94,7 @@ public class FileJSONCollectorPlugin extends FileCollectorPlugin { private String calculateNext() { try { Document document = DocumentHelper.createDocument(); - Element root = document.addElement("Entry"); + Element root = document.addElement(this.metadataRootNodeName); if (!aatInfosIterator.hasNext()) { log.info("json entries finished, closing RESULT SET"); diff --git a/dnet-ariadneplus/src/main/java/eu/dnetlib/data/collector/plugins/ariadneplus/ads/AATCollectorPlugin.java b/dnet-ariadneplus/src/main/java/eu/dnetlib/data/collector/plugins/ariadneplus/ads/FolderCollectorPlugin.java similarity index 87% rename from dnet-ariadneplus/src/main/java/eu/dnetlib/data/collector/plugins/ariadneplus/ads/AATCollectorPlugin.java rename to dnet-ariadneplus/src/main/java/eu/dnetlib/data/collector/plugins/ariadneplus/ads/FolderCollectorPlugin.java index 5c92765..f765c8a 100644 --- a/dnet-ariadneplus/src/main/java/eu/dnetlib/data/collector/plugins/ariadneplus/ads/AATCollectorPlugin.java +++ b/dnet-ariadneplus/src/main/java/eu/dnetlib/data/collector/plugins/ariadneplus/ads/FolderCollectorPlugin.java @@ -15,13 +15,13 @@ import eu.dnetlib.rmi.data.CollectorServiceException; import eu.dnetlib.rmi.data.InterfaceDescriptor; -public class AATCollectorPlugin extends FileJSONCollectorPlugin { +public class FolderCollectorPlugin extends FileJSONCollectorPlugin { private Iterator recordIterator; private URL basePath; /** The Constant log. */ - private static final Log log = LogFactory.getLog(AATCollectorPlugin.class); + private static final Log log = LogFactory.getLog(FolderCollectorPlugin.class); @Override public Iterable collect(final InterfaceDescriptor interfaceDescriptor, final String fromDate, final String untilDate) @@ -33,7 +33,7 @@ public class AATCollectorPlugin extends FileJSONCollectorPlugin { try { basePath = new URL(url); } catch (MalformedURLException mue) { - log.error("Failed collecting json aat from base url " + url, mue); + log.error("Failed collecting json from base url " + url, mue); throw new CollectorServiceException(mue); } @@ -57,7 +57,7 @@ public class AATCollectorPlugin extends FileJSONCollectorPlugin { recordIterator = Iterators.concat(recordIterator, super.collect(interfaceDescriptor, fromDate, untilDate).iterator()); } } catch (CollectorServiceException e) { - log.error("Failed collecting json aat from path: " + nextFilePath, e); + log.error("Failed collecting json from path: " + nextFilePath, e); } } return new ADSIterable(recordIterator); diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/data/collector/plugins/ariadneplus/applicationContext-ariadneplus-collector-plugins.xml b/dnet-ariadneplus/src/main/resources/eu/dnetlib/data/collector/plugins/ariadneplus/applicationContext-ariadneplus-collector-plugins.xml index cae146f..cd1d103 100644 --- a/dnet-ariadneplus/src/main/resources/eu/dnetlib/data/collector/plugins/ariadneplus/applicationContext-ariadneplus-collector-plugins.xml +++ b/dnet-ariadneplus/src/main/resources/eu/dnetlib/data/collector/plugins/ariadneplus/applicationContext-ariadneplus-collector-plugins.xml @@ -17,13 +17,25 @@ - + + p:name="metadataRootNodeName"/> + + + + + + + + + + +