Updates Promotion DBs

- Add a step for promoting the splitted monitor DBs

.gitignore

@@ -7,6 +7,8 @@
 *.iws
 *~
 .vscode
+.metals
+.bloop
 .classpath
 /*/.classpath
 /*/*/.classpath
@@ -24,4 +26,5 @@
 spark-warehouse
 /**/job-override.properties
 /**/*.log
+/**/.factorypath
 

dhp-common/pom.xml

@@ -6,7 +6,8 @@
 		<groupId>eu.dnetlib.dhp</groupId>
 		<artifactId>dhp</artifactId>
 		<version>1.2.4-SNAPSHOT</version>
-		<relativePath>../</relativePath>
+		<relativePath>../pom.xml</relativePath>
+
 	</parent>
 
 	<artifactId>dhp-common</artifactId>
@@ -20,6 +21,10 @@
 			<groupId>org.apache.hadoop</groupId>
 			<artifactId>hadoop-common</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.github.sisyphsu</groupId>
+			<artifactId>dateparser</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.spark</groupId>
 			<artifactId>spark-core_2.11</artifactId>
@@ -53,11 +58,6 @@
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
 		</dependency>
-		<!-- https://mvnrepository.com/artifact/com.rabbitmq/amqp-client -->
-		<dependency>
-			<groupId>com.rabbitmq</groupId>
-			<artifactId>amqp-client</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>net.sf.saxon</groupId>
 			<artifactId>Saxon-HE</artifactId>
@@ -98,10 +98,19 @@
 			<artifactId>dnet-pace-core</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.mongodb</groupId>
+			<artifactId>mongo-java-driver</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>eu.dnetlib.dhp</groupId>
 			<artifactId>dhp-schemas</artifactId>
-			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
 

dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common/model/MDStore.java

@@ -1,119 +0,0 @@
-
-package eu.dnetlib.data.mdstore.manager.common.model;
-
-import java.io.Serializable;
-import java.util.UUID;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-@Entity
-@Table(name = "mdstores")
-public class MDStore implements Serializable {
-
-	/** */
-	private static final long serialVersionUID = 3160530489149700055L;
-
-	@Id
-	@Column(name = "id")
-	private String id;
-
-	@Column(name = "format")
-	private String format;
-
-	@Column(name = "layout")
-	private String layout;
-
-	@Column(name = "interpretation")
-	private String interpretation;
-
-	@Column(name = "datasource_name")
-	private String datasourceName;
-
-	@Column(name = "datasource_id")
-	private String datasourceId;
-
-	@Column(name = "api_id")
-	private String apiId;
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(final String id) {
-		this.id = id;
-	}
-
-	public String getFormat() {
-		return format;
-	}
-
-	public void setFormat(final String format) {
-		this.format = format;
-	}
-
-	public String getLayout() {
-		return layout;
-	}
-
-	public void setLayout(final String layout) {
-		this.layout = layout;
-	}
-
-	public String getInterpretation() {
-		return interpretation;
-	}
-
-	public void setInterpretation(final String interpretation) {
-		this.interpretation = interpretation;
-	}
-
-	public String getDatasourceName() {
-		return datasourceName;
-	}
-
-	public void setDatasourceName(final String datasourceName) {
-		this.datasourceName = datasourceName;
-	}
-
-	public String getDatasourceId() {
-		return datasourceId;
-	}
-
-	public void setDatasourceId(final String datasourceId) {
-		this.datasourceId = datasourceId;
-	}
-
-	public String getApiId() {
-		return apiId;
-	}
-
-	public void setApiId(final String apiId) {
-		this.apiId = apiId;
-	}
-
-	public static MDStore newInstance(
-		final String format, final String layout, final String interpretation) {
-		return newInstance(format, layout, interpretation, null, null, null);
-	}
-
-	public static MDStore newInstance(
-		final String format,
-		final String layout,
-		final String interpretation,
-		final String dsName,
-		final String dsId,
-		final String apiId) {
-		final MDStore md = new MDStore();
-		md.setId("md-" + UUID.randomUUID());
-		md.setFormat(format);
-		md.setLayout(layout);
-		md.setInterpretation(interpretation);
-		md.setDatasourceName(dsName);
-		md.setDatasourceId(dsId);
-		md.setApiId(apiId);
-		return md;
-	}
-}

dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common/model/MDStoreCurrentVersion.java

@@ -1,51 +0,0 @@
-
-package eu.dnetlib.data.mdstore.manager.common.model;
-
-import java.io.Serializable;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-@Entity
-@Table(name = "mdstore_current_versions")
-public class MDStoreCurrentVersion implements Serializable {
-
-	/** */
-	private static final long serialVersionUID = -4757725888593745773L;
-
-	@Id
-	@Column(name = "mdstore")
-	private String mdstore;
-
-	@Column(name = "current_version")
-	private String currentVersion;
-
-	public String getMdstore() {
-		return mdstore;
-	}
-
-	public void setMdstore(final String mdstore) {
-		this.mdstore = mdstore;
-	}
-
-	public String getCurrentVersion() {
-		return currentVersion;
-	}
-
-	public void setCurrentVersion(final String currentVersion) {
-		this.currentVersion = currentVersion;
-	}
-
-	public static MDStoreCurrentVersion newInstance(final String mdId, final String versionId) {
-		final MDStoreCurrentVersion cv = new MDStoreCurrentVersion();
-		cv.setMdstore(mdId);
-		cv.setCurrentVersion(versionId);
-		return cv;
-	}
-
-	public static MDStoreCurrentVersion newInstance(final MDStoreVersion v) {
-		return newInstance(v.getMdstore(), v.getId());
-	}
-}

dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common/model/MDStoreVersion.java

@@ -1,99 +0,0 @@
-
-package eu.dnetlib.data.mdstore.manager.common.model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-
-@Entity
-@Table(name = "mdstore_versions")
-public class MDStoreVersion implements Serializable {
-
-	/** */
-	private static final long serialVersionUID = -4763494442274298339L;
-
-	@Id
-	@Column(name = "id")
-	private String id;
-
-	@Column(name = "mdstore")
-	private String mdstore;
-
-	@Column(name = "writing")
-	private boolean writing;
-
-	@Column(name = "readcount")
-	private int readCount = 0;
-
-	@Column(name = "lastupdate")
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date lastUpdate;
-
-	@Column(name = "size")
-	private long size = 0;
-
-	public static MDStoreVersion newInstance(final String mdId, final boolean writing) {
-		final MDStoreVersion t = new MDStoreVersion();
-		t.setId(mdId + "-" + new Date().getTime());
-		t.setMdstore(mdId);
-		t.setLastUpdate(null);
-		t.setWriting(writing);
-		t.setReadCount(0);
-		t.setSize(0);
-		return t;
-	}
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(final String id) {
-		this.id = id;
-	}
-
-	public String getMdstore() {
-		return mdstore;
-	}
-
-	public void setMdstore(final String mdstore) {
-		this.mdstore = mdstore;
-	}
-
-	public boolean isWriting() {
-		return writing;
-	}
-
-	public void setWriting(final boolean writing) {
-		this.writing = writing;
-	}
-
-	public int getReadCount() {
-		return readCount;
-	}
-
-	public void setReadCount(final int readCount) {
-		this.readCount = readCount;
-	}
-
-	public Date getLastUpdate() {
-		return lastUpdate;
-	}
-
-	public void setLastUpdate(final Date lastUpdate) {
-		this.lastUpdate = lastUpdate;
-	}
-
-	public long getSize() {
-		return size;
-	}
-
-	public void setSize(final long size) {
-		this.size = size;
-	}
-}

dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common/model/MDStoreWithInfo.java

@@ -1,143 +0,0 @@
-
-package eu.dnetlib.data.mdstore.manager.common.model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-
-@Entity
-@Table(name = "mdstores_with_info")
-public class MDStoreWithInfo implements Serializable {
-
-	/** */
-	private static final long serialVersionUID = -8445784770687571492L;
-
-	@Id
-	@Column(name = "id")
-	private String id;
-
-	@Column(name = "format")
-	private String format;
-
-	@Column(name = "layout")
-	private String layout;
-
-	@Column(name = "interpretation")
-	private String interpretation;
-
-	@Column(name = "datasource_name")
-	private String datasourceName;
-
-	@Column(name = "datasource_id")
-	private String datasourceId;
-
-	@Column(name = "api_id")
-	private String apiId;
-
-	@Column(name = "current_version")
-	private String currentVersion;
-
-	@Column(name = "lastupdate")
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date lastUpdate;
-
-	@Column(name = "size")
-	private long size = 0;
-
-	@Column(name = "n_versions")
-	private long numberOfVersions = 0;
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(final String id) {
-		this.id = id;
-	}
-
-	public String getFormat() {
-		return format;
-	}
-
-	public void setFormat(final String format) {
-		this.format = format;
-	}
-
-	public String getLayout() {
-		return layout;
-	}
-
-	public void setLayout(final String layout) {
-		this.layout = layout;
-	}
-
-	public String getInterpretation() {
-		return interpretation;
-	}
-
-	public void setInterpretation(final String interpretation) {
-		this.interpretation = interpretation;
-	}
-
-	public String getDatasourceName() {
-		return datasourceName;
-	}
-
-	public void setDatasourceName(final String datasourceName) {
-		this.datasourceName = datasourceName;
-	}
-
-	public String getDatasourceId() {
-		return datasourceId;
-	}
-
-	public void setDatasourceId(final String datasourceId) {
-		this.datasourceId = datasourceId;
-	}
-
-	public String getApiId() {
-		return apiId;
-	}
-
-	public void setApiId(final String apiId) {
-		this.apiId = apiId;
-	}
-
-	public String getCurrentVersion() {
-		return currentVersion;
-	}
-
-	public void setCurrentVersion(final String currentVersion) {
-		this.currentVersion = currentVersion;
-	}
-
-	public Date getLastUpdate() {
-		return lastUpdate;
-	}
-
-	public void setLastUpdate(final Date lastUpdate) {
-		this.lastUpdate = lastUpdate;
-	}
-
-	public long getSize() {
-		return size;
-	}
-
-	public void setSize(final long size) {
-		this.size = size;
-	}
-
-	public long getNumberOfVersions() {
-		return numberOfVersions;
-	}
-
-	public void setNumberOfVersions(final long numberOfVersions) {
-		this.numberOfVersions = numberOfVersions;
-	}
-}

dhp-common/src/main/java/eu/dnetlib/dhp/application/ApplicationUtils.java

@@ -0,0 +1,14 @@
+
+package eu.dnetlib.dhp.application;
+
+import java.io.*;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.hadoop.conf.Configuration;
+
+import com.google.common.collect.Maps;
+
+public class ApplicationUtils {
+
+}

dhp-common/src/main/java/eu/dnetlib/dhp/application/ArgumentApplicationParser.java

@@ -1,10 +1,7 @@
 
 package eu.dnetlib.dhp.application;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.Serializable;
-import java.io.StringWriter;
+import java.io.*;
 import java.util.*;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
@@ -12,17 +9,21 @@ import java.util.zip.GZIPOutputStream;
 import org.apache.commons.cli.*;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class ArgumentApplicationParser implements Serializable {
 
+	private static final Logger log = LoggerFactory.getLogger(ArgumentApplicationParser.class);
+
 	private final Options options = new Options();
 	private final Map<String, String> objectMap = new HashMap<>();
 
 	private final List<String> compressedValues = new ArrayList<>();
 
-	public ArgumentApplicationParser(final String json_configuration) throws Exception {
+	public ArgumentApplicationParser(final String json_configuration) throws IOException {
 		final ObjectMapper mapper = new ObjectMapper();
 		final OptionsParameter[] configuration = mapper.readValue(json_configuration, OptionsParameter[].class);
 		createOptionMap(configuration);
@@ -33,7 +34,6 @@ public class ArgumentApplicationParser implements Serializable {
 	}
 
 	private void createOptionMap(final OptionsParameter[] configuration) {
-
 		Arrays
 			.stream(configuration)
 			.map(
@@ -47,10 +47,6 @@ public class ArgumentApplicationParser implements Serializable {
 					return o;
 				})
 			.forEach(options::addOption);
-
-		// HelpFormatter formatter = new HelpFormatter();
-		// formatter.printHelp("myapp", null, options, null, true);
-
 	}
 
 	public static String decompressValue(final String abstractCompressed) {
@@ -61,7 +57,7 @@ public class ArgumentApplicationParser implements Serializable {
 			IOUtils.copy(gis, stringWriter);
 			return stringWriter.toString();
 		} catch (Throwable e) {
-			System.out.println("Wrong value to decompress:" + abstractCompressed);
+			log.error("Wrong value to decompress:" + abstractCompressed);
 			throw new RuntimeException(e);
 		}
 	}
@@ -74,7 +70,7 @@ public class ArgumentApplicationParser implements Serializable {
 		return java.util.Base64.getEncoder().encodeToString(out.toByteArray());
 	}
 
-	public void parseArgument(final String[] args) throws Exception {
+	public void parseArgument(final String[] args) throws ParseException {
 		CommandLineParser parser = new BasicParser();
 		CommandLine cmd = parser.parse(options, args);
 		Arrays

dhp-common/src/main/java/eu/dnetlib/dhp/collection/ApiDescriptor.java

@@ -1,5 +1,5 @@
 
-package eu.dnetlib.collector.worker.model;
+package eu.dnetlib.dhp.collection;
 
 import java.util.HashMap;
 import java.util.Map;

dhp-common/src/main/java/eu/dnetlib/dhp/common/Constants.java

@@ -27,4 +27,26 @@ public class Constants {
 		coarCodeLabelMap.put("c_f1cf", "EMBARGO");
 	}
 
+	public static final String SEQUENCE_FILE_NAME = "/sequence_file";
+	public static final String REPORT_FILE_NAME = "/report";
+	public static final String MDSTORE_DATA_PATH = "/store";
+	public static final String MDSTORE_SIZE_PATH = "/size";
+
+	public static final String COLLECTION_MODE = "collectionMode";
+	public static final String METADATA_ENCODING = "metadataEncoding";
+	public static final String OOZIE_WF_PATH = "oozieWfPath";
+	public static final String DNET_MESSAGE_MGR_URL = "dnetMessageManagerURL";
+
+	public static final String MAX_NUMBER_OF_RETRY = "maxNumberOfRetry";
+	public static final String REQUEST_DELAY = "requestDelay";
+	public static final String RETRY_DELAY = "retryDelay";
+	public static final String CONNECT_TIMEOUT = "connectTimeOut";
+	public static final String READ_TIMEOUT = "readTimeOut";
+	public static final String FROM_DATE_OVERRIDE = "fromDateOverride";
+	public static final String UNTIL_DATE_OVERRIDE = "untilDateOverride";
+
+	public static final String CONTENT_TOTALITEMS = "TotalItems";
+	public static final String CONTENT_INVALIDRECORDS = "InvalidRecords";
+	public static final String CONTENT_TRANSFORMEDRECORDS = "transformedItems";
+
 }

dhp-common/src/main/java/eu/dnetlib/dhp/common/DbClient.java

@@ -14,7 +14,7 @@ public class DbClient implements Closeable {
 
 	private static final Log log = LogFactory.getLog(DbClient.class);
 
-	private Connection connection;
+	private final Connection connection;
 
 	public DbClient(final String address, final String login, final String password) {
 

dhp-common/src/main/java/eu/dnetlib/dhp/common/MakeTarArchive.java

@@ -100,7 +100,7 @@ public class MakeTarArchive implements Serializable {
 			BufferedInputStream bis = new BufferedInputStream(is);
 
 			int count;
-			byte data[] = new byte[1024];
+			byte[] data = new byte[1024];
 			while ((count = bis.read(data, 0, data.length)) != -1) {
 				ar.write(data, 0, count);
 			}

dhp-common/src/main/java/eu/dnetlib/dhp/common/MdstoreClient.java

@@ -1,39 +1,60 @@
 
-package eu.dnetlib.dhp.oa.graph.raw.common;
+package eu.dnetlib.dhp.common;
 
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.StreamSupport;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.bson.Document;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.Iterables;
+import com.mongodb.BasicDBObject;
 import com.mongodb.MongoClient;
 import com.mongodb.MongoClientURI;
+import com.mongodb.QueryBuilder;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
 
 public class MdstoreClient implements Closeable {
 
+	private static final Logger log = LoggerFactory.getLogger(MdstoreClient.class);
+
 	private final MongoClient client;
 	private final MongoDatabase db;
 
 	private static final String COLL_METADATA = "metadata";
 	private static final String COLL_METADATA_MANAGER = "metadataManager";
 
-	private static final Log log = LogFactory.getLog(MdstoreClient.class);
-
 	public MdstoreClient(final String baseUrl, final String dbName) {
 		this.client = new MongoClient(new MongoClientURI(baseUrl));
 		this.db = getDb(client, dbName);
 	}
 
+	public MongoCollection<Document> mdStore(final String mdId) {
+		BasicDBObject query = (BasicDBObject) QueryBuilder.start("mdId").is(mdId).get();
+
+		log.info("querying current mdId: {}", query.toJson());
+
+		final String currentId = Optional
+			.ofNullable(getColl(db, COLL_METADATA_MANAGER, true).find(query))
+			.map(r -> r.first())
+			.map(d -> d.getString("currentId"))
+			.orElseThrow(() -> new IllegalArgumentException("cannot find current mdstore id for: " + mdId));
+
+		log.info("currentId: {}", currentId);
+
+		return getColl(db, currentId, true);
+	}
+
 	public Map<String, String> validCollections(
 		final String mdFormat, final String mdLayout, final String mdInterpretation) {
 

dhp-common/src/main/java/eu/dnetlib/dhp/common/api/InputStreamRequestBody.java

@@ -13,9 +13,9 @@ import okio.Source;
 
 public class InputStreamRequestBody extends RequestBody {
 
-	private InputStream inputStream;
-	private MediaType mediaType;
-	private long lenght;
+	private final InputStream inputStream;
+	private final MediaType mediaType;
+	private final long lenght;
 
 	public static RequestBody create(final MediaType mediaType, final InputStream inputStream, final long len) {
 

dhp-common/src/main/java/eu/dnetlib/dhp/common/rest/DNetRestClient.java

@@ -0,0 +1,72 @@
+
+package eu.dnetlib.dhp.common.rest;
+
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class DNetRestClient {
+
+	private static final Logger log = LoggerFactory.getLogger(DNetRestClient.class);
+
+	private static final ObjectMapper mapper = new ObjectMapper();
+
+	public static <T> T doGET(final String url, Class<T> clazz) throws Exception {
+		final HttpGet httpGet = new HttpGet(url);
+		return doHTTPRequest(httpGet, clazz);
+	}
+
+	public static String doGET(final String url) throws Exception {
+		final HttpGet httpGet = new HttpGet(url);
+		return doHTTPRequest(httpGet);
+	}
+
+	public static <V> String doPOST(final String url, V objParam) throws Exception {
+		final HttpPost httpPost = new HttpPost(url);
+
+		if (objParam != null) {
+			final StringEntity entity = new StringEntity(mapper.writeValueAsString(objParam));
+			httpPost.setEntity(entity);
+			httpPost.setHeader("Accept", "application/json");
+			httpPost.setHeader("Content-type", "application/json");
+		}
+		return doHTTPRequest(httpPost);
+	}
+
+	public static <T, V> T doPOST(final String url, V objParam, Class<T> clazz) throws Exception {
+		return mapper.readValue(doPOST(url, objParam), clazz);
+	}
+
+	private static String doHTTPRequest(final HttpUriRequest r) throws Exception {
+		CloseableHttpClient client = HttpClients.createDefault();
+
+		log.info("performing HTTP request, method {} on URI {}", r.getMethod(), r.getURI().toString());
+		log
+			.info(
+				"request headers: {}",
+				Arrays
+					.asList(r.getAllHeaders())
+					.stream()
+					.map(h -> h.getName() + ":" + h.getValue())
+					.collect(Collectors.joining(",")));
+
+		CloseableHttpResponse response = client.execute(r);
+		return IOUtils.toString(response.getEntity().getContent());
+	}
+
+	private static <T> T doHTTPRequest(final HttpUriRequest r, Class<T> clazz) throws Exception {
+		return mapper.readValue(doHTTPRequest(r), clazz);
+	}
+}

dhp-common/src/main/java/eu/dnetlib/dhp/common/vocabulary/Vocabulary.java

@@ -1,5 +1,5 @@
 
-package eu.dnetlib.dhp.oa.graph.raw.common;
+package eu.dnetlib.dhp.common.vocabulary;
 
 import java.io.Serializable;
 import java.util.HashMap;
@@ -10,8 +10,8 @@ import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.collect.Maps;
 
-import eu.dnetlib.dhp.schema.oaf.OafMapperUtils;
 import eu.dnetlib.dhp.schema.oaf.Qualifier;
+import eu.dnetlib.dhp.schema.oaf.utils.OafMapperUtils;
 
 public class Vocabulary implements Serializable {
 

dhp-common/src/main/java/eu/dnetlib/dhp/common/vocabulary/VocabularyGroup.java

@@ -1,5 +1,5 @@
 
-package eu.dnetlib.dhp.oa.graph.raw.common;
+package eu.dnetlib.dhp.common.vocabulary;
 
 import java.io.Serializable;
 import java.util.*;
@@ -7,8 +7,8 @@ import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 
-import eu.dnetlib.dhp.schema.oaf.OafMapperUtils;
 import eu.dnetlib.dhp.schema.oaf.Qualifier;
+import eu.dnetlib.dhp.schema.oaf.utils.OafMapperUtils;
 import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpException;
 import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpService;
 
@@ -67,6 +67,10 @@ public class VocabularyGroup implements Serializable {
 
 	private final Map<String, Vocabulary> vocs = new HashMap<>();
 
+	public Set<String> vocabularyNames() {
+		return vocs.keySet();
+	}
+
 	public void addVocabulary(final String id, final String name) {
 		vocs.put(id.toLowerCase(), new Vocabulary(id, name));
 	}
@@ -118,7 +122,31 @@ public class VocabularyGroup implements Serializable {
 		return vocs.get(vocId.toLowerCase()).getSynonymAsQualifier(syn);
 	}
 
+	/**
+	 * getSynonymAsQualifierCaseSensitive
+	 *
+	 * refelects the situation to check caseSensitive vocabulary
+	 */
+	public Qualifier getSynonymAsQualifierCaseSensitive(final String vocId, final String syn) {
+		if (StringUtils.isBlank(vocId)) {
+			return OafMapperUtils.unknown("", "");
+		}
+		return vocs.get(vocId).getSynonymAsQualifier(syn);
+	}
+
+	/**
+	 * termExists
+	 *
+	 * two methods: without and with caseSensitive check
+	 */
 	public boolean termExists(final String vocId, final String id) {
+		return termExists(vocId, id, Boolean.FALSE);
+	}
+
+	public boolean termExists(final String vocId, final String id, final Boolean caseSensitive) {
+		if (Boolean.TRUE.equals(caseSensitive)) {
+			return vocabularyExists(vocId) && vocs.get(vocId).termExists(id);
+		}
 		return vocabularyExists(vocId) && vocs.get(vocId.toLowerCase()).termExists(id);
 	}
 

dhp-common/src/main/java/eu/dnetlib/dhp/common/vocabulary/VocabularyTerm.java

@@ -1,5 +1,5 @@
 
-package eu.dnetlib.dhp.oa.graph.raw.common;
+package eu.dnetlib.dhp.common.vocabulary;
 
 import java.io.Serializable;
 

dhp-common/src/main/java/eu/dnetlib/dhp/message/Message.java

@@ -0,0 +1,64 @@
+
+package eu.dnetlib.dhp.message;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class Message implements Serializable {
+
+	private static final long serialVersionUID = 401753881204524893L;
+
+	public static String CURRENT_PARAM = "current";
+	public static String TOTAL_PARAM = "total";
+
+	private MessageType messageType;
+
+	private String workflowId;
+
+	private Map<String, String> body;
+
+	public Message() {
+	}
+
+	public Message(final MessageType messageType, final String workflowId) {
+		this(messageType, workflowId, new LinkedHashMap<>());
+	}
+
+	public Message(final MessageType messageType, final String workflowId, final Map<String, String> body) {
+		this.messageType = messageType;
+		this.workflowId = workflowId;
+		this.body = body;
+	}
+
+	public MessageType getMessageType() {
+		return messageType;
+	}
+
+	public void setMessageType(MessageType messageType) {
+		this.messageType = messageType;
+	}
+
+	public String getWorkflowId() {
+		return workflowId;
+	}
+
+	public void setWorkflowId(final String workflowId) {
+		this.workflowId = workflowId;
+	}
+
+	public Map<String, String> getBody() {
+		return body;
+	}
+
+	public void setBody(final Map<String, String> body) {
+		this.body = body;
+	}
+
+	@Override
+	public String toString() {
+		return String.format("Message [type=%s, workflowId=%s, body=%s]", messageType, workflowId, body);
+	}
+
+}

dhp-common/src/main/java/eu/dnetlib/dhp/message/MessageSender.java

@@ -0,0 +1,94 @@
+
+package eu.dnetlib.dhp.message;
+
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class MessageSender {
+
+	private static final Logger log = LoggerFactory.getLogger(MessageSender.class);
+
+	private static final int SOCKET_TIMEOUT_MS = 2000;
+
+	private static final int CONNECTION_REQUEST_TIMEOUT_MS = 2000;
+
+	private static final int CONNTECTION_TIMEOUT_MS = 2000;
+
+	private final ObjectMapper objectMapper = new ObjectMapper();
+
+	private final String dnetMessageEndpoint;
+
+	private final String workflowId;
+
+	private final ExecutorService executorService = Executors.newCachedThreadPool();
+
+	public MessageSender(final String dnetMessageEndpoint, final String workflowId) {
+		this.workflowId = workflowId;
+		this.dnetMessageEndpoint = dnetMessageEndpoint;
+	}
+
+	public void sendMessage(final Message message) {
+		executorService.submit(() -> _sendMessage(message));
+	}
+
+	public void sendMessage(final Long current, final Long total) {
+		sendMessage(createOngoingMessage(current, total));
+	}
+
+	public void sendReport(final Map<String, String> report) {
+		sendMessage(new Message(MessageType.REPORT, workflowId, report));
+	}
+
+	private Message createOngoingMessage(final Long current, final Long total) {
+		final Message m = new Message(MessageType.ONGOING, workflowId);
+		m.getBody().put(Message.CURRENT_PARAM, current.toString());
+		if (total != null) {
+			m.getBody().put(Message.TOTAL_PARAM, total.toString());
+		}
+		return m;
+	}
+
+	private void _sendMessage(final Message message) {
+		try {
+			final String json = objectMapper.writeValueAsString(message);
+
+			final HttpPut req = new HttpPut(dnetMessageEndpoint);
+			req.setEntity(new StringEntity(json, ContentType.APPLICATION_JSON));
+
+			final RequestConfig requestConfig = RequestConfig
+				.custom()
+				.setConnectTimeout(CONNTECTION_TIMEOUT_MS)
+				.setConnectionRequestTimeout(CONNECTION_REQUEST_TIMEOUT_MS)
+				.setSocketTimeout(SOCKET_TIMEOUT_MS)
+				.build();
+
+			try (final CloseableHttpClient client = HttpClients
+				.custom()
+				.setDefaultRequestConfig(requestConfig)
+				.build();
+				final CloseableHttpResponse response = client.execute(req)) {
+				log.debug("Sent Message to " + dnetMessageEndpoint);
+				log.debug("MESSAGE:" + message);
+			} catch (final Throwable e) {
+				log.error("Error sending message to " + dnetMessageEndpoint + ", message content: " + message, e);
+			}
+		} catch (final JsonProcessingException e) {
+			log.error("Error sending message to " + dnetMessageEndpoint + ", message content: " + message, e);
+		}
+	}
+
+}

dhp-common/src/main/java/eu/dnetlib/dhp/message/MessageType.java

@@ -0,0 +1,21 @@
+
+package eu.dnetlib.dhp.message;
+
+import java.io.Serializable;
+import java.util.Optional;
+
+import org.apache.commons.lang3.StringUtils;
+
+public enum MessageType implements Serializable {
+
+	ONGOING, REPORT;
+
+	public MessageType from(String value) {
+		return Optional
+			.ofNullable(value)
+			.map(StringUtils::upperCase)
+			.map(MessageType::valueOf)
+			.orElseThrow(() -> new IllegalArgumentException("unknown message type: " + value));
+	}
+
+}

dhp-common/src/main/java/eu/dnetlib/dhp/model/mdstore/MetadataRecord.java

@@ -1,121 +0,0 @@
-
-package eu.dnetlib.dhp.model.mdstore;
-
-import java.io.Serializable;
-
-import eu.dnetlib.dhp.utils.DHPUtils;
-
-/** This class models a record inside the new Metadata store collection on HDFS * */
-public class MetadataRecord implements Serializable {
-
-	/** The D-Net Identifier associated to the record */
-	private String id;
-
-	/** The original Identifier of the record */
-	private String originalId;
-
-	/** The encoding of the record, should be JSON or XML */
-	private String encoding;
-
-	/**
-	 * The information about the provenance of the record see @{@link Provenance} for the model of this information
-	 */
-	private Provenance provenance;
-
-	/** The content of the metadata */
-	private String body;
-
-	/** the date when the record has been stored */
-	private long dateOfCollection;
-
-	/** the date when the record has been stored */
-	private long dateOfTransformation;
-
-	public MetadataRecord() {
-		this.dateOfCollection = System.currentTimeMillis();
-	}
-
-	public MetadataRecord(
-		String originalId,
-		String encoding,
-		Provenance provenance,
-		String body,
-		long dateOfCollection) {
-
-		this.originalId = originalId;
-		this.encoding = encoding;
-		this.provenance = provenance;
-		this.body = body;
-		this.dateOfCollection = dateOfCollection;
-		this.id = DHPUtils.generateIdentifier(originalId, this.provenance.getNsPrefix());
-	}
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getOriginalId() {
-		return originalId;
-	}
-
-	public void setOriginalId(String originalId) {
-		this.originalId = originalId;
-	}
-
-	public String getEncoding() {
-		return encoding;
-	}
-
-	public void setEncoding(String encoding) {
-		this.encoding = encoding;
-	}
-
-	public Provenance getProvenance() {
-		return provenance;
-	}
-
-	public void setProvenance(Provenance provenance) {
-		this.provenance = provenance;
-	}
-
-	public String getBody() {
-		return body;
-	}
-
-	public void setBody(String body) {
-		this.body = body;
-	}
-
-	public long getDateOfCollection() {
-		return dateOfCollection;
-	}
-
-	public void setDateOfCollection(long dateOfCollection) {
-		this.dateOfCollection = dateOfCollection;
-	}
-
-	public long getDateOfTransformation() {
-		return dateOfTransformation;
-	}
-
-	public void setDateOfTransformation(long dateOfTransformation) {
-		this.dateOfTransformation = dateOfTransformation;
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (!(o instanceof MetadataRecord)) {
-			return false;
-		}
-		return ((MetadataRecord) o).getId().equalsIgnoreCase(id);
-	}
-
-	@Override
-	public int hashCode() {
-		return id.hashCode();
-	}
-}

dhp-common/src/main/java/eu/dnetlib/dhp/model/mdstore/Provenance.java

@@ -1,52 +0,0 @@
-
-package eu.dnetlib.dhp.model.mdstore;
-
-import java.io.Serializable;
-
-/**
- * @author Sandro La Bruzzo
- *         <p>
- *         Provenace class models the provenance of the record in the metadataStore It contains the identifier and the
- *         name of the datasource that gives the record
- */
-public class Provenance implements Serializable {
-
-	private String datasourceId;
-
-	private String datasourceName;
-
-	private String nsPrefix;
-
-	public Provenance() {
-	}
-
-	public Provenance(String datasourceId, String datasourceName, String nsPrefix) {
-		this.datasourceId = datasourceId;
-		this.datasourceName = datasourceName;
-		this.nsPrefix = nsPrefix;
-	}
-
-	public String getDatasourceId() {
-		return datasourceId;
-	}
-
-	public void setDatasourceId(String datasourceId) {
-		this.datasourceId = datasourceId;
-	}
-
-	public String getDatasourceName() {
-		return datasourceName;
-	}
-
-	public void setDatasourceName(String datasourceName) {
-		this.datasourceName = datasourceName;
-	}
-
-	public String getNsPrefix() {
-		return nsPrefix;
-	}
-
-	public void setNsPrefix(String nsPrefix) {
-		this.nsPrefix = nsPrefix;
-	}
-}

dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/ResultTypeComparator.java

@@ -1,49 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf;
-
-import java.util.Comparator;
-
-import eu.dnetlib.dhp.schema.common.ModelConstants;
-
-public class ResultTypeComparator implements Comparator<Result> {
-
-	@Override
-	public int compare(Result left, Result right) {
-
-		if (left == null && right == null)
-			return 0;
-		if (left == null)
-			return 1;
-		if (right == null)
-			return -1;
-
-		String lClass = left.getResulttype().getClassid();
-		String rClass = right.getResulttype().getClassid();
-
-		if (lClass.equals(rClass))
-			return 0;
-
-		if (lClass.equals(ModelConstants.PUBLICATION_RESULTTYPE_CLASSID))
-			return -1;
-		if (rClass.equals(ModelConstants.PUBLICATION_RESULTTYPE_CLASSID))
-			return 1;
-
-		if (lClass.equals(ModelConstants.DATASET_RESULTTYPE_CLASSID))
-			return -1;
-		if (rClass.equals(ModelConstants.DATASET_RESULTTYPE_CLASSID))
-			return 1;
-
-		if (lClass.equals(ModelConstants.SOFTWARE_RESULTTYPE_CLASSID))
-			return -1;
-		if (rClass.equals(ModelConstants.SOFTWARE_RESULTTYPE_CLASSID))
-			return 1;
-
-		if (lClass.equals(ModelConstants.ORP_RESULTTYPE_CLASSID))
-			return -1;
-		if (rClass.equals(ModelConstants.ORP_RESULTTYPE_CLASSID))
-			return 1;
-
-		// Else (but unlikely), lexicographical ordering will do.
-		return lClass.compareTo(rClass);
-	}
-}

dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/GraphCleaningFunctions.java

@@ -1,33 +1,37 @@
 
-package eu.dnetlib.dhp.oa.graph.clean;
+package eu.dnetlib.dhp.schema.oaf.utils;
 
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
 import java.util.*;
 import java.util.function.Function;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
 
-import com.clearspring.analytics.util.Lists;
+import com.github.sisyphsu.dateparser.DateParserUtils;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
 
-import eu.dnetlib.dhp.oa.graph.raw.AbstractMdRecordToOafMapper;
 import eu.dnetlib.dhp.schema.common.ModelConstants;
+import eu.dnetlib.dhp.schema.common.ModelSupport;
 import eu.dnetlib.dhp.schema.oaf.*;
 
-public class CleaningFunctions {
-
-	public static final String DOI_PREFIX_REGEX = "^10\\.";
+public class GraphCleaningFunctions extends CleaningFunctions {
 
 	public static final String ORCID_CLEANING_REGEX = ".*([0-9]{4}).*[-–—−=].*([0-9]{4}).*[-–—−=].*([0-9]{4}).*[-–—−=].*([0-9x]{4})";
 	public static final int ORCID_LEN = 19;
-
 	public static final String CLEANING_REGEX = "(?:\\n|\\r|\\t)";
-
-	public static final Set<String> PID_BLACKLIST = new HashSet<>();
-
-	static {
-		PID_BLACKLIST.add("none");
-		PID_BLACKLIST.add("na");
-	}
+	public static final String INVALID_AUTHOR_REGEX = ".*deactivated.*";
+	public static final String TITLE_FILTER_REGEX = "[.*test.*\\W\\d]";
+	public static final int TITLE_FILTER_RESIDUAL_LENGTH = 10;
 
 	public static <T extends Oaf> T fixVocabularyNames(T value) {
 		if (value instanceof Datasource) {
@@ -59,23 +63,17 @@ public class CleaningFunctions {
 				}
 			}
 			if (Objects.nonNull(r.getAuthor())) {
-				r
-					.getAuthor()
-					.stream()
-					.filter(Objects::nonNull)
-					.forEach(a -> {
-						if (Objects.nonNull(a.getPid())) {
-							a
-								.getPid()
-								.stream()
-								.filter(Objects::nonNull)
-								.forEach(p -> fixVocabName(p.getQualifier(), ModelConstants.DNET_PID_TYPES));
-						}
-					});
+				r.getAuthor().stream().filter(Objects::nonNull).forEach(a -> {
+					if (Objects.nonNull(a.getPid())) {
+						a.getPid().stream().filter(Objects::nonNull).forEach(p -> {
+							fixVocabName(p.getQualifier(), ModelConstants.DNET_PID_TYPES);
+						});
+					}
+				});
 			}
 			if (value instanceof Publication) {
 
-			} else if (value instanceof eu.dnetlib.dhp.schema.oaf.Dataset) {
+			} else if (value instanceof Dataset) {
 
 			} else if (value instanceof OtherResearchProduct) {
 
@@ -87,7 +85,37 @@ public class CleaningFunctions {
 		return value;
 	}
 
-	public static <T extends Oaf> T fixDefaults(T value) {
+	public static <T extends Oaf> boolean filter(T value) {
+		if (value instanceof Datasource) {
+			// nothing to evaluate here
+		} else if (value instanceof Project) {
+			// nothing to evaluate here
+		} else if (value instanceof Organization) {
+			// nothing to evaluate here
+		} else if (value instanceof Relation) {
+			// nothing to clean here
+		} else if (value instanceof Result) {
+
+			Result r = (Result) value;
+
+			if (Objects.isNull(r.getTitle()) || r.getTitle().isEmpty()) {
+				return false;
+			}
+
+			if (value instanceof Publication) {
+
+			} else if (value instanceof Dataset) {
+
+			} else if (value instanceof OtherResearchProduct) {
+
+			} else if (value instanceof Software) {
+
+			}
+		}
+		return true;
+	}
+
+	public static <T extends Oaf> T cleanup(T value) {
 		if (value instanceof Datasource) {
 			// nothing to clean here
 		} else if (value instanceof Project) {
@@ -98,10 +126,44 @@ public class CleaningFunctions {
 				o.setCountry(ModelConstants.UNKNOWN_COUNTRY);
 			}
 		} else if (value instanceof Relation) {
-			// nothing to clean here
+			Relation r = (Relation) value;
+
+			Optional<String> validationDate = doCleanDate(r.getValidationDate());
+			if (validationDate.isPresent()) {
+				r.setValidationDate(validationDate.get());
+				r.setValidated(true);
+			} else {
+				r.setValidationDate(null);
+				r.setValidated(false);
+			}
 		} else if (value instanceof Result) {
 
 			Result r = (Result) value;
+
+			if (Objects.nonNull(r.getDateofacceptance())) {
+				Optional<String> date = cleanDateField(r.getDateofacceptance());
+				if (date.isPresent()) {
+					r.getDateofacceptance().setValue(date.get());
+				} else {
+					r.setDateofacceptance(null);
+				}
+			}
+			if (Objects.nonNull(r.getRelevantdate())) {
+				r
+					.setRelevantdate(
+						r
+							.getRelevantdate()
+							.stream()
+							.filter(Objects::nonNull)
+							.filter(sp -> Objects.nonNull(sp.getQualifier()))
+							.filter(sp -> StringUtils.isNotBlank(sp.getQualifier().getClassid()))
+							.map(sp -> {
+								sp.setValue(GraphCleaningFunctions.cleanDate(sp.getValue()));
+								return sp;
+							})
+							.filter(sp -> StringUtils.isNotBlank(sp.getValue()))
+							.collect(Collectors.toList()));
+			}
 			if (Objects.nonNull(r.getPublisher()) && StringUtils.isBlank(r.getPublisher().getValue())) {
 				r.setPublisher(null);
 			}
@@ -110,16 +172,6 @@ public class CleaningFunctions {
 					.setLanguage(
 						qualifier("und", "Undetermined", ModelConstants.DNET_LANGUAGES));
 			}
-			if (Objects.nonNull(r.getCountry())) {
-				r
-					.setCountry(
-						r
-							.getCountry()
-							.stream()
-							.filter(Objects::nonNull)
-							.filter(c -> StringUtils.isNotBlank(c.getClassid()))
-							.collect(Collectors.toList()));
-			}
 			if (Objects.nonNull(r.getSubject())) {
 				r
 					.setSubject(
@@ -130,7 +182,7 @@ public class CleaningFunctions {
 							.filter(sp -> StringUtils.isNotBlank(sp.getValue()))
 							.filter(sp -> Objects.nonNull(sp.getQualifier()))
 							.filter(sp -> StringUtils.isNotBlank(sp.getQualifier().getClassid()))
-							.map(CleaningFunctions::cleanValue)
+							.map(GraphCleaningFunctions::cleanValue)
 							.collect(Collectors.toList()));
 			}
 			if (Objects.nonNull(r.getTitle())) {
@@ -141,7 +193,13 @@ public class CleaningFunctions {
 							.stream()
 							.filter(Objects::nonNull)
 							.filter(sp -> StringUtils.isNotBlank(sp.getValue()))
-							.map(CleaningFunctions::cleanValue)
+							.filter(
+								sp -> sp
+									.getValue()
+									.toLowerCase()
+									.replaceAll(TITLE_FILTER_REGEX, "")
+									.length() > TITLE_FILTER_RESIDUAL_LENGTH)
+							.map(GraphCleaningFunctions::cleanValue)
 							.collect(Collectors.toList()));
 			}
 			if (Objects.nonNull(r.getDescription())) {
@@ -152,22 +210,11 @@ public class CleaningFunctions {
 							.stream()
 							.filter(Objects::nonNull)
 							.filter(sp -> StringUtils.isNotBlank(sp.getValue()))
-							.map(CleaningFunctions::cleanValue)
+							.map(GraphCleaningFunctions::cleanValue)
 							.collect(Collectors.toList()));
 			}
 			if (Objects.nonNull(r.getPid())) {
-				r
-					.setPid(
-						r
-							.getPid()
-							.stream()
-							.filter(Objects::nonNull)
-							.filter(sp -> StringUtils.isNotBlank(StringUtils.trim(sp.getValue())))
-							.filter(sp -> !PID_BLACKLIST.contains(sp.getValue().trim().toLowerCase()))
-							.filter(sp -> Objects.nonNull(sp.getQualifier()))
-							.filter(sp -> StringUtils.isNotBlank(sp.getQualifier().getClassid()))
-							.map(CleaningFunctions::normalizePidValue)
-							.collect(Collectors.toList()));
+				r.setPid(processPidCleaning(r.getPid()));
 			}
 			if (Objects.isNull(r.getResourcetype()) || StringUtils.isBlank(r.getResourcetype().getClassid())) {
 				r
@@ -175,11 +222,32 @@ public class CleaningFunctions {
 						qualifier(ModelConstants.UNKNOWN, "Unknown", ModelConstants.DNET_DATA_CITE_RESOURCE));
 			}
 			if (Objects.nonNull(r.getInstance())) {
+
 				for (Instance i : r.getInstance()) {
+					if (Objects.nonNull(i.getPid())) {
+						i.setPid(processPidCleaning(i.getPid()));
+					}
+					if (Objects.nonNull(i.getAlternateIdentifier())) {
+						i.setAlternateIdentifier(processPidCleaning(i.getAlternateIdentifier()));
+					}
+					Optional
+						.ofNullable(i.getPid())
+						.ifPresent(pid -> {
+							final Set<StructuredProperty> pids = Sets.newHashSet(pid);
+							Optional
+								.ofNullable(i.getAlternateIdentifier())
+								.ifPresent(altId -> {
+									final Set<StructuredProperty> altIds = Sets.newHashSet(altId);
+									i.setAlternateIdentifier(Lists.newArrayList(Sets.difference(altIds, pids)));
+								});
+						});
+
 					if (Objects.isNull(i.getAccessright()) || StringUtils.isBlank(i.getAccessright().getClassid())) {
 						i
 							.setAccessright(
-								qualifier(ModelConstants.UNKNOWN, "not available", ModelConstants.DNET_ACCESS_MODES));
+								accessRight(
+									ModelConstants.UNKNOWN, ModelConstants.NOT_AVAILABLE,
+									ModelConstants.DNET_ACCESS_MODES));
 					}
 					if (Objects.isNull(i.getHostedby()) || StringUtils.isBlank(i.getHostedby().getKey())) {
 						i.setHostedby(ModelConstants.UNKNOWN_REPOSITORY);
@@ -187,14 +255,24 @@ public class CleaningFunctions {
 					if (Objects.isNull(i.getRefereed())) {
 						i.setRefereed(qualifier("0000", "Unknown", ModelConstants.DNET_REVIEW_LEVELS));
 					}
+					if (Objects.nonNull(i.getDateofacceptance())) {
+						Optional<String> date = cleanDateField(i.getDateofacceptance());
+						if (date.isPresent()) {
+							i.getDateofacceptance().setValue(date.get());
+						} else {
+							i.setDateofacceptance(null);
+						}
+					}
 				}
 			}
 			if (Objects.isNull(r.getBestaccessright()) || StringUtils.isBlank(r.getBestaccessright().getClassid())) {
-				Qualifier bestaccessrights = AbstractMdRecordToOafMapper.createBestAccessRights(r.getInstance());
+				Qualifier bestaccessrights = OafMapperUtils.createBestAccessRights(r.getInstance());
 				if (Objects.isNull(bestaccessrights)) {
 					r
 						.setBestaccessright(
-							qualifier(ModelConstants.UNKNOWN, "not available", ModelConstants.DNET_ACCESS_MODES));
+							qualifier(
+								ModelConstants.UNKNOWN, ModelConstants.NOT_AVAILABLE,
+								ModelConstants.DNET_ACCESS_MODES));
 				} else {
 					r.setBestaccessright(bestaccessrights);
 				}
@@ -280,11 +358,10 @@ public class CleaningFunctions {
 									.collect(Collectors.toList()));
 					}
 				}
-
 			}
 			if (value instanceof Publication) {
 
-			} else if (value instanceof eu.dnetlib.dhp.schema.oaf.Dataset) {
+			} else if (value instanceof Dataset) {
 
 			} else if (value instanceof OtherResearchProduct) {
 
@@ -296,6 +373,79 @@ public class CleaningFunctions {
 		return value;
 	}
 
+	private static Optional<String> cleanDateField(Field<String> dateofacceptance) {
+		return Optional
+			.ofNullable(dateofacceptance)
+			.map(Field::getValue)
+			.map(GraphCleaningFunctions::cleanDate)
+			.filter(Objects::nonNull);
+	}
+
+	protected static Optional<String> doCleanDate(String date) {
+		return Optional.ofNullable(cleanDate(date));
+	}
+
+	public static String cleanDate(final String inputDate) {
+
+		if (StringUtils.isBlank(inputDate)) {
+			return null;
+		}
+
+		try {
+			final LocalDate date = DateParserUtils
+				.parseDate(inputDate.trim())
+				.toInstant()
+				.atZone(ZoneId.systemDefault())
+				.toLocalDate();
+			return DateTimeFormatter.ofPattern(ModelSupport.DATE_FORMAT).format(date);
+		} catch (DateTimeParseException e) {
+			return null;
+		}
+	}
+
+	// HELPERS
+
+	private static boolean isValidAuthorName(Author a) {
+		return !Stream
+			.of(a.getFullname(), a.getName(), a.getSurname())
+			.filter(s -> s != null && !s.isEmpty())
+			.collect(Collectors.joining(""))
+			.toLowerCase()
+			.matches(INVALID_AUTHOR_REGEX);
+	}
+
+	private static List<StructuredProperty> processPidCleaning(List<StructuredProperty> pids) {
+		return pids
+			.stream()
+			.filter(Objects::nonNull)
+			.filter(sp -> StringUtils.isNotBlank(StringUtils.trim(sp.getValue())))
+			.filter(sp -> !PID_BLACKLIST.contains(sp.getValue().trim().toLowerCase()))
+			.filter(sp -> Objects.nonNull(sp.getQualifier()))
+			.filter(sp -> StringUtils.isNotBlank(sp.getQualifier().getClassid()))
+			.map(CleaningFunctions::normalizePidValue)
+			.filter(CleaningFunctions::pidFilter)
+			.collect(Collectors.toList());
+	}
+
+	private static void fixVocabName(Qualifier q, String vocabularyName) {
+		if (Objects.nonNull(q) && StringUtils.isBlank(q.getSchemeid())) {
+			q.setSchemeid(vocabularyName);
+			q.setSchemename(vocabularyName);
+		}
+	}
+
+	private static AccessRight accessRight(String classid, String classname, String scheme) {
+		return OafMapperUtils
+			.accessRight(
+				classid, classname, scheme, scheme);
+	}
+
+	private static Qualifier qualifier(String classid, String classname, String scheme) {
+		return OafMapperUtils
+			.qualifier(
+				classid, classname, scheme, scheme);
+	}
+
 	protected static StructuredProperty cleanValue(StructuredProperty s) {
 		s.setValue(s.getValue().replaceAll(CLEANING_REGEX, " "));
 		return s;
@@ -306,39 +456,4 @@ public class CleaningFunctions {
 		return s;
 	}
 
-	// HELPERS
-
-	private static void fixVocabName(Qualifier q, String vocabularyName) {
-		if (Objects.nonNull(q) && StringUtils.isBlank(q.getSchemeid())) {
-			q.setSchemeid(vocabularyName);
-			q.setSchemename(vocabularyName);
-		}
-	}
-
-	private static Qualifier qualifier(String classid, String classname, String scheme) {
-		return OafMapperUtils
-			.qualifier(
-				classid, classname, scheme, scheme);
-	}
-
-	/**
-	 * Utility method that normalises PID values on a per-type basis.
-	 * @param pid the PID whose value will be normalised.
-	 * @return the PID containing the normalised value.
-	 */
-	public static StructuredProperty normalizePidValue(StructuredProperty pid) {
-		String value = Optional
-			.ofNullable(pid.getValue())
-			.map(String::trim)
-			.orElseThrow(() -> new IllegalArgumentException("PID value cannot be empty"));
-		switch (pid.getQualifier().getClassid()) {
-
-			// TODO add cleaning for more PID types as needed
-			case "doi":
-				pid.setValue(value.toLowerCase().replaceAll(DOI_PREFIX_REGEX, "10."));
-				break;
-		}
-		return pid;
-	}
-
 }

dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/OafMapperUtils.java

@@ -1,11 +1,9 @@
 
-package eu.dnetlib.dhp.schema.oaf;
+package eu.dnetlib.dhp.schema.oaf.utils;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import static eu.dnetlib.dhp.schema.common.ModelConstants.*;
+
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -13,40 +11,45 @@ import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 
+import eu.dnetlib.dhp.schema.common.AccessRightComparator;
 import eu.dnetlib.dhp.schema.common.ModelSupport;
-import eu.dnetlib.dhp.utils.DHPUtils;
+import eu.dnetlib.dhp.schema.oaf.*;
 
 public class OafMapperUtils {
 
-	public static Oaf merge(final Oaf o1, final Oaf o2) {
-		if (ModelSupport.isSubClass(o1, OafEntity.class)) {
-			if (ModelSupport.isSubClass(o1, Result.class)) {
-
-				return mergeResults((Result) o1, (Result) o2);
-			} else if (ModelSupport.isSubClass(o1, Datasource.class)) {
-				((Datasource) o1).mergeFrom((Datasource) o2);
-			} else if (ModelSupport.isSubClass(o1, Organization.class)) {
-				((Organization) o1).mergeFrom((Organization) o2);
-			} else if (ModelSupport.isSubClass(o1, Project.class)) {
-				((Project) o1).mergeFrom((Project) o2);
-			} else {
-				throw new RuntimeException("invalid OafEntity subtype:" + o1.getClass().getCanonicalName());
-			}
-		} else if (ModelSupport.isSubClass(o1, Relation.class)) {
-			((Relation) o1).mergeFrom((Relation) o2);
+	public static Oaf merge(final Oaf left, final Oaf right) {
+		if (ModelSupport.isSubClass(left, OafEntity.class)) {
+			return mergeEntities((OafEntity) left, (OafEntity) right);
+		} else if (ModelSupport.isSubClass(left, Relation.class)) {
+			((Relation) left).mergeFrom((Relation) right);
 		} else {
-			throw new RuntimeException("invalid Oaf type:" + o1.getClass().getCanonicalName());
+			throw new RuntimeException("invalid Oaf type:" + left.getClass().getCanonicalName());
 		}
-		return o1;
+		return left;
 	}
 
-	public static Result mergeResults(Result r1, Result r2) {
-		if (new ResultTypeComparator().compare(r1, r2) < 0) {
-			r1.mergeFrom(r2);
-			return r1;
+	public static OafEntity mergeEntities(OafEntity left, OafEntity right) {
+		if (ModelSupport.isSubClass(left, Result.class)) {
+			return mergeResults((Result) left, (Result) right);
+		} else if (ModelSupport.isSubClass(left, Datasource.class)) {
+			left.mergeFrom(right);
+		} else if (ModelSupport.isSubClass(left, Organization.class)) {
+			left.mergeFrom(right);
+		} else if (ModelSupport.isSubClass(left, Project.class)) {
+			left.mergeFrom(right);
 		} else {
-			r2.mergeFrom(r1);
-			return r2;
+			throw new RuntimeException("invalid OafEntity subtype:" + left.getClass().getCanonicalName());
+		}
+		return left;
+	}
+
+	public static Result mergeResults(Result left, Result right) {
+		if (new ResultTypeComparator().compare(left, right) < 0) {
+			left.mergeFrom(right);
+			return left;
+		} else {
+			right.mergeFrom(left);
+			return right;
 		}
 	}
 
@@ -102,6 +105,29 @@ public class OafMapperUtils {
 		return qualifier("UNKNOWN", "Unknown", schemeid, schemename);
 	}
 
+	public static AccessRight accessRight(
+		final String classid,
+		final String classname,
+		final String schemeid,
+		final String schemename) {
+		return accessRight(classid, classname, schemeid, schemename, null);
+	}
+
+	public static AccessRight accessRight(
+		final String classid,
+		final String classname,
+		final String schemeid,
+		final String schemename,
+		final OpenAccessRoute openAccessRoute) {
+		final AccessRight accessRight = new AccessRight();
+		accessRight.setClassid(classid);
+		accessRight.setClassname(classname);
+		accessRight.setSchemeid(schemeid);
+		accessRight.setSchemename(schemename);
+		accessRight.setOpenAccessRoute(openAccessRoute);
+		return accessRight;
+	}
+
 	public static Qualifier qualifier(
 		final String classid,
 		final String classname,
@@ -115,6 +141,15 @@ public class OafMapperUtils {
 		return q;
 	}
 
+	public static Qualifier qualifier(final Qualifier qualifier) {
+		final Qualifier q = new Qualifier();
+		q.setClassid(qualifier.getClassid());
+		q.setClassname(qualifier.getClassname());
+		q.setSchemeid(qualifier.getSchemeid());
+		q.setSchemename(qualifier.getSchemename());
+		return q;
+	}
+
 	public static StructuredProperty structuredProperty(
 		final String value,
 		final String classid,
@@ -183,7 +218,8 @@ public class OafMapperUtils {
 		final String issnOnline,
 		final String issnLinking,
 		final DataInfo dataInfo) {
-		return journal(
+
+		return hasIssn(issnPrinted, issnOnline, issnLinking) ? journal(
 			name,
 			issnPrinted,
 			issnOnline,
@@ -195,7 +231,7 @@ public class OafMapperUtils {
 			null,
 			null,
 			null,
-			dataInfo);
+			dataInfo) : null;
 	}
 
 	public static Journal journal(
@@ -212,10 +248,7 @@ public class OafMapperUtils {
 		final String conferencedate,
 		final DataInfo dataInfo) {
 
-		if (StringUtils.isNotBlank(name)
-			|| StringUtils.isNotBlank(issnPrinted)
-			|| StringUtils.isNotBlank(issnOnline)
-			|| StringUtils.isNotBlank(issnLinking)) {
+		if (StringUtils.isNotBlank(name) || hasIssn(issnPrinted, issnOnline, issnLinking)) {
 			final Journal j = new Journal();
 			j.setName(name);
 			j.setIssnPrinted(issnPrinted);
@@ -235,6 +268,12 @@ public class OafMapperUtils {
 		}
 	}
 
+	private static boolean hasIssn(String issnPrinted, String issnOnline, String issnLinking) {
+		return StringUtils.isNotBlank(issnPrinted)
+			|| StringUtils.isNotBlank(issnOnline)
+			|| StringUtils.isNotBlank(issnLinking);
+	}
+
 	public static DataInfo dataInfo(
 		final Boolean deletedbyinference,
 		final String inferenceprovenance,
@@ -261,7 +300,7 @@ public class OafMapperUtils {
 		} else if (to_md5) {
 			final String nsPrefix = StringUtils.substringBefore(originalId, "::");
 			final String rest = StringUtils.substringAfter(originalId, "::");
-			return String.format("%s|%s::%s", prefix, nsPrefix, DHPUtils.md5(rest));
+			return String.format("%s|%s::%s", prefix, nsPrefix, IdentifierFactory.md5(rest));
 		} else {
 			return String.format("%s|%s", prefix, originalId);
 		}
@@ -294,4 +333,36 @@ public class OafMapperUtils {
 		final Map<Object, Boolean> seen = new ConcurrentHashMap<>();
 		return t -> seen.putIfAbsent(keyExtractor.apply(t), Boolean.TRUE) == null;
 	}
+
+	public static Qualifier createBestAccessRights(final List<Instance> instanceList) {
+		return getBestAccessRights(instanceList);
+	}
+
+	protected static Qualifier getBestAccessRights(final List<Instance> instanceList) {
+		if (instanceList != null) {
+			final Optional<AccessRight> min = instanceList
+				.stream()
+				.map(i -> i.getAccessright())
+				.min(new AccessRightComparator<>());
+
+			final Qualifier rights = min.isPresent() ? qualifier(min.get()) : new Qualifier();
+
+			if (StringUtils.isBlank(rights.getClassid())) {
+				rights.setClassid(UNKNOWN);
+			}
+			if (StringUtils.isBlank(rights.getClassname())
+				|| UNKNOWN.equalsIgnoreCase(rights.getClassname())) {
+				rights.setClassname(NOT_AVAILABLE);
+			}
+			if (StringUtils.isBlank(rights.getSchemeid())) {
+				rights.setSchemeid(DNET_ACCESS_MODES);
+			}
+			if (StringUtils.isBlank(rights.getSchemename())) {
+				rights.setSchemename(DNET_ACCESS_MODES);
+			}
+
+			return rights;
+		}
+		return null;
+	}
 }

dhp-common/src/main/java/eu/dnetlib/dhp/utils/DHPUtils.java

@@ -1,18 +1,29 @@
 
 package eu.dnetlib.dhp.utils;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
+import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.util.List;
+import java.util.Map;
+import java.util.Properties;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.binary.Base64OutputStream;
 import org.apache.commons.codec.binary.Hex;
+import org.apache.commons.io.IOUtils;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.spark.sql.Dataset;
+import org.apache.spark.sql.SaveMode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.Maps;
 import com.jayway.jsonpath.JsonPath;
 
 import net.minidev.json.JSONArray;
@@ -21,6 +32,8 @@ import scala.collection.Seq;
 
 public class DHPUtils {
 
+	private static final Logger log = LoggerFactory.getLogger(DHPUtils.class);
+
 	public static Seq<String> toSeq(List<String> list) {
 		return JavaConverters.asScalaIteratorConverter(list.iterator()).asScala().toSeq();
 	}
@@ -79,4 +92,72 @@ public class DHPUtils {
 			return "";
 		}
 	}
+
+	public static final ObjectMapper MAPPER = new ObjectMapper();
+
+	public static void writeHdfsFile(final Configuration conf, final String content, final String path)
+		throws IOException {
+
+		log.info("writing file {}, size {}", path, content.length());
+		try (FileSystem fs = FileSystem.get(conf);
+			BufferedOutputStream os = new BufferedOutputStream(fs.create(new Path(path)))) {
+			os.write(content.getBytes(StandardCharsets.UTF_8));
+			os.flush();
+		}
+	}
+
+	public static String readHdfsFile(Configuration conf, String path) throws IOException {
+		log.info("reading file {}", path);
+
+		try (FileSystem fs = FileSystem.get(conf)) {
+			final Path p = new Path(path);
+			if (!fs.exists(p)) {
+				throw new FileNotFoundException(path);
+			}
+			return IOUtils.toString(fs.open(p));
+		}
+	}
+
+	public static <T> T readHdfsFileAs(Configuration conf, String path, Class<T> clazz) throws IOException {
+		return MAPPER.readValue(readHdfsFile(conf, path), clazz);
+	}
+
+	public static <T> void saveDataset(final Dataset<T> mdstore, final String targetPath) {
+		log.info("saving dataset in: {}", targetPath);
+		mdstore
+			.write()
+			.mode(SaveMode.Overwrite)
+			.format("parquet")
+			.save(targetPath);
+	}
+
+	public static Configuration getHadoopConfiguration(String nameNode) {
+		// ====== Init HDFS File System Object
+		Configuration conf = new Configuration();
+		// Set FileSystem URI
+		conf.set("fs.defaultFS", nameNode);
+		// Because of Maven
+		conf.set("fs.hdfs.impl", org.apache.hadoop.hdfs.DistributedFileSystem.class.getName());
+		conf.set("fs.file.impl", org.apache.hadoop.fs.LocalFileSystem.class.getName());
+
+		System.setProperty("hadoop.home.dir", "/");
+		return conf;
+	}
+
+	public static void populateOOZIEEnv(final Map<String, String> report) throws IOException {
+		File file = new File(System.getProperty("oozie.action.output.properties"));
+		Properties props = new Properties();
+		report.forEach((k, v) -> props.setProperty(k, v));
+
+		try (OutputStream os = new FileOutputStream(file)) {
+			props.store(os, "");
+		}
+	}
+
+	public static void populateOOZIEEnv(final String paramName, String value) throws IOException {
+		Map<String, String> report = Maps.newHashMap();
+		report.put(paramName, value);
+
+		populateOOZIEEnv(report);
+	}
 }

dhp-common/src/main/java/eu/dnetlib/dhp/utils/ISLookupClientFactory.java

@@ -1,11 +1,11 @@
 
 package eu.dnetlib.dhp.utils;
 
-import java.util.Map;
-
-import javax.xml.ws.BindingProvider;
-
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.frontend.ClientProxy;
 import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
+import org.apache.cxf.transport.http.HTTPConduit;
+import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -15,8 +15,8 @@ public class ISLookupClientFactory {
 
 	private static final Logger log = LoggerFactory.getLogger(ISLookupClientFactory.class);
 
-	private static int requestTimeout = 60000 * 10;
-	private static int connectTimeout = 60000 * 10;
+	private static final int requestTimeout = 60000 * 10;
+	private static final int connectTimeout = 60000 * 10;
 
 	public static ISLookUpService getLookUpService(final String isLookupUrl) {
 		return getServiceStub(ISLookUpService.class, isLookupUrl);
@@ -31,20 +31,23 @@ public class ISLookupClientFactory {
 
 		final T service = (T) jaxWsProxyFactory.create();
 
-		if (service instanceof BindingProvider) {
+		Client client = ClientProxy.getClient(service);
+		if (client != null) {
+			HTTPConduit conduit = (HTTPConduit) client.getConduit();
+			HTTPClientPolicy policy = new HTTPClientPolicy();
+
 			log
 				.info(
-					"setting timeouts for {} to requestTimeout: {}, connectTimeout: {}",
-					BindingProvider.class.getName(), requestTimeout, connectTimeout);
+					String
+						.format(
+							"setting connectTimeout to %s, requestTimeout to %s for service %s",
+							connectTimeout,
+							requestTimeout,
+							clazz.getCanonicalName()));
 
-			Map<String, Object> requestContext = ((BindingProvider) service).getRequestContext();
-
-			requestContext.put("com.sun.xml.internal.ws.request.timeout", requestTimeout);
-			requestContext.put("com.sun.xml.internal.ws.connect.timeout", connectTimeout);
-			requestContext.put("com.sun.xml.ws.request.timeout", requestTimeout);
-			requestContext.put("com.sun.xml.ws.connect.timeout", connectTimeout);
-			requestContext.put("javax.xml.ws.client.receiveTimeout", requestTimeout);
-			requestContext.put("javax.xml.ws.client.connectionTimeout", connectTimeout);
+			policy.setConnectionTimeout(connectTimeout);
+			policy.setReceiveTimeout(requestTimeout);
+			conduit.setClient(policy);
 		}
 
 		return service;

dhp-common/src/main/java/eu/dnetlib/message/Message.java

@@ -1,76 +0,0 @@
-
-package eu.dnetlib.message;
-
-import java.io.IOException;
-import java.util.Map;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-public class Message {
-
-	private String workflowId;
-
-	private String jobName;
-
-	private MessageType type;
-
-	private Map<String, String> body;
-
-	public static Message fromJson(final String json) throws IOException {
-		final ObjectMapper jsonMapper = new ObjectMapper();
-		return jsonMapper.readValue(json, Message.class);
-	}
-
-	public Message() {
-	}
-
-	public Message(String workflowId, String jobName, MessageType type, Map<String, String> body) {
-		this.workflowId = workflowId;
-		this.jobName = jobName;
-		this.type = type;
-		this.body = body;
-	}
-
-	public String getWorkflowId() {
-		return workflowId;
-	}
-
-	public void setWorkflowId(String workflowId) {
-		this.workflowId = workflowId;
-	}
-
-	public String getJobName() {
-		return jobName;
-	}
-
-	public void setJobName(String jobName) {
-		this.jobName = jobName;
-	}
-
-	public MessageType getType() {
-		return type;
-	}
-
-	public void setType(MessageType type) {
-		this.type = type;
-	}
-
-	public Map<String, String> getBody() {
-		return body;
-	}
-
-	public void setBody(Map<String, String> body) {
-		this.body = body;
-	}
-
-	@Override
-	public String toString() {
-		final ObjectMapper jsonMapper = new ObjectMapper();
-		try {
-			return jsonMapper.writeValueAsString(this);
-		} catch (JsonProcessingException e) {
-			return null;
-		}
-	}
-}

dhp-common/src/main/java/eu/dnetlib/message/MessageConsumer.java

@@ -1,47 +0,0 @@
-
-package eu.dnetlib.message;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.concurrent.LinkedBlockingQueue;
-
-import com.rabbitmq.client.AMQP;
-import com.rabbitmq.client.Channel;
-import com.rabbitmq.client.DefaultConsumer;
-import com.rabbitmq.client.Envelope;
-
-public class MessageConsumer extends DefaultConsumer {
-
-	final LinkedBlockingQueue<Message> queueMessages;
-
-	/**
-	 * Constructs a new instance and records its association to the passed-in channel.
-	 *
-	 * @param channel the channel to which this consumer is attached
-	 * @param queueMessages
-	 */
-	public MessageConsumer(Channel channel, LinkedBlockingQueue<Message> queueMessages) {
-		super(channel);
-		this.queueMessages = queueMessages;
-	}
-
-	@Override
-	public void handleDelivery(
-		String consumerTag, Envelope envelope, AMQP.BasicProperties properties, byte[] body)
-		throws IOException {
-		final String json = new String(body, StandardCharsets.UTF_8);
-		Message message = Message.fromJson(json);
-		try {
-			this.queueMessages.put(message);
-			System.out.println("Receiving Message " + message);
-		} catch (InterruptedException e) {
-			if (message.getType() == MessageType.REPORT)
-				throw new RuntimeException("Error on sending message");
-			else {
-				// TODO LOGGING EXCEPTION
-			}
-		} finally {
-			getChannel().basicAck(envelope.getDeliveryTag(), false);
-		}
-	}
-}

dhp-common/src/main/java/eu/dnetlib/message/MessageManager.java

@@ -1,136 +0,0 @@
-
-package eu.dnetlib.message;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeoutException;
-
-import com.rabbitmq.client.Channel;
-import com.rabbitmq.client.Connection;
-import com.rabbitmq.client.ConnectionFactory;
-
-public class MessageManager {
-
-	private final String messageHost;
-
-	private final String username;
-
-	private final String password;
-
-	private Connection connection;
-
-	private final Map<String, Channel> channels = new HashMap<>();
-
-	private boolean durable;
-
-	private boolean autodelete;
-
-	private final LinkedBlockingQueue<Message> queueMessages;
-
-	public MessageManager(
-		String messageHost,
-		String username,
-		String password,
-		final LinkedBlockingQueue<Message> queueMessages) {
-		this.queueMessages = queueMessages;
-		this.messageHost = messageHost;
-		this.username = username;
-		this.password = password;
-	}
-
-	public MessageManager(
-		String messageHost,
-		String username,
-		String password,
-		boolean durable,
-		boolean autodelete,
-		final LinkedBlockingQueue<Message> queueMessages) {
-		this.queueMessages = queueMessages;
-		this.messageHost = messageHost;
-		this.username = username;
-		this.password = password;
-
-		this.durable = durable;
-		this.autodelete = autodelete;
-	}
-
-	private Connection createConnection() throws IOException, TimeoutException {
-		ConnectionFactory factory = new ConnectionFactory();
-		factory.setHost(this.messageHost);
-		factory.setUsername(this.username);
-		factory.setPassword(this.password);
-		return factory.newConnection();
-	}
-
-	private Channel createChannel(
-		final Connection connection,
-		final String queueName,
-		final boolean durable,
-		final boolean autodelete)
-		throws Exception {
-		Map<String, Object> args = new HashMap<>();
-		args.put("x-message-ttl", 10000);
-		Channel channel = connection.createChannel();
-		channel.queueDeclare(queueName, durable, false, this.autodelete, args);
-		return channel;
-	}
-
-	private Channel getOrCreateChannel(final String queueName, boolean durable, boolean autodelete)
-		throws Exception {
-		if (channels.containsKey(queueName)) {
-			return channels.get(queueName);
-		}
-
-		if (this.connection == null) {
-			this.connection = createConnection();
-		}
-		channels.put(queueName, createChannel(this.connection, queueName, durable, autodelete));
-		return channels.get(queueName);
-	}
-
-	public void close() throws IOException {
-		channels
-			.values()
-			.forEach(
-				ch -> {
-					try {
-						ch.close();
-					} catch (Exception e) {
-						// TODO LOG
-					}
-				});
-
-		this.connection.close();
-	}
-
-	public boolean sendMessage(final Message message, String queueName) throws Exception {
-		try {
-			Channel channel = getOrCreateChannel(queueName, this.durable, this.autodelete);
-			channel.basicPublish("", queueName, null, message.toString().getBytes());
-			return true;
-		} catch (Throwable e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	public boolean sendMessage(
-		final Message message, String queueName, boolean durable_var, boolean autodelete_var)
-		throws Exception {
-		try {
-			Channel channel = getOrCreateChannel(queueName, durable_var, autodelete_var);
-			channel.basicPublish("", queueName, null, message.toString().getBytes());
-			return true;
-		} catch (Throwable e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	public void startConsumingMessage(
-		final String queueName, final boolean durable, final boolean autodelete) throws Exception {
-
-		Channel channel = createChannel(createConnection(), queueName, durable, autodelete);
-		channel.basicConsume(queueName, false, new MessageConsumer(channel, queueMessages));
-	}
-}

dhp-common/src/main/java/eu/dnetlib/message/MessageType.java

@@ -1,6 +0,0 @@
-
-package eu.dnetlib.message;
-
-public enum MessageType {
-	ONGOING, REPORT
-}

dhp-common/src/test/java/eu/dnetlib/dhp/model/mdstore/MetadataRecordTest.java

@@ -1,16 +0,0 @@
-
-package eu.dnetlib.dhp.model.mdstore;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import org.junit.jupiter.api.Test;
-
-public class MetadataRecordTest {
-
-	@Test
-	public void getTimestamp() {
-
-		MetadataRecord r = new MetadataRecord();
-		assertTrue(r.getDateOfCollection() > 0);
-	}
-}

dhp-common/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/OafMapperUtilsTest.java

@@ -0,0 +1,180 @@
+
+package eu.dnetlib.dhp.schema.oaf.utils;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.io.IOException;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.apache.commons.io.IOUtils;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import eu.dnetlib.dhp.schema.common.ModelConstants;
+import eu.dnetlib.dhp.schema.oaf.*;
+
+public class OafMapperUtilsTest {
+
+	private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper()
+		.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+
+	@Test
+	public void testDateValidation() {
+
+		assertTrue(GraphCleaningFunctions.doCleanDate("2016-05-07T12:41:19.202Z  ").isPresent());
+		assertTrue(GraphCleaningFunctions.doCleanDate("2020-09-10 11:08:52 ").isPresent());
+		assertTrue(GraphCleaningFunctions.doCleanDate("  2016-04-05").isPresent());
+
+		assertEquals("2016-04-05", GraphCleaningFunctions.doCleanDate("2016 Apr 05").get());
+
+		assertEquals("2009-05-08", GraphCleaningFunctions.doCleanDate("May 8, 2009 5:57:51 PM").get());
+		assertEquals("1970-10-07", GraphCleaningFunctions.doCleanDate("oct 7, 1970").get());
+		assertEquals("1970-10-07", GraphCleaningFunctions.doCleanDate("oct 7, '70").get());
+		assertEquals("1970-10-07", GraphCleaningFunctions.doCleanDate("oct. 7, 1970").get());
+		assertEquals("1970-10-07", GraphCleaningFunctions.doCleanDate("oct. 7, 70").get());
+		assertEquals("2006-01-02", GraphCleaningFunctions.doCleanDate("Mon Jan  2 15:04:05 2006").get());
+		assertEquals("2006-01-02", GraphCleaningFunctions.doCleanDate("Mon Jan  2 15:04:05 MST 2006").get());
+		assertEquals("2006-01-02", GraphCleaningFunctions.doCleanDate("Mon Jan 02 15:04:05 -0700 2006").get());
+		assertEquals("2006-01-02", GraphCleaningFunctions.doCleanDate("Monday, 02-Jan-06 15:04:05 MST").get());
+		assertEquals("2006-01-02", GraphCleaningFunctions.doCleanDate("Mon, 02 Jan 2006 15:04:05 MST").get());
+		assertEquals("2017-07-11", GraphCleaningFunctions.doCleanDate("Tue, 11 Jul 2017 16:28:13 +0200 (CEST)").get());
+		assertEquals("2006-01-02", GraphCleaningFunctions.doCleanDate("Mon, 02 Jan 2006 15:04:05 -0700").get());
+		assertEquals("2018-01-04", GraphCleaningFunctions.doCleanDate("Thu, 4 Jan 2018 17:53:36 +0000").get());
+		assertEquals("2015-08-10", GraphCleaningFunctions.doCleanDate("Mon Aug 10 15:44:11 UTC+0100 2015").get());
+		assertEquals(
+			"2015-07-03",
+			GraphCleaningFunctions.doCleanDate("Fri Jul 03 2015 18:04:07 GMT+0100 (GMT Daylight Time)").get());
+		assertEquals("2012-09-17", GraphCleaningFunctions.doCleanDate("September 17, 2012 10:09am").get());
+		assertEquals("2012-09-17", GraphCleaningFunctions.doCleanDate("September 17, 2012 at 10:09am PST-08").get());
+		assertEquals("2012-09-17", GraphCleaningFunctions.doCleanDate("September 17, 2012, 10:10:09").get());
+		assertEquals("1970-10-07", GraphCleaningFunctions.doCleanDate("October 7, 1970").get());
+		assertEquals("1970-10-07", GraphCleaningFunctions.doCleanDate("October 7th, 1970").get());
+		assertEquals("2006-02-12", GraphCleaningFunctions.doCleanDate("12 Feb 2006, 19:17").get());
+		assertEquals("2006-02-12", GraphCleaningFunctions.doCleanDate("12 Feb 2006 19:17").get());
+		assertEquals("1970-10-07", GraphCleaningFunctions.doCleanDate("7 oct 70").get());
+		assertEquals("1970-10-07", GraphCleaningFunctions.doCleanDate("7 oct 1970").get());
+		assertEquals("2013-02-03", GraphCleaningFunctions.doCleanDate("03 February 2013").get());
+		assertEquals("2013-07-01", GraphCleaningFunctions.doCleanDate("1 July 2013").get());
+		assertEquals("2013-02-03", GraphCleaningFunctions.doCleanDate("2013-Feb-03").get());
+		assertEquals("2014-03-31", GraphCleaningFunctions.doCleanDate("3/31/2014").get());
+		assertEquals("2014-03-31", GraphCleaningFunctions.doCleanDate("03/31/2014").get());
+		assertEquals("1971-08-21", GraphCleaningFunctions.doCleanDate("08/21/71").get());
+		assertEquals("1971-01-08", GraphCleaningFunctions.doCleanDate("8/1/71").get());
+		assertEquals("2014-08-04", GraphCleaningFunctions.doCleanDate("4/8/2014 22:05").get());
+		assertEquals("2014-08-04", GraphCleaningFunctions.doCleanDate("04/08/2014 22:05").get());
+		assertEquals("2014-08-04", GraphCleaningFunctions.doCleanDate("4/8/14 22:05").get());
+		assertEquals("2014-02-04", GraphCleaningFunctions.doCleanDate("04/2/2014 03:00:51").get());
+		assertEquals("1965-08-08", GraphCleaningFunctions.doCleanDate("8/8/1965 12:00:00 AM").get());
+		assertEquals("1965-08-08", GraphCleaningFunctions.doCleanDate("8/8/1965 01:00:01 PM").get());
+		assertEquals("1965-08-08", GraphCleaningFunctions.doCleanDate("8/8/1965 01:00 PM").get());
+		assertEquals("1965-08-08", GraphCleaningFunctions.doCleanDate("8/8/1965 1:00 PM").get());
+		assertEquals("1965-08-08", GraphCleaningFunctions.doCleanDate("8/8/1965 12:00 AM").get());
+		assertEquals("2014-02-04", GraphCleaningFunctions.doCleanDate("4/02/2014 03:00:51").get());
+		assertEquals("2012-03-19", GraphCleaningFunctions.doCleanDate("03/19/2012 10:11:59").get());
+		assertEquals("2012-03-19", GraphCleaningFunctions.doCleanDate("03/19/2012 10:11:59.3186369").get());
+		assertEquals("2014-03-31", GraphCleaningFunctions.doCleanDate("2014/3/31").get());
+		assertEquals("2014-03-31", GraphCleaningFunctions.doCleanDate("2014/03/31").get());
+		assertEquals("2014-04-08", GraphCleaningFunctions.doCleanDate("2014/4/8 22:05").get());
+		assertEquals("2014-04-08", GraphCleaningFunctions.doCleanDate("2014/04/08 22:05").get());
+		assertEquals("2014-04-02", GraphCleaningFunctions.doCleanDate("2014/04/2 03:00:51").get());
+		assertEquals("2014-04-02", GraphCleaningFunctions.doCleanDate("2014/4/02 03:00:51").get());
+		assertEquals("2012-03-19", GraphCleaningFunctions.doCleanDate("2012/03/19 10:11:59").get());
+		assertEquals("2012-03-19", GraphCleaningFunctions.doCleanDate("2012/03/19 10:11:59.3186369").get());
+		assertEquals("2014-04-08", GraphCleaningFunctions.doCleanDate("2014年04月08日").get());
+		assertEquals("2006-01-02", GraphCleaningFunctions.doCleanDate("2006-01-02T15:04:05+0000").get());
+		assertEquals("2009-08-13", GraphCleaningFunctions.doCleanDate("2009-08-12T22:15:09-07:00").get());
+		assertEquals("2009-08-12", GraphCleaningFunctions.doCleanDate("2009-08-12T22:15:09").get());
+		assertEquals("2009-08-12", GraphCleaningFunctions.doCleanDate("2009-08-12T22:15:09Z").get());
+		assertEquals("2014-04-26", GraphCleaningFunctions.doCleanDate("2014-04-26 17:24:37.3186369").get());
+		assertEquals("2012-08-03", GraphCleaningFunctions.doCleanDate("2012-08-03 18:31:59.257000000").get());
+		assertEquals("2014-04-26", GraphCleaningFunctions.doCleanDate("2014-04-26 17:24:37.123").get());
+		assertEquals("2013-04-01", GraphCleaningFunctions.doCleanDate("2013-04-01 22:43").get());
+		assertEquals("2013-04-01", GraphCleaningFunctions.doCleanDate("2013-04-01 22:43:22").get());
+		assertEquals("2014-12-16", GraphCleaningFunctions.doCleanDate("2014-12-16 06:20:00 UTC").get());
+		assertEquals("2014-12-16", GraphCleaningFunctions.doCleanDate("2014-12-16 06:20:00 GMT").get());
+		assertEquals("2014-04-26", GraphCleaningFunctions.doCleanDate("2014-04-26 05:24:37 PM").get());
+		assertEquals("2014-04-26", GraphCleaningFunctions.doCleanDate("2014-04-26 13:13:43 +0800").get());
+		assertEquals("2014-04-26", GraphCleaningFunctions.doCleanDate("2014-04-26 13:13:43 +0800 +08").get());
+		assertEquals("2014-04-26", GraphCleaningFunctions.doCleanDate("2014-04-26 13:13:44 +09:00").get());
+		assertEquals("2012-08-03", GraphCleaningFunctions.doCleanDate("2012-08-03 18:31:59.257000000 +0000 UTC").get());
+		assertEquals("2015-09-30", GraphCleaningFunctions.doCleanDate("2015-09-30 18:48:56.35272715 +0000 UTC").get());
+		assertEquals("2015-02-18", GraphCleaningFunctions.doCleanDate("2015-02-18 00:12:00 +0000 GMT").get());
+		assertEquals("2015-02-18", GraphCleaningFunctions.doCleanDate("2015-02-18 00:12:00 +0000 UTC").get());
+		assertEquals(
+			"2015-02-08", GraphCleaningFunctions.doCleanDate("2015-02-08 03:02:00 +0300 MSK m=+0.000000001").get());
+		assertEquals(
+			"2015-02-08", GraphCleaningFunctions.doCleanDate("2015-02-08 03:02:00.001 +0300 MSK m=+0.000000001").get());
+		assertEquals("2017-07-19", GraphCleaningFunctions.doCleanDate("2017-07-19 03:21:51+00:00").get());
+		assertEquals("2014-04-26", GraphCleaningFunctions.doCleanDate("2014-04-26").get());
+		assertEquals("2014-04-01", GraphCleaningFunctions.doCleanDate("2014-04").get());
+		assertEquals("2014-01-01", GraphCleaningFunctions.doCleanDate("2014").get());
+		assertEquals("2014-05-11", GraphCleaningFunctions.doCleanDate("2014-05-11 08:20:13,787").get());
+		assertEquals("2014-03-31", GraphCleaningFunctions.doCleanDate("3.31.2014").get());
+		assertEquals("2014-03-31", GraphCleaningFunctions.doCleanDate("03.31.2014").get());
+		assertEquals("1971-08-21", GraphCleaningFunctions.doCleanDate("08.21.71").get());
+		assertEquals("2014-03-01", GraphCleaningFunctions.doCleanDate("2014.03").get());
+		assertEquals("2014-03-30", GraphCleaningFunctions.doCleanDate("2014.03.30").get());
+		assertEquals("2014-06-01", GraphCleaningFunctions.doCleanDate("20140601").get());
+		assertEquals("2014-07-22", GraphCleaningFunctions.doCleanDate("20140722105203").get());
+		assertEquals("2012-03-19", GraphCleaningFunctions.doCleanDate("1332151919").get());
+		assertEquals("2013-11-12", GraphCleaningFunctions.doCleanDate("1384216367189").get());
+		assertEquals("2013-11-12", GraphCleaningFunctions.doCleanDate("1384216367111222").get());
+		assertEquals("2013-11-12", GraphCleaningFunctions.doCleanDate("1384216367111222333").get());
+
+	}
+
+	@Test
+	public void testDate() {
+		System.out.println(GraphCleaningFunctions.cleanDate("23-FEB-1998"));
+	}
+
+	@Test
+	public void testMergePubs() throws IOException {
+		Publication p1 = read("publication_1.json", Publication.class);
+		Publication p2 = read("publication_2.json", Publication.class);
+		Dataset d1 = read("dataset_1.json", Dataset.class);
+		Dataset d2 = read("dataset_2.json", Dataset.class);
+
+		assertEquals(p1.getCollectedfrom().size(), 1);
+		assertEquals(p1.getCollectedfrom().get(0).getKey(), ModelConstants.CROSSREF_ID);
+		assertEquals(d2.getCollectedfrom().size(), 1);
+		assertFalse(cfId(d2.getCollectedfrom()).contains(ModelConstants.CROSSREF_ID));
+
+		assertTrue(
+			OafMapperUtils
+				.mergeResults(p1, d2)
+				.getResulttype()
+				.getClassid()
+				.equals(ModelConstants.PUBLICATION_RESULTTYPE_CLASSID));
+
+		assertEquals(p2.getCollectedfrom().size(), 1);
+		assertFalse(cfId(p2.getCollectedfrom()).contains(ModelConstants.CROSSREF_ID));
+		assertEquals(d1.getCollectedfrom().size(), 1);
+		assertTrue(cfId(d1.getCollectedfrom()).contains(ModelConstants.CROSSREF_ID));
+
+		assertTrue(
+			OafMapperUtils
+				.mergeResults(p2, d1)
+				.getResulttype()
+				.getClassid()
+				.equals(ModelConstants.DATASET_RESULTTYPE_CLASSID));
+	}
+
+	protected HashSet<String> cfId(List<KeyValue> collectedfrom) {
+		return collectedfrom.stream().map(c -> c.getKey()).collect(Collectors.toCollection(HashSet::new));
+	}
+
+	protected <T extends Result> T read(String filename, Class<T> clazz) throws IOException {
+		final String json = IOUtils.toString(getClass().getResourceAsStream(filename));
+		return OBJECT_MAPPER.readValue(json, clazz);
+	}
+
+}

dhp-common/src/test/java/eu/dnetlib/message/MessageTest.java

@@ -1,51 +0,0 @@
-
-package eu.dnetlib.message;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.jupiter.api.Test;
-
-public class MessageTest {
-
-	@Test
-	public void fromJsonTest() throws IOException {
-		Message m = new Message();
-		m.setWorkflowId("wId");
-		m.setType(MessageType.ONGOING);
-		m.setJobName("Collection");
-		Map<String, String> body = new HashMap<>();
-		body.put("parsedItem", "300");
-		body.put("ExecutionTime", "30s");
-
-		m.setBody(body);
-		System.out.println("m = " + m);
-		Message m1 = Message.fromJson(m.toString());
-		assertEquals(m1.getWorkflowId(), m.getWorkflowId());
-		assertEquals(m1.getType(), m.getType());
-		assertEquals(m1.getJobName(), m.getJobName());
-
-		assertNotNull(m1.getBody());
-		m1.getBody().keySet().forEach(it -> assertEquals(m1.getBody().get(it), m.getBody().get(it)));
-		assertEquals(m1.getJobName(), m.getJobName());
-	}
-
-	@Test
-	public void toStringTest() {
-		final String expectedJson = "{\"workflowId\":\"wId\",\"jobName\":\"Collection\",\"type\":\"ONGOING\",\"body\":{\"ExecutionTime\":\"30s\",\"parsedItem\":\"300\"}}";
-		Message m = new Message();
-		m.setWorkflowId("wId");
-		m.setType(MessageType.ONGOING);
-		m.setJobName("Collection");
-		Map<String, String> body = new HashMap<>();
-		body.put("parsedItem", "300");
-		body.put("ExecutionTime", "30s");
-
-		m.setBody(body);
-
-		assertEquals(expectedJson, m.toString());
-	}
-}

dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/dataset_1.json

@@ -0,0 +1 @@
+{"id":"50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1g", "resuttype" : { "classid" : "dataset" }, "pid":[{"qualifier":{"classid":"doi"},"value":"10.1016/j.cmet.2011.03.013"},{"qualifier":{"classid":"urn"},"value":"urn:nbn:nl:ui:29-f3ed5f9e-edf6-457e-8848-61b58a4075e2"},{"qualifier":{"classid":"scp-number"},"value":"79953761260"},{"qualifier":{"classid":"pmc"},"value":"21459329"}], "collectedfrom" : [ { "key" : "10|openaire____::081b82f96300b6a6e3d282bad31cb6e2", "value" : "Crossref"} ]}

dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/dataset_2.json

@@ -0,0 +1 @@
+{"id":"50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1g", "resuttype" : { "classid" : "dataset" }, "pid":[{"qualifier":{"classid":"doi"},"value":"10.1016/j.cmet.2011.03.013"},{"qualifier":{"classid":"urn"},"value":"urn:nbn:nl:ui:29-f3ed5f9e-edf6-457e-8848-61b58a4075e2"},{"qualifier":{"classid":"scp-number"},"value":"79953761260"},{"qualifier":{"classid":"pmc"},"value":"21459329"}], "collectedfrom" : [ { "key" : "10|openaire____::081b82f96300b6a6e3d282bad31cb6e3", "value" : "Repository B"} ]}

dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_1.json

@@ -0,0 +1 @@
+{"id":"50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1f", "resuttype" : { "classid" : "publication" }, "pid":[{"qualifier":{"classid":"doi"},"value":"10.1016/j.cmet.2011.03.013"},{"qualifier":{"classid":"urn"},"value":"urn:nbn:nl:ui:29-f3ed5f9e-edf6-457e-8848-61b58a4075e2"},{"qualifier":{"classid":"scp-number"},"value":"79953761260"},{"qualifier":{"classid":"pmc"},"value":"21459329"}], "collectedfrom" : [ { "key" : "10|openaire____::081b82f96300b6a6e3d282bad31cb6e2", "value" : "Crossref"} ]}

dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_2.json

@@ -0,0 +1 @@
+{"id":"50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1f", "resuttype" : { "classid" : "publication" }, "pid":[{"qualifier":{"classid":"doi"},"value":"10.1016/j.cmet.2011.03.013"},{"qualifier":{"classid":"urn"},"value":"urn:nbn:nl:ui:29-f3ed5f9e-edf6-457e-8848-61b58a4075e2"},{"qualifier":{"classid":"scp-number"},"value":"79953761260"},{"qualifier":{"classid":"pmc"},"value":"21459329"}], "collectedfrom" : [ { "key" : "10|openaire____::081b82f96300b6a6e3d282bad31cb6e3", "value" : "Repository A"} ]}

dhp-schemas/README.md

@@ -1,11 +0,0 @@
-Description of the project
---------------------------
-This project defines **object schemas** of the OpenAIRE main entities and the relationships that intercur among them. 
-Namely it defines the model for 
-  
--  **research product (result)** which subclasses in publication, dataset, other research product, software
--  **data source** object describing the data provider (institutional repository, aggregators, cris systems)
--  **organization** research bodies managing a data source or participating to a research project
--  **project** research project
- 
-Te serialization of such objects (data store files) are used to pass data between workflow nodes in the processing pipeline.

dhp-schemas/pom.xml

@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>eu.dnetlib.dhp</groupId>
-        <artifactId>dhp</artifactId>
-        <version>1.2.4-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>dhp-schemas</artifactId>
-    <packaging>jar</packaging>
-
-    <description>This module contains common schema classes meant to be used across the dnet-hadoop submodules</description>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>net.alchim31.maven</groupId>
-                <artifactId>scala-maven-plugin</artifactId>
-                <version>4.0.1</version>
-                <executions>
-                    <execution>
-                        <id>scala-compile-first</id>
-                        <phase>initialize</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                            <goal>compile</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>scala-test-compile</id>
-                        <phase>process-test-resources</phase>
-                        <goals>
-                            <goal>testCompile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <scalaVersion>${scala.version}</scalaVersion>
-                </configuration>
-            </plugin>
-
-        </plugins>
-    </build>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-
-    </dependencies>
-
-
-</project>

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/action/AtomicAction.java

@@ -1,40 +0,0 @@
-
-package eu.dnetlib.dhp.schema.action;
-
-import java.io.Serializable;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
-import eu.dnetlib.dhp.schema.oaf.Oaf;
-
-@JsonDeserialize(using = AtomicActionDeserializer.class)
-public class AtomicAction<T extends Oaf> implements Serializable {
-
-	private Class<T> clazz;
-
-	private T payload;
-
-	public AtomicAction() {
-	}
-
-	public AtomicAction(Class<T> clazz, T payload) {
-		this.clazz = clazz;
-		this.payload = payload;
-	}
-
-	public Class<T> getClazz() {
-		return clazz;
-	}
-
-	public void setClazz(Class<T> clazz) {
-		this.clazz = clazz;
-	}
-
-	public T getPayload() {
-		return payload;
-	}
-
-	public void setPayload(T payload) {
-		this.payload = payload;
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/action/AtomicActionDeserializer.java

@@ -1,32 +0,0 @@
-
-package eu.dnetlib.dhp.schema.action;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import eu.dnetlib.dhp.schema.oaf.Oaf;
-
-public class AtomicActionDeserializer extends JsonDeserializer {
-
-	@Override
-	public Object deserialize(JsonParser jp, DeserializationContext ctxt)
-		throws IOException {
-		JsonNode node = jp.getCodec().readTree(jp);
-		String classTag = node.get("clazz").asText();
-		JsonNode payload = node.get("payload");
-		ObjectMapper mapper = new ObjectMapper();
-
-		try {
-			final Class<?> clazz = Class.forName(classTag);
-			return new AtomicAction(clazz, (Oaf) mapper.readValue(payload.toString(), clazz));
-		} catch (ClassNotFoundException e) {
-			throw new IOException(e);
-		}
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/EntityType.java

@@ -1,21 +0,0 @@
-
-package eu.dnetlib.dhp.schema.common;
-
-import eu.dnetlib.dhp.schema.oaf.OafEntity;
-
-/** Actual entity types in the Graph */
-public enum EntityType {
-	publication, dataset, otherresearchproduct, software, datasource, organization, project;
-
-	/**
-	 * Resolves the EntityType, given the relative class name
-	 *
-	 * @param clazz the given class name
-	 * @param <T> actual OafEntity subclass
-	 * @return the EntityType associated to the given class
-	 */
-	public static <T extends OafEntity> EntityType fromClass(Class<T> clazz) {
-
-		return EntityType.valueOf(clazz.getSimpleName().toLowerCase());
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/LicenseComparator.java

@@ -1,69 +0,0 @@
-
-package eu.dnetlib.dhp.schema.common;
-
-import java.util.Comparator;
-
-import eu.dnetlib.dhp.schema.oaf.Qualifier;
-
-public class LicenseComparator implements Comparator<Qualifier> {
-
-	@Override
-	public int compare(Qualifier left, Qualifier right) {
-
-		if (left == null && right == null)
-			return 0;
-		if (left == null)
-			return 1;
-		if (right == null)
-			return -1;
-
-		String lClass = left.getClassid();
-		String rClass = right.getClassid();
-
-		if (lClass.equals(rClass))
-			return 0;
-
-		if (lClass.equals("OPEN SOURCE"))
-			return -1;
-		if (rClass.equals("OPEN SOURCE"))
-			return 1;
-
-		if (lClass.equals("OPEN"))
-			return -1;
-		if (rClass.equals("OPEN"))
-			return 1;
-
-		if (lClass.equals("6MONTHS"))
-			return -1;
-		if (rClass.equals("6MONTHS"))
-			return 1;
-
-		if (lClass.equals("12MONTHS"))
-			return -1;
-		if (rClass.equals("12MONTHS"))
-			return 1;
-
-		if (lClass.equals("EMBARGO"))
-			return -1;
-		if (rClass.equals("EMBARGO"))
-			return 1;
-
-		if (lClass.equals("RESTRICTED"))
-			return -1;
-		if (rClass.equals("RESTRICTED"))
-			return 1;
-
-		if (lClass.equals("CLOSED"))
-			return -1;
-		if (rClass.equals("CLOSED"))
-			return 1;
-
-		if (lClass.equals("UNKNOWN"))
-			return -1;
-		if (rClass.equals("UNKNOWN"))
-			return 1;
-
-		// Else (but unlikely), lexicographical ordering will do.
-		return lClass.compareTo(rClass);
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/MainEntityType.java

@@ -1,7 +0,0 @@
-
-package eu.dnetlib.dhp.schema.common;
-
-/** Main entity types in the Graph */
-public enum MainEntityType {
-	result, datasource, organization, project
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java

@@ -1,130 +0,0 @@
-
-package eu.dnetlib.dhp.schema.common;
-
-import eu.dnetlib.dhp.schema.oaf.DataInfo;
-import eu.dnetlib.dhp.schema.oaf.KeyValue;
-import eu.dnetlib.dhp.schema.oaf.Qualifier;
-
-public class ModelConstants {
-
-	public static final String ORCID = "orcid";
-	public static final String ORCID_PENDING = "orcid_pending";
-	public static final String ORCID_CLASSNAME = "Open Researcher and Contributor ID";
-
-	public static final String DNET_SUBJECT_TYPOLOGIES = "dnet:subject_classification_typologies";
-	public static final String DNET_RESULT_TYPOLOGIES = "dnet:result_typologies";
-	public static final String DNET_PUBLICATION_RESOURCE = "dnet:publication_resource";
-	public static final String DNET_ACCESS_MODES = "dnet:access_modes";
-	public static final String DNET_LANGUAGES = "dnet:languages";
-	public static final String DNET_PID_TYPES = "dnet:pid_types";
-	public static final String DNET_DATA_CITE_DATE = "dnet:dataCite_date";
-	public static final String DNET_DATA_CITE_RESOURCE = "dnet:dataCite_resource";
-	public static final String DNET_PROVENANCE_ACTIONS = "dnet:provenanceActions";
-	public static final String DNET_COUNTRY_TYPE = "dnet:countries";
-	public static final String DNET_REVIEW_LEVELS = "dnet:review_levels";
-
-	public static final String SYSIMPORT_CROSSWALK_REPOSITORY = "sysimport:crosswalk:repository";
-	public static final String SYSIMPORT_CROSSWALK_ENTITYREGISTRY = "sysimport:crosswalk:entityregistry";
-	public static final String USER_CLAIM = "user:claim";
-
-	public static final String DATASET_RESULTTYPE_CLASSID = "dataset";
-	public static final String PUBLICATION_RESULTTYPE_CLASSID = "publication";
-	public static final String SOFTWARE_RESULTTYPE_CLASSID = "software";
-	public static final String ORP_RESULTTYPE_CLASSID = "other";
-
-	public static final String RESULT_RESULT = "resultResult";
-	/**
-	 * @deprecated Use {@link ModelConstants#RELATIONSHIP} instead.
-	 */
-	@Deprecated
-	public static final String PUBLICATION_DATASET = "publicationDataset";
-	public static final String IS_RELATED_TO = "isRelatedTo";
-	public static final String SUPPLEMENT = "supplement";
-	public static final String IS_SUPPLEMENT_TO = "isSupplementTo";
-	public static final String IS_SUPPLEMENTED_BY = "isSupplementedBy";
-	public static final String PART = "part";
-	public static final String IS_PART_OF = "isPartOf";
-	public static final String HAS_PARTS = "hasParts";
-	public static final String RELATIONSHIP = "relationship";
-	public static final String CITATION = "citation";
-	public static final String CITES = "cites";
-	public static final String IS_CITED_BY = "isCitedBy";
-	public static final String REVIEW = "review";
-	public static final String REVIEWS = "reviews";
-	public static final String IS_REVIEWED_BY = "isReviewedBy";
-
-	public static final String RESULT_PROJECT = "resultProject";
-	public static final String OUTCOME = "outcome";
-	public static final String IS_PRODUCED_BY = "isProducedBy";
-	public static final String PRODUCES = "produces";
-
-	public static final String DATASOURCE_ORGANIZATION = "datasourceOrganization";
-	public static final String PROVISION = "provision";
-	public static final String IS_PROVIDED_BY = "isProvidedBy";
-	public static final String PROVIDES = "provides";
-
-	public static final String PROJECT_ORGANIZATION = "projectOrganization";
-	public static final String PARTICIPATION = "participation";
-	public static final String HAS_PARTICIPANT = "hasParticipant";
-	public static final String IS_PARTICIPANT = "isParticipant";
-
-	public static final String RESULT_ORGANIZATION = "resultOrganization";
-	public static final String AFFILIATION = "affiliation";
-	public static final String IS_AUTHOR_INSTITUTION_OF = "isAuthorInstitutionOf";
-	public static final String HAS_AUTHOR_INSTITUTION = "hasAuthorInstitution";
-
-	public static final String MERGES = "merges";
-
-	public static final String UNKNOWN = "UNKNOWN";
-	public static final String NOT_AVAILABLE = "not available";
-
-	public static final Qualifier PUBLICATION_DEFAULT_RESULTTYPE = qualifier(
-		PUBLICATION_RESULTTYPE_CLASSID, PUBLICATION_RESULTTYPE_CLASSID,
-		DNET_RESULT_TYPOLOGIES, DNET_RESULT_TYPOLOGIES);
-
-	public static final Qualifier DATASET_DEFAULT_RESULTTYPE = qualifier(
-		DATASET_RESULTTYPE_CLASSID, DATASET_RESULTTYPE_CLASSID,
-		DNET_RESULT_TYPOLOGIES, DNET_RESULT_TYPOLOGIES);
-
-	public static final Qualifier SOFTWARE_DEFAULT_RESULTTYPE = qualifier(
-		SOFTWARE_RESULTTYPE_CLASSID, SOFTWARE_RESULTTYPE_CLASSID,
-		DNET_RESULT_TYPOLOGIES, DNET_RESULT_TYPOLOGIES);
-
-	public static final Qualifier ORP_DEFAULT_RESULTTYPE = qualifier(
-		ORP_RESULTTYPE_CLASSID, ORP_RESULTTYPE_CLASSID,
-		DNET_RESULT_TYPOLOGIES, DNET_RESULT_TYPOLOGIES);
-
-	public static final Qualifier REPOSITORY_PROVENANCE_ACTIONS = qualifier(
-		SYSIMPORT_CROSSWALK_REPOSITORY, SYSIMPORT_CROSSWALK_REPOSITORY,
-		DNET_PROVENANCE_ACTIONS, DNET_PROVENANCE_ACTIONS);
-
-	public static final Qualifier ENTITYREGISTRY_PROVENANCE_ACTION = qualifier(
-		SYSIMPORT_CROSSWALK_ENTITYREGISTRY, SYSIMPORT_CROSSWALK_ENTITYREGISTRY,
-		DNET_PROVENANCE_ACTIONS, DNET_PROVENANCE_ACTIONS);
-
-	public static final KeyValue UNKNOWN_REPOSITORY = keyValue(
-		"10|openaire____::55045bd2a65019fd8e6741a755395c8c", "Unknown Repository");
-
-	public static final Qualifier UNKNOWN_COUNTRY = qualifier(UNKNOWN, "Unknown", DNET_COUNTRY_TYPE, DNET_COUNTRY_TYPE);
-
-	private static Qualifier qualifier(
-		final String classid,
-		final String classname,
-		final String schemeid,
-		final String schemename) {
-		final Qualifier q = new Qualifier();
-		q.setClassid(classid);
-		q.setClassname(classname);
-		q.setSchemeid(schemeid);
-		q.setSchemename(schemename);
-		return q;
-	}
-
-	private static KeyValue keyValue(String key, String value) {
-		KeyValue kv = new KeyValue();
-		kv.setKey(key);
-		kv.setValue(value);
-		kv.setDataInfo(new DataInfo());
-		return kv;
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/ModelSupport.java

@@ -1,476 +0,0 @@
-
-package eu.dnetlib.dhp.schema.common;
-
-import static com.google.common.base.Preconditions.checkArgument;
-
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.function.Function;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.google.common.collect.Maps;
-
-import eu.dnetlib.dhp.schema.oaf.*;
-
-/** Oaf model utility methods. */
-public class ModelSupport {
-
-	/** Defines the mapping between the actual entity type and the main entity type */
-	private static Map<EntityType, MainEntityType> entityMapping = Maps.newHashMap();
-
-	static {
-		entityMapping.put(EntityType.publication, MainEntityType.result);
-		entityMapping.put(EntityType.dataset, MainEntityType.result);
-		entityMapping.put(EntityType.otherresearchproduct, MainEntityType.result);
-		entityMapping.put(EntityType.software, MainEntityType.result);
-		entityMapping.put(EntityType.datasource, MainEntityType.datasource);
-		entityMapping.put(EntityType.organization, MainEntityType.organization);
-		entityMapping.put(EntityType.project, MainEntityType.project);
-	}
-
-	/**
-	 * Defines the mapping between the actual entity types and the relative classes implementing them
-	 */
-	public static final Map<EntityType, Class> entityTypes = Maps.newHashMap();
-
-	static {
-		entityTypes.put(EntityType.datasource, Datasource.class);
-		entityTypes.put(EntityType.organization, Organization.class);
-		entityTypes.put(EntityType.project, Project.class);
-		entityTypes.put(EntityType.dataset, Dataset.class);
-		entityTypes.put(EntityType.otherresearchproduct, OtherResearchProduct.class);
-		entityTypes.put(EntityType.software, Software.class);
-		entityTypes.put(EntityType.publication, Publication.class);
-	}
-
-	public static final Map<String, Class> oafTypes = Maps.newHashMap();
-
-	static {
-		oafTypes.put("datasource", Datasource.class);
-		oafTypes.put("organization", Organization.class);
-		oafTypes.put("project", Project.class);
-		oafTypes.put("dataset", Dataset.class);
-		oafTypes.put("otherresearchproduct", OtherResearchProduct.class);
-		oafTypes.put("software", Software.class);
-		oafTypes.put("publication", Publication.class);
-		oafTypes.put("relation", Relation.class);
-	}
-
-	public static final Map<Class, String> idPrefixMap = Maps.newHashMap();
-
-	static {
-		idPrefixMap.put(Datasource.class, "10");
-		idPrefixMap.put(Organization.class, "20");
-		idPrefixMap.put(Project.class, "40");
-		idPrefixMap.put(Dataset.class, "50");
-		idPrefixMap.put(OtherResearchProduct.class, "50");
-		idPrefixMap.put(Software.class, "50");
-		idPrefixMap.put(Publication.class, "50");
-	}
-
-	public static final Map<String, String> entityIdPrefix = Maps.newHashMap();
-
-	static {
-		entityIdPrefix.put("datasource", "10");
-		entityIdPrefix.put("organization", "20");
-		entityIdPrefix.put("project", "40");
-		entityIdPrefix.put("result", "50");
-	}
-
-	public static final Map<String, String> idPrefixEntity = Maps.newHashMap();
-
-	static {
-		idPrefixEntity.put("10", "datasource");
-		idPrefixEntity.put("20", "organization");
-		idPrefixEntity.put("40", "project");
-		idPrefixEntity.put("50", "result");
-	}
-
-	public static final Map<String, RelationInverse> relationInverseMap = Maps.newHashMap();
-
-	static {
-		relationInverseMap
-			.put(
-				"personResult_authorship_isAuthorOf", new RelationInverse()
-					.setRelation("isAuthorOf")
-					.setInverse("hasAuthor")
-					.setRelType("personResult")
-					.setSubReltype("authorship"));
-		relationInverseMap
-			.put(
-				"personResult_authorship_hasAuthor", new RelationInverse()
-					.setInverse("isAuthorOf")
-					.setRelation("hasAuthor")
-					.setRelType("personResult")
-					.setSubReltype("authorship"));
-		relationInverseMap
-			.put(
-				"projectOrganization_participation_isParticipant", new RelationInverse()
-					.setRelation("isParticipant")
-					.setInverse("hasParticipant")
-					.setRelType("projectOrganization")
-					.setSubReltype("participation"));
-		relationInverseMap
-			.put(
-				"projectOrganization_participation_hasParticipant", new RelationInverse()
-					.setInverse("isParticipant")
-					.setRelation("hasParticipant")
-					.setRelType("projectOrganization")
-					.setSubReltype("participation"));
-		relationInverseMap
-			.put(
-				"resultOrganization_affiliation_hasAuthorInstitution", new RelationInverse()
-					.setRelation("hasAuthorInstitution")
-					.setInverse("isAuthorInstitutionOf")
-					.setRelType("resultOrganization")
-					.setSubReltype("affiliation"));
-		relationInverseMap
-			.put(
-				"resultOrganization_affiliation_isAuthorInstitutionOf", new RelationInverse()
-					.setInverse("hasAuthorInstitution")
-					.setRelation("isAuthorInstitutionOf")
-					.setRelType("resultOrganization")
-					.setSubReltype("affiliation"));
-		relationInverseMap
-			.put(
-				"organizationOrganization_dedup_merges", new RelationInverse()
-					.setRelation("merges")
-					.setInverse("isMergedIn")
-					.setRelType("organizationOrganization")
-					.setSubReltype("dedup"));
-		relationInverseMap
-			.put(
-				"organizationOrganization_dedup_isMergedIn", new RelationInverse()
-					.setInverse("merges")
-					.setRelation("isMergedIn")
-					.setRelType("organizationOrganization")
-					.setSubReltype("dedup"));
-		relationInverseMap
-			.put(
-				"organizationOrganization_dedupSimilarity_isSimilarTo", new RelationInverse()
-					.setInverse("isSimilarTo")
-					.setRelation("isSimilarTo")
-					.setRelType("organizationOrganization")
-					.setSubReltype("dedupSimilarity"));
-
-		relationInverseMap
-			.put(
-				"resultProject_outcome_isProducedBy", new RelationInverse()
-					.setRelation("isProducedBy")
-					.setInverse("produces")
-					.setRelType("resultProject")
-					.setSubReltype("outcome"));
-		relationInverseMap
-			.put(
-				"resultProject_outcome_produces", new RelationInverse()
-					.setInverse("isProducedBy")
-					.setRelation("produces")
-					.setRelType("resultProject")
-					.setSubReltype("outcome"));
-		relationInverseMap
-			.put(
-				"projectPerson_contactPerson_isContact", new RelationInverse()
-					.setRelation("isContact")
-					.setInverse("hasContact")
-					.setRelType("projectPerson")
-					.setSubReltype("contactPerson"));
-		relationInverseMap
-			.put(
-				"projectPerson_contactPerson_hasContact", new RelationInverse()
-					.setInverse("isContact")
-					.setRelation("hasContact")
-					.setRelType("personPerson")
-					.setSubReltype("coAuthorship"));
-		relationInverseMap
-			.put(
-				"personPerson_coAuthorship_isCoauthorOf", new RelationInverse()
-					.setInverse("isCoAuthorOf")
-					.setRelation("isCoAuthorOf")
-					.setRelType("personPerson")
-					.setSubReltype("coAuthorship"));
-		relationInverseMap
-			.put(
-				"personPerson_dedup_merges", new RelationInverse()
-					.setInverse("isMergedIn")
-					.setRelation("merges")
-					.setRelType("personPerson")
-					.setSubReltype("dedup"));
-		relationInverseMap
-			.put(
-				"personPerson_dedup_isMergedIn", new RelationInverse()
-					.setInverse("merges")
-					.setRelation("isMergedIn")
-					.setRelType("personPerson")
-					.setSubReltype("dedup"));
-		relationInverseMap
-			.put(
-				"personPerson_dedupSimilarity_isSimilarTo", new RelationInverse()
-					.setInverse("isSimilarTo")
-					.setRelation("isSimilarTo")
-					.setRelType("personPerson")
-					.setSubReltype("dedupSimilarity"));
-		relationInverseMap
-			.put(
-				"datasourceOrganization_provision_isProvidedBy", new RelationInverse()
-					.setInverse("provides")
-					.setRelation("isProvidedBy")
-					.setRelType("datasourceOrganization")
-					.setSubReltype("provision"));
-		relationInverseMap
-			.put(
-				"datasourceOrganization_provision_provides", new RelationInverse()
-					.setInverse("isProvidedBy")
-					.setRelation("provides")
-					.setRelType("datasourceOrganization")
-					.setSubReltype("provision"));
-		relationInverseMap
-			.put(
-				"resultResult_similarity_hasAmongTopNSimilarDocuments", new RelationInverse()
-					.setInverse("isAmongTopNSimilarDocuments")
-					.setRelation("hasAmongTopNSimilarDocuments")
-					.setRelType("resultResult")
-					.setSubReltype("similarity"));
-		relationInverseMap
-			.put(
-				"resultResult_similarity_isAmongTopNSimilarDocuments", new RelationInverse()
-					.setInverse("hasAmongTopNSimilarDocuments")
-					.setRelation("isAmongTopNSimilarDocuments")
-					.setRelType("resultResult")
-					.setSubReltype("similarity"));
-		relationInverseMap
-			.put(
-				"resultResult_relationship_isRelatedTo", new RelationInverse()
-					.setInverse("isRelatedTo")
-					.setRelation("isRelatedTo")
-					.setRelType("resultResult")
-					.setSubReltype("relationship"));
-		relationInverseMap
-			.put(
-				"resultResult_similarity_isAmongTopNSimilarDocuments", new RelationInverse()
-					.setInverse("hasAmongTopNSimilarDocuments")
-					.setRelation("isAmongTopNSimilarDocuments")
-					.setRelType("resultResult")
-					.setSubReltype("similarity"));
-		relationInverseMap
-			.put(
-				"resultResult_supplement_isSupplementTo", new RelationInverse()
-					.setInverse("isSupplementedBy")
-					.setRelation("isSupplementTo")
-					.setRelType("resultResult")
-					.setSubReltype("supplement"));
-		relationInverseMap
-			.put(
-				"resultResult_supplement_isSupplementedBy", new RelationInverse()
-					.setInverse("isSupplementTo")
-					.setRelation("isSupplementedBy")
-					.setRelType("resultResult")
-					.setSubReltype("supplement"));
-		relationInverseMap
-			.put(
-				"resultResult_part_isPartOf", new RelationInverse()
-					.setInverse("hasPart")
-					.setRelation("isPartOf")
-					.setRelType("resultResult")
-					.setSubReltype("part"));
-		relationInverseMap
-			.put(
-				"resultResult_part_hasPart", new RelationInverse()
-					.setInverse("isPartOf")
-					.setRelation("hasPart")
-					.setRelType("resultResult")
-					.setSubReltype("part"));
-		relationInverseMap
-			.put(
-				"resultResult_dedup_merges", new RelationInverse()
-					.setInverse("isMergedIn")
-					.setRelation("merges")
-					.setRelType("resultResult")
-					.setSubReltype("dedup"));
-		relationInverseMap
-			.put(
-				"resultResult_dedup_isMergedIn", new RelationInverse()
-					.setInverse("merges")
-					.setRelation("isMergedIn")
-					.setRelType("resultResult")
-					.setSubReltype("dedup"));
-		relationInverseMap
-			.put(
-				"resultResult_dedupSimilarity_isSimilarTo", new RelationInverse()
-					.setInverse("isSimilarTo")
-					.setRelation("isSimilarTo")
-					.setRelType("resultResult")
-					.setSubReltype("dedupSimilarity"));
-
-	}
-
-	private static final String schemeTemplate = "dnet:%s_%s_relations";
-
-	private ModelSupport() {
-	}
-
-	public static <E extends OafEntity> String getIdPrefix(Class<E> clazz) {
-		return idPrefixMap.get(clazz);
-	}
-
-	/**
-	 * Checks subclass-superclass relationship.
-	 *
-	 * @param subClazzObject Subclass object instance
-	 * @param superClazzObject Superclass object instance
-	 * @param <X> Subclass type
-	 * @param <Y> Superclass type
-	 * @return True if X is a subclass of Y
-	 */
-	public static <X extends Oaf, Y extends Oaf> Boolean isSubClass(
-		X subClazzObject, Y superClazzObject) {
-		return isSubClass(subClazzObject.getClass(), superClazzObject.getClass());
-	}
-
-	/**
-	 * Checks subclass-superclass relationship.
-	 *
-	 * @param subClazzObject Subclass object instance
-	 * @param superClazz Superclass class
-	 * @param <X> Subclass type
-	 * @param <Y> Superclass type
-	 * @return True if X is a subclass of Y
-	 */
-	public static <X extends Oaf, Y extends Oaf> Boolean isSubClass(
-		X subClazzObject, Class<Y> superClazz) {
-		return isSubClass(subClazzObject.getClass(), superClazz);
-	}
-
-	/**
-	 * Checks subclass-superclass relationship.
-	 *
-	 * @param subClazz Subclass class
-	 * @param superClazz Superclass class
-	 * @param <X> Subclass type
-	 * @param <Y> Superclass type
-	 * @return True if X is a subclass of Y
-	 */
-	public static <X extends Oaf, Y extends Oaf> Boolean isSubClass(
-		Class<X> subClazz, Class<Y> superClazz) {
-		return superClazz.isAssignableFrom(subClazz);
-	}
-
-	/**
-	 * Lists all the OAF model classes
-	 *
-	 * @param <T>
-	 * @return
-	 */
-	public static <T extends Oaf> Class<T>[] getOafModelClasses() {
-		return new Class[] {
-			Author.class,
-			Context.class,
-			Country.class,
-			DataInfo.class,
-			Dataset.class,
-			Datasource.class,
-			ExternalReference.class,
-			ExtraInfo.class,
-			Field.class,
-			GeoLocation.class,
-			Instance.class,
-			Journal.class,
-			KeyValue.class,
-			Oaf.class,
-			OafEntity.class,
-			OAIProvenance.class,
-			Organization.class,
-			OriginDescription.class,
-			OtherResearchProduct.class,
-			Project.class,
-			Publication.class,
-			Qualifier.class,
-			Relation.class,
-			Result.class,
-			Software.class,
-			StructuredProperty.class
-		};
-	}
-
-	public static String getMainType(final EntityType type) {
-		return entityMapping.get(type).name();
-	}
-
-	public static boolean isResult(EntityType type) {
-		return MainEntityType.result.name().equals(getMainType(type));
-	}
-
-	public static String getScheme(final String sourceType, final String targetType) {
-		return String
-			.format(
-				schemeTemplate,
-				entityMapping.get(EntityType.valueOf(sourceType)).name(),
-				entityMapping.get(EntityType.valueOf(targetType)).name());
-	}
-
-	public static <T extends Oaf> String tableIdentifier(String dbName, String tableName) {
-
-		checkArgument(StringUtils.isNotBlank(dbName), "DB name cannot be empty");
-		checkArgument(StringUtils.isNotBlank(tableName), "table name cannot be empty");
-
-		return String.format("%s.%s", dbName, tableName);
-	}
-
-	public static <T extends Oaf> String tableIdentifier(String dbName, Class<T> clazz) {
-
-		checkArgument(Objects.nonNull(clazz), "clazz is needed to derive the table name, thus cannot be null");
-
-		return tableIdentifier(dbName, clazz.getSimpleName().toLowerCase());
-	}
-
-	public static <T extends Oaf> Function<T, String> idFn() {
-		return x -> {
-			if (isSubClass(x, Relation.class)) {
-				return idFnForRelation(x);
-			}
-			return idFnForOafEntity(x);
-		};
-	}
-
-	private static <T extends Oaf> String idFnForRelation(T t) {
-		Relation r = (Relation) t;
-		return Optional
-			.ofNullable(r.getSource())
-			.map(
-				source -> Optional
-					.ofNullable(r.getTarget())
-					.map(
-						target -> Optional
-							.ofNullable(r.getRelType())
-							.map(
-								relType -> Optional
-									.ofNullable(r.getSubRelType())
-									.map(
-										subRelType -> Optional
-											.ofNullable(r.getRelClass())
-											.map(
-												relClass -> String
-													.join(
-														source,
-														target,
-														relType,
-														subRelType,
-														relClass))
-											.orElse(
-												String
-													.join(
-														source,
-														target,
-														relType,
-														subRelType)))
-									.orElse(String.join(source, target, relType)))
-							.orElse(String.join(source, target)))
-					.orElse(source))
-			.orElse(null);
-	}
-
-	private static <T extends Oaf> String idFnForOafEntity(T t) {
-		return ((OafEntity) t).getId();
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/RelationInverse.java

@@ -1,46 +0,0 @@
-
-package eu.dnetlib.dhp.schema.common;
-
-public class RelationInverse {
-	private String relation;
-	private String inverse;
-	private String relType;
-	private String subReltype;
-
-	public String getRelType() {
-		return relType;
-	}
-
-	public RelationInverse setRelType(String relType) {
-		this.relType = relType;
-		return this;
-	}
-
-	public String getSubReltype() {
-		return subReltype;
-	}
-
-	public RelationInverse setSubReltype(String subReltype) {
-		this.subReltype = subReltype;
-		return this;
-	}
-
-	public String getRelation() {
-		return relation;
-	}
-
-	public RelationInverse setRelation(String relation) {
-		this.relation = relation;
-		return this;
-	}
-
-	public String getInverse() {
-		return inverse;
-	}
-
-	public RelationInverse setInverse(String inverse) {
-		this.inverse = inverse;
-		return this;
-	}
-
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/APC.java

@@ -1,29 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf;
-
-import java.io.Serializable;
-
-/**
- * Used to refer to the Article Processing Charge information. Not dumped in this release. It contains two parameters: -
- * currency of type String to store the currency of the APC - amount of type String to stores the charged amount
- */
-public class APC implements Serializable {
-	private String currency;
-	private String amount;
-
-	public String getCurrency() {
-		return currency;
-	}
-
-	public void setCurrency(String currency) {
-		this.currency = currency;
-	}
-
-	public String getAmount() {
-		return amount;
-	}
-
-	public void setAmount(String amount) {
-		this.amount = amount;
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/AccessRight.java

@@ -1,31 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf;
-
-/**
- * AccessRight. Used to represent the result access rights. It extends the eu.dnet.lib.dhp.schema.dump.oaf.Qualifier
- * element with a parameter scheme of type String to store the scheme. Values for this element are found against the
- * COAR access right scheme. The classid of the element accessright in eu.dnetlib.dhp.schema.oaf.Result is used to get
- * the COAR corresponding code whose value will be used to set the code parameter. The COAR label corresponding to the
- * COAR code will be used to set the label parameter. The scheme value will always be the one referring to the COAR
- * access right scheme
- */
-public class AccessRight extends Qualifier {
-
-	private String scheme;
-
-	public String getScheme() {
-		return scheme;
-	}
-
-	public void setScheme(String scheme) {
-		this.scheme = scheme;
-	}
-
-	public static AccessRight newInstance(String code, String label, String scheme) {
-		AccessRight ar = new AccessRight();
-		ar.setCode(code);
-		ar.setLabel(label);
-		ar.setScheme(scheme);
-		return ar;
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Author.java

@@ -1,73 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * Used to represent the generic author of the result. It has six parameters: - name of type String to store the given
- * name of the author. The value for this parameter corresponds to eu.dnetlib.dhp.schema.oaf.Author name - surname of
- * type String to store the family name of the author. The value for this parameter corresponds to
- * eu.dnetlib.dhp.schema.oaf.Author surname - fullname of type String to store the fullname of the author. The value for
- * this parameter corresponds to eu.dnetlib.dhp.schema.oaf.Author fullname - rank of type Integer to store the rank on
- * the author in the result's authors list. The value for this parameter corresponds to eu.dnetlib.dhp.schema.oaf.Author
- * rank - pid of type eu.dnetlib.dhp.schema.dump.oaf.Pid to store the persistent identifier for the author. For the
- * moment only ORCID identifiers will be dumped. - The id element is instantiated by using the following values in the
- * eu.dnetlib.dhp.schema.oaf.Result pid: * Qualifier.classid for scheme * value for value - The provenance element is
- * instantiated only if the dataInfo is set for the pid in the result to be dumped. The provenance element is
- * instantiated by using the following values in the eu.dnetlib.dhp.schema.oaf.Result pid: *
- * dataInfo.provenanceaction.classname for provenance * dataInfo.trust for trust
- */
-public class Author implements Serializable {
-
-	private String fullname;
-
-	private String name;
-
-	private String surname;
-
-	private Integer rank;
-
-	private Pid pid;
-
-	public String getFullname() {
-		return fullname;
-	}
-
-	public void setFullname(String fullname) {
-		this.fullname = fullname;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getSurname() {
-		return surname;
-	}
-
-	public void setSurname(String surname) {
-		this.surname = surname;
-	}
-
-	public Integer getRank() {
-		return rank;
-	}
-
-	public void setRank(Integer rank) {
-		this.rank = rank;
-	}
-
-	public Pid getPid() {
-		return pid;
-	}
-
-	public void setPid(Pid pid) {
-		this.pid = pid;
-	}
-
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Container.java

@@ -1,136 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf;
-
-import java.io.Serializable;
-import java.util.Objects;
-
-/**
- * To store information about the conference or journal where the result has been presented or published. It contains
- * eleven parameters: - name of type String to store the name of the journal or conference. It corresponds to the
- * parameter name of eu.dnetlib.dhp.schema.oaf.Journal - issnPrinted ot type String to store the journal printed issn.
- * It corresponds to the parameter issnPrinted of eu.dnetlib.dhp.schema.oaf.Journal - issnOnline of type String to store
- * the journal online issn. It corresponds to the parameter issnOnline of eu.dnetlib.dhp.schema.oaf.Journal -
- * issnLinking of type String to store the journal linking issn. It corresponds to the parameter issnLinking of
- * eu.dnetlib.dhp.schema.oaf.Journal - ep of type String to store the end page. It corresponds to the parameter ep of
- * eu.dnetlib.dhp.schema.oaf.Journal - iss of type String to store the journal issue. It corresponds to the parameter
- * iss of eu.dnetlib.dhp.schema.oaf.Journal - sp of type String to store the start page. It corresponds to the parameter
- * sp of eu.dnetlib.dhp.schema.oaf.Journal - vol of type String to store the Volume. It corresponds to the parameter vol
- * of eu.dnetlib.dhp.schema.oaf.Journal - edition of type String to store the edition of the journal or conference
- * proceeding. It corresponds to the parameter edition of eu.dnetlib.dhp.schema.oaf.Journal - conferenceplace of type
- * String to store the place of the conference. It corresponds to the parameter conferenceplace of
- * eu.dnetlib.dhp.schema.oaf.Journal - conferencedate of type String to store the date of the conference. It corresponds
- * to the parameter conferencedate of eu.dnetlib.dhp.schema.oaf.Journal
- */
-public class Container implements Serializable {
-
-	private String name;
-
-	private String issnPrinted;
-
-	private String issnOnline;
-
-	private String issnLinking;
-
-	private String ep;
-
-	private String iss;
-
-	private String sp;
-
-	private String vol;
-
-	private String edition;
-
-	private String conferenceplace;
-
-	private String conferencedate;
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getIssnPrinted() {
-		return issnPrinted;
-	}
-
-	public void setIssnPrinted(String issnPrinted) {
-		this.issnPrinted = issnPrinted;
-	}
-
-	public String getIssnOnline() {
-		return issnOnline;
-	}
-
-	public void setIssnOnline(String issnOnline) {
-		this.issnOnline = issnOnline;
-	}
-
-	public String getIssnLinking() {
-		return issnLinking;
-	}
-
-	public void setIssnLinking(String issnLinking) {
-		this.issnLinking = issnLinking;
-	}
-
-	public String getEp() {
-		return ep;
-	}
-
-	public void setEp(String ep) {
-		this.ep = ep;
-	}
-
-	public String getIss() {
-		return iss;
-	}
-
-	public void setIss(String iss) {
-		this.iss = iss;
-	}
-
-	public String getSp() {
-		return sp;
-	}
-
-	public void setSp(String sp) {
-		this.sp = sp;
-	}
-
-	public String getVol() {
-		return vol;
-	}
-
-	public void setVol(String vol) {
-		this.vol = vol;
-	}
-
-	public String getEdition() {
-		return edition;
-	}
-
-	public void setEdition(String edition) {
-		this.edition = edition;
-	}
-
-	public String getConferenceplace() {
-		return conferenceplace;
-	}
-
-	public void setConferenceplace(String conferenceplace) {
-		this.conferenceplace = conferenceplace;
-	}
-
-	public String getConferencedate() {
-		return conferencedate;
-	}
-
-	public void setConferencedate(String conferencedate) {
-		this.conferencedate = conferencedate;
-	}
-
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/ControlledField.java

@@ -1,38 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf;
-
-import java.io.Serializable;
-
-/**
- * To represent the information described by a scheme and a value in that scheme (i.e. pid). It has two parameters: -
- * scheme of type String to store the scheme - value of type String to store the value in that scheme
- */
-public class ControlledField implements Serializable {
-	private String scheme;
-	private String value;
-
-	public String getScheme() {
-		return scheme;
-	}
-
-	public void setScheme(String scheme) {
-		this.scheme = scheme;
-	}
-
-	public String getValue() {
-		return value;
-	}
-
-	public void setValue(String value) {
-		this.value = value;
-	}
-
-	public static ControlledField newInstance(String scheme, String value) {
-		ControlledField cf = new ControlledField();
-
-		cf.setScheme(scheme);
-		cf.setValue(value);
-
-		return cf;
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Country.java

@@ -1,37 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf;
-
-/**
- * Represents the country associated to this result. It extends eu.dnetlib.dhp.schema.dump.oaf.Qualifier with a
- * provenance parameter of type eu.dnetlib.dhp.schema.dumo.oaf.Provenance. The country in not mapped if its value in the
- * result reprensented in the internal format is Unknown. The value for this element correspond to: - code corresponds
- * to the classid of eu.dnetlib.dhp.schema.oaf.Country - label corresponds to the classname of
- * eu.dnetlib.dhp.schema.oaf.Country - provenance set only if the dataInfo associated to the Country of the result to be
- * dumped is not null. In this case : - provenance corresponds to dataInfo.provenanceaction.classid (to be modified with
- * datainfo.provenanceaction.classname) - trust corresponds to dataInfo.trust
- */
-public class Country extends Qualifier {
-
-	private Provenance provenance;
-
-	public Provenance getProvenance() {
-		return provenance;
-	}
-
-	public void setProvenance(Provenance provenance) {
-		this.provenance = provenance;
-	}
-
-	public static Country newInstance(String code, String label, Provenance provenance) {
-		Country c = new Country();
-		c.setProvenance(provenance);
-		c.setCode(code);
-		c.setLabel(label);
-		return c;
-	}
-
-	public static Country newInstance(String code, String label, String provenance, String trust) {
-		return newInstance(code, label, Provenance.newInstance(provenance, trust));
-	}
-
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Funder.java

@@ -1,36 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf;
-
-import java.io.Serializable;
-
-public class Funder implements Serializable {
-	private String shortName;
-
-	private String name;
-
-	private String jurisdiction;
-
-	public String getJurisdiction() {
-		return jurisdiction;
-	}
-
-	public void setJurisdiction(String jurisdiction) {
-		this.jurisdiction = jurisdiction;
-	}
-
-	public String getShortName() {
-		return shortName;
-	}
-
-	public void setShortName(String shortName) {
-		this.shortName = shortName;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/GeoLocation.java

@@ -1,53 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf;
-
-import java.io.Serializable;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-/**
- * Represents the geolocation information. It has three parameters: - point of type String to store the point
- * information. It corresponds to eu.dnetlib.dhp.schema.oaf.GeoLocation point - box ot type String to store the box
- * information. It corresponds to eu.dnetlib.dhp.schema.oaf.GeoLocation box - place of type String to store the place
- * information. It corresponds to eu.dnetlib.dhp.schema.oaf.GeoLocation place
- */
-public class GeoLocation implements Serializable {
-
-	private String point;
-
-	private String box;
-
-	private String place;
-
-	public String getPoint() {
-		return point;
-	}
-
-	public void setPoint(String point) {
-		this.point = point;
-	}
-
-	public String getBox() {
-		return box;
-	}
-
-	public void setBox(String box) {
-		this.box = box;
-	}
-
-	public String getPlace() {
-		return place;
-	}
-
-	public void setPlace(String place) {
-		this.place = place;
-	}
-
-	@JsonIgnore
-	public boolean isBlank() {
-		return StringUtils.isBlank(point) && StringUtils.isBlank(box) && StringUtils.isBlank(place);
-	}
-
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Instance.java

@@ -1,81 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * Represents the manifestations (i.e. different versions) of the result. For example: the pre-print and the published
- * versions are two manifestations of the same research result. It has the following parameters: - license of type
- * String to store the license applied to the instance. It corresponds to the value of the licence in the instance to be
- * dumped - accessright of type eu.dnetlib.dhp.schema.dump.oaf.AccessRight to store the accessright of the instance. -
- * type of type String to store the type of the instance as defined in the corresponding dnet vocabulary
- * (dnet:pubication_resource). It corresponds to the instancetype.classname of the instance to be mapped - url of type
- * List<String> list of locations where the instance is accessible. It corresponds to url of the instance to be dumped -
- * publicationdate of type String to store the publication date of the instance ;// dateofacceptance; - refereed of type
- * String to store information abour tthe review status of the instance. Possible values are 'Unknown',
- * 'nonPeerReviewed', 'peerReviewed'. It corresponds to refereed.classname of the instance to be dumped
- */
-public class Instance implements Serializable {
-
-	private String license;
-
-	private AccessRight accessright;
-
-	private String type;
-
-	private List<String> url;
-
-	private String publicationdate;// dateofacceptance;
-
-	private String refereed; // peer-review status
-
-	public String getLicense() {
-		return license;
-	}
-
-	public void setLicense(String license) {
-		this.license = license;
-	}
-
-	public AccessRight getAccessright() {
-		return accessright;
-	}
-
-	public void setAccessright(AccessRight accessright) {
-		this.accessright = accessright;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public List<String> getUrl() {
-		return url;
-	}
-
-	public void setUrl(List<String> url) {
-		this.url = url;
-	}
-
-	public String getPublicationdate() {
-		return publicationdate;
-	}
-
-	public void setPublicationdate(String publicationdate) {
-		this.publicationdate = publicationdate;
-	}
-
-	public String getRefereed() {
-		return refereed;
-	}
-
-	public void setRefereed(String refereed) {
-		this.refereed = refereed;
-	}
-
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/KeyValue.java

@@ -1,48 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf;
-
-import java.io.Serializable;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-/**
- * To represent the information described by a key and a value. It has two parameters: - key to store the key (generally
- * the OpenAIRE id for some entity) - value to store the value (generally the OpenAIRE name for the key)
- */
-public class KeyValue implements Serializable {
-
-	private String key;
-
-	private String value;
-
-	public String getKey() {
-		return key;
-	}
-
-	public void setKey(String key) {
-		this.key = key;
-	}
-
-	public String getValue() {
-		return value;
-	}
-
-	public void setValue(String value) {
-		this.value = value;
-	}
-
-	public static KeyValue newInstance(String key, String value) {
-		KeyValue inst = new KeyValue();
-		inst.key = key;
-		inst.value = value;
-		return inst;
-	}
-
-	@JsonIgnore
-	public boolean isBlank() {
-		return StringUtils.isBlank(key) && StringUtils.isBlank(value);
-	}
-
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Pid.java

@@ -1,45 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf;
-
-import java.io.Serializable;
-
-/**
- * To represent the generic persistent identifier. It has two parameters: - id of type
- * eu.dnetlib.dhp.schema.dump.oaf.ControlledField to store the scheme and value of the Persistent Identifier. -
- * provenance of type eu.dnetlib.dhp.schema.dump.oaf.Provenance to store the provenance and trust of the information
- */
-public class Pid implements Serializable {
-	private ControlledField id;
-	private Provenance provenance;
-
-	public ControlledField getId() {
-		return id;
-	}
-
-	public void setId(ControlledField pid) {
-		this.id = pid;
-	}
-
-	public Provenance getProvenance() {
-		return provenance;
-	}
-
-	public void setProvenance(Provenance provenance) {
-		this.provenance = provenance;
-	}
-
-	public static Pid newInstance(ControlledField pid, Provenance provenance) {
-		Pid p = new Pid();
-		p.id = pid;
-		p.provenance = provenance;
-
-		return p;
-	}
-
-	public static Pid newInstance(ControlledField pid) {
-		Pid p = new Pid();
-		p.id = pid;
-
-		return p;
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Project.java

@@ -1,51 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf;
-
-import java.io.Serializable;
-
-/**
- * This class to store the common information about the project that will be dumped for community and for the whole
- * graph - private String id to store the id of the project (OpenAIRE id) - private String code to store the grant
- * agreement of the project - private String acronym to store the acronym of the project - private String title to store
- * the tile of the project
- */
-public class Project implements Serializable {
-	protected String id;// OpenAIRE id
-	protected String code;
-
-	protected String acronym;
-
-	protected String title;
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public String getAcronym() {
-		return acronym;
-	}
-
-	public void setAcronym(String acronym) {
-		this.acronym = acronym;
-	}
-
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Provenance.java

@@ -1,41 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf;
-
-import java.io.Serializable;
-
-/**
- * Indicates the process that produced (or provided) the information, and the trust associated to the information. It
- * has two parameters: - provenance of type String to store the provenance of the information, - trust of type String to
- * store the trust associated to the information
- */
-public class Provenance implements Serializable {
-	private String provenance;
-	private String trust;
-
-	public String getProvenance() {
-		return provenance;
-	}
-
-	public void setProvenance(String provenance) {
-		this.provenance = provenance;
-	}
-
-	public String getTrust() {
-		return trust;
-	}
-
-	public void setTrust(String trust) {
-		this.trust = trust;
-	}
-
-	public static Provenance newInstance(String provenance, String trust) {
-		Provenance p = new Provenance();
-		p.provenance = provenance;
-		p.trust = trust;
-		return p;
-	}
-
-	public String toString() {
-		return provenance + trust;
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Qualifier.java

@@ -1,42 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf;
-
-import java.io.Serializable;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-/**
- * To represent the information described by a code and a value It has two parameters: - code to store the code
- * (generally the classid of the eu.dnetlib.dhp.schema.oaf.Qualifier element) - label to store the label (generally the
- * classname of the eu.dnetlib.dhp.schema.oaf.Qualifier element
- */
-public class Qualifier implements Serializable {
-
-	private String code; // the classid in the Qualifier
-	private String label; // the classname in the Qualifier
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public String getLabel() {
-		return label;
-	}
-
-	public void setLabel(String label) {
-		this.label = label;
-	}
-
-	public static Qualifier newInstance(String code, String value) {
-		Qualifier qualifier = new Qualifier();
-		qualifier.setCode(code);
-		qualifier.setLabel(value);
-		return qualifier;
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Result.java

@@ -1,379 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf;
-
-import java.io.Serializable;
-import java.util.List;
-
-import eu.dnetlib.dhp.schema.dump.oaf.community.Project;
-
-/**
- * To represent the dumped result. It will be extended in the dump for Research Communities - Research
- * Initiative/Infrastructures. It has the following parameters: - author of type
- * List<eu.dnetlib.dhpschema.dump.oaf.Author> to describe the authors of a result. For each author in the result
- * represented in the internal model one author in the esternal model is produced. - type of type String to represent
- * the category of the result. Possible values are publication, dataset, software, other. It corresponds to
- * resulttype.classname of the dumped result - language of type eu.dnetlib.dhp.schema.dump.oaf.Qualifier to store
- * information about the language of the result. It is dumped as - code corresponds to language.classid - value
- * corresponds to language.classname - country of type List<eu.dnetlib.dhp.schema.dump.oaf.Country> to store the country
- * list to which the result is associated. For each country in the result respresented in the internal model one country
- * in the external model is produces - subjects of type List<eu.dnetlib.dhp.dump.oaf.Subject> to store the subjects for
- * the result. For each subject in the result represented in the internal model one subject in the external model is
- * produced - maintitle of type String to store the main title of the result. It corresponds to the value of the first
- * title in the resul to be dumped having classid equals to "main title" - subtitle of type String to store the subtitle
- * of the result. It corresponds to the value of the first title in the resul to be dumped having classid equals to
- * "subtitle" - description of type List<String> to store the description of the result. It corresponds to the list of
- * description.value in the result represented in the internal model - publicationdate of type String to store the
- * pubblication date. It corresponds to dateofacceptance.value in the result represented in the internal model -
- * publisher of type String to store information about the publisher. It corresponds to publisher.value of the result
- * represented in the intrenal model - embargoenddate of type String to store the embargo end date. It corresponds to
- * embargoenddate.value of the result represented in the internal model - source of type List<String> See definition of
- * Dublin Core field dc:source. It corresponds to the list of source.value in the result represented in the internal
- * model - format of type List<String> It corresponds to the list of format.value in the result represented in the
- * internal model - contributor of type List<String> to represent contributors for this result. It corresponds to the
- * list of contributor.value in the result represented in the internal model - coverage of type String. It corresponds
- * to the list of coverage.value in the result represented in the internal model - bestaccessright of type
- * eu.dnetlib.dhp.schema.dump.oaf.AccessRight to store informatin about the openest access right associated to the
- * manifestations of this research results. It corresponds to the same parameter in the result represented in the
- * internal model - container of type eu.dnetlib.dhp.schema/dump.oaf.Container (only for result of type publication). It
- * corresponds to the parameter journal of the result represented in the internal model - documentationUrl of type
- * List<String> (only for results of type software) to store the URLs to the software documentation. It corresponds to
- * the list of documentationUrl.value of the result represented in the internal model - codeRepositoryUrl of type String
- * (only for results of type software) to store the URL to the repository with the source code. It corresponds to
- * codeRepositoryUrl.value of the result represented in the internal model - programmingLanguage of type String (only
- * for results of type software) to store the programming language. It corresponds to programmingLanguaga.classid of the
- * result represented in the internal model - contactperson of type List<String> (only for results of type other) to
- * store the contact person for this result. It corresponds to the list of contactperson.value of the result represented
- * in the internal model - contactgroup of type List<String> (only for results of type other) to store the information
- * for the contact group. It corresponds to the list of contactgroup.value of the result represented in the internal
- * model - tool of type List<String> (only fro results of type other) to store information about tool useful for the
- * interpretation and/or re-used of the research product. It corresponds to the list of tool.value in the result
- * represented in the internal modelt - size of type String (only for results of type dataset) to store the size of the
- * dataset. It corresponds to size.value in the result represented in the internal model - version of type String (only
- * for results of type dataset) to store the version. It corresponds to version.value of the result represented in the
- * internal model - geolocation fo type List<eu.dnetlib.dhp.schema.dump.oaf.GeoLocation> (only for results of type
- * dataset) to store geolocation information. For each geolocation element in the result represented in the internal
- * model a GeoLocation in the external model il produced - id of type String to store the OpenAIRE id of the result. It
- * corresponds to the id of the result represented in the internal model - originalId of type List<String> to store the
- * original ids of the result. It corresponds to the originalId of the result represented in the internal model - pid of
- * type List<eu.dnetlib.dhp.schema.dump.oaf.ControlledField> to store the persistent identifiers for the result. For
- * each pid in the results represented in the internal model one pid in the external model is produced. The value
- * correspondence is: - scheme corresponds to pid.qualifier.classid of the result represented in the internal model -
- * value corresponds to the pid.value of the result represented in the internal model - dateofcollection of type String
- * to store information about the time OpenAIRE collected the record. It corresponds to dateofcollection of the result
- * represented in the internal model - lasteupdatetimestamp of type String to store the timestamp of the last update of
- * the record. It corresponds to lastupdatetimestamp of the resord represented in the internal model
- */
-public class Result implements Serializable {
-
-	private List<Author> author;
-
-	// resulttype allows subclassing results into publications | datasets | software
-	private String type; // resulttype
-
-	// common fields
-	private Qualifier language;
-
-	private List<Country> country;
-
-	private List<Subject> subjects;
-
-	private String maintitle;
-
-	private String subtitle;
-
-	private List<String> description;
-
-	private String publicationdate; // dateofacceptance;
-
-	private String publisher;
-
-	private String embargoenddate;
-
-	private List<String> source;
-
-	private List<String> format;
-
-	private List<String> contributor;
-
-	private List<String> coverage;
-
-	private AccessRight bestaccessright;
-
-	private Container container;// Journal
-
-	private List<String> documentationUrl; // software
-
-	private String codeRepositoryUrl; // software
-
-	private String programmingLanguage; // software
-
-	private List<String> contactperson; // orp
-
-	private List<String> contactgroup; // orp
-
-	private List<String> tool; // orp
-
-	private String size; // dataset
-
-	private String version; // dataset
-
-	private List<GeoLocation> geolocation; // dataset
-
-	private String id;
-
-	private List<String> originalId;
-
-	private List<ControlledField> pid;
-
-	private String dateofcollection;
-
-	private Long lastupdatetimestamp;
-
-	public Long getLastupdatetimestamp() {
-		return lastupdatetimestamp;
-	}
-
-	public void setLastupdatetimestamp(Long lastupdatetimestamp) {
-		this.lastupdatetimestamp = lastupdatetimestamp;
-	}
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public List<String> getOriginalId() {
-		return originalId;
-	}
-
-	public void setOriginalId(List<String> originalId) {
-		this.originalId = originalId;
-	}
-
-	public List<ControlledField> getPid() {
-		return pid;
-	}
-
-	public void setPid(List<ControlledField> pid) {
-		this.pid = pid;
-	}
-
-	public String getDateofcollection() {
-		return dateofcollection;
-	}
-
-	public void setDateofcollection(String dateofcollection) {
-		this.dateofcollection = dateofcollection;
-	}
-
-	public List<Author> getAuthor() {
-		return author;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public Container getContainer() {
-		return container;
-	}
-
-	public void setContainer(Container container) {
-		this.container = container;
-	}
-
-	public void setAuthor(List<Author> author) {
-		this.author = author;
-	}
-
-	public Qualifier getLanguage() {
-		return language;
-	}
-
-	public void setLanguage(Qualifier language) {
-		this.language = language;
-	}
-
-	public List<Country> getCountry() {
-		return country;
-	}
-
-	public void setCountry(List<Country> country) {
-		this.country = country;
-	}
-
-	public List<Subject> getSubjects() {
-		return subjects;
-	}
-
-	public void setSubjects(List<Subject> subjects) {
-		this.subjects = subjects;
-	}
-
-	public String getMaintitle() {
-		return maintitle;
-	}
-
-	public void setMaintitle(String maintitle) {
-		this.maintitle = maintitle;
-	}
-
-	public String getSubtitle() {
-		return subtitle;
-	}
-
-	public void setSubtitle(String subtitle) {
-		this.subtitle = subtitle;
-	}
-
-	public List<String> getDescription() {
-		return description;
-	}
-
-	public void setDescription(List<String> description) {
-		this.description = description;
-	}
-
-	public String getPublicationdate() {
-		return publicationdate;
-	}
-
-	public void setPublicationdate(String publicationdate) {
-		this.publicationdate = publicationdate;
-	}
-
-	public String getPublisher() {
-		return publisher;
-	}
-
-	public void setPublisher(String publisher) {
-		this.publisher = publisher;
-	}
-
-	public String getEmbargoenddate() {
-		return embargoenddate;
-	}
-
-	public void setEmbargoenddate(String embargoenddate) {
-		this.embargoenddate = embargoenddate;
-	}
-
-	public List<String> getSource() {
-		return source;
-	}
-
-	public void setSource(List<String> source) {
-		this.source = source;
-	}
-
-	public List<String> getFormat() {
-		return format;
-	}
-
-	public void setFormat(List<String> format) {
-		this.format = format;
-	}
-
-	public List<String> getContributor() {
-		return contributor;
-	}
-
-	public void setContributor(List<String> contributor) {
-		this.contributor = contributor;
-	}
-
-	public List<String> getCoverage() {
-		return coverage;
-	}
-
-	public void setCoverage(List<String> coverage) {
-		this.coverage = coverage;
-	}
-
-	public AccessRight getBestaccessright() {
-		return bestaccessright;
-	}
-
-	public void setBestaccessright(AccessRight bestaccessright) {
-		this.bestaccessright = bestaccessright;
-	}
-
-	public List<String> getDocumentationUrl() {
-		return documentationUrl;
-	}
-
-	public void setDocumentationUrl(List<String> documentationUrl) {
-		this.documentationUrl = documentationUrl;
-	}
-
-	public String getCodeRepositoryUrl() {
-		return codeRepositoryUrl;
-	}
-
-	public void setCodeRepositoryUrl(String codeRepositoryUrl) {
-		this.codeRepositoryUrl = codeRepositoryUrl;
-	}
-
-	public String getProgrammingLanguage() {
-		return programmingLanguage;
-	}
-
-	public void setProgrammingLanguage(String programmingLanguage) {
-		this.programmingLanguage = programmingLanguage;
-	}
-
-	public List<String> getContactperson() {
-		return contactperson;
-	}
-
-	public void setContactperson(List<String> contactperson) {
-		this.contactperson = contactperson;
-	}
-
-	public List<String> getContactgroup() {
-		return contactgroup;
-	}
-
-	public void setContactgroup(List<String> contactgroup) {
-		this.contactgroup = contactgroup;
-	}
-
-	public List<String> getTool() {
-		return tool;
-	}
-
-	public void setTool(List<String> tool) {
-		this.tool = tool;
-	}
-
-	public String getSize() {
-		return size;
-	}
-
-	public void setSize(String size) {
-		this.size = size;
-	}
-
-	public String getVersion() {
-		return version;
-	}
-
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-	public List<GeoLocation> getGeolocation() {
-		return geolocation;
-	}
-
-	public void setGeolocation(List<GeoLocation> geolocation) {
-		this.geolocation = geolocation;
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Subject.java

@@ -1,34 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf;
-
-import java.io.Serializable;
-
-/**
- * To represent keywords associated to the result. It has two parameters: - subject of type
- * eu.dnetlib.dhp.schema.dump.oaf.ControlledField to describe the subject. It mapped as: - schema it corresponds to
- * qualifier.classid of the dumped subject - value it corresponds to the subject value - provenance of type
- * eu.dnetlib.dhp.schema.dump.oaf.Provenance to represent the provenance of the subject. It is dumped only if dataInfo
- * is not null. In this case: - provenance corresponds to dataInfo.provenanceaction.classname - trust corresponds to
- * dataInfo.trust
- */
-public class Subject implements Serializable {
-	private ControlledField subject;
-	private Provenance provenance;
-
-	public ControlledField getSubject() {
-		return subject;
-	}
-
-	public void setSubject(ControlledField subject) {
-		this.subject = subject;
-	}
-
-	public Provenance getProvenance() {
-		return provenance;
-	}
-
-	public void setProvenance(Provenance provenance) {
-		this.provenance = provenance;
-	}
-
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/CommunityInstance.java

@@ -1,36 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf.community;
-
-import eu.dnetlib.dhp.schema.dump.oaf.Instance;
-import eu.dnetlib.dhp.schema.dump.oaf.KeyValue;
-
-/**
- * It extends eu.dnetlib.dhp.dump.oaf.Instance with values related to the community dump. In the Result dump this
- * information is not present because it is dumped as a set of relations between the result and the datasource. -
- * hostedby of type eu.dnetlib.dhp.schema.dump.oaf.KeyValue to store the information about the source from which the
- * instance can be viewed or downloaded. It is mapped against the hostedby parameter of the instance to be dumped and -
- * key corresponds to hostedby.key - value corresponds to hostedby.value - collectedfrom of type
- * eu.dnetlib.dhp.schema.dump.oaf.KeyValue to store the information about the source from which the instance has been
- * collected. It is mapped against the collectedfrom parameter of the instance to be dumped and - key corresponds to
- * collectedfrom.key - value corresponds to collectedfrom.value
- */
-public class CommunityInstance extends Instance {
-	private KeyValue hostedby;
-	private KeyValue collectedfrom;
-
-	public KeyValue getHostedby() {
-		return hostedby;
-	}
-
-	public void setHostedby(KeyValue hostedby) {
-		this.hostedby = hostedby;
-	}
-
-	public KeyValue getCollectedfrom() {
-		return collectedfrom;
-	}
-
-	public void setCollectedfrom(KeyValue collectedfrom) {
-		this.collectedfrom = collectedfrom;
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/CommunityResult.java

@@ -1,63 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf.community;
-
-import java.util.List;
-
-import eu.dnetlib.dhp.schema.dump.oaf.KeyValue;
-import eu.dnetlib.dhp.schema.dump.oaf.Result;
-
-/**
- * extends eu.dnetlib.dhp.schema.dump.oaf.Result with the following parameters: - projects of type
- * List<eu.dnetlib.dhp.schema.dump.oaf.community.Project> to store the list of projects related to the result. The
- * information is added after the result is mapped to the external model - context of type
- * List<eu.dnetlib.dhp.schema.dump.oaf.community.Context> to store information about the RC RI related to the result.
- * For each context in the result represented in the internal model one context in the external model is produced -
- * collectedfrom of type List<eu.dnetliv.dhp.schema.dump.oaf.KeyValue> to store information about the sources from which
- * the record has been collected. For each collectedfrom in the result represented in the internal model one
- * collectedfrom in the external model is produced - instance of type
- * List<eu.dnetlib.dhp.schema.dump.oaf.community.CommunityInstance> to store all the instances associated to the result.
- * It corresponds to the same parameter in the result represented in the internal model
- */
-public class CommunityResult extends Result {
-
-	private List<Project> projects;
-
-	private List<Context> context;
-
-	protected List<KeyValue> collectedfrom;
-
-	private List<CommunityInstance> instance;
-
-	public List<CommunityInstance> getInstance() {
-		return instance;
-	}
-
-	public void setInstance(List<CommunityInstance> instance) {
-		this.instance = instance;
-	}
-
-	public List<KeyValue> getCollectedfrom() {
-		return collectedfrom;
-	}
-
-	public void setCollectedfrom(List<KeyValue> collectedfrom) {
-		this.collectedfrom = collectedfrom;
-	}
-
-	public List<Project> getProjects() {
-		return projects;
-	}
-
-	public void setProjects(List<Project> projects) {
-		this.projects = projects;
-	}
-
-	public List<Context> getContext() {
-		return context;
-	}
-
-	public void setContext(List<Context> context) {
-		this.context = context;
-	}
-
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Context.java

@@ -1,40 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf.community;
-
-import java.util.List;
-import java.util.Objects;
-
-import eu.dnetlib.dhp.schema.dump.oaf.Provenance;
-import eu.dnetlib.dhp.schema.dump.oaf.Qualifier;
-
-/**
- * Reference to a relevant research infrastructure, initiative or community (RI/RC) among those collaborating with
- * OpenAIRE. It extend eu.dnetlib.dhp.shema.dump.oaf.Qualifier with a parameter provenance of type
- * List<eu.dnetlib.dhp.schema.dump.oaf.Provenance> to store the provenances of the association between the result and
- * the RC/RI. The values for this element correspond to: - code: it corresponds to the id of the context in the result
- * to be mapped. If the context id refers to a RC/RI and contains '::' only the part of the id before the first "::"
- * will be used as value for code - label it corresponds to the label associated to the id. The information id taken
- * from the profile of the RC/RI - provenance it is set only if the dataInfo associated to the contenxt element of the
- * result to be dumped is not null. For each dataInfo one instance of type eu.dnetlib.dhp.schema.dump.oaf.Provenance is
- * instantiated if the element datainfo.provenanceaction is not null. In this case - provenance corresponds to
- * dataInfo.provenanceaction.classname - trust corresponds to dataInfo.trust
- */
-public class Context extends Qualifier {
-	private List<Provenance> provenance;
-
-	public List<Provenance> getProvenance() {
-		return provenance;
-	}
-
-	public void setProvenance(List<Provenance> provenance) {
-		this.provenance = provenance;
-	}
-
-	@Override
-	public int hashCode() {
-		String provenance = new String();
-		this.provenance.forEach(p -> provenance.concat(p.toString()));
-		return Objects.hash(getCode(), getLabel(), provenance);
-	}
-
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Funder.java

@@ -1,23 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf.community;
-
-import java.io.Serializable;
-
-/**
- * To store information about the funder funding the project related to the result. It has the following parameters: -
- * shortName of type String to store the funder short name (e.c. AKA). - name of type String to store the funder name
- * (e.c. Akademy of Finland) - fundingStream of type String to store the funding stream - jurisdiction of type String to
- * store the jurisdiction of the funder
- */
-public class Funder extends eu.dnetlib.dhp.schema.dump.oaf.Funder {
-
-	private String fundingStream;
-
-	public String getFundingStream() {
-		return fundingStream;
-	}
-
-	public void setFundingStream(String fundingStream) {
-		this.fundingStream = fundingStream;
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Project.java

@@ -1,47 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf.community;
-
-import java.io.Serializable;
-
-import eu.dnetlib.dhp.schema.dump.oaf.Provenance;
-
-/**
- * To store information about the project related to the result. This information is not directly mapped from the result
- * represented in the internal model because it is not there. The mapped result will be enriched with project
- * information derived by relation between results and projects. Project extends eu.dnetlib.dhp.schema.dump.oaf.Project
- * with the following parameters: - funder of type eu.dnetlib.dhp.schema.dump.oaf.community.Funder to store information
- * about the funder funding the project - provenance of type eu.dnetlib.dhp.schema.dump.oaf.Provenance to store
- * information about the. provenance of the association between the result and the project
- */
-public class Project extends eu.dnetlib.dhp.schema.dump.oaf.Project {
-
-	private Funder funder;
-
-	private Provenance provenance;
-
-	public Provenance getProvenance() {
-		return provenance;
-	}
-
-	public void setProvenance(Provenance provenance) {
-		this.provenance = provenance;
-	}
-
-	public Funder getFunder() {
-		return funder;
-	}
-
-	public void setFunder(Funder funders) {
-		this.funder = funders;
-	}
-
-	public static Project newInstance(String id, String code, String acronym, String title, Funder funder) {
-		Project project = new Project();
-		project.setAcronym(acronym);
-		project.setCode(code);
-		project.setFunder(funder);
-		project.setId(id);
-		project.setTitle(title);
-		return project;
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Constants.java

@@ -1,21 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf.graph;
-
-import java.io.Serializable;
-
-public class Constants implements Serializable {
-	// collectedFrom va con isProvidedBy -> becco da ModelSupport
-
-	public static final String HOSTED_BY = "isHostedBy";
-	public static final String HOSTS = "hosts";
-
-	// community result uso isrelatedto
-
-	public static final String RESULT_ENTITY = "result";
-	public static final String DATASOURCE_ENTITY = "datasource";
-	public static final String CONTEXT_ENTITY = "context";
-
-	public static final String CONTEXT_ID = "60";
-	public static final String CONTEXT_NS_PREFIX = "context____";
-
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Datasource.java

@@ -1,316 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf.graph;
-
-import java.io.Serializable;
-import java.util.List;
-
-import eu.dnetlib.dhp.schema.dump.oaf.Container;
-import eu.dnetlib.dhp.schema.dump.oaf.ControlledField;
-import eu.dnetlib.dhp.schema.dump.oaf.KeyValue;
-
-/**
- * To store information about the datasource OpenAIRE collects information from. It contains the following parameters: -
- * id of type String to store the OpenAIRE id for the datasource. It corresponds to the parameter id of the datasource
- * represented in the internal model - originalId of type List<String> to store the list of original ids associated to
- * the datasource. It corresponds to the parameter originalId of the datasource represented in the internal model. The
- * null values are filtered out - pid of type List<eu.dnetlib.shp.schema.dump.oaf.ControlledField> to store the
- * persistent identifiers for the datasource. For each pid in the datasource represented in the internal model one pid
- * in the external model is produced as : - schema corresponds to pid.qualifier.classid of the datasource represented in
- * the internal model - value corresponds to pid.value of the datasource represented in the internal model -
- * datasourceType of type eu.dnetlib.dhp.schema.dump.oaf.ControlledField to store the datasource type (e.g.
- * pubsrepository::institutional, Institutional Repository) as in the dnet vocabulary dnet:datasource_typologies. It
- * corresponds to datasourcetype of the datasource represented in the internal model and : - code corresponds to
- * datasourcetype.classid - value corresponds to datasourcetype.classname - openairecompatibility of type String to
- * store information about the OpenAIRE compatibility of the ingested results (which guidelines they are compliant to).
- * It corresponds to openairecompatibility.classname of the datasource represented in the internal model - officialname
- * of type Sgtring to store the official name of the datasource. It correspond to officialname.value of the datasource
- * represented in the internal model - englishname of type String to store the English name of the datasource. It
- * corresponds to englishname.value of the datasource represented in the internal model - websiteurl of type String to
- * store the URL of the website of the datasource. It corresponds to websiteurl.value of the datasource represented in
- * the internal model - logourl of type String to store the URL of the logo for the datasource. It corresponds to
- * logourl.value of the datasource represented in the internal model - dateofvalidation of type String to store the data
- * of validation against the guidelines for the datasource records. It corresponds to dateofvalidation.value of the
- * datasource represented in the internal model - description of type String to store the description for the
- * datasource. It corresponds to description.value of the datasource represented in the internal model
- */
-public class Datasource implements Serializable {
-
-	private String id; // string
-
-	private List<String> originalId; // list string
-
-	private List<ControlledField> pid; // list<String>
-
-	private ControlledField datasourcetype; // value
-
-	private String openairecompatibility; // value
-
-	private String officialname; // string
-
-	private String englishname; // string
-
-	private String websiteurl; // string
-
-	private String logourl; // string
-
-	private String dateofvalidation; // string
-
-	private String description; // description
-
-	private List<String> subjects; // List<String>
-
-	// opendoar specific fields (od*)
-
-	private List<String> languages; // odlanguages List<String>
-
-	private List<String> contenttypes; // odcontent types List<String>
-
-	// re3data fields
-	private String releasestartdate; // string
-
-	private String releaseenddate; // string
-
-	private String missionstatementurl; // string
-
-	// {open, restricted or closed}
-	private String accessrights; // databaseaccesstype string
-
-	// {open, restricted or closed}
-	private String uploadrights; // datauploadtype string
-
-	// {feeRequired, registration, other}
-	private String databaseaccessrestriction; // string
-
-	// {feeRequired, registration, other}
-	private String datauploadrestriction; // string
-
-	private Boolean versioning; // boolean
-
-	private String citationguidelineurl; // string
-
-	// {yes, no, uknown}
-
-	private String pidsystems; // string
-
-	private String certificates; // string
-
-	private List<Object> policies; //
-
-	private Container journal; // issn etc del Journal
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public List<String> getOriginalId() {
-		return originalId;
-	}
-
-	public void setOriginalId(List<String> originalId) {
-		this.originalId = originalId;
-	}
-
-	public List<ControlledField> getPid() {
-		return pid;
-	}
-
-	public void setPid(List<ControlledField> pid) {
-		this.pid = pid;
-	}
-
-	public ControlledField getDatasourcetype() {
-		return datasourcetype;
-	}
-
-	public void setDatasourcetype(ControlledField datasourcetype) {
-		this.datasourcetype = datasourcetype;
-	}
-
-	public String getOpenairecompatibility() {
-		return openairecompatibility;
-	}
-
-	public void setOpenairecompatibility(String openairecompatibility) {
-		this.openairecompatibility = openairecompatibility;
-	}
-
-	public String getOfficialname() {
-		return officialname;
-	}
-
-	public void setOfficialname(String officialname) {
-		this.officialname = officialname;
-	}
-
-	public String getEnglishname() {
-		return englishname;
-	}
-
-	public void setEnglishname(String englishname) {
-		this.englishname = englishname;
-	}
-
-	public String getWebsiteurl() {
-		return websiteurl;
-	}
-
-	public void setWebsiteurl(String websiteurl) {
-		this.websiteurl = websiteurl;
-	}
-
-	public String getLogourl() {
-		return logourl;
-	}
-
-	public void setLogourl(String logourl) {
-		this.logourl = logourl;
-	}
-
-	public String getDateofvalidation() {
-		return dateofvalidation;
-	}
-
-	public void setDateofvalidation(String dateofvalidation) {
-		this.dateofvalidation = dateofvalidation;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public List<String> getSubjects() {
-		return subjects;
-	}
-
-	public void setSubjects(List<String> subjects) {
-		this.subjects = subjects;
-	}
-
-	public List<String> getLanguages() {
-		return languages;
-	}
-
-	public void setLanguages(List<String> languages) {
-		this.languages = languages;
-	}
-
-	public List<String> getContenttypes() {
-		return contenttypes;
-	}
-
-	public void setContenttypes(List<String> contenttypes) {
-		this.contenttypes = contenttypes;
-	}
-
-	public String getReleasestartdate() {
-		return releasestartdate;
-	}
-
-	public void setReleasestartdate(String releasestartdate) {
-		this.releasestartdate = releasestartdate;
-	}
-
-	public String getReleaseenddate() {
-		return releaseenddate;
-	}
-
-	public void setReleaseenddate(String releaseenddate) {
-		this.releaseenddate = releaseenddate;
-	}
-
-	public String getMissionstatementurl() {
-		return missionstatementurl;
-	}
-
-	public void setMissionstatementurl(String missionstatementurl) {
-		this.missionstatementurl = missionstatementurl;
-	}
-
-	public String getAccessrights() {
-		return accessrights;
-	}
-
-	public void setAccessrights(String accessrights) {
-		this.accessrights = accessrights;
-	}
-
-	public String getUploadrights() {
-		return uploadrights;
-	}
-
-	public void setUploadrights(String uploadrights) {
-		this.uploadrights = uploadrights;
-	}
-
-	public String getDatabaseaccessrestriction() {
-		return databaseaccessrestriction;
-	}
-
-	public void setDatabaseaccessrestriction(String databaseaccessrestriction) {
-		this.databaseaccessrestriction = databaseaccessrestriction;
-	}
-
-	public String getDatauploadrestriction() {
-		return datauploadrestriction;
-	}
-
-	public void setDatauploadrestriction(String datauploadrestriction) {
-		this.datauploadrestriction = datauploadrestriction;
-	}
-
-	public Boolean getVersioning() {
-		return versioning;
-	}
-
-	public void setVersioning(Boolean versioning) {
-		this.versioning = versioning;
-	}
-
-	public String getCitationguidelineurl() {
-		return citationguidelineurl;
-	}
-
-	public void setCitationguidelineurl(String citationguidelineurl) {
-		this.citationguidelineurl = citationguidelineurl;
-	}
-
-	public String getPidsystems() {
-		return pidsystems;
-	}
-
-	public void setPidsystems(String pidsystems) {
-		this.pidsystems = pidsystems;
-	}
-
-	public String getCertificates() {
-		return certificates;
-	}
-
-	public void setCertificates(String certificates) {
-		this.certificates = certificates;
-	}
-
-	public List<Object> getPolicies() {
-		return policies;
-	}
-
-	public void setPolicies(List<Object> policiesr3) {
-		this.policies = policiesr3;
-	}
-
-	public Container getJournal() {
-		return journal;
-	}
-
-	public void setJournal(Container journal) {
-		this.journal = journal;
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Funder.java

@@ -1,22 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf.graph;
-
-import java.io.Serializable;
-
-/**
- * To store information about the funder funding the project related to the result. It extends
- * eu.dnetlib.dhp.schema.dump.oaf.Funder with the following parameter: - - private
- * eu.dnetdlib.dhp.schema.dump.oaf.graph.Fundings funding_stream to store the fundingstream
- */
-public class Funder extends eu.dnetlib.dhp.schema.dump.oaf.Funder {
-
-	private Fundings funding_stream;
-
-	public Fundings getFunding_stream() {
-		return funding_stream;
-	}
-
-	public void setFunding_stream(Fundings funding_stream) {
-		this.funding_stream = funding_stream;
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Fundings.java

@@ -1,35 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf.graph;
-
-import java.io.Serializable;
-
-/**
- * To store inforamtion about the funding stream. It has two parameters: - private String id to store the id of the
- * fundings stream. The id is created by appending the shortname of the funder to the name of each level in the xml
- * representing the fundng stream. For example: if the funder is the European Commission, the funding level 0 name is
- * FP7, the funding level 1 name is SP3 and the funding level 2 name is PEOPLE then the id will be: EC::FP7::SP3::PEOPLE
- * - private String description to describe the funding stream. It is created by concatenating the description of each
- * funding level so for the example above the description would be: SEVENTH FRAMEWORK PROGRAMME - SP3-People -
- * Marie-Curie Actions
- */
-public class Fundings implements Serializable {
-
-	private String id;
-	private String description;
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Granted.java

@@ -1,55 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf.graph;
-
-import java.io.Serializable;
-import java.util.Optional;
-
-/**
- * To describe the funded amount. It has the following parameters: - private String currency to store the currency of
- * the fund - private float totalcost to store the total cost of the project - private float fundedamount to store the
- * funded amount by the funder
- */
-public class Granted implements Serializable {
-	private String currency;
-	private float totalcost;
-	private float fundedamount;
-
-	public String getCurrency() {
-		return currency;
-	}
-
-	public void setCurrency(String currency) {
-		this.currency = currency;
-	}
-
-	public float getTotalcost() {
-		return totalcost;
-	}
-
-	public void setTotalcost(float totalcost) {
-		this.totalcost = totalcost;
-	}
-
-	public float getFundedamount() {
-		return fundedamount;
-	}
-
-	public void setFundedamount(float fundedamount) {
-		this.fundedamount = fundedamount;
-	}
-
-	public static Granted newInstance(String currency, float totalcost, float fundedamount) {
-		Granted granted = new Granted();
-		granted.currency = currency;
-		granted.totalcost = totalcost;
-		granted.fundedamount = fundedamount;
-		return granted;
-	}
-
-	public static Granted newInstance(String currency, float fundedamount) {
-		Granted granted = new Granted();
-		granted.currency = currency;
-		granted.fundedamount = fundedamount;
-		return granted;
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/GraphResult.java

@@ -1,24 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf.graph;
-
-import java.util.List;
-
-import eu.dnetlib.dhp.schema.dump.oaf.Instance;
-import eu.dnetlib.dhp.schema.dump.oaf.Result;
-
-/**
- * It extends the eu.dnetlib.dhp.schema.dump.oaf.Result with - instance of type
- * List<eu.dnetlib.dhp.schema.dump.oaf.Instance> to store all the instances associated to the result. It corresponds to
- * the same parameter in the result represented in the internal model
- */
-public class GraphResult extends Result {
-	private List<Instance> instance;
-
-	public List<Instance> getInstance() {
-		return instance;
-	}
-
-	public void setInstance(List<Instance> instance) {
-		this.instance = instance;
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/H2020Classification.java

@@ -1,82 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf.graph;
-
-import java.io.Serializable;
-
-/**
- * To store information about the classification for the project. The classification depends on the programme. For example
- * H2020-EU.3.4.5.3 can be classified as
- * H2020-EU.3.       => Societal Challenges  (level1)
- * H2020-EU.3.4.     => Transport            (level2)
- * H2020-EU.3.4.5.   => CLEANSKY2            (level3)
- * H2020-EU.3.4.5.3. => IADP Fast Rotorcraft (level4)
- *
- * We decided to explicitly represent up to three levels in the classification.
- *
- * H2020Classification has the following parameters:
- * - private Programme programme to store the information about the programme related to this classification
- * - private String level1 to store the information about the level 1 of the classification (Priority or Pillar of the EC)
- * - private String level2 to store the information about the level2 af the classification (Objectives (?))
- * - private String level3 to store the information about the level3 of the classification
- * - private String classification to store the entire classification related to the programme
- */
-public class H2020Classification implements Serializable {
-	private Programme programme;
-
-	private String level1;
-	private String level2;
-	private String level3;
-
-	private String classification;
-
-	public Programme getProgramme() {
-		return programme;
-	}
-
-	public void setProgramme(Programme programme) {
-		this.programme = programme;
-	}
-
-	public String getLevel1() {
-		return level1;
-	}
-
-	public void setLevel1(String level1) {
-		this.level1 = level1;
-	}
-
-	public String getLevel2() {
-		return level2;
-	}
-
-	public void setLevel2(String level2) {
-		this.level2 = level2;
-	}
-
-	public String getLevel3() {
-		return level3;
-	}
-
-	public void setLevel3(String level3) {
-		this.level3 = level3;
-	}
-
-	public String getClassification() {
-		return classification;
-	}
-
-	public void setClassification(String classification) {
-		this.classification = classification;
-	}
-
-	public static H2020Classification newInstance(String programme_code, String programme_description, String level1,
-		String level2, String level3, String classification) {
-		H2020Classification h2020classification = new H2020Classification();
-		h2020classification.programme = Programme.newInstance(programme_code, programme_description);
-		h2020classification.level1 = level1;
-		h2020classification.level2 = level2;
-		h2020classification.level3 = level3;
-		h2020classification.classification = classification;
-		return h2020classification;
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Node.java

@@ -1,38 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf.graph;
-
-import java.io.Serializable;
-
-/**
- * To represent the generic node in a relation. It has the following parameters: - private String id the openaire id of
- * the entity in the relation - private String type the type of the entity in the relation. Consider the generic
- * relation between a Result R and a Project P, the node representing R will have as id the id of R and as type result,
- * while the node representing the project will have as id the id of the project and as type project
- */
-public class Node implements Serializable {
-	private String id;
-	private String type;
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public static Node newInstance(String id, String type) {
-		Node node = new Node();
-		node.id = id;
-		node.type = type;
-		return node;
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Organization.java

@@ -1,86 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf.graph;
-
-import java.io.Serializable;
-import java.util.List;
-
-import eu.dnetlib.dhp.schema.dump.oaf.ControlledField;
-import eu.dnetlib.dhp.schema.dump.oaf.Country;
-import eu.dnetlib.dhp.schema.dump.oaf.KeyValue;
-import eu.dnetlib.dhp.schema.dump.oaf.Qualifier;
-import eu.dnetlib.dhp.schema.dump.oaf.community.Project;
-
-/**
- * To represent the generic organizaiton. It has the following parameters: - private String legalshortname to store the
- * legalshortname of the organizaiton - private String legalname to store the legal name of the organization - private
- * String websiteurl to store the websiteurl of the organization - private List<String> alternativenames to store the
- * alternative names of the organization - private Qualifier country to store the country of the organization - private
- * String id to store the id of the organization - private List<ControlledField> pid to store the list of pids for the
- * organization
- */
-public class Organization implements Serializable {
-	private String legalshortname;
-	private String legalname;
-	private String websiteurl;
-	private List<String> alternativenames;
-	private Qualifier country;
-	private String id;
-	private List<ControlledField> pid;
-
-	public String getLegalshortname() {
-		return legalshortname;
-	}
-
-	public void setLegalshortname(String legalshortname) {
-		this.legalshortname = legalshortname;
-	}
-
-	public String getLegalname() {
-		return legalname;
-	}
-
-	public void setLegalname(String legalname) {
-		this.legalname = legalname;
-	}
-
-	public String getWebsiteurl() {
-		return websiteurl;
-	}
-
-	public void setWebsiteurl(String websiteurl) {
-		this.websiteurl = websiteurl;
-	}
-
-	public List<String> getAlternativenames() {
-		return alternativenames;
-	}
-
-	public void setAlternativenames(List<String> alternativenames) {
-		this.alternativenames = alternativenames;
-	}
-
-	public Qualifier getCountry() {
-		return country;
-	}
-
-	public void setCountry(Qualifier country) {
-		this.country = country;
-	}
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public List<ControlledField> getPid() {
-		return pid;
-	}
-
-	public void setPid(List<ControlledField> pid) {
-		this.pid = pid;
-	}
-
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Programme.java

@@ -1,36 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf.graph;
-
-import java.io.Serializable;
-
-/**
- * To store information about the ec programme for the project. It has the following parameters: - private String code
- * to store the code of the programme - private String description to store the description of the programme
- */
-public class Programme implements Serializable {
-	private String code;
-	private String description;
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public static Programme newInstance(String code, String description) {
-		Programme p = new Programme();
-		p.code = code;
-		p.description = description;
-		return p;
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Project.java

@@ -1,192 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf.graph;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * This is the class representing the Project in the model used for the dumps of the whole graph. At the moment the dump
- * of the Projects differs from the other dumps because we do not create relations between Funders (Organization) and
- * Projects but we put the information about the Funder within the Project representation. We also removed the
- * collected from element from the Project. No relation between the Project and the Datasource entity from which it is
- * collected will be created. We will never create relations between Project and Datasource. In case some relation will
- * be extracted from the Project they will refer the Funder and will be of type ( organization -> funds -> project,
- * project -> isFundedBy -> organization) We also removed the duration parameter because the most of times it is set to
- * 0. It has the following parameters:
- * - private String id to store the id of the project (OpenAIRE id)
- * - private String websiteurl to store the websiteurl of the project
- * - private String code to store the grant agreement of the project
- * - private String acronym to store the acronym of the project
- * - private String title to store the tile of the project
- * - private String startdate to store the start date
- * - private String enddate to store the end date
- * - private String callidentifier to store the call indentifier
- * - private String keywords to store the keywords
- * - private boolean openaccessmandateforpublications to store if the project must accomplish to the open access mandate
- *   for publications. This value will be set to true if one of the field in the project represented in the internal model
- *   is set to true
- * - private boolean openaccessmandatefordataset to store if the project must accomplish to the open access mandate for
- * 	 dataset. It is set to the value in the corresponding filed of the project represented in the internal model
- * - private List<String> subject to store the list of subjects of the project
- * - private List<Funder> funding to store the list of funder of the project
- * - private String summary to store the summary of the project
- * - private Granted granted to store the granted amount
- * - private List<Programme> h2020programme to store the list of programmes the project is related to
- */
-
-public class Project implements Serializable {
-	private String id;
-
-	private String websiteurl;
-	private String code;
-	private String acronym;
-	private String title;
-	private String startdate;
-
-	private String enddate;
-
-	private String callidentifier;
-
-	private String keywords;
-
-	private boolean openaccessmandateforpublications;
-
-	private boolean openaccessmandatefordataset;
-	private List<String> subject;
-
-	private List<Funder> funding;
-
-	private String summary;
-
-	private Granted granted;
-
-	private List<Programme> h2020programme;
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getWebsiteurl() {
-		return websiteurl;
-	}
-
-	public void setWebsiteurl(String websiteurl) {
-		this.websiteurl = websiteurl;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public String getAcronym() {
-		return acronym;
-	}
-
-	public void setAcronym(String acronym) {
-		this.acronym = acronym;
-	}
-
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-	public String getStartdate() {
-		return startdate;
-	}
-
-	public void setStartdate(String startdate) {
-		this.startdate = startdate;
-	}
-
-	public String getEnddate() {
-		return enddate;
-	}
-
-	public void setEnddate(String enddate) {
-		this.enddate = enddate;
-	}
-
-	public String getCallidentifier() {
-		return callidentifier;
-	}
-
-	public void setCallidentifier(String callidentifier) {
-		this.callidentifier = callidentifier;
-	}
-
-	public String getKeywords() {
-		return keywords;
-	}
-
-	public void setKeywords(String keywords) {
-		this.keywords = keywords;
-	}
-
-	public boolean isOpenaccessmandateforpublications() {
-		return openaccessmandateforpublications;
-	}
-
-	public void setOpenaccessmandateforpublications(boolean openaccessmandateforpublications) {
-		this.openaccessmandateforpublications = openaccessmandateforpublications;
-	}
-
-	public boolean isOpenaccessmandatefordataset() {
-		return openaccessmandatefordataset;
-	}
-
-	public void setOpenaccessmandatefordataset(boolean openaccessmandatefordataset) {
-		this.openaccessmandatefordataset = openaccessmandatefordataset;
-	}
-
-	public List<String> getSubject() {
-		return subject;
-	}
-
-	public void setSubject(List<String> subject) {
-		this.subject = subject;
-	}
-
-	public List<Funder> getFunding() {
-		return funding;
-	}
-
-	public void setFunding(List<Funder> funding) {
-		this.funding = funding;
-	}
-
-	public String getSummary() {
-		return summary;
-	}
-
-	public void setSummary(String summary) {
-		this.summary = summary;
-	}
-
-	public Granted getGranted() {
-		return granted;
-	}
-
-	public void setGranted(Granted granted) {
-		this.granted = granted;
-	}
-
-	public List<Programme> getH2020programme() {
-		return h2020programme;
-	}
-
-	public void setH2020programme(List<Programme> h2020programme) {
-		this.h2020programme = h2020programme;
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/RelType.java

@@ -1,39 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf.graph;
-
-import java.io.Serializable;
-
-/**
- * To represent the semantics of the generic relation between two entities. It has the following parameters: - private
- * String name to store the semantics of the relation (i.e. isAuthorInstitutionOf). It corresponds to the relclass
- * parameter in the relation represented in the internal model represented in the internal model - private String type
- * to store the type of the relation (i.e. affiliation). It corresponds to the subreltype parameter of the relation
- * represented in theinternal model
- */
-public class RelType implements Serializable {
-	private String name; // relclass
-	private String type; // subreltype
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public static RelType newInstance(String name, String type) {
-		RelType rel = new RelType();
-		rel.name = name;
-		rel.type = type;
-		return rel;
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Relation.java

@@ -1,67 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf.graph;
-
-import java.io.Serializable;
-import java.util.Objects;
-
-import eu.dnetlib.dhp.schema.dump.oaf.Provenance;
-
-/**
- * To represent the gereric relation between two entities. It has the following parameters: - private Node source to
- * represent the entity source of the relation - private Node target to represent the entity target of the relation -
- * private RelType reltype to represent the semantics of the relation - private Provenance provenance to represent the
- * provenance of the relation
- */
-public class Relation implements Serializable {
-	private Node source;
-	private Node target;
-	private RelType reltype;
-	private Provenance provenance;
-
-	public Node getSource() {
-		return source;
-	}
-
-	public void setSource(Node source) {
-		this.source = source;
-	}
-
-	public Node getTarget() {
-		return target;
-	}
-
-	public void setTarget(Node target) {
-		this.target = target;
-	}
-
-	public RelType getReltype() {
-		return reltype;
-	}
-
-	public void setReltype(RelType reltype) {
-		this.reltype = reltype;
-	}
-
-	public Provenance getProvenance() {
-		return provenance;
-	}
-
-	public void setProvenance(Provenance provenance) {
-		this.provenance = provenance;
-	}
-
-	@Override
-	public int hashCode() {
-
-		return Objects.hash(source.getId(), target.getId(), reltype.getType() + ":" + reltype.getName());
-	}
-
-	public static Relation newInstance(Node source, Node target, RelType reltype, Provenance provenance) {
-		Relation relation = new Relation();
-		relation.source = source;
-		relation.target = target;
-		relation.reltype = reltype;
-		relation.provenance = provenance;
-		return relation;
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/ResearchCommunity.java

@@ -1,20 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf.graph;
-
-import java.util.List;
-
-/**
- * To represent RC entities. It extends eu.dnetlib.dhp.dump.oaf.grap.ResearchInitiative by adding the parameter subject
- * to store the list of subjects related to the community
- */
-public class ResearchCommunity extends ResearchInitiative {
-	private List<String> subject;
-
-	public List<String> getSubject() {
-		return subject;
-	}
-
-	public void setSubject(List<String> subject) {
-		this.subject = subject;
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/ResearchInitiative.java

@@ -1,75 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf.graph;
-
-import java.io.Serializable;
-
-/**
- * To represent entity of type RC/RI. It has the following parameters, which are mostly derived by the profile
- * - private
- * String id to store the openaire id for the entity. Is has as code 00 and will be created as
- * 00|context_____::md5(originalId) private
- * String originalId to store the id of the context as provided in the profile
- * (i.e. mes)
- * - private String name to store the name of the context (got from the label attribute in the context
- * definition)
- * - private String type to store the type of the context (i.e.: research initiative or research community)
- * - private String description to store the description of the context as given in the profile
- * -private String
- * zenodo_community to store the zenodo community associated to the context (main zenodo community)
- */
-public class ResearchInitiative implements Serializable {
-	private String id; // openaireId
-	private String originalId; // context id
-	private String name; // context name
-	private String type; // context type: research initiative or research community
-	private String description;
-	private String zenodo_community;
-
-	public String getZenodo_community() {
-		return zenodo_community;
-	}
-
-	public void setZenodo_community(String zenodo_community) {
-		this.zenodo_community = zenodo_community;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String label) {
-		this.name = label;
-	}
-
-	public String getOriginalId() {
-		return originalId;
-	}
-
-	public void setOriginalId(String originalId) {
-		this.originalId = originalId;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Author.java

@@ -1,89 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf;
-
-import java.io.Serializable;
-import java.util.*;
-
-public class Author implements Serializable {
-
-	private String fullname;
-
-	private String name;
-
-	private String surname;
-
-	private Integer rank;
-
-	private List<StructuredProperty> pid;
-
-	private List<Field<String>> affiliation;
-
-	public String getFullname() {
-		return fullname;
-	}
-
-	public void setFullname(String fullname) {
-		this.fullname = fullname;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getSurname() {
-		return surname;
-	}
-
-	public void setSurname(String surname) {
-		this.surname = surname;
-	}
-
-	public Integer getRank() {
-		return rank;
-	}
-
-	public void setRank(Integer rank) {
-		this.rank = rank;
-	}
-
-	public List<StructuredProperty> getPid() {
-		return pid;
-	}
-
-	public void setPid(List<StructuredProperty> pid) {
-		this.pid = pid;
-	}
-
-	public List<Field<String>> getAffiliation() {
-		return affiliation;
-	}
-
-	public void setAffiliation(List<Field<String>> affiliation) {
-		this.affiliation = affiliation;
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (this == o)
-			return true;
-		if (o == null || getClass() != o.getClass())
-			return false;
-		Author author = (Author) o;
-		return Objects.equals(fullname, author.fullname)
-			&& Objects.equals(name, author.name)
-			&& Objects.equals(surname, author.surname)
-			&& Objects.equals(rank, author.rank)
-			&& Objects.equals(pid, author.pid)
-			&& Objects.equals(affiliation, author.affiliation);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(fullname, name, surname, rank, pid, affiliation);
-	}
-
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Context.java

@@ -1,46 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf;
-
-import java.io.Serializable;
-import java.util.List;
-
-public class Context implements Serializable {
-	private String id;
-
-	private List<DataInfo> dataInfo;
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public List<DataInfo> getDataInfo() {
-		return dataInfo;
-	}
-
-	public void setDataInfo(List<DataInfo> dataInfo) {
-		this.dataInfo = dataInfo;
-	}
-
-	@Override
-	public int hashCode() {
-		return id == null ? 0 : id.hashCode();
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-
-		Context other = (Context) obj;
-
-		return id.equals(other.getId());
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Country.java

@@ -1,34 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf;
-
-import java.util.Objects;
-
-public class Country extends Qualifier {
-
-	private DataInfo dataInfo;
-
-	public DataInfo getDataInfo() {
-		return dataInfo;
-	}
-
-	public void setDataInfo(DataInfo dataInfo) {
-		this.dataInfo = dataInfo;
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (this == o)
-			return true;
-		if (o == null || getClass() != o.getClass())
-			return false;
-		if (!super.equals(o))
-			return false;
-		Country country = (Country) o;
-		return Objects.equals(dataInfo, country.dataInfo);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(super.hashCode(), dataInfo);
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/DataInfo.java

@@ -1,85 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf;
-
-import java.io.Serializable;
-import java.util.Objects;
-
-public class DataInfo implements Serializable {
-
-	private Boolean invisible = false;
-	private Boolean inferred;
-	private Boolean deletedbyinference = false;
-	private String trust;
-	private String inferenceprovenance;
-	private Qualifier provenanceaction;
-
-	public Boolean getInvisible() {
-		return invisible;
-	}
-
-	public void setInvisible(Boolean invisible) {
-		this.invisible = invisible;
-	}
-
-	public Boolean getInferred() {
-		return inferred;
-	}
-
-	public void setInferred(Boolean inferred) {
-		this.inferred = inferred;
-	}
-
-	public Boolean getDeletedbyinference() {
-		return deletedbyinference;
-	}
-
-	public void setDeletedbyinference(Boolean deletedbyinference) {
-		this.deletedbyinference = deletedbyinference;
-	}
-
-	public String getTrust() {
-		return trust;
-	}
-
-	public void setTrust(String trust) {
-		this.trust = trust;
-	}
-
-	public String getInferenceprovenance() {
-		return inferenceprovenance;
-	}
-
-	public void setInferenceprovenance(String inferenceprovenance) {
-		this.inferenceprovenance = inferenceprovenance;
-	}
-
-	public Qualifier getProvenanceaction() {
-		return provenanceaction;
-	}
-
-	public void setProvenanceaction(Qualifier provenanceaction) {
-		this.provenanceaction = provenanceaction;
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (this == o)
-			return true;
-		if (o == null || getClass() != o.getClass())
-			return false;
-		DataInfo dataInfo = (DataInfo) o;
-		return Objects.equals(invisible, dataInfo.invisible)
-			&& Objects.equals(inferred, dataInfo.inferred)
-			&& Objects.equals(deletedbyinference, dataInfo.deletedbyinference)
-			&& Objects.equals(trust, dataInfo.trust)
-			&& Objects.equals(inferenceprovenance, dataInfo.inferenceprovenance)
-			&& Objects.equals(provenanceaction, dataInfo.provenanceaction);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects
-			.hash(
-				invisible, inferred, deletedbyinference, trust, inferenceprovenance, provenanceaction);
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Dataset.java

@@ -1,116 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf;
-
-import java.io.Serializable;
-import java.util.List;
-
-import eu.dnetlib.dhp.schema.common.ModelConstants;
-
-public class Dataset extends Result implements Serializable {
-
-	private Field<String> storagedate;
-
-	// candidate for removal
-	private Field<String> device;
-
-	private Field<String> size;
-
-	private Field<String> version;
-
-	private Field<String> lastmetadataupdate;
-
-	private Field<String> metadataversionnumber;
-
-	private List<GeoLocation> geolocation;
-
-	public Dataset() {
-		setResulttype(ModelConstants.DATASET_DEFAULT_RESULTTYPE);
-	}
-
-	public Field<String> getStoragedate() {
-		return storagedate;
-	}
-
-	public void setStoragedate(Field<String> storagedate) {
-		this.storagedate = storagedate;
-	}
-
-	public Field<String> getDevice() {
-		return device;
-	}
-
-	public void setDevice(Field<String> device) {
-		this.device = device;
-	}
-
-	public Field<String> getSize() {
-		return size;
-	}
-
-	public void setSize(Field<String> size) {
-		this.size = size;
-	}
-
-	public Field<String> getVersion() {
-		return version;
-	}
-
-	public void setVersion(Field<String> version) {
-		this.version = version;
-	}
-
-	public Field<String> getLastmetadataupdate() {
-		return lastmetadataupdate;
-	}
-
-	public void setLastmetadataupdate(Field<String> lastmetadataupdate) {
-		this.lastmetadataupdate = lastmetadataupdate;
-	}
-
-	public Field<String> getMetadataversionnumber() {
-		return metadataversionnumber;
-	}
-
-	public void setMetadataversionnumber(Field<String> metadataversionnumber) {
-		this.metadataversionnumber = metadataversionnumber;
-	}
-
-	public List<GeoLocation> getGeolocation() {
-		return geolocation;
-	}
-
-	public void setGeolocation(List<GeoLocation> geolocation) {
-		this.geolocation = geolocation;
-	}
-
-	@Override
-	public void mergeFrom(OafEntity e) {
-		super.mergeFrom(e);
-
-		if (!Dataset.class.isAssignableFrom(e.getClass())) {
-			return;
-		}
-
-		final Dataset d = (Dataset) e;
-
-		storagedate = d.getStoragedate() != null && compareTrust(this, e) < 0 ? d.getStoragedate() : storagedate;
-
-		device = d.getDevice() != null && compareTrust(this, e) < 0 ? d.getDevice() : device;
-
-		size = d.getSize() != null && compareTrust(this, e) < 0 ? d.getSize() : size;
-
-		version = d.getVersion() != null && compareTrust(this, e) < 0 ? d.getVersion() : version;
-
-		lastmetadataupdate = d.getLastmetadataupdate() != null && compareTrust(this, e) < 0
-			? d.getLastmetadataupdate()
-			: lastmetadataupdate;
-
-		metadataversionnumber = d.getMetadataversionnumber() != null && compareTrust(this, e) < 0
-			? d.getMetadataversionnumber()
-			: metadataversionnumber;
-
-		geolocation = mergeLists(geolocation, d.getGeolocation());
-
-		mergeOAFDataInfo(d);
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java

@@ -1,472 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf;
-
-import java.io.Serializable;
-import java.util.List;
-
-public class Datasource extends OafEntity implements Serializable {
-
-	private Qualifier datasourcetype;
-
-	private Qualifier openairecompatibility;
-
-	private Field<String> officialname;
-
-	private Field<String> englishname;
-
-	private Field<String> websiteurl;
-
-	private Field<String> logourl;
-
-	private Field<String> contactemail;
-
-	private Field<String> namespaceprefix;
-
-	private Field<String> latitude;
-
-	private Field<String> longitude;
-
-	private Field<String> dateofvalidation;
-
-	private Field<String> description;
-
-	private List<StructuredProperty> subjects;
-
-	// opendoar specific fields (od*)
-	private Field<String> odnumberofitems;
-
-	private Field<String> odnumberofitemsdate;
-
-	private Field<String> odpolicies;
-
-	private List<Field<String>> odlanguages;
-
-	private List<Field<String>> odcontenttypes;
-
-	private List<Field<String>> accessinfopackage;
-
-	// re3data fields
-	private Field<String> releasestartdate;
-
-	private Field<String> releaseenddate;
-
-	private Field<String> missionstatementurl;
-
-	private Field<Boolean> dataprovider;
-
-	private Field<Boolean> serviceprovider;
-
-	// {open, restricted or closed}
-	private Field<String> databaseaccesstype;
-
-	// {open, restricted or closed}
-	private Field<String> datauploadtype;
-
-	// {feeRequired, registration, other}
-	private Field<String> databaseaccessrestriction;
-
-	// {feeRequired, registration, other}
-	private Field<String> datauploadrestriction;
-
-	private Field<Boolean> versioning;
-
-	private Field<String> citationguidelineurl;
-
-	// {yes, no, uknown}
-	private Field<String> qualitymanagementkind;
-
-	private Field<String> pidsystems;
-
-	private Field<String> certificates;
-
-	private List<KeyValue> policies;
-
-	private Journal journal;
-
-	public Qualifier getDatasourcetype() {
-		return datasourcetype;
-	}
-
-	public void setDatasourcetype(Qualifier datasourcetype) {
-		this.datasourcetype = datasourcetype;
-	}
-
-	public Qualifier getOpenairecompatibility() {
-		return openairecompatibility;
-	}
-
-	public void setOpenairecompatibility(Qualifier openairecompatibility) {
-		this.openairecompatibility = openairecompatibility;
-	}
-
-	public Field<String> getOfficialname() {
-		return officialname;
-	}
-
-	public void setOfficialname(Field<String> officialname) {
-		this.officialname = officialname;
-	}
-
-	public Field<String> getEnglishname() {
-		return englishname;
-	}
-
-	public void setEnglishname(Field<String> englishname) {
-		this.englishname = englishname;
-	}
-
-	public Field<String> getWebsiteurl() {
-		return websiteurl;
-	}
-
-	public void setWebsiteurl(Field<String> websiteurl) {
-		this.websiteurl = websiteurl;
-	}
-
-	public Field<String> getLogourl() {
-		return logourl;
-	}
-
-	public void setLogourl(Field<String> logourl) {
-		this.logourl = logourl;
-	}
-
-	public Field<String> getContactemail() {
-		return contactemail;
-	}
-
-	public void setContactemail(Field<String> contactemail) {
-		this.contactemail = contactemail;
-	}
-
-	public Field<String> getNamespaceprefix() {
-		return namespaceprefix;
-	}
-
-	public void setNamespaceprefix(Field<String> namespaceprefix) {
-		this.namespaceprefix = namespaceprefix;
-	}
-
-	public Field<String> getLatitude() {
-		return latitude;
-	}
-
-	public void setLatitude(Field<String> latitude) {
-		this.latitude = latitude;
-	}
-
-	public Field<String> getLongitude() {
-		return longitude;
-	}
-
-	public void setLongitude(Field<String> longitude) {
-		this.longitude = longitude;
-	}
-
-	public Field<String> getDateofvalidation() {
-		return dateofvalidation;
-	}
-
-	public void setDateofvalidation(Field<String> dateofvalidation) {
-		this.dateofvalidation = dateofvalidation;
-	}
-
-	public Field<String> getDescription() {
-		return description;
-	}
-
-	public void setDescription(Field<String> description) {
-		this.description = description;
-	}
-
-	public List<StructuredProperty> getSubjects() {
-		return subjects;
-	}
-
-	public void setSubjects(List<StructuredProperty> subjects) {
-		this.subjects = subjects;
-	}
-
-	public Field<String> getOdnumberofitems() {
-		return odnumberofitems;
-	}
-
-	public void setOdnumberofitems(Field<String> odnumberofitems) {
-		this.odnumberofitems = odnumberofitems;
-	}
-
-	public Field<String> getOdnumberofitemsdate() {
-		return odnumberofitemsdate;
-	}
-
-	public void setOdnumberofitemsdate(Field<String> odnumberofitemsdate) {
-		this.odnumberofitemsdate = odnumberofitemsdate;
-	}
-
-	public Field<String> getOdpolicies() {
-		return odpolicies;
-	}
-
-	public void setOdpolicies(Field<String> odpolicies) {
-		this.odpolicies = odpolicies;
-	}
-
-	public List<Field<String>> getOdlanguages() {
-		return odlanguages;
-	}
-
-	public void setOdlanguages(List<Field<String>> odlanguages) {
-		this.odlanguages = odlanguages;
-	}
-
-	public List<Field<String>> getOdcontenttypes() {
-		return odcontenttypes;
-	}
-
-	public void setOdcontenttypes(List<Field<String>> odcontenttypes) {
-		this.odcontenttypes = odcontenttypes;
-	}
-
-	public List<Field<String>> getAccessinfopackage() {
-		return accessinfopackage;
-	}
-
-	public void setAccessinfopackage(List<Field<String>> accessinfopackage) {
-		this.accessinfopackage = accessinfopackage;
-	}
-
-	public Field<String> getReleasestartdate() {
-		return releasestartdate;
-	}
-
-	public void setReleasestartdate(Field<String> releasestartdate) {
-		this.releasestartdate = releasestartdate;
-	}
-
-	public Field<String> getReleaseenddate() {
-		return releaseenddate;
-	}
-
-	public void setReleaseenddate(Field<String> releaseenddate) {
-		this.releaseenddate = releaseenddate;
-	}
-
-	public Field<String> getMissionstatementurl() {
-		return missionstatementurl;
-	}
-
-	public void setMissionstatementurl(Field<String> missionstatementurl) {
-		this.missionstatementurl = missionstatementurl;
-	}
-
-	public Field<Boolean> getDataprovider() {
-		return dataprovider;
-	}
-
-	public void setDataprovider(Field<Boolean> dataprovider) {
-		this.dataprovider = dataprovider;
-	}
-
-	public Field<Boolean> getServiceprovider() {
-		return serviceprovider;
-	}
-
-	public void setServiceprovider(Field<Boolean> serviceprovider) {
-		this.serviceprovider = serviceprovider;
-	}
-
-	public Field<String> getDatabaseaccesstype() {
-		return databaseaccesstype;
-	}
-
-	public void setDatabaseaccesstype(Field<String> databaseaccesstype) {
-		this.databaseaccesstype = databaseaccesstype;
-	}
-
-	public Field<String> getDatauploadtype() {
-		return datauploadtype;
-	}
-
-	public void setDatauploadtype(Field<String> datauploadtype) {
-		this.datauploadtype = datauploadtype;
-	}
-
-	public Field<String> getDatabaseaccessrestriction() {
-		return databaseaccessrestriction;
-	}
-
-	public void setDatabaseaccessrestriction(Field<String> databaseaccessrestriction) {
-		this.databaseaccessrestriction = databaseaccessrestriction;
-	}
-
-	public Field<String> getDatauploadrestriction() {
-		return datauploadrestriction;
-	}
-
-	public void setDatauploadrestriction(Field<String> datauploadrestriction) {
-		this.datauploadrestriction = datauploadrestriction;
-	}
-
-	public Field<Boolean> getVersioning() {
-		return versioning;
-	}
-
-	public void setVersioning(Field<Boolean> versioning) {
-		this.versioning = versioning;
-	}
-
-	public Field<String> getCitationguidelineurl() {
-		return citationguidelineurl;
-	}
-
-	public void setCitationguidelineurl(Field<String> citationguidelineurl) {
-		this.citationguidelineurl = citationguidelineurl;
-	}
-
-	public Field<String> getQualitymanagementkind() {
-		return qualitymanagementkind;
-	}
-
-	public void setQualitymanagementkind(Field<String> qualitymanagementkind) {
-		this.qualitymanagementkind = qualitymanagementkind;
-	}
-
-	public Field<String> getPidsystems() {
-		return pidsystems;
-	}
-
-	public void setPidsystems(Field<String> pidsystems) {
-		this.pidsystems = pidsystems;
-	}
-
-	public Field<String> getCertificates() {
-		return certificates;
-	}
-
-	public void setCertificates(Field<String> certificates) {
-		this.certificates = certificates;
-	}
-
-	public List<KeyValue> getPolicies() {
-		return policies;
-	}
-
-	public void setPolicies(List<KeyValue> policies) {
-		this.policies = policies;
-	}
-
-	public Journal getJournal() {
-		return journal;
-	}
-
-	public void setJournal(Journal journal) {
-		this.journal = journal;
-	}
-
-	@Override
-	public void mergeFrom(OafEntity e) {
-		super.mergeFrom(e);
-
-		if (!Datasource.class.isAssignableFrom(e.getClass())) {
-			return;
-		}
-
-		Datasource d = (Datasource) e;
-
-		datasourcetype = d.getDatasourcetype() != null && compareTrust(this, e) < 0
-			? d.getDatasourcetype()
-			: datasourcetype;
-		openairecompatibility = d.getOpenairecompatibility() != null && compareTrust(this, e) < 0
-			? d.getOpenairecompatibility()
-			: openairecompatibility;
-		officialname = d.getOfficialname() != null && compareTrust(this, e) < 0
-			? d.getOfficialname()
-			: officialname;
-		englishname = d.getEnglishname() != null && compareTrust(this, e) < 0 ? d.getEnglishname() : officialname;
-		websiteurl = d.getWebsiteurl() != null && compareTrust(this, e) < 0 ? d.getWebsiteurl() : websiteurl;
-		logourl = d.getLogourl() != null && compareTrust(this, e) < 0 ? d.getLogourl() : getLogourl();
-		contactemail = d.getContactemail() != null && compareTrust(this, e) < 0
-			? d.getContactemail()
-			: contactemail;
-		namespaceprefix = d.getNamespaceprefix() != null && compareTrust(this, e) < 0
-			? d.getNamespaceprefix()
-			: namespaceprefix;
-		latitude = d.getLatitude() != null && compareTrust(this, e) < 0 ? d.getLatitude() : latitude;
-		longitude = d.getLongitude() != null && compareTrust(this, e) < 0 ? d.getLongitude() : longitude;
-		dateofvalidation = d.getDateofvalidation() != null && compareTrust(this, e) < 0
-			? d.getDateofvalidation()
-			: dateofvalidation;
-		description = d.getDescription() != null && compareTrust(this, e) < 0 ? d.getDescription() : description;
-		subjects = mergeLists(subjects, d.getSubjects());
-
-		// opendoar specific fields (od*)
-		odnumberofitems = d.getOdnumberofitems() != null && compareTrust(this, e) < 0
-			? d.getOdnumberofitems()
-			: odnumberofitems;
-		odnumberofitemsdate = d.getOdnumberofitemsdate() != null && compareTrust(this, e) < 0
-			? d.getOdnumberofitemsdate()
-			: odnumberofitemsdate;
-		odpolicies = d.getOdpolicies() != null && compareTrust(this, e) < 0 ? d.getOdpolicies() : odpolicies;
-		odlanguages = mergeLists(odlanguages, d.getOdlanguages());
-		odcontenttypes = mergeLists(odcontenttypes, d.getOdcontenttypes());
-		accessinfopackage = mergeLists(accessinfopackage, d.getAccessinfopackage());
-
-		// re3data fields
-		releasestartdate = d.getReleasestartdate() != null && compareTrust(this, e) < 0
-			? d.getReleasestartdate()
-			: releasestartdate;
-		releaseenddate = d.getReleaseenddate() != null && compareTrust(this, e) < 0
-			? d.getReleaseenddate()
-			: releaseenddate;
-		missionstatementurl = d.getMissionstatementurl() != null && compareTrust(this, e) < 0
-			? d.getMissionstatementurl()
-			: missionstatementurl;
-		dataprovider = d.getDataprovider() != null && compareTrust(this, e) < 0
-			? d.getDataprovider()
-			: dataprovider;
-		serviceprovider = d.getServiceprovider() != null && compareTrust(this, e) < 0
-			? d.getServiceprovider()
-			: serviceprovider;
-
-		// {open, restricted or closed}
-		databaseaccesstype = d.getDatabaseaccesstype() != null && compareTrust(this, e) < 0
-			? d.getDatabaseaccesstype()
-			: databaseaccesstype;
-
-		// {open, restricted or closed}
-		datauploadtype = d.getDatauploadtype() != null && compareTrust(this, e) < 0
-			? d.getDatauploadtype()
-			: datauploadtype;
-
-		// {feeRequired, registration, other}
-		databaseaccessrestriction = d.getDatabaseaccessrestriction() != null && compareTrust(this, e) < 0
-			? d.getDatabaseaccessrestriction()
-			: databaseaccessrestriction;
-
-		// {feeRequired, registration, other}
-		datauploadrestriction = d.getDatauploadrestriction() != null && compareTrust(this, e) < 0
-			? d.getDatauploadrestriction()
-			: datauploadrestriction;
-
-		versioning = d.getVersioning() != null && compareTrust(this, e) < 0 ? d.getVersioning() : versioning;
-		citationguidelineurl = d.getCitationguidelineurl() != null && compareTrust(this, e) < 0
-			? d.getCitationguidelineurl()
-			: citationguidelineurl;
-
-		// {yes, no, unknown}
-		qualitymanagementkind = d.getQualitymanagementkind() != null && compareTrust(this, e) < 0
-			? d.getQualitymanagementkind()
-			: qualitymanagementkind;
-		pidsystems = d.getPidsystems() != null && compareTrust(this, e) < 0 ? d.getPidsystems() : pidsystems;
-
-		certificates = d.getCertificates() != null && compareTrust(this, e) < 0
-			? d.getCertificates()
-			: certificates;
-
-		policies = mergeLists(policies, d.getPolicies());
-
-		journal = d.getJournal() != null && compareTrust(this, e) < 0 ? d.getJournal() : journal;
-
-		mergeOAFDataInfo(e);
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/ExternalReference.java

@@ -1,119 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf;
-
-import java.io.Serializable;
-import java.util.Objects;
-
-public class ExternalReference implements Serializable {
-	// source
-	private String sitename;
-
-	// title
-	private String label;
-
-	// text()
-	private String url;
-
-	// ?? not mapped yet ??
-	private String description;
-
-	// type
-	private Qualifier qualifier;
-
-	// site internal identifier
-	private String refidentifier;
-
-	// maps the oaf:reference/@query attribute
-	private String query;
-
-	// ExternalReferences might be also inferred
-	private DataInfo dataInfo;
-
-	public String getSitename() {
-		return sitename;
-	}
-
-	public void setSitename(String sitename) {
-		this.sitename = sitename;
-	}
-
-	public String getLabel() {
-		return label;
-	}
-
-	public void setLabel(String label) {
-		this.label = label;
-	}
-
-	public String getUrl() {
-		return url;
-	}
-
-	public void setUrl(String url) {
-		this.url = url;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public Qualifier getQualifier() {
-		return qualifier;
-	}
-
-	public void setQualifier(Qualifier qualifier) {
-		this.qualifier = qualifier;
-	}
-
-	public String getRefidentifier() {
-		return refidentifier;
-	}
-
-	public void setRefidentifier(String refidentifier) {
-		this.refidentifier = refidentifier;
-	}
-
-	public String getQuery() {
-		return query;
-	}
-
-	public void setQuery(String query) {
-		this.query = query;
-	}
-
-	public DataInfo getDataInfo() {
-		return dataInfo;
-	}
-
-	public void setDataInfo(DataInfo dataInfo) {
-		this.dataInfo = dataInfo;
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (this == o)
-			return true;
-		if (o == null || getClass() != o.getClass())
-			return false;
-		ExternalReference that = (ExternalReference) o;
-		return Objects.equals(sitename, that.sitename)
-			&& Objects.equals(label, that.label)
-			&& Objects.equals(url, that.url)
-			&& Objects.equals(description, that.description)
-			&& Objects.equals(qualifier, that.qualifier)
-			&& Objects.equals(refidentifier, that.refidentifier)
-			&& Objects.equals(query, that.query)
-			&& Objects.equals(dataInfo, that.dataInfo);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects
-			.hash(
-				sitename, label, url, description, qualifier, refidentifier, query, dataInfo);
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/ExtraInfo.java

@@ -1,77 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf;
-
-import java.io.Serializable;
-import java.util.Objects;
-
-public class ExtraInfo implements Serializable {
-	private String name;
-
-	private String typology;
-
-	private String provenance;
-
-	private String trust;
-
-	// json containing a Citation or Statistics
-	private String value;
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getTypology() {
-		return typology;
-	}
-
-	public void setTypology(String typology) {
-		this.typology = typology;
-	}
-
-	public String getProvenance() {
-		return provenance;
-	}
-
-	public void setProvenance(String provenance) {
-		this.provenance = provenance;
-	}
-
-	public String getTrust() {
-		return trust;
-	}
-
-	public void setTrust(String trust) {
-		this.trust = trust;
-	}
-
-	public String getValue() {
-		return value;
-	}
-
-	public void setValue(String value) {
-		this.value = value;
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (this == o)
-			return true;
-		if (o == null || getClass() != o.getClass())
-			return false;
-		ExtraInfo extraInfo = (ExtraInfo) o;
-		return Objects.equals(name, extraInfo.name)
-			&& Objects.equals(typology, extraInfo.typology)
-			&& Objects.equals(provenance, extraInfo.provenance)
-			&& Objects.equals(trust, extraInfo.trust)
-			&& Objects.equals(value, extraInfo.value);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(name, typology, provenance, trust, value);
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Field.java

@@ -1,45 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf;
-
-import java.io.Serializable;
-import java.util.Objects;
-
-public class Field<T> implements Serializable {
-
-	private T value;
-
-	private DataInfo dataInfo;
-
-	public T getValue() {
-		return value;
-	}
-
-	public void setValue(T value) {
-		this.value = value;
-	}
-
-	public DataInfo getDataInfo() {
-		return dataInfo;
-	}
-
-	public void setDataInfo(DataInfo dataInfo) {
-		this.dataInfo = dataInfo;
-	}
-
-	@Override
-	public int hashCode() {
-		return getValue() == null ? 0 : getValue().hashCode();
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		Field<T> other = (Field<T>) obj;
-		return Objects.equals(getValue(), other.getValue());
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/GeoLocation.java

@@ -1,76 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf;
-
-import java.io.Serializable;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-public class GeoLocation implements Serializable {
-
-	private String point;
-
-	private String box;
-
-	private String place;
-
-	public String getPoint() {
-		return point;
-	}
-
-	public void setPoint(String point) {
-		this.point = point;
-	}
-
-	public String getBox() {
-		return box;
-	}
-
-	public void setBox(String box) {
-		this.box = box;
-	}
-
-	public String getPlace() {
-		return place;
-	}
-
-	public void setPlace(String place) {
-		this.place = place;
-	}
-
-	@JsonIgnore
-	public boolean isBlank() {
-		return StringUtils.isBlank(point) && StringUtils.isBlank(box) && StringUtils.isBlank(place);
-	}
-
-	public String toComparableString() {
-		return isBlank()
-			? ""
-			: String
-				.format(
-					"%s::%s%s",
-					point != null ? point.toLowerCase() : "",
-					box != null ? box.toLowerCase() : "",
-					place != null ? place.toLowerCase() : "");
-	}
-
-	@Override
-	public int hashCode() {
-		return toComparableString().hashCode();
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-
-		GeoLocation other = (GeoLocation) obj;
-
-		return toComparableString().equals(other.toComparableString());
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/H2020Classification.java

@@ -1,88 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf;
-
-import java.io.Serializable;
-import java.util.Objects;
-
-/**
- * To store information about the classification for the project. The classification depends on the programme. For example
- * H2020-EU.3.4.5.3 can be classified as
- * H2020-EU.3.       => Societal Challenges  (level1)
- * H2020-EU.3.4.     => Transport            (level2)
- * H2020-EU.3.4.5.   => CLEANSKY2            (level3)
- * H2020-EU.3.4.5.3. => IADP Fast Rotorcraft (level4)
- *
- * We decided to explicitly represent up to three levels in the classification.
- *
- * H2020Classification has the following parameters:
- * - private Programme programme to store the information about the programme related to this classification
- * - private String level1 to store the information about the level 1 of the classification (Priority or Pillar of the EC)
- * - private String level2 to store the information about the level2 af the classification (Objectives (?))
- * - private String level3 to store the information about the level3 of the classification
- * - private String classification to store the entire classification related to the programme
- */
-
-public class H2020Classification implements Serializable {
-	private H2020Programme h2020Programme;
-	private String level1;
-	private String level2;
-	private String level3;
-
-	private String classification;
-
-	public H2020Programme getH2020Programme() {
-		return h2020Programme;
-	}
-
-	public void setH2020Programme(H2020Programme h2020Programme) {
-		this.h2020Programme = h2020Programme;
-	}
-
-	public String getLevel1() {
-		return level1;
-	}
-
-	public void setLevel1(String level1) {
-		this.level1 = level1;
-	}
-
-	public String getLevel2() {
-		return level2;
-	}
-
-	public void setLevel2(String level2) {
-		this.level2 = level2;
-	}
-
-	public String getLevel3() {
-		return level3;
-	}
-
-	public void setLevel3(String level3) {
-		this.level3 = level3;
-	}
-
-	public String getClassification() {
-		return classification;
-	}
-
-	public void setClassification(String classification) {
-		this.classification = classification;
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (this == o)
-			return true;
-		if (o == null || getClass() != o.getClass())
-			return false;
-
-		H2020Classification h2020classification = (H2020Classification) o;
-
-		return Objects.equals(level1, h2020classification.level1) &&
-			Objects.equals(level2, h2020classification.level2) &&
-			Objects.equals(level3, h2020classification.level3) &&
-			Objects.equals(classification, h2020classification.classification) &&
-			h2020Programme.equals(h2020classification.h2020Programme);
-	}
-}

dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/H2020Programme.java

@@ -1,44 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf;
-
-import java.io.Serializable;
-import java.util.Objects;
-
-/**
- * To store information about the ec programme for the project. It has the following parameters:
- * - private String code to store the code of the programme
- * - private String description to store the description of the programme
- */
-
-public class H2020Programme implements Serializable {
-	private String code;
-	private String description;
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (this == o)
-			return true;
-		if (o == null || getClass() != o.getClass())
-			return false;
-
-		H2020Programme h2020Programme = (H2020Programme) o;
-		return Objects.equals(code, h2020Programme.code);
-	}
-
-}