implemented methods to extract fulltext link from an API call

.gitignore

@@ -27,4 +27,3 @@ spark-warehouse
 /**/.factorypath
 /**/.scalafmt.conf
 /.java-version
-/dhp-shade-package/dependency-reduced-pom.xml

dhp-build/dhp-build-properties-maven-plugin/src/test/java/eu/dnetlib/maven/plugin/properties/WritePredefinedProjectPropertiesTest.java

@@ -80,15 +80,7 @@ class WritePredefinedProjectPropertiesTest {
 		mojo.outputFile = testFolder;
 
 		// execute
-		try {
-			mojo.execute();
-			Assertions.assertTrue(false); // not reached
-		} catch (Exception e) {
-			Assertions
-				.assertTrue(
-					MojoExecutionException.class.isAssignableFrom(e.getClass()) ||
-						IllegalArgumentException.class.isAssignableFrom(e.getClass()));
-		}
+		Assertions.assertThrows(MojoExecutionException.class, () -> mojo.execute());
 	}
 
 	@Test

dhp-common/pom.xml

@@ -70,7 +70,10 @@
 			<groupId>com.ibm.icu</groupId>
 			<artifactId>icu4j</artifactId>
 		</dependency>
-
+		<dependency>
+			<groupId>org.apache.hadoop</groupId>
+			<artifactId>hadoop-common</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>com.github.sisyphsu</groupId>
 			<artifactId>dateparser</artifactId>
@@ -160,7 +163,7 @@
 
 		<dependency>
 			<groupId>eu.dnetlib.dhp</groupId>
-			<artifactId>dhp-schemas</artifactId>
+			<artifactId>${dhp-schemas.artifact}</artifactId>
 		</dependency>
 
 		<dependency>
@@ -169,23 +172,4 @@
 		</dependency>
 	</dependencies>
 
-	<!-- dependencies required on JDK9+ because J2EE has been removed -->
-	<profiles>
-		<profile>
-			<id>spark-34</id>
-			<dependencies>
-				<dependency>
-					<groupId>javax.xml.bind</groupId>
-					<artifactId>jaxb-api</artifactId>
-					<version>2.2.11</version>
-				</dependency>
-				<dependency>
-					<groupId>com.sun.xml.ws</groupId>
-					<artifactId>jaxws-ri</artifactId>
-					<version>2.3.3</version>
-					<type>pom</type>
-				</dependency>
-			</dependencies>
-		</profile>
-	</profiles>
 </project>

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

@@ -38,7 +38,7 @@ public class PacePerson {
 					PacePerson.class
 						.getResourceAsStream(
 							"/eu/dnetlib/dhp/common/name_particles.txt")));
-		} catch (Exception e) {
+		} catch (IOException e) {
 			throw new RuntimeException(e);
 		}
 	}

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

@@ -12,7 +12,9 @@ import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.math.NumberUtils;
+import org.apache.commons.lang3.time.DateUtils;
 import org.apache.http.HttpHeaders;
+import org.joda.time.Instant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -212,11 +214,11 @@ public class HttpConnector2 {
 					.format(
 						"Unexpected status code: %s errors: %s", urlConn.getResponseCode(),
 						MAPPER.writeValueAsString(report)));
-		} catch (MalformedURLException e) {
+		} catch (MalformedURLException | UnknownHostException e) {
 			log.error(e.getMessage(), e);
 			report.put(e.getClass().getName(), e.getMessage());
 			throw new CollectorException(e.getMessage(), e);
-		} catch (SocketTimeoutException | SocketException | UnknownHostException e) {
+		} catch (SocketTimeoutException | SocketException e) {
 			log.error(e.getMessage(), e);
 			report.put(e.getClass().getName(), e.getMessage());
 			backoffAndSleep(getClientParams().getRetryDelay() * retryNumber * 1000);

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

@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2024.
- * SPDX-FileCopyrightText: © 2023 Consiglio Nazionale delle Ricerche
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-package eu.dnetlib.dhp.schema.oaf;
-
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-
-public class HashableStructuredProperty extends StructuredProperty {
-
-	private static final long serialVersionUID = 8371670185221126045L;
-
-	public static HashableStructuredProperty newInstance(String value, Qualifier qualifier, DataInfo dataInfo) {
-		if (value == null) {
-			return null;
-		}
-		final HashableStructuredProperty sp = new HashableStructuredProperty();
-		sp.setValue(value);
-		sp.setQualifier(qualifier);
-		sp.setDataInfo(dataInfo);
-		return sp;
-	}
-
-	public static HashableStructuredProperty newInstance(StructuredProperty sp) {
-		HashableStructuredProperty hsp = new HashableStructuredProperty();
-		hsp.setQualifier(sp.getQualifier());
-		hsp.setValue(sp.getValue());
-		hsp.setQualifier(sp.getQualifier());
-		return hsp;
-	}
-
-	public static StructuredProperty toStructuredProperty(HashableStructuredProperty hsp) {
-		StructuredProperty sp = new StructuredProperty();
-		sp.setQualifier(hsp.getQualifier());
-		sp.setValue(hsp.getValue());
-		sp.setQualifier(hsp.getQualifier());
-		return sp;
-	}
-
-	@Override
-	public int hashCode() {
-		return new HashCodeBuilder(11, 91)
-			.append(getQualifier().getClassid())
-			.append(getQualifier().getSchemeid())
-			.append(getValue())
-			.hashCode();
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (obj == null) {
-			return false;
-		}
-		if (obj == this) {
-			return true;
-		}
-		if (obj.getClass() != getClass()) {
-			return false;
-		}
-		final HashableStructuredProperty rhs = (HashableStructuredProperty) obj;
-		return new EqualsBuilder()
-			.append(getQualifier().getClassid(), rhs.getQualifier().getClassid())
-			.append(getQualifier().getSchemeid(), rhs.getQualifier().getSchemeid())
-			.append(getValue(), rhs.getValue())
-			.isEquals();
-	}
-}

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

@@ -43,4 +43,34 @@ public class CleaningFunctions {
 		return !PidBlacklistProvider.getBlacklist(s.getQualifier().getClassid()).contains(pidValue);
 	}
 
+	/**
+	 * 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) {
+		pid
+			.setValue(
+				normalizePidValue(
+					pid.getQualifier().getClassid(),
+					pid.getValue()));
+
+		return pid;
+	}
+
+	public static String normalizePidValue(String pidType, String pidValue) {
+		String value = Optional
+			.ofNullable(pidValue)
+			.map(String::trim)
+			.orElseThrow(() -> new IllegalArgumentException("PID value cannot be empty"));
+
+		switch (pidType) {
+
+			// TODO add cleaning for more PID types as needed
+			case "doi":
+				return value.toLowerCase().replaceFirst(DOI_PREFIX_REGEX, DOI_PREFIX);
+		}
+		return value;
+	}
+
 }

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

@@ -6,11 +6,18 @@ import org.apache.commons.lang3.StringUtils;
 public class DoiCleaningRule {
 
 	public static String clean(final String doi) {
-		if (doi == null)
-			return null;
-		final String replaced = doi
-			.replaceAll("\\n|\\r|\\t|\\s", "")
+		return doi
+			.toLowerCase()
+			.replaceAll("\\s", "")
 			.replaceAll("^doi:", "")
+			.replaceFirst(CleaningFunctions.DOI_PREFIX_REGEX, CleaningFunctions.DOI_PREFIX);
+	}
+
+	public static String normalizeDoi(final String input) {
+		if (input == null)
+			return null;
+		final String replaced = input
+			.replaceAll("\\n|\\r|\\t|\\s", "")
 			.toLowerCase()
 			.replaceFirst(CleaningFunctions.DOI_PREFIX_REGEX, CleaningFunctions.DOI_PREFIX);
 		if (StringUtils.isEmpty(replaced))
@@ -25,6 +32,7 @@ public class DoiCleaningRule {
 			return null;
 
 		return ret;
+
 	}
 
 }

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

@@ -563,24 +563,12 @@ public class GraphCleaningFunctions extends CleaningFunctions {
 						Optional
 							.ofNullable(i.getPid())
 							.ifPresent(pid -> {
-								final Set<HashableStructuredProperty> pids = pid
-									.stream()
-									.map(HashableStructuredProperty::newInstance)
-									.collect(Collectors.toCollection(HashSet::new));
+								final Set<StructuredProperty> pids = Sets.newHashSet(pid);
 								Optional
 									.ofNullable(i.getAlternateIdentifier())
 									.ifPresent(altId -> {
-										final Set<HashableStructuredProperty> altIds = altId
-											.stream()
-											.map(HashableStructuredProperty::newInstance)
-											.collect(Collectors.toCollection(HashSet::new));
-										i
-											.setAlternateIdentifier(
-												Sets
-													.difference(altIds, pids)
-													.stream()
-													.map(HashableStructuredProperty::toStructuredProperty)
-													.collect(Collectors.toList()));
+										final Set<StructuredProperty> altIds = Sets.newHashSet(altId);
+										i.setAlternateIdentifier(Lists.newArrayList(Sets.difference(altIds, pids)));
 									});
 							});
 

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

@@ -175,7 +175,7 @@ public class IdentifierFactory implements Serializable {
 			return entity
 				.getPid()
 				.stream()
-				.map(PidCleaner::normalizePidValue)
+				.map(CleaningFunctions::normalizePidValue)
 				.filter(CleaningFunctions::pidFilter)
 				.collect(
 					Collectors
@@ -207,7 +207,7 @@ public class IdentifierFactory implements Serializable {
 					// filter away PIDs provided by a DS that is not considered an authority for the
 					// given PID Type
 					.filter(p -> shouldFilterPidByCriteria(collectedFrom, p, mapHandles))
-					.map(PidCleaner::normalizePidValue)
+					.map(CleaningFunctions::normalizePidValue)
 					.filter(p -> isNotFromDelegatedAuthority(collectedFrom, p))
 					.filter(CleaningFunctions::pidFilter))
 			.orElse(Stream.empty());

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

@@ -96,7 +96,7 @@ public class MergeEntitiesComparator implements Comparator<Oaf> {
 		// id
 		if (res == 0) {
 			if (left instanceof OafEntity && right instanceof OafEntity) {
-				res = ((OafEntity) right).getId().compareTo(((OafEntity) left).getId());
+				res = ((OafEntity) left).getId().compareTo(((OafEntity) right).getId());
 			}
 		}
 

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

@@ -30,7 +30,6 @@ import eu.dnetlib.dhp.schema.common.ModelSupport;
 import eu.dnetlib.dhp.schema.oaf.*;
 
 public class MergeUtils {
-
 	public static <T extends Oaf> T mergeById(String s, Iterator<T> oafEntityIterator) {
 		return mergeGroup(s, oafEntityIterator, true);
 	}
@@ -89,7 +88,7 @@ public class MergeUtils {
 	private static Oaf mergeEntities(Oaf left, Oaf right, boolean checkDelegatedAuthority) {
 
 		if (sameClass(left, right, Result.class)) {
-			if (checkDelegatedAuthority) {
+			if (!left.getClass().equals(right.getClass()) || checkDelegatedAuthority) {
 				return mergeResultsOfDifferentTypes((Result) left, (Result) right);
 			}
 
@@ -468,10 +467,6 @@ public class MergeUtils {
 		merge.setIsInDiamondJournal(booleanOR(merge.getIsInDiamondJournal(), enrich.getIsInDiamondJournal()));
 		merge.setPubliclyFunded(booleanOR(merge.getPubliclyFunded(), enrich.getPubliclyFunded()));
 
-		if (StringUtils.isBlank(merge.getTransformativeAgreement())) {
-			merge.setTransformativeAgreement(enrich.getTransformativeAgreement());
-		}
-
 		return merge;
 	}
 
@@ -975,7 +970,7 @@ public class MergeUtils {
 	private static String extractKeyFromPid(final StructuredProperty pid) {
 		if (pid == null)
 			return null;
-		final StructuredProperty normalizedPid = PidCleaner.normalizePidValue(pid);
+		final StructuredProperty normalizedPid = CleaningFunctions.normalizePidValue(pid);
 
 		return String.format("%s::%s", normalizedPid.getQualifier().getClassid(), normalizedPid.getValue());
 	}

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

@@ -18,8 +18,8 @@ public class PidValueComparator implements Comparator<StructuredProperty> {
 		if (right == null)
 			return -1;
 
-		StructuredProperty l = PidCleaner.normalizePidValue(left);
-		StructuredProperty r = PidCleaner.normalizePidValue(right);
+		StructuredProperty l = CleaningFunctions.normalizePidValue(left);
+		StructuredProperty r = CleaningFunctions.normalizePidValue(right);
 
 		return Optional
 			.ofNullable(l.getValue())

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

@@ -28,7 +28,6 @@ import com.jayway.jsonpath.JsonPath;
 
 import eu.dnetlib.dhp.schema.mdstore.MDStoreWithInfo;
 import eu.dnetlib.dhp.schema.oaf.utils.CleaningFunctions;
-import eu.dnetlib.dhp.schema.oaf.utils.PidCleaner;
 import net.minidev.json.JSONArray;
 import scala.collection.JavaConverters;
 import scala.collection.Seq;
@@ -105,7 +104,7 @@ public class DHPUtils {
 
 	public static String generateUnresolvedIdentifier(final String pid, final String pidType) {
 
-		final String cleanedPid = PidCleaner.normalizePidValue(pidType, pid);
+		final String cleanedPid = CleaningFunctions.normalizePidValue(pidType, pid);
 
 		return String.format("unresolved::%s::%s", cleanedPid, pidType.toLowerCase().trim());
 	}

dhp-common/src/main/resources/eu/dnetlib/scholexplorer/relation/relations.json

@@ -154,13 +154,5 @@
   "unknown":{
     "original":"Unknown",
     "inverse":"Unknown"
-  },
-  "isamongtopnsimilardocuments": {
-    "original": "IsAmongTopNSimilarDocuments",
-    "inverse": "HasAmongTopNSimilarDocuments"
-  },
-  "hasamongtopnsimilardocuments": {
-    "original": "HasAmongTopNSimilarDocuments",
-    "inverse": "IsAmongTopNSimilarDocuments"
   }
 }

dhp-common/src/main/scala/eu/dnetlib/dhp/application/SparkScalaApplication.scala

@@ -65,13 +65,12 @@ abstract class AbstractScalaApplication(
     val conf: SparkConf = new SparkConf()
     val master = parser.get("master")
     log.info(s"Creating Spark session: Master: $master")
-    val b = SparkSession
+    SparkSession
       .builder()
       .config(conf)
       .appName(getClass.getSimpleName)
-    if (master != null)
-      b.master(master)
-    b.getOrCreate()
+      .master(master)
+      .getOrCreate()
   }
 
   def reportTotalSize(targetPath: String, outputBasePath: String): Unit = {

dhp-common/src/main/scala/eu/dnetlib/dhp/sx/graph/scholix/ScholixUtils.scala

@@ -65,11 +65,7 @@ object ScholixUtils extends Serializable {
   }
 
   def generateScholixResourceFromResult(r: Result): ScholixResource = {
-    val sum = ScholixUtils.resultToSummary(r)
-    if (sum != null)
-      generateScholixResourceFromSummary(ScholixUtils.resultToSummary(r))
-    else
-      null
+    generateScholixResourceFromSummary(ScholixUtils.resultToSummary(r))
   }
 
   val statsAggregator: Aggregator[(String, String, Long), RelatedEntities, RelatedEntities] =
@@ -157,14 +153,6 @@ object ScholixUtils extends Serializable {
 
   }
 
-  def invRel(rel: String): String = {
-    val semanticRelation = relations.getOrElse(rel.toLowerCase, null)
-    if (semanticRelation != null)
-      semanticRelation.inverse
-    else
-      null
-  }
-
   def extractCollectedFrom(summary: ScholixResource): List[ScholixEntityId] = {
     if (summary.getCollectedFrom != null && !summary.getCollectedFrom.isEmpty) {
       val l: List[ScholixEntityId] = summary.getCollectedFrom.asScala.map { d =>
@@ -389,7 +377,10 @@ object ScholixUtils extends Serializable {
     if (persistentIdentifiers.isEmpty)
       return null
     s.setLocalIdentifier(persistentIdentifiers.asJava)
-//    s.setTypology(r.getResulttype.getClassid)
+    if (r.isInstanceOf[Publication])
+      s.setTypology(Typology.publication)
+    else
+      s.setTypology(Typology.dataset)
 
     s.setSubType(r.getInstance().get(0).getInstancetype.getClassname)
 

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

@@ -29,7 +29,7 @@ class IdentifierFactoryTest {
 			"publication_doi2.json", "50|doi_________::79dbc7a2a56dc1532659f9038843256e", true);
 
 		verifyIdentifier(
-			"publication_doi3.json", "50|pmc_________::e2a339e0e11bfbf55462e14a07f1b304", true);
+			"publication_doi3.json", "50|pmc_________::94e4cb08c93f8733b48e2445d04002ac", true);
 
 		verifyIdentifier(
 			"publication_doi4.json", "50|od______2852::38861c44e6052a8d49f59a4c39ba5e66", true);
@@ -41,7 +41,7 @@ class IdentifierFactoryTest {
 			"publication_pmc1.json", "50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1f", true);
 
 		verifyIdentifier(
-			"publication_pmc2.json", "50|pmc_________::e2a339e0e11bfbf55462e14a07f1b304", true);
+			"publication_pmc2.json", "50|pmc_________::94e4cb08c93f8733b48e2445d04002ac", true);
 
 		verifyIdentifier(
 			"publication_openapc.json", "50|doi_________::79dbc7a2a56dc1532659f9038843256e", true);

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

@@ -177,7 +177,7 @@ class OafMapperUtilsTest {
 		assertTrue(cfId(d1.getCollectedfrom()).contains(ModelConstants.CROSSREF_ID));
 
 		assertEquals(
-			ModelConstants.PUBLICATION_RESULTTYPE_CLASSID,
+			ModelConstants.DATASET_RESULTTYPE_CLASSID,
 			((Result) MergeUtils
 				.merge(p2, d1))
 					.getResulttype()

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

@@ -29,7 +29,7 @@
         },
         {
           "qualifier": {"classid": "pmc"},
-          "value": "PMC21459329"
+          "value": "21459329"
         }
       ]
     }

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

@@ -13,7 +13,7 @@
         },
         {
           "qualifier":{"classid":"pmc"},
-          "value":"PMC21459329"
+          "value":"21459329"
         }
       ]
     }

dhp-pace-core/pom.xml

@@ -24,7 +24,7 @@
 				<executions>
 					<execution>
 						<id>scala-compile-first</id>
-						<phase>process-resources</phase>
+						<phase>initialize</phase>
 						<goals>
 							<goal>add-source</goal>
 							<goal>compile</goal>
@@ -59,6 +59,14 @@
 			<groupId>edu.cmu</groupId>
 			<artifactId>secondstring</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
@@ -83,6 +91,10 @@
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-math3</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>com.jayway.jsonpath</groupId>
 			<artifactId>json-path</artifactId>
@@ -101,90 +113,4 @@
 		</dependency>
 	</dependencies>
 
-	<profiles>
-		<profile>
-			<id>spark-24</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>build-helper-maven-plugin</artifactId>
-						<version>3.4.0</version>
-						<executions>
-							<execution>
-								<phase>generate-sources</phase>
-								<goals>
-									<goal>add-source</goal>
-								</goals>
-								<configuration>
-									<sources>
-										<source>src/main/spark-2</source>
-									</sources>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-
-		<profile>
-			<id>spark-34</id>
-
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>build-helper-maven-plugin</artifactId>
-						<version>3.4.0</version>
-						<executions>
-							<execution>
-								<phase>generate-sources</phase>
-								<goals>
-									<goal>add-source</goal>
-								</goals>
-								<configuration>
-									<sources>
-										<source>src/main/spark-2</source>
-									</sources>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-
-		<profile>
-			<id>spark-35</id>
-
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>build-helper-maven-plugin</artifactId>
-						<version>3.4.0</version>
-						<executions>
-							<execution>
-								<phase>generate-sources</phase>
-								<goals>
-									<goal>add-source</goal>
-								</goals>
-								<configuration>
-									<sources>
-										<source>src/main/spark-35</source>
-									</sources>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-
 </project>

dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/KeywordsClustering.java

@@ -2,41 +2,31 @@
 package eu.dnetlib.pace.clustering;
 
 import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 
 import eu.dnetlib.pace.config.Config;
 
-@ClusteringClass("legalnameclustering")
-public class LegalnameClustering extends AbstractClusteringFunction {
+@ClusteringClass("keywordsclustering")
+public class KeywordsClustering extends AbstractClusteringFunction {
 
-	private static final Pattern CITY_CODE_PATTERN = Pattern.compile("city::\\d+");
-	private static final Pattern KEYWORD_CODE_PATTERN = Pattern.compile("key::\\d+");
-
-	public LegalnameClustering(Map<String, Object> params) {
+	public KeywordsClustering(Map<String, Object> params) {
 		super(params);
 	}
 
-	public Set<String> getRegexList(String input, Pattern codeRegex) {
-		Matcher matcher = codeRegex.matcher(input);
-		Set<String> cities = new HashSet<>();
-		while (matcher.find()) {
-			cities.add(matcher.group());
-		}
-		return cities;
-	}
-
 	@Override
 	protected Collection<String> doApply(final Config conf, String s) {
 
+		// takes city codes and keywords codes without duplicates
+		Set<String> keywords = getKeywords(s, conf.translationMap(), paramOrDefault("windowSize", 4));
+		Set<String> cities = getCities(s, paramOrDefault("windowSize", 4));
+
 		// list of combination to return as result
 		final Collection<String> combinations = new LinkedHashSet<String>();
 
-		for (String keyword : getRegexList(s, KEYWORD_CODE_PATTERN)) {
-			for (String city : getRegexList(s, CITY_CODE_PATTERN)) {
+		for (String keyword : keywordsToCodes(keywords, conf.translationMap())) {
+			for (String city : citiesToCodes(cities)) {
 				combinations.add(keyword + "-" + city);
 				if (combinations.size() >= paramOrDefault("max", 2)) {
 					return combinations;
@@ -52,6 +42,9 @@ public class LegalnameClustering extends AbstractClusteringFunction {
 		return fields
 			.stream()
 			.filter(f -> !f.isEmpty())
+			.map(KeywordsClustering::cleanup)
+			.map(KeywordsClustering::normalize)
+			.map(s -> filterAllStopWords(s))
 			.map(s -> doApply(conf, s))
 			.map(c -> filterBlacklisted(c, ngramBlacklist))
 			.flatMap(c -> c.stream())

dhp-pace-core/src/main/java/eu/dnetlib/pace/common/AbstractPaceFunctions.java

@@ -27,14 +27,6 @@ public class AbstractPaceFunctions extends PaceCommonUtils {
 	private static Map<String, String> cityMap = AbstractPaceFunctions
 		.loadMapFromClasspath("/eu/dnetlib/pace/config/city_map.csv");
 
-	// keywords map to be used when translating the keyword names into codes
-	private static Map<String, String> keywordMap = AbstractPaceFunctions
-		.loadMapFromClasspath("/eu/dnetlib/pace/config/translation_map.csv");
-
-	// country map to be used when inferring the country from the city name
-	private static Map<String, String> countryMap = AbstractPaceFunctions
-		.loadCountryMapFromClasspath("/eu/dnetlib/pace/config/country_map.csv");
-
 	// list of stopwords in different languages
 	protected static Set<String> stopwords_gr = loadFromClasspath("/eu/dnetlib/pace/config/stopwords_gr.txt");
 	protected static Set<String> stopwords_en = loadFromClasspath("/eu/dnetlib/pace/config/stopwords_en.txt");
@@ -82,64 +74,6 @@ public class AbstractPaceFunctions extends PaceCommonUtils {
 		return s12;
 	}
 
-	public static String countryInference(final String original, String inferFrom) {
-		if (!original.equalsIgnoreCase("unknown"))
-			return original;
-
-		inferFrom = cleanup(inferFrom);
-		inferFrom = normalize(inferFrom);
-		inferFrom = filterAllStopWords(inferFrom);
-		Set<String> cities = getCities(inferFrom, 4);
-		return citiesToCountry(cities).stream().findFirst().orElse("UNKNOWN");
-	}
-
-	public static String cityInference(String original) {
-		original = cleanup(original);
-		original = normalize(original);
-		original = filterAllStopWords(original);
-
-		Set<String> cities = getCities(original, 4);
-
-		for (String city : cities) {
-			original = original.replaceAll(city, cityMap.get(city));
-		}
-
-		return original;
-	}
-
-	public static String keywordInference(String original) {
-		original = cleanup(original);
-		original = normalize(original);
-		original = filterAllStopWords(original);
-
-		Set<String> keywords = getKeywords(original, keywordMap, 4);
-
-		for (String keyword : keywords) {
-			original = original.replaceAll(keyword, keywordMap.get(keyword));
-		}
-
-		return original;
-	}
-
-	public static String cityKeywordInference(String original) {
-		original = cleanup(original);
-		original = normalize(original);
-		original = filterAllStopWords(original);
-
-		Set<String> keywords = getKeywords(original, keywordMap, 4);
-		Set<String> cities = getCities(original, 4);
-
-		for (String keyword : keywords) {
-			original = original.replaceAll(keyword, keywordMap.get(keyword));
-		}
-
-		for (String city : cities) {
-			original = original.replaceAll(city, cityMap.get(city));
-		}
-
-		return original;
-	}
-
 	protected static String fixXML(final String a) {
 
 		return a
@@ -274,30 +208,6 @@ public class AbstractPaceFunctions extends PaceCommonUtils {
 		return m;
 	}
 
-	public static Map<String, String> loadCountryMapFromClasspath(final String classpath) {
-
-		Transliterator transliterator = Transliterator.getInstance("Any-Eng");
-
-		final Map<String, String> m = new HashMap<>();
-		try {
-			for (final String s : IOUtils
-				.readLines(AbstractPaceFunctions.class.getResourceAsStream(classpath), StandardCharsets.UTF_8)) {
-				// string is like this: country_code;city1;city2;city3
-				String[] line = s.split(";");
-				String value = line[0];
-				for (int i = 1; i < line.length; i++) {
-					String city = fixAliases(transliterator.transliterate(line[i].toLowerCase()));
-					String code = cityMap.get(city);
-					m.put(code, value);
-				}
-			}
-		} catch (final Throwable e) {
-			return new HashMap<>();
-		}
-		return m;
-
-	}
-
 	public static String removeKeywords(String s, Set<String> keywords) {
 
 		s = " " + s + " ";
@@ -327,10 +237,6 @@ public class AbstractPaceFunctions extends PaceCommonUtils {
 		return toCodes(keywords, cityMap);
 	}
 
-	public static Set<String> citiesToCountry(Set<String> cities) {
-		return toCodes(toCodes(cities, cityMap), countryMap);
-	}
-
 	protected static String firstLC(final String s) {
 		return StringUtils.substring(s, 0, 1).toLowerCase();
 	}

dhp-pace-core/src/main/java/eu/dnetlib/pace/model/FieldDef.java

@@ -47,21 +47,9 @@ public class FieldDef implements Serializable {
 
 	private String clean;
 
-	private String infer;
-
-	private String inferenceFrom;
-
 	public FieldDef() {
 	}
 
-	public String getInferenceFrom() {
-		return inferenceFrom;
-	}
-
-	public void setInferenceFrom(final String inferenceFrom) {
-		this.inferenceFrom = inferenceFrom;
-	}
-
 	public String getName() {
 		return name;
 	}
@@ -138,14 +126,6 @@ public class FieldDef implements Serializable {
 		this.clean = clean;
 	}
 
-	public String getInfer() {
-		return infer;
-	}
-
-	public void setInfer(String infer) {
-		this.infer = infer;
-	}
-
 	@Override
 	public String toString() {
 		try {

dhp-pace-core/src/main/java/eu/dnetlib/pace/model/SparkModel.scala

@@ -3,7 +3,7 @@ package eu.dnetlib.pace.model
 import com.jayway.jsonpath.{Configuration, JsonPath}
 import eu.dnetlib.pace.common.AbstractPaceFunctions
 import eu.dnetlib.pace.config.{DedupConfig, Type}
-import eu.dnetlib.pace.util.{MapDocumentUtil, SparkCompatUtils}
+import eu.dnetlib.pace.util.MapDocumentUtil
 import org.apache.commons.lang3.StringUtils
 import org.apache.spark.sql.catalyst.encoders.RowEncoder
 import org.apache.spark.sql.catalyst.expressions.GenericRowWithSchema
@@ -52,7 +52,7 @@ case class SparkModel(conf: DedupConfig) {
   val orderingFieldPosition: Int = schema.fieldIndex(orderingFieldName)
 
   val parseJsonDataset: (Dataset[String] => Dataset[Row]) = df => {
-    df.map(r => rowFromJson(r))(SparkCompatUtils.encoderFor(schema))
+    df.map(r => rowFromJson(r))(RowEncoder(schema))
   }
 
   def rowFromJson(json: String): Row = {
@@ -123,19 +123,9 @@ case class SparkModel(conf: DedupConfig) {
               case _ => res(index)
             }
           }
-
-          if (StringUtils.isNotBlank(fdef.getInfer)) {
-            val inferFrom : String = if (StringUtils.isNotBlank(fdef.getInferenceFrom)) fdef.getInferenceFrom else fdef.getPath
-            res(index) = res(index) match {
-              case x: Seq[String] => x.map(inference(_, MapDocumentUtil.getJPathString(inferFrom, documentContext), fdef.getInfer))
-              case _ => inference(res(index).toString, MapDocumentUtil.getJPathString(inferFrom, documentContext), fdef.getInfer)
-            }
-          }
-
         }
 
         res
-
     }
 
     new GenericRowWithSchema(values, schema)
@@ -156,17 +146,5 @@ case class SparkModel(conf: DedupConfig) {
     res
   }
 
-  def inference(value: String, inferfrom: String, infertype: String) : String = {
-    val res = infertype match {
-      case "country" => AbstractPaceFunctions.countryInference(value, inferfrom)
-      case "city" => AbstractPaceFunctions.cityInference(value)
-      case "keyword" => AbstractPaceFunctions.keywordInference(value)
-      case "city_keyword" => AbstractPaceFunctions.cityKeywordInference(value)
-      case _ => value
-    }
-
-    res
-  }
-
 }
 

dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/CityMatch.java

@@ -0,0 +1,48 @@
+
+package eu.dnetlib.pace.tree;
+
+import java.util.Map;
+import java.util.Set;
+
+import eu.dnetlib.pace.config.Config;
+import eu.dnetlib.pace.tree.support.AbstractStringComparator;
+import eu.dnetlib.pace.tree.support.ComparatorClass;
+
+@ComparatorClass("cityMatch")
+public class CityMatch extends AbstractStringComparator {
+
+	private Map<String, String> params;
+
+	public CityMatch(Map<String, String> params) {
+		super(params);
+		this.params = params;
+	}
+
+	@Override
+	public double distance(final String a, final String b, final Config conf) {
+
+		String ca = cleanup(a);
+		String cb = cleanup(b);
+
+		ca = normalize(ca);
+		cb = normalize(cb);
+
+		ca = filterAllStopWords(ca);
+		cb = filterAllStopWords(cb);
+
+		Set<String> cities1 = getCities(ca, Integer.parseInt(params.getOrDefault("windowSize", "4")));
+		Set<String> cities2 = getCities(cb, Integer.parseInt(params.getOrDefault("windowSize", "4")));
+
+		Set<String> codes1 = citiesToCodes(cities1);
+		Set<String> codes2 = citiesToCodes(cities2);
+
+		// if no cities are detected, the comparator gives 1.0
+		if (codes1.isEmpty() && codes2.isEmpty())
+			return 1.0;
+		else {
+			if (codes1.isEmpty() ^ codes2.isEmpty())
+				return -1; // undefined if one of the two has no cities
+			return commonElementsPercentage(codes1, codes2);
+		}
+	}
+}

dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/CodeMatch.java

@@ -1,51 +0,0 @@
-
-package eu.dnetlib.pace.tree;
-
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import eu.dnetlib.pace.config.Config;
-import eu.dnetlib.pace.tree.support.AbstractStringComparator;
-import eu.dnetlib.pace.tree.support.ComparatorClass;
-
-@ComparatorClass("codeMatch")
-public class CodeMatch extends AbstractStringComparator {
-
-	private Map<String, String> params;
-
-	private Pattern CODE_REGEX;
-
-	public CodeMatch(Map<String, String> params) {
-		super(params);
-		this.params = params;
-		this.CODE_REGEX = Pattern.compile(params.getOrDefault("codeRegex", "[a-zA-Z]::\\d+"));
-	}
-
-	public Set<String> getRegexList(String input) {
-		Matcher matcher = this.CODE_REGEX.matcher(input);
-		Set<String> cities = new HashSet<>();
-		while (matcher.find()) {
-			cities.add(matcher.group());
-		}
-		return cities;
-	}
-
-	@Override
-	public double distance(final String a, final String b, final Config conf) {
-
-		Set<String> codes1 = getRegexList(a);
-		Set<String> codes2 = getRegexList(b);
-
-		// if no codes are detected, the comparator gives 1.0
-		if (codes1.isEmpty() && codes2.isEmpty())
-			return 1.0;
-		else {
-			if (codes1.isEmpty() ^ codes2.isEmpty())
-				return -1; // undefined if one of the two has no codes
-			return commonElementsPercentage(codes1, codes2);
-		}
-	}
-}

dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/CountryMatch.java

@@ -2,7 +2,6 @@
 package eu.dnetlib.pace.tree;
 
 import java.util.Map;
-import java.util.Set;
 
 import com.wcohen.ss.AbstractStringDistance;
 
@@ -13,11 +12,8 @@ import eu.dnetlib.pace.tree.support.ComparatorClass;
 @ComparatorClass("countryMatch")
 public class CountryMatch extends AbstractStringComparator {
 
-	private Map<String, String> params;
-
 	public CountryMatch(Map<String, String> params) {
 		super(params, new com.wcohen.ss.JaroWinkler());
-		this.params = params;
 	}
 
 	public CountryMatch(final double weight) {
@@ -30,7 +26,6 @@ public class CountryMatch extends AbstractStringComparator {
 
 	@Override
 	public double distance(final String a, final String b, final Config conf) {
-
 		if (a.isEmpty() || b.isEmpty()) {
 			return -1.0; // return -1 if a field is missing
 		}
@@ -50,5 +45,4 @@ public class CountryMatch extends AbstractStringComparator {
 	protected double normalize(final double d) {
 		return d;
 	}
-
 }

dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/JaroWinklerLegalname.java

@@ -1,59 +0,0 @@
-
-package eu.dnetlib.pace.tree;
-
-import java.util.Map;
-import java.util.Set;
-
-import com.wcohen.ss.AbstractStringDistance;
-
-import eu.dnetlib.pace.config.Config;
-import eu.dnetlib.pace.tree.support.AbstractStringComparator;
-import eu.dnetlib.pace.tree.support.ComparatorClass;
-
-@ComparatorClass("jaroWinklerLegalname")
-public class JaroWinklerLegalname extends AbstractStringComparator {
-
-	private Map<String, String> params;
-
-	private final String CITY_CODE_REGEX = "city::\\d+";
-	private final String KEYWORD_CODE_REGEX = "key::\\d+";
-
-	public JaroWinklerLegalname(Map<String, String> params) {
-		super(params, new com.wcohen.ss.JaroWinkler());
-		this.params = params;
-	}
-
-	public JaroWinklerLegalname(double weight) {
-		super(weight, new com.wcohen.ss.JaroWinkler());
-	}
-
-	protected JaroWinklerLegalname(double weight, AbstractStringDistance ssalgo) {
-		super(weight, ssalgo);
-	}
-
-	@Override
-	public double distance(String a, String b, final Config conf) {
-
-		String ca = a.replaceAll(CITY_CODE_REGEX, "").replaceAll(KEYWORD_CODE_REGEX, " ");
-		String cb = b.replaceAll(CITY_CODE_REGEX, "").replaceAll(KEYWORD_CODE_REGEX, " ");
-
-		ca = ca.replaceAll("[ ]{2,}", " ");
-		cb = cb.replaceAll("[ ]{2,}", " ");
-
-		if (ca.isEmpty() && cb.isEmpty())
-			return 1.0;
-		else
-			return normalize(ssalgo.score(ca, cb));
-	}
-
-	@Override
-	public double getWeight() {
-		return super.weight;
-	}
-
-	@Override
-	protected double normalize(double d) {
-		return d;
-	}
-
-}

dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/JaroWinklerNormalizedName.java

@@ -0,0 +1,74 @@
+
+package eu.dnetlib.pace.tree;
+
+import java.util.Map;
+import java.util.Set;
+
+import com.wcohen.ss.AbstractStringDistance;
+
+import eu.dnetlib.pace.config.Config;
+import eu.dnetlib.pace.tree.support.AbstractStringComparator;
+import eu.dnetlib.pace.tree.support.ComparatorClass;
+
+@ComparatorClass("jaroWinklerNormalizedName")
+public class JaroWinklerNormalizedName extends AbstractStringComparator {
+
+	private Map<String, String> params;
+
+	public JaroWinklerNormalizedName(Map<String, String> params) {
+		super(params, new com.wcohen.ss.JaroWinkler());
+		this.params = params;
+	}
+
+	public JaroWinklerNormalizedName(double weight) {
+		super(weight, new com.wcohen.ss.JaroWinkler());
+	}
+
+	protected JaroWinklerNormalizedName(double weight, AbstractStringDistance ssalgo) {
+		super(weight, ssalgo);
+	}
+
+	@Override
+	public double distance(String a, String b, final Config conf) {
+		String ca = cleanup(a);
+		String cb = cleanup(b);
+
+		ca = normalize(ca);
+		cb = normalize(cb);
+
+		ca = filterAllStopWords(ca);
+		cb = filterAllStopWords(cb);
+
+		Set<String> keywords1 = getKeywords(
+			ca, conf.translationMap(), Integer.parseInt(params.getOrDefault("windowSize", "4")));
+		Set<String> keywords2 = getKeywords(
+			cb, conf.translationMap(), Integer.parseInt(params.getOrDefault("windowSize", "4")));
+
+		Set<String> cities1 = getCities(ca, Integer.parseInt(params.getOrDefault("windowSize", "4")));
+		Set<String> cities2 = getCities(cb, Integer.parseInt(params.getOrDefault("windowSize", "4")));
+
+		ca = removeKeywords(ca, keywords1);
+		ca = removeKeywords(ca, cities1);
+		cb = removeKeywords(cb, keywords2);
+		cb = removeKeywords(cb, cities2);
+
+		ca = ca.replaceAll("[ ]{2,}", " ");
+		cb = cb.replaceAll("[ ]{2,}", " ");
+
+		if (ca.isEmpty() && cb.isEmpty())
+			return 1.0;
+		else
+			return normalize(ssalgo.score(ca, cb));
+	}
+
+	@Override
+	public double getWeight() {
+		return super.weight;
+	}
+
+	@Override
+	protected double normalize(double d) {
+		return d;
+	}
+
+}

dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/KeywordMatch.java

@@ -0,0 +1,50 @@
+
+package eu.dnetlib.pace.tree;
+
+import java.util.Map;
+import java.util.Set;
+
+import eu.dnetlib.pace.config.Config;
+import eu.dnetlib.pace.tree.support.AbstractStringComparator;
+import eu.dnetlib.pace.tree.support.ComparatorClass;
+
+@ComparatorClass("keywordMatch")
+public class KeywordMatch extends AbstractStringComparator {
+
+	Map<String, String> params;
+
+	public KeywordMatch(Map<String, String> params) {
+		super(params);
+		this.params = params;
+	}
+
+	@Override
+	public double distance(final String a, final String b, final Config conf) {
+
+		String ca = cleanup(a);
+		String cb = cleanup(b);
+
+		ca = normalize(ca);
+		cb = normalize(cb);
+
+		ca = filterAllStopWords(ca);
+		cb = filterAllStopWords(cb);
+
+		Set<String> keywords1 = getKeywords(
+			ca, conf.translationMap(), Integer.parseInt(params.getOrDefault("windowSize", "4")));
+		Set<String> keywords2 = getKeywords(
+			cb, conf.translationMap(), Integer.parseInt(params.getOrDefault("windowSize", "4")));
+
+		Set<String> codes1 = toCodes(keywords1, conf.translationMap());
+		Set<String> codes2 = toCodes(keywords2, conf.translationMap());
+
+		// if no cities are detected, the comparator gives 1.0
+		if (codes1.isEmpty() && codes2.isEmpty())
+			return 1.0;
+		else {
+			if (codes1.isEmpty() ^ codes2.isEmpty())
+				return -1.0; // undefined if one of the two has no keywords
+			return commonElementsPercentage(codes1, codes2);
+		}
+	}
+}

dhp-pace-core/src/main/spark-2/eu/dnetlib/pace/util/SparkCompatUtils.scala

@@ -1,12 +0,0 @@
-package eu.dnetlib.pace.util
-
-import org.apache.spark.sql.Row
-import org.apache.spark.sql.catalyst.encoders.{ExpressionEncoder, RowEncoder}
-import org.apache.spark.sql.types.StructType
-
-object SparkCompatUtils {
-
-  def encoderFor(schema: StructType): ExpressionEncoder[Row] = {
-    RowEncoder(schema)
-  }
-}

dhp-pace-core/src/main/spark-35/eu/dnetlib/pace/util/SparkCompatUtils.scala

@@ -1,12 +0,0 @@
-package eu.dnetlib.pace.util
-
-import org.apache.spark.sql.Row
-import org.apache.spark.sql.catalyst.encoders.ExpressionEncoder
-import org.apache.spark.sql.types.StructType
-
-object SparkCompatUtils {
-
-  def encoderFor(schema: StructType): ExpressionEncoder[Row] = {
-    ExpressionEncoder(schema)
-  }
-}

dhp-pace-core/src/test/java/eu/dnetlib/pace/clustering/ClusteringFunctionTest.java

@@ -8,7 +8,6 @@ import org.junit.jupiter.api.Test;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.mongodb.connection.Cluster;
 
 import eu.dnetlib.pace.AbstractPaceTest;
 import eu.dnetlib.pace.common.AbstractPaceFunctions;
@@ -178,16 +177,41 @@ public class ClusteringFunctionTest extends AbstractPaceTest {
 	}
 
 	@Test
-	public void legalnameClustering() {
+	public void testKeywordsClustering() {
 
-		final ClusteringFunction cf = new LegalnameClustering(params);
-		String s = "key::1 key::2 city::1";
+		final ClusteringFunction cf = new KeywordsClustering(params);
+		final String s = "Polytechnic University of Turin";
 		System.out.println(s);
 		System.out.println(cf.apply(conf, Lists.newArrayList(s)));
 
-		s = "key::1 key::2 city::1 city::2";
-		System.out.println(s);
-		System.out.println(cf.apply(conf, Lists.newArrayList(s)));
+		final String s1 = "POLITECNICO DI TORINO";
+		System.out.println(s1);
+		System.out.println(cf.apply(conf, Lists.newArrayList(s1)));
+
+		final String s2 = "Universita farmaceutica culturale di milano bergamo";
+		System.out.println("s2 = " + s2);
+		System.out.println(cf.apply(conf, Lists.newArrayList(s2)));
+
+		final String s3 = "universita universita milano milano";
+		System.out.println("s3 = " + s3);
+		System.out.println(cf.apply(conf, Lists.newArrayList(s3)));
+
+		final String s4 = "Politechniki Warszawskiej (Warsaw University of Technology)";
+		System.out.println("s4 = " + s4);
+		System.out.println(cf.apply(conf, Lists.newArrayList(s4)));
+
+		final String s5 = "İstanbul Ticarət Universiteti";
+		System.out.println("s5 = " + s5);
+		System.out.println(cf.apply(conf, Lists.newArrayList(s5)));
+
+		final String s6 = "National and Kapodistrian University of Athens";
+		System.out.println("s6 = " + s6);
+		System.out.println(cf.apply(conf, Lists.newArrayList(s6)));
+
+		final String s7 = "Εθνικό και Καποδιστριακό Πανεπιστήμιο Αθηνών";
+		System.out.println("s7 = " + s7);
+		System.out.println(cf.apply(conf, Lists.newArrayList(s7)));
+
 	}
 
 	@Test

dhp-pace-core/src/test/java/eu/dnetlib/pace/common/PaceFunctionTest.java

@@ -54,47 +54,4 @@ public class PaceFunctionTest extends AbstractPaceFunctions {
 		System.out.println("Fixed aliases  : " + fixAliases(TEST_STRING));
 	}
 
-	@Test
-	public void countryInferenceTest() {
-		assertEquals("IT", countryInference("UNKNOWN", "Università di Bologna"));
-		assertEquals("UK", countryInference("UK", "Università di Bologna"));
-		assertEquals("IT", countryInference("UNKNOWN", "Universiteé de Naples"));
-		assertEquals("UNKNOWN", countryInference("UNKNOWN", "Università del Lavoro"));
-	}
-
-	@Test
-	public void cityInferenceTest() {
-		assertEquals("universita city::3181928", cityInference("Università di Bologna"));
-		assertEquals("university city::3170647", cityInference("University of Pisa"));
-		assertEquals("universita", cityInference("Università del lavoro"));
-		assertEquals("universita city::3173331 city::3169522", cityInference("Università di Modena e Reggio Emilia"));
-	}
-
-	@Test
-	public void keywordInferenceTest() {
-		assertEquals("key::41 turin", keywordInference("Polytechnic University of Turin"));
-		assertEquals("key::41 torino", keywordInference("POLITECNICO DI TORINO"));
-		assertEquals(
-			"key::1 key::60 key::81 milano bergamo",
-			keywordInference("Universita farmaceutica culturale di milano bergamo"));
-		assertEquals("key::1 key::1 milano milano", keywordInference("universita universita milano milano"));
-		assertEquals(
-			"key::10 kapodistriako panepistemio athenon",
-			keywordInference("Εθνικό και Καποδιστριακό Πανεπιστήμιο Αθηνών"));
-	}
-
-	@Test
-	public void cityKeywordInferenceTest() {
-		assertEquals("key::41 city::3165524", cityKeywordInference("Polytechnic University of Turin"));
-		assertEquals("key::41 city::3165524", cityKeywordInference("POLITECNICO DI TORINO"));
-		assertEquals(
-			"key::1 key::60 key::81 city::3173435 city::3182164",
-			cityKeywordInference("Universita farmaceutica culturale di milano bergamo"));
-		assertEquals(
-			"key::1 key::1 city::3173435 city::3173435", cityKeywordInference("universita universita milano milano"));
-		assertEquals(
-			"key::10 kapodistriako panepistemio city::264371",
-			cityKeywordInference("Εθνικό και Καποδιστριακό Πανεπιστήμιο Αθηνών"));
-	}
-
 }

dhp-pace-core/src/test/java/eu/dnetlib/pace/comparators/ComparatorTest.java

@@ -35,7 +35,6 @@ public class ComparatorTest extends AbstractPaceTest {
 		params.put("name_th", "0.95");
 		params.put("jpath_value", "$.value");
 		params.put("jpath_classid", "$.qualifier.classid");
-		params.put("codeRegex", "key::\\d+");
 	}
 
 	@Test
@@ -45,23 +44,52 @@ public class ComparatorTest extends AbstractPaceTest {
 	}
 
 	@Test
-	public void codeMatchTest() {
-		CodeMatch codeMatch = new CodeMatch(params);
+	public void cityMatchTest() {
+		final CityMatch cityMatch = new CityMatch(params);
 
-		// both names with no codes
-		assertEquals(1.0, codeMatch.distance("testing1", "testing2", conf));
+		// both names with no cities
+		assertEquals(1.0, cityMatch.distance("Università", "Centro di ricerca", conf));
 
-		// one of the two names with no codes
-		assertEquals(-1.0, codeMatch.distance("testing1 key::1", "testing", conf));
+		// one of the two names with no cities
+		assertEquals(-1.0, cityMatch.distance("Università di Bologna", "Centro di ricerca", conf));
 
-		// both names with codes (same)
-		assertEquals(1.0, codeMatch.distance("testing1 key::1", "testing2 key::1", conf));
+		// both names with cities (same)
+		assertEquals(1.0, cityMatch.distance("Universita di Bologna", "Biblioteca di Bologna", conf));
 
-		// both names with codes (different)
-		assertEquals(0.0, codeMatch.distance("testing1 key::1", "testing2 key::2", conf));
+		// both names with cities (different)
+		assertEquals(0.0, cityMatch.distance("Universita di Bologna", "Universita di Torino", conf));
+		assertEquals(0.0, cityMatch.distance("Franklin College", "Concordia College", conf));
 
-		// both names with codes (1 same, 1 different)
-		assertEquals(0.5, codeMatch.distance("key::1 key::2 testing1", "key::1 testing", conf));
+		// particular cases
+		assertEquals(1.0, cityMatch.distance("Free University of Bozen-Bolzano", "Università di Bolzano", conf));
+		assertEquals(
+			1.0,
+			cityMatch
+				.distance(
+					"Politechniki Warszawskiej (Warsaw University of Technology)", "Warsaw University of Technology",
+					conf));
+
+		// failing becasuse 'Allen' is a transliterrated greek stopword
+		// assertEquals(-1.0, cityMatch.distance("Allen (United States)", "United States Military Academy", conf));
+		assertEquals(-1.0, cityMatch.distance("Washington (United States)", "United States Military Academy", conf));
+	}
+
+	@Test
+	public void keywordMatchTest() {
+		params.put("threshold", "0.5");
+
+		final KeywordMatch keywordMatch = new KeywordMatch(params);
+
+		assertEquals(
+			0.5, keywordMatch.distance("Biblioteca dell'Universita di Bologna", "Università di Bologna", conf));
+		assertEquals(1.0, keywordMatch.distance("Universita degli studi di Pisa", "Universita di Pisa", conf));
+		assertEquals(1.0, keywordMatch.distance("Polytechnic University of Turin", "POLITECNICO DI TORINO", conf));
+		assertEquals(1.0, keywordMatch.distance("Istanbul Commerce University", "İstanbul Ticarət Universiteti", conf));
+		assertEquals(1.0, keywordMatch.distance("Franklin College", "Concordia College", conf));
+		assertEquals(2.0 / 3.0, keywordMatch.distance("University of Georgia", "Georgia State University", conf));
+		assertEquals(0.5, keywordMatch.distance("University College London", "University of London", conf));
+		assertEquals(0.5, keywordMatch.distance("Washington State University", "University of Washington", conf));
+		assertEquals(-1.0, keywordMatch.distance("Allen (United States)", "United States Military Academy", conf));
 
 	}
 
@@ -127,15 +155,15 @@ public class ComparatorTest extends AbstractPaceTest {
 	}
 
 	@Test
-	public void jaroWinklerLegalnameTest() {
+	public void jaroWinklerNormalizedNameTest() {
 
-		final JaroWinklerLegalname jaroWinklerLegalname = new JaroWinklerLegalname(params);
+		final JaroWinklerNormalizedName jaroWinklerNormalizedName = new JaroWinklerNormalizedName(params);
 
-		double result = jaroWinklerLegalname
-			.distance("AT&T (United States)", "United States key::2 key::1", conf);
+		double result = jaroWinklerNormalizedName
+			.distance("AT&T (United States)", "United States Military Academy", conf);
 		System.out.println("result = " + result);
 
-		result = jaroWinklerLegalname.distance("NOAA - Servicio Meteorol\\u00f3gico Nacional", "NOAA - NWS", conf);
+		result = jaroWinklerNormalizedName.distance("NOAA - Servicio Meteorol\\u00f3gico Nacional", "NOAA - NWS", conf);
 		System.out.println("result = " + result);
 
 	}
@@ -316,13 +344,13 @@ public class ComparatorTest extends AbstractPaceTest {
 		double result = countryMatch.distance("UNKNOWN", "UNKNOWN", conf);
 		assertEquals(-1.0, result);
 
-		result = countryMatch.distance("CL", "UNKNOWN", conf);
+		result = countryMatch.distance("CHILE", "UNKNOWN", conf);
 		assertEquals(-1.0, result);
 
-		result = countryMatch.distance("CL", "IT", conf);
+		result = countryMatch.distance("CHILE", "ITALY", conf);
 		assertEquals(0.0, result);
 
-		result = countryMatch.distance("CL", "CL", conf);
+		result = countryMatch.distance("CHILE", "CHILE", conf);
 		assertEquals(1.0, result);
 
 	}

dhp-pace-core/src/test/java/eu/dnetlib/pace/util/UtilTest.java

@@ -11,7 +11,6 @@ import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import eu.dnetlib.pace.model.Person;
-import jdk.nashorn.internal.ir.annotations.Ignore;
 
 public class UtilTest {
 

dhp-shade-package/pom.xml

@@ -1,169 +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.5-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-
-    </parent>
-
-    <artifactId>dhp-shade-package</artifactId>
-    <packaging>jar</packaging>
-
-    <distributionManagement>
-        <site>
-            <id>DHPSite</id>
-            <url>${dhp.site.stage.path}/dhp-common</url>
-        </site>
-    </distributionManagement>
-
-    <description>This module create a jar of all module dependencies</description>
-
-
-    <dependencies>
-
-        <dependency>
-            <groupId>eu.dnetlib.dhp</groupId>
-            <artifactId>dhp-actionmanager</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-<!--        <dependency>-->
-<!--            <groupId>eu.dnetlib.dhp</groupId>-->
-<!--            <artifactId>dhp-aggregation</artifactId>-->
-<!--            <version>${project.version}</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>eu.dnetlib.dhp</groupId>-->
-<!--            <artifactId>dhp-blacklist</artifactId>-->
-<!--            <version>${project.version}</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>eu.dnetlib.dhp</groupId>-->
-<!--            <artifactId>dhp-broker-events</artifactId>-->
-<!--            <version>${project.version}</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>eu.dnetlib.dhp</groupId>-->
-<!--            <artifactId>dhp-dedup-openaire</artifactId>-->
-<!--            <version>${project.version}</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>eu.dnetlib.dhp</groupId>-->
-<!--            <artifactId>dhp-enrichment</artifactId>-->
-<!--            <version>${project.version}</version>-->
-<!--        </dependency>-->
-        <dependency>
-            <groupId>eu.dnetlib.dhp</groupId>
-            <artifactId>dhp-graph-mapper</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>eu.dnetlib.dhp</groupId>
-            <artifactId>dhp-graph-provision</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>eu.dnetlib.dhp</groupId>
-            <artifactId>dhp-impact-indicators</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>eu.dnetlib.dhp</groupId>
-            <artifactId>dhp-stats-actionsets</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>eu.dnetlib.dhp</groupId>
-            <artifactId>dhp-stats-hist-snaps</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>eu.dnetlib.dhp</groupId>
-            <artifactId>dhp-stats-monitor-irish</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>eu.dnetlib.dhp</groupId>
-            <artifactId>dhp-stats-promote</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>eu.dnetlib.dhp</groupId>
-            <artifactId>dhp-stats-update</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>eu.dnetlib.dhp</groupId>
-            <artifactId>dhp-swh</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>eu.dnetlib.dhp</groupId>
-            <artifactId>dhp-usage-raw-data-update</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>eu.dnetlib.dhp</groupId>
-            <artifactId>dhp-usage-stats-build</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <transformers>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>eu.dnetlib.dhp.oa.dedup.SparkCreateSimRels</mainClass>
-                                </transformer>
-                                <!-- This is needed if you have dependencies that use Service Loader. Most Google Cloud client libraries do. -->
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                                    <resource>META-INF/cxf/bus-extensions.txt</resource>
-                                </transformer>
-                            </transformers>
-                            <filters>
-                                <filter>
-                                    <artifact>*:*</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/maven/**</exclude>
-                                        <exclude>META-INF/*.SF</exclude>
-                                        <exclude>META-INF/*.DSA</exclude>
-                                        <exclude>META-INF/*.RSA</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                            <relocations>
-                                <relocation>
-                                    <pattern>com</pattern>
-                                    <shadedPattern>repackaged.com.google.common</shadedPattern>
-                                    <includes>
-                                        <include>com.google.common.**</include>
-                                    </includes>
-                                </relocation>
-                            </relocations>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

dhp-workflows/dhp-actionmanager/pom.xml

@@ -51,5 +51,48 @@
             <artifactId>hadoop-distcp</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>eu.dnetlib</groupId>
+            <artifactId>dnet-actionmanager-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>eu.dnetlib</groupId>
+            <artifactId>dnet-actionmanager-common</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>eu.dnetlib</groupId>
+                    <artifactId>dnet-openaireplus-mapping-utils</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>saxonica</groupId>
+                    <artifactId>saxon</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>saxonica</groupId>
+                    <artifactId>saxon-dom</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>jgrapht</groupId>
+                    <artifactId>jgrapht</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.sf.ehcache</groupId>
+                    <artifactId>ehcache</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-test</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>apache</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
     </dependencies>
 </project>

dhp-workflows/dhp-actionmanager/src/main/java/eu/dnetlib/dhp/actionmanager/ISClient.java

@@ -4,6 +4,7 @@ package eu.dnetlib.dhp.actionmanager;
 import java.io.Serializable;
 import java.io.StringReader;
 import java.util.List;
+import java.util.NoSuchElementException;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -21,6 +22,7 @@ import com.google.common.base.Splitter;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
 
+import eu.dnetlib.actionmanager.rmi.ActionManagerException;
 import eu.dnetlib.dhp.utils.ISLookupClientFactory;
 import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpException;
 import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpService;
@@ -63,7 +65,7 @@ public class ISClient implements Serializable {
 						.map(t -> buildDirectory(basePath, t))
 						.collect(Collectors.toList()))
 				.orElseThrow(() -> new IllegalStateException("empty set list"));
-		} catch (ISLookUpException e) {
+		} catch (ActionManagerException | ISLookUpException e) {
 			throw new IllegalStateException("unable to query ActionSets info from the IS");
 		}
 	}
@@ -87,18 +89,31 @@ public class ISClient implements Serializable {
 		return Joiner.on("/").join(basePath, t.getMiddle(), t.getRight());
 	}
 
-	private String getBasePathHDFS(ISLookUpService isLookup) throws ISLookUpException {
+	private String getBasePathHDFS(ISLookUpService isLookup) throws ActionManagerException {
 		return queryServiceProperty(isLookup, "basePath");
 	}
 
 	private String queryServiceProperty(ISLookUpService isLookup, final String propertyName)
-		throws ISLookUpException {
+		throws ActionManagerException {
 		final String q = "for $x in /RESOURCE_PROFILE[.//RESOURCE_TYPE/@value='ActionManagerServiceResourceType'] return $x//SERVICE_PROPERTIES/PROPERTY[./@ key='"
 			+ propertyName
 			+ "']/@value/string()";
 		log.debug("quering for service property: {}", q);
-
-		final List<String> value = isLookup.quickSearchProfile(q);
-		return Iterables.getOnlyElement(value);
+		try {
+			final List<String> value = isLookup.quickSearchProfile(q);
+			return Iterables.getOnlyElement(value);
+		} catch (ISLookUpException e) {
+			String msg = "Error accessing service profile, using query: " + q;
+			log.error(msg, e);
+			throw new ActionManagerException(msg, e);
+		} catch (NoSuchElementException e) {
+			String msg = "missing service property: " + propertyName;
+			log.error(msg, e);
+			throw new ActionManagerException(msg, e);
+		} catch (IllegalArgumentException e) {
+			String msg = "found more than one service property: " + propertyName;
+			log.error(msg, e);
+			throw new ActionManagerException(msg, e);
+		}
 	}
 }

dhp-workflows/dhp-actionmanager/src/test/java/eu/dnetlib/dhp/actionmanager/promote/PromoteResultWithMeasuresTest.java

@@ -1,210 +0,0 @@
-/*
- * Copyright (c) 2024.
- * SPDX-FileCopyrightText: © 2023 Consiglio Nazionale delle Ricerche
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-package eu.dnetlib.dhp.actionmanager.promote;
-
-import static eu.dnetlib.dhp.common.FunctionalInterfaceSupport.*;
-import static eu.dnetlib.dhp.schema.common.ModelSupport.isSubClass;
-import static org.apache.spark.sql.functions.*;
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.io.IOException;
-import java.nio.file.DirectoryStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.HashSet;
-import java.util.List;
-import java.util.function.BiFunction;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.spark.SparkConf;
-import org.apache.spark.sql.*;
-import org.apache.spark.sql.Dataset;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.Lists;
-
-import eu.dnetlib.dhp.schema.common.ModelSupport;
-import eu.dnetlib.dhp.schema.oaf.*;
-
-public class PromoteResultWithMeasuresTest {
-
-	private static final Logger log = LoggerFactory.getLogger(PromoteResultWithMeasuresTest.class);
-
-	private static SparkSession spark;
-
-	private static Path tempDir;
-
-	public static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
-
-	@BeforeAll
-	public static void beforeAll() throws IOException {
-		tempDir = Files.createTempDirectory(PromoteResultWithMeasuresTest.class.getSimpleName());
-		log.info("using work dir {}", tempDir);
-
-		SparkConf conf = new SparkConf();
-		conf.setMaster("local[*]");
-		conf.setAppName(PromoteResultWithMeasuresTest.class.getSimpleName());
-		conf.set("spark.driver.host", "localhost");
-
-		conf.set("hive.metastore.local", "true");
-		conf.set("spark.ui.enabled", "false");
-
-		conf.set("spark.sql.warehouse.dir", tempDir.toString());
-		conf.set("hive.metastore.warehouse.dir", tempDir.resolve("warehouse").toString());
-
-		spark = SparkSession.builder().config(conf).getOrCreate();
-	}
-
-	@AfterAll
-	public static void afterAll() throws IOException {
-		spark.stop();
-		FileUtils.deleteDirectory(tempDir.toFile());
-	}
-
-	@Test
-	void testPromoteResultWithMeasures_job() throws Exception {
-
-		final String inputGraphTablePath = getClass()
-			.getResource("/eu/dnetlib/dhp/actionmanager/promote/measures/graph")
-			.getPath();
-
-		final String inputActionPayloadPath = getClass()
-			.getResource("/eu/dnetlib/dhp/actionmanager/promote/measures/actionPayloads")
-			.getPath();
-
-		final String actionPayloadsPath = tempDir.resolve("actionPayloads").toString();
-
-		spark
-			.read()
-			.text(inputActionPayloadPath)
-			.withColumn("payload", col("value"))
-			.select("payload")
-			.write()
-			.parquet(actionPayloadsPath);
-
-		final Path outputGraphTablePath = tempDir.resolve("outputGraphTablePath");
-
-		PromoteActionPayloadForGraphTableJob
-			.main(new String[] {
-				"--isSparkSessionManaged", Boolean.FALSE.toString(),
-				"--graphTableClassName", Publication.class.getCanonicalName(),
-				"--inputGraphTablePath", inputGraphTablePath,
-				"--inputActionPayloadPath", actionPayloadsPath,
-				"--actionPayloadClassName", Result.class.getCanonicalName(),
-				"--outputGraphTablePath", outputGraphTablePath.toString(),
-				"--mergeAndGetStrategy", MergeAndGet.Strategy.MERGE_FROM_AND_GET.toString(),
-				"--promoteActionStrategy", PromoteAction.Strategy.ENRICH.toString(),
-				"--shouldGroupById", "true"
-			});
-
-		assertFalse(isDirEmpty(outputGraphTablePath));
-
-		final Encoder<Publication> pubEncoder = Encoders.bean(Publication.class);
-		List<Publication> results = spark
-			.read()
-			.schema(pubEncoder.schema())
-			.json(outputGraphTablePath.toString())
-			.as(pubEncoder)
-			.collectAsList();
-
-		verify(results);
-	}
-
-	@Test
-	void testPromoteResultWithMeasures_internal() throws JsonProcessingException {
-
-		Dataset<Publication> rowDS = spark
-			.read()
-			.schema(Encoders.bean(Publication.class).schema())
-			.json("src/test/resources/eu/dnetlib/dhp/actionmanager/promote/measures/graph")
-			.as(Encoders.bean(Publication.class));
-
-		Dataset<Result> actionPayloadDS = spark
-			.read()
-			.schema(Encoders.bean(Result.class).schema())
-			.json("src/test/resources/eu/dnetlib/dhp/actionmanager/promote/measures/actionPayloads")
-			.as(Encoders.bean(Result.class));
-
-		final MergeAndGet.Strategy mergeFromAndGet = MergeAndGet.Strategy.MERGE_FROM_AND_GET;
-
-		final SerializableSupplier<Function<Publication, String>> rowIdFn = ModelSupport::idFn;
-		final SerializableSupplier<BiFunction<Publication, Result, Publication>> mergeAndGetFn = MergeAndGet
-			.functionFor(mergeFromAndGet);
-		final SerializableSupplier<Publication> zeroFn = () -> Publication.class
-			.cast(new eu.dnetlib.dhp.schema.oaf.Publication());
-		final SerializableSupplier<Function<Publication, Boolean>> isNotZeroFn = PromoteResultWithMeasuresTest::isNotZeroFnUsingIdOrSourceAndTarget;
-
-		Dataset<Publication> joinedResults = PromoteActionPayloadFunctions
-			.joinGraphTableWithActionPayloadAndMerge(
-				rowDS,
-				actionPayloadDS,
-				rowIdFn,
-				ModelSupport::idFn,
-				mergeAndGetFn,
-				PromoteAction.Strategy.ENRICH,
-				Publication.class,
-				Result.class);
-
-		SerializableSupplier<BiFunction<Publication, Publication, Publication>> mergeRowsAndGetFn = MergeAndGet
-			.functionFor(mergeFromAndGet);
-
-		Dataset<Publication> mergedResults = PromoteActionPayloadFunctions
-			.groupGraphTableByIdAndMerge(
-				joinedResults, rowIdFn, mergeRowsAndGetFn, zeroFn, isNotZeroFn, Publication.class);
-
-		verify(mergedResults.collectAsList());
-	}
-
-	private static void verify(List<Publication> results) throws JsonProcessingException {
-		assertNotNull(results);
-		assertEquals(1, results.size());
-
-		Result r = results.get(0);
-
-		log.info(OBJECT_MAPPER.writeValueAsString(r));
-
-		assertNotNull(r.getMeasures());
-		assertFalse(r.getMeasures().isEmpty());
-		assertTrue(
-			r
-				.getMeasures()
-				.stream()
-				.map(Measure::getId)
-				.collect(Collectors.toCollection(HashSet::new))
-				.containsAll(
-					Lists
-						.newArrayList(
-							"downloads", "views", "influence", "popularity", "influence_alt", "popularity_alt",
-							"impulse")));
-	}
-
-	private static <T extends Oaf> Function<T, Boolean> isNotZeroFnUsingIdOrSourceAndTarget() {
-		return t -> {
-			if (isSubClass(t, Relation.class)) {
-				final Relation rel = (Relation) t;
-				return StringUtils.isNotBlank(rel.getSource()) && StringUtils.isNotBlank(rel.getTarget());
-			}
-			return StringUtils.isNotBlank(((OafEntity) t).getId());
-		};
-	}
-
-	private static boolean isDirEmpty(final Path directory) throws IOException {
-		try (DirectoryStream<Path> dirStream = Files.newDirectoryStream(directory)) {
-			return !dirStream.iterator().hasNext();
-		}
-	}
-
-}

dhp-workflows/dhp-actionmanager/src/test/resources/eu/dnetlib/dhp/actionmanager/promote/measures/actionPayloads/part0000.json

@@ -1,3 +0,0 @@
-{"collectedfrom":null,"dataInfo":null,"lastupdatetimestamp":null,"id":"50|doi_dedup___::02317b7093277ec8aa0311d5c6a25b9b","originalId":null,"pid":null,"dateofcollection":null,"dateoftransformation":null,"extraInfo":null,"oaiprovenance":null,"measures":[{"id":"downloads","unit":[{"key":"opendoar____::358aee4cc897452c00244351e4d91f69||ZENODO","value":"125","dataInfo":{"invisible":false,"inferred":true,"deletedbyinference":false,"trust":"","inferenceprovenance":"update","provenanceaction":{"classid":"measure:usage_counts","classname":"Inferred by OpenAIRE","schemeid":"dnet:provenanceActions","schemename":"dnet:provenanceActions"}}}]},{"id":"views","unit":[{"key":"opendoar____::358aee4cc897452c00244351e4d91f69||ZENODO","value":"35","dataInfo":{"invisible":false,"inferred":true,"deletedbyinference":false,"trust":"","inferenceprovenance":"update","provenanceaction":{"classid":"measure:usage_counts","classname":"Inferred by OpenAIRE","schemeid":"dnet:provenanceActions","schemename":"dnet:provenanceActions"}}}]}],"context":null,"processingchargeamount":null,"processingchargecurrency":null,"author":null,"resulttype":null,"metaResourceType":null,"language":null,"country":null,"subject":null,"title":null,"relevantdate":null,"description":null,"dateofacceptance":null,"publisher":null,"embargoenddate":null,"source":null,"fulltext":null,"format":null,"contributor":null,"resourcetype":null,"coverage":null,"bestaccessright":null,"externalReference":null,"instance":null,"eoscifguidelines":null,"openAccessColor":null,"publiclyFunded":null,"transformativeAgreement":null,"isGreen":null,"isInDiamondJournal":null}
-{"collectedfrom":null,"dataInfo":null,"lastupdatetimestamp":null,"id":"50|doi_dedup___::02317b7093277ec8aa0311d5c6a25b9b","originalId":null,"pid":null,"dateofcollection":null,"dateoftransformation":null,"extraInfo":null,"oaiprovenance":null,"measures":[{"id":"influence","unit":[{"key":"score","value":"3.1167566E-9","dataInfo":{"invisible":false,"inferred":true,"deletedbyinference":false,"trust":"","inferenceprovenance":"update","provenanceaction":{"classid":"measure:bip","classname":"Inferred by OpenAIRE","schemeid":"dnet:provenanceActions","schemename":"dnet:provenanceActions"}}},{"key":"class","value":"C5","dataInfo":{"invisible":false,"inferred":true,"deletedbyinference":false,"trust":"","inferenceprovenance":"update","provenanceaction":{"classid":"measure:bip","classname":"Inferred by OpenAIRE","schemeid":"dnet:provenanceActions","schemename":"dnet:provenanceActions"}}}]},{"id":"popularity","unit":[{"key":"score","value":"7.335433E-9","dataInfo":{"invisible":false,"inferred":true,"deletedbyinference":false,"trust":"","inferenceprovenance":"update","provenanceaction":{"classid":"measure:bip","classname":"Inferred by OpenAIRE","schemeid":"dnet:provenanceActions","schemename":"dnet:provenanceActions"}}},{"key":"class","value":"C4","dataInfo":{"invisible":false,"inferred":true,"deletedbyinference":false,"trust":"","inferenceprovenance":"update","provenanceaction":{"classid":"measure:bip","classname":"Inferred by OpenAIRE","schemeid":"dnet:provenanceActions","schemename":"dnet:provenanceActions"}}}]},{"id":"influence_alt","unit":[{"key":"score","value":"4","dataInfo":{"invisible":false,"inferred":true,"deletedbyinference":false,"trust":"","inferenceprovenance":"update","provenanceaction":{"classid":"measure:bip","classname":"Inferred by OpenAIRE","schemeid":"dnet:provenanceActions","schemename":"dnet:provenanceActions"}}},{"key":"class","value":"C5","dataInfo":{"invisible":false,"inferred":true,"deletedbyinference":false,"trust":"","inferenceprovenance":"update","provenanceaction":{"classid":"measure:bip","classname":"Inferred by OpenAIRE","schemeid":"dnet:provenanceActions","schemename":"dnet:provenanceActions"}}}]},{"id":"popularity_alt","unit":[{"key":"score","value":"2.96","dataInfo":{"invisible":false,"inferred":true,"deletedbyinference":false,"trust":"","inferenceprovenance":"update","provenanceaction":{"classid":"measure:bip","classname":"Inferred by OpenAIRE","schemeid":"dnet:provenanceActions","schemename":"dnet:provenanceActions"}}},{"key":"class","value":"C4","dataInfo":{"invisible":false,"inferred":true,"deletedbyinference":false,"trust":"","inferenceprovenance":"update","provenanceaction":{"classid":"measure:bip","classname":"Inferred by OpenAIRE","schemeid":"dnet:provenanceActions","schemename":"dnet:provenanceActions"}}}]},{"id":"impulse","unit":[{"key":"score","value":"4","dataInfo":{"invisible":false,"inferred":true,"deletedbyinference":false,"trust":"","inferenceprovenance":"update","provenanceaction":{"classid":"measure:bip","classname":"Inferred by OpenAIRE","schemeid":"dnet:provenanceActions","schemename":"dnet:provenanceActions"}}},{"key":"class","value":"C5","dataInfo":{"invisible":false,"inferred":true,"deletedbyinference":false,"trust":"","inferenceprovenance":"update","provenanceaction":{"classid":"measure:bip","classname":"Inferred by OpenAIRE","schemeid":"dnet:provenanceActions","schemename":"dnet:provenanceActions"}}}]}],"context":null,"processingchargeamount":null,"processingchargecurrency":null,"author":null,"resulttype":null,"metaResourceType":null,"language":null,"country":null,"subject":null,"title":null,"relevantdate":null,"description":null,"dateofacceptance":null,"publisher":null,"embargoenddate":null,"source":null,"fulltext":null,"format":null,"contributor":null,"resourcetype":null,"coverage":null,"bestaccessright":null,"externalReference":null,"instance":null,"eoscifguidelines":null,"openAccessColor":null,"publiclyFunded":null,"transformativeAgreement":null,"isGreen":null,"isInDiamondJournal":null}
-{"collectedfrom":null,"dataInfo":null,"lastupdatetimestamp":null,"id":"50|doi_dedup___::02317b7093277ec8aa0311d5c6a25b9b","originalId":null,"pid":null,"dateofcollection":null,"dateoftransformation":null,"extraInfo":null,"oaiprovenance":null,"measures":null,"context":null,"processingchargeamount":null,"processingchargecurrency":null,"author":null,"resulttype":null,"metaResourceType":null,"language":null,"country":null,"subject":null,"title":null,"relevantdate":null,"description":null,"dateofacceptance":null,"publisher":null,"embargoenddate":null,"source":null,"fulltext":null,"format":null,"contributor":null,"resourcetype":null,"coverage":null,"bestaccessright":null,"externalReference":null,"instance":null,"eoscifguidelines":null,"openAccessColor":"hybrid","publiclyFunded":false,"transformativeAgreement":null,"isGreen":true,"isInDiamondJournal":false}

dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/bipaffiliations/PrepareAffiliationRelations.java

@@ -10,6 +10,7 @@ import java.util.List;
 import org.apache.commons.io.IOUtils;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.io.compress.BZip2Codec;
+import org.apache.hadoop.io.compress.GzipCodec;
 import org.apache.hadoop.mapred.SequenceFileOutputFormat;
 import org.apache.spark.SparkConf;
 import org.apache.spark.api.java.JavaPairRDD;
@@ -28,7 +29,6 @@ import eu.dnetlib.dhp.schema.action.AtomicAction;
 import eu.dnetlib.dhp.schema.common.ModelConstants;
 import eu.dnetlib.dhp.schema.oaf.*;
 import eu.dnetlib.dhp.schema.oaf.utils.CleaningFunctions;
-import eu.dnetlib.dhp.schema.oaf.utils.DoiCleaningRule;
 import eu.dnetlib.dhp.schema.oaf.utils.IdentifierFactory;
 import eu.dnetlib.dhp.schema.oaf.utils.OafMapperUtils;
 import scala.Tuple2;
@@ -44,10 +44,6 @@ public class PrepareAffiliationRelations implements Serializable {
 	public static final String BIP_AFFILIATIONS_CLASSID = "result:organization:openaireinference";
 	public static final String BIP_AFFILIATIONS_CLASSNAME = "Affiliation relation inferred by OpenAIRE";
 	public static final String BIP_INFERENCE_PROVENANCE = "openaire:affiliation";
-	public static final String OPENAIRE_DATASOURCE_ID = "10|infrastruct_::f66f1bd369679b5b077dcdf006089556";
-	public static final String OPENAIRE_DATASOURCE_NAME = "OpenAIRE";
-	public static final String DOI_URL_PREFIX = "https://doi.org/";
-	public static final int DOI_URL_PREFIX_LENGTH = 16;
 
 	public static <I extends Result> void main(String[] args) throws Exception {
 
@@ -78,9 +74,6 @@ public class PrepareAffiliationRelations implements Serializable {
 		final String webcrawlInputPath = parser.get("webCrawlInputPath");
 		log.info("webcrawlInputPath: {}", webcrawlInputPath);
 
-		final String publisherInputPath = parser.get("publisherInputPath");
-		log.info("publisherInputPath: {}", publisherInputPath);
-
 		final String outputPath = parser.get("outputPath");
 		log.info("outputPath: {}", outputPath);
 
@@ -91,74 +84,43 @@ public class PrepareAffiliationRelations implements Serializable {
 			isSparkSessionManaged,
 			spark -> {
 				Constants.removeOutputDir(spark, outputPath);
-				createActionSet(
-					spark, crossrefInputPath, pubmedInputPath, openapcInputPath, dataciteInputPath, webcrawlInputPath,
-					publisherInputPath, outputPath);
+
+				List<KeyValue> collectedFromCrossref = OafMapperUtils
+					.listKeyValues(ModelConstants.CROSSREF_ID, "Crossref");
+				JavaPairRDD<Text, Text> crossrefRelations = prepareAffiliationRelations(
+					spark, crossrefInputPath, collectedFromCrossref);
+
+				List<KeyValue> collectedFromPubmed = OafMapperUtils
+					.listKeyValues(ModelConstants.PUBMED_CENTRAL_ID, "Pubmed");
+				JavaPairRDD<Text, Text> pubmedRelations = prepareAffiliationRelations(
+					spark, pubmedInputPath, collectedFromPubmed);
+
+				List<KeyValue> collectedFromOpenAPC = OafMapperUtils
+					.listKeyValues(ModelConstants.OPEN_APC_ID, "OpenAPC");
+				JavaPairRDD<Text, Text> openAPCRelations = prepareAffiliationRelations(
+					spark, openapcInputPath, collectedFromOpenAPC);
+
+				List<KeyValue> collectedFromDatacite = OafMapperUtils
+					.listKeyValues(ModelConstants.DATACITE_ID, "Datacite");
+				JavaPairRDD<Text, Text> dataciteRelations = prepareAffiliationRelations(
+					spark, dataciteInputPath, collectedFromDatacite);
+
+				List<KeyValue> collectedFromWebCrawl = OafMapperUtils
+					.listKeyValues(Constants.WEB_CRAWL_ID, Constants.WEB_CRAWL_NAME);
+				JavaPairRDD<Text, Text> webCrawlRelations = prepareAffiliationRelations(
+					spark, webcrawlInputPath, collectedFromWebCrawl);
+
+				crossrefRelations
+					.union(pubmedRelations)
+					.union(openAPCRelations)
+					.union(dataciteRelations)
+					.union(webCrawlRelations)
+					.saveAsHadoopFile(
+						outputPath, Text.class, Text.class, SequenceFileOutputFormat.class, BZip2Codec.class);
+
 			});
 	}
 
-	private static void createActionSet(SparkSession spark, String crossrefInputPath, String pubmedInputPath,
-		String openapcInputPath, String dataciteInputPath, String webcrawlInputPath, String publisherlInputPath,
-		String outputPath) {
-		List<KeyValue> collectedfromOpenAIRE = OafMapperUtils
-			.listKeyValues(OPENAIRE_DATASOURCE_ID, OPENAIRE_DATASOURCE_NAME);
-
-		JavaPairRDD<Text, Text> crossrefRelations = prepareAffiliationRelationsNewModel(
-			spark, crossrefInputPath, collectedfromOpenAIRE);
-
-		JavaPairRDD<Text, Text> pubmedRelations = prepareAffiliationRelations(
-			spark, pubmedInputPath, collectedfromOpenAIRE);
-
-		JavaPairRDD<Text, Text> openAPCRelations = prepareAffiliationRelationsNewModel(
-			spark, openapcInputPath, collectedfromOpenAIRE);
-
-		JavaPairRDD<Text, Text> dataciteRelations = prepareAffiliationRelations(
-			spark, dataciteInputPath, collectedfromOpenAIRE);
-
-		JavaPairRDD<Text, Text> webCrawlRelations = prepareAffiliationRelations(
-			spark, webcrawlInputPath, collectedfromOpenAIRE);
-
-		JavaPairRDD<Text, Text> publisherRelations = prepareAffiliationRelationFromPublisher(
-			spark, publisherlInputPath, collectedfromOpenAIRE);
-
-		crossrefRelations
-			.union(pubmedRelations)
-			.union(openAPCRelations)
-			.union(dataciteRelations)
-			.union(webCrawlRelations)
-			.union(publisherRelations)
-			.saveAsHadoopFile(
-				outputPath, Text.class, Text.class, SequenceFileOutputFormat.class, BZip2Codec.class);
-	}
-
-	private static JavaPairRDD<Text, Text> prepareAffiliationRelationFromPublisherNewModel(SparkSession spark,
-		String inputPath,
-		List<KeyValue> collectedfrom) {
-
-		Dataset<Row> df = spark
-			.read()
-			.schema(
-				"`DOI` STRING, `Organizations` ARRAY<STRUCT<`PID`:STRING, `Value`:STRING,`Confidence`:DOUBLE, `Status`:STRING>>")
-			.json(inputPath)
-			.where("DOI is not null");
-
-		return getTextTextJavaPairRDD(collectedfrom, df.selectExpr("DOI", "Organizations as Matchings"));
-
-	}
-
-	private static JavaPairRDD<Text, Text> prepareAffiliationRelationFromPublisher(SparkSession spark, String inputPath,
-		List<KeyValue> collectedfrom) {
-
-		Dataset<Row> df = spark
-			.read()
-			.schema("`DOI` STRING, `Organizations` ARRAY<STRUCT<`RORid`:STRING,`Confidence`:DOUBLE>>")
-			.json(inputPath)
-			.where("DOI is not null");
-
-		return getTextTextJavaPairRDD(collectedfrom, df.selectExpr("DOI", "Organizations as Matchings"));
-
-	}
-
 	private static <I extends Result> JavaPairRDD<Text, Text> prepareAffiliationRelations(SparkSession spark,
 		String inputPath,
 		List<KeyValue> collectedfrom) {
@@ -167,27 +129,8 @@ public class PrepareAffiliationRelations implements Serializable {
 		Dataset<Row> df = spark
 			.read()
 			.schema("`DOI` STRING, `Matchings` ARRAY<STRUCT<`RORid`:STRING,`Confidence`:DOUBLE>>")
-			.json(inputPath)
-			.where("DOI is not null");
+			.json(inputPath);
 
-		return getTextTextJavaPairRDD(collectedfrom, df);
-	}
-
-	private static <I extends Result> JavaPairRDD<Text, Text> prepareAffiliationRelationsNewModel(SparkSession spark,
-		String inputPath,
-		List<KeyValue> collectedfrom) {
-		// load and parse affiliation relations from HDFS
-		Dataset<Row> df = spark
-			.read()
-			.schema(
-				"`DOI` STRING, `Matchings` ARRAY<STRUCT<`PID`:STRING, `Value`:STRING,`Confidence`:DOUBLE, `Status`:STRING>>")
-			.json(inputPath)
-			.where("DOI is not null");
-
-		return getTextTextJavaPairRDDNew(collectedfrom, df);
-	}
-
-	private static JavaPairRDD<Text, Text> getTextTextJavaPairRDD(List<KeyValue> collectedfrom, Dataset<Row> df) {
 		// unroll nested arrays
 		df = df
 			.withColumn("matching", functions.explode(new Column("Matchings")))
@@ -203,7 +146,7 @@ public class PrepareAffiliationRelations implements Serializable {
 
 				// DOI to OpenAIRE id
 				final String paperId = ID_PREFIX
-					+ IdentifierFactory.md5(DoiCleaningRule.clean(removePrefix(row.getAs("doi"))));
+					+ IdentifierFactory.md5(CleaningFunctions.normalizePidValue("doi", row.getAs("doi")));
 
 				// ROR id to OpenAIRE id
 				final String affId = GenerateRorActionSetJob.calculateOpenaireId(row.getAs("rorid"));
@@ -235,69 +178,6 @@ public class PrepareAffiliationRelations implements Serializable {
 					new Text(OBJECT_MAPPER.writeValueAsString(aa))));
 	}
 
-	private static JavaPairRDD<Text, Text> getTextTextJavaPairRDDNew(List<KeyValue> collectedfrom, Dataset<Row> df) {
-		// unroll nested arrays
-		df = df
-			.withColumn("matching", functions.explode(new Column("Matchings")))
-			.select(
-				new Column("DOI").as("doi"),
-				new Column("matching.PID").as("pidtype"),
-				new Column("matching.Value").as("pidvalue"),
-				new Column("matching.Confidence").as("confidence"),
-				new Column("matching.Status").as("status"))
-			.where("status = 'active'");
-
-		// prepare action sets for affiliation relations
-		return df
-			.toJavaRDD()
-			.flatMap((FlatMapFunction<Row, Relation>) row -> {
-
-				// DOI to OpenAIRE id
-				final String paperId = ID_PREFIX
-					+ IdentifierFactory.md5(DoiCleaningRule.clean(removePrefix(row.getAs("doi"))));
-
-				// Organization to OpenAIRE identifier
-				String affId = null;
-				if (row.getAs("pidtype").equals("ROR"))
-					// ROR id to OpenIARE id
-					affId = GenerateRorActionSetJob.calculateOpenaireId(row.getAs("pidvalue"));
-				else
-					// getting the OpenOrgs identifier for the organization
-					affId = row.getAs("pidvalue");
-
-				Qualifier qualifier = OafMapperUtils
-					.qualifier(
-						BIP_AFFILIATIONS_CLASSID,
-						BIP_AFFILIATIONS_CLASSNAME,
-						ModelConstants.DNET_PROVENANCE_ACTIONS,
-						ModelConstants.DNET_PROVENANCE_ACTIONS);
-
-				// format data info; setting `confidence` into relation's `trust`
-				DataInfo dataInfo = OafMapperUtils
-					.dataInfo(
-						false,
-						BIP_INFERENCE_PROVENANCE,
-						true,
-						false,
-						qualifier,
-						Double.toString(row.getAs("confidence")));
-
-				// return bi-directional relations
-				return getAffiliationRelationPair(paperId, affId, collectedfrom, dataInfo).iterator();
-
-			})
-			.map(p -> new AtomicAction(Relation.class, p))
-			.mapToPair(
-				aa -> new Tuple2<>(new Text(aa.getClazz().getCanonicalName()),
-					new Text(OBJECT_MAPPER.writeValueAsString(aa))));
-	}
-
-	private static String removePrefix(String doi) {
-		if (doi.startsWith(DOI_URL_PREFIX))
-			return doi.substring(DOI_URL_PREFIX_LENGTH);
-		return doi;
-	}
-
 	private static List<Relation> getAffiliationRelationPair(String paperId, String affId, List<KeyValue> collectedfrom,
 		DataInfo dataInfo) {
 		return Arrays

dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/bipfinder/SparkAtomicActionScoreJob.java

@@ -10,7 +10,6 @@ import java.util.stream.Collectors;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.hadoop.io.Text;
-import org.apache.hadoop.io.compress.BZip2Codec;
 import org.apache.hadoop.io.compress.GzipCodec;
 import org.apache.hadoop.mapred.SequenceFileOutputFormat;
 import org.apache.spark.SparkConf;
@@ -84,7 +83,7 @@ public class SparkAtomicActionScoreJob implements Serializable {
 				resultsRDD
 					.union(projectsRDD)
 					.saveAsHadoopFile(
-						outputPath, Text.class, Text.class, SequenceFileOutputFormat.class, BZip2Codec.class);
+						outputPath, Text.class, Text.class, SequenceFileOutputFormat.class, GzipCodec.class);
 			});
 	}
 

dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/createunresolvedentities/PrepareSDGSparkJob.java

@@ -6,23 +6,26 @@ import static eu.dnetlib.dhp.common.SparkSessionSupport.runWithSparkSession;
 
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Optional;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.spark.SparkConf;
 import org.apache.spark.api.java.function.MapFunction;
 import org.apache.spark.api.java.function.MapGroupsFunction;
-import org.apache.spark.sql.*;
-import org.jetbrains.annotations.NotNull;
+import org.apache.spark.sql.Dataset;
+import org.apache.spark.sql.Encoders;
+import org.apache.spark.sql.SaveMode;
+import org.apache.spark.sql.SparkSession;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import eu.dnetlib.dhp.actionmanager.createunresolvedentities.model.SDGDataModel;
 import eu.dnetlib.dhp.application.ArgumentApplicationParser;
-import eu.dnetlib.dhp.schema.common.ModelSupport;
+import eu.dnetlib.dhp.schema.common.ModelConstants;
 import eu.dnetlib.dhp.schema.oaf.Result;
+import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
 import eu.dnetlib.dhp.schema.oaf.Subject;
+import eu.dnetlib.dhp.schema.oaf.utils.OafMapperUtils;
 import eu.dnetlib.dhp.utils.DHPUtils;
 
 public class PrepareSDGSparkJob implements Serializable {
@@ -49,91 +52,42 @@ public class PrepareSDGSparkJob implements Serializable {
 		final String outputPath = parser.get("outputPath");
 		log.info("outputPath: {}", outputPath);
 
-		final Boolean distributeDOI = Optional
-			.ofNullable(parser.get("distributeDoi"))
-			.map(Boolean::valueOf)
-			.orElse(Boolean.TRUE);
-
-		log.info("distribute doi {}", distributeDOI);
-
 		SparkConf conf = new SparkConf();
 		runWithSparkSession(
 			conf,
 			isSparkSessionManaged,
 			spark -> {
-				if (distributeDOI)
-					doPrepare(
-						spark,
-						sourcePath,
-
-						outputPath);
-				else
-					doPrepareoaid(spark, sourcePath, outputPath);
+				doPrepare(
+					spark,
+					sourcePath,
 
+					outputPath);
 			});
 	}
 
 	private static void doPrepare(SparkSession spark, String sourcePath, String outputPath) {
-		Dataset<Row> sdgDataset = spark
-			.read()
-			.format("csv")
-			.option("sep", DEFAULT_DELIMITER)
-			.option("inferSchema", "true")
-			.option("header", "true")
-			.option("quotes", "\"")
-			.load(sourcePath);
+		Dataset<SDGDataModel> sdgDataset = readPath(spark, sourcePath, SDGDataModel.class);
 
 		sdgDataset
-			.groupByKey((MapFunction<Row, String>) v -> ((String) v.getAs("doi")).toLowerCase(), Encoders.STRING())
-			.mapGroups(
-				(MapGroupsFunction<String, Row, Result>) (k,
-					it) -> getResult(
-						DHPUtils
-							.generateUnresolvedIdentifier(
-								ModelSupport.entityIdPrefix.get(Result.class.getSimpleName().toLowerCase()) + "|" + k,
-								DOI),
-						it),
-				Encoders.bean(Result.class))
+			.groupByKey((MapFunction<SDGDataModel, String>) r -> r.getDoi().toLowerCase(), Encoders.STRING())
+			.mapGroups((MapGroupsFunction<String, SDGDataModel, Result>) (k, it) -> {
+				Result r = new Result();
+				r.setId(DHPUtils.generateUnresolvedIdentifier(k, DOI));
+				SDGDataModel first = it.next();
+				List<Subject> sbjs = new ArrayList<>();
+				sbjs.add(getSubject(first.getSbj(), SDG_CLASS_ID, SDG_CLASS_NAME, UPDATE_SUBJECT_SDG_CLASS_ID));
+				it
+					.forEachRemaining(
+						s -> sbjs
+							.add(getSubject(s.getSbj(), SDG_CLASS_ID, SDG_CLASS_NAME, UPDATE_SUBJECT_SDG_CLASS_ID)));
+				r.setSubject(sbjs);
+
+				return r;
+			}, Encoders.bean(Result.class))
 			.write()
 			.mode(SaveMode.Overwrite)
 			.option("compression", "gzip")
 			.json(outputPath + "/sdg");
 	}
 
-	private static void doPrepareoaid(SparkSession spark, String sourcePath, String outputPath) {
-		Dataset<Row> sdgDataset = spark
-			.read()
-			.format("csv")
-			.option("sep", DEFAULT_DELIMITER)
-			.option("inferSchema", "true")
-			.option("header", "true")
-			.option("quotes", "\"")
-			.load(sourcePath);
-		;
-
-		sdgDataset
-			.groupByKey((MapFunction<Row, String>) r -> "50|" + ((String) r.getAs("oaid")), Encoders.STRING())
-			.mapGroups(
-				(MapGroupsFunction<String, Row, Result>) PrepareSDGSparkJob::getResult, Encoders.bean(Result.class))
-			.write()
-			.mode(SaveMode.Overwrite)
-			.option("compression", "gzip")
-			.json(outputPath + "/sdg");
-	}
-
-	private static @NotNull Result getResult(String id, Iterator<Row> it) {
-		Result r = new Result();
-		r.setId(id);
-		Row first = it.next();
-		List<Subject> sbjs = new ArrayList<>();
-		sbjs.add(getSubject(first.getAs("sdg"), SDG_CLASS_ID, SDG_CLASS_NAME, UPDATE_SUBJECT_SDG_CLASS_ID));
-		it
-			.forEachRemaining(
-				s -> sbjs
-					.add(getSubject(s.getAs("sdg"), SDG_CLASS_ID, SDG_CLASS_NAME, UPDATE_SUBJECT_SDG_CLASS_ID)));
-		r.setSubject(sbjs);
-
-		return r;
-	}
-
 }

dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/fosnodoi/CreateActionSetSparkJob.java

@@ -13,6 +13,9 @@ import org.apache.hadoop.io.Text;
 import org.apache.hadoop.io.compress.GzipCodec;
 import org.apache.hadoop.mapred.SequenceFileOutputFormat;
 import org.apache.spark.SparkConf;
+import org.apache.spark.api.java.JavaPairRDD;
+import org.apache.spark.api.java.function.FilterFunction;
+import org.apache.spark.api.java.function.FlatMapFunction;
 import org.apache.spark.api.java.function.MapFunction;
 import org.apache.spark.sql.Encoders;
 import org.apache.spark.sql.SparkSession;
@@ -21,9 +24,13 @@ import org.slf4j.LoggerFactory;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import eu.dnetlib.dhp.actionmanager.opencitations.model.COCI;
 import eu.dnetlib.dhp.application.ArgumentApplicationParser;
 import eu.dnetlib.dhp.schema.action.AtomicAction;
+import eu.dnetlib.dhp.schema.common.ModelConstants;
+import eu.dnetlib.dhp.schema.oaf.Relation;
 import eu.dnetlib.dhp.schema.oaf.Result;
+import eu.dnetlib.dhp.schema.oaf.utils.*;
 import scala.Tuple2;
 
 public class CreateActionSetSparkJob implements Serializable {

dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/opencitations/ReadCOCI.java

@@ -49,9 +49,6 @@ public class ReadCOCI implements Serializable {
 		final String workingPath = parser.get("inputPath");
 		log.info("workingPath {}", workingPath);
 
-		final String backupPath = parser.get("backupPath");
-		log.info("backupPath {}", backupPath);
-
 		SparkConf sconf = new SparkConf();
 
 		Configuration conf = new Configuration();
@@ -71,14 +68,12 @@ public class ReadCOCI implements Serializable {
 					workingPath,
 					fileSystem,
 					outputPath,
-					backupPath,
 					delimiter);
 			});
 	}
 
 	private static void doRead(SparkSession spark, String workingPath, FileSystem fileSystem,
 		String outputPath,
-		String backupPath,
 		String delimiter) throws IOException {
 		RemoteIterator<LocatedFileStatus> fileStatusListIterator = fileSystem
 			.listFiles(
@@ -112,8 +107,7 @@ public class ReadCOCI implements Serializable {
 				.mode(SaveMode.Append)
 				.option("compression", "gzip")
 				.json(outputPath);
-
-			fileSystem.rename(fileStatus.getPath(), new Path(backupPath));
+			fileSystem.rename(fileStatus.getPath(), new Path("/tmp/miriam/OC/DONE"));
 		}
 
 	}

dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/personentity/CoAuthorshipIterator.java

@@ -1,80 +0,0 @@
-
-package eu.dnetlib.dhp.actionmanager.personentity;
-
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import eu.dnetlib.dhp.schema.common.ModelConstants;
-import eu.dnetlib.dhp.schema.common.ModelSupport;
-import eu.dnetlib.dhp.schema.oaf.Person;
-import eu.dnetlib.dhp.schema.oaf.Relation;
-import eu.dnetlib.dhp.schema.oaf.utils.IdentifierFactory;
-import eu.dnetlib.dhp.schema.oaf.utils.OafMapperUtils;
-import eu.dnetlib.dhp.utils.DHPUtils;
-
-public class CoAuthorshipIterator implements Iterator<Relation> {
-	private int firstIndex;
-	private int secondIndex;
-	private boolean firstRelation;
-	private List<String> authors;
-	private static final String PERSON_PREFIX = ModelSupport.getIdPrefix(Person.class) + "|orcid_______::";
-	private static final String OPENAIRE_PREFIX = "openaire____";
-	private static final String SEPARATOR = "::";
-	private static final String ORCID_KEY = "10|" + OPENAIRE_PREFIX + SEPARATOR
-		+ DHPUtils.md5(ModelConstants.ORCID.toLowerCase());
-	public static final String ORCID_AUTHORS_CLASSID = "sysimport:crosswalk:orcid";
-	public static final String ORCID_AUTHORS_CLASSNAME = "Imported from ORCID";
-
-	@Override
-	public boolean hasNext() {
-		return firstIndex < authors.size() - 1;
-	}
-
-	@Override
-	public Relation next() {
-		Relation rel = null;
-		if (firstRelation) {
-			rel = getRelation(authors.get(firstIndex), authors.get(secondIndex));
-			firstRelation = Boolean.FALSE;
-		} else {
-			rel = getRelation(authors.get(secondIndex), authors.get(firstIndex));
-			firstRelation = Boolean.TRUE;
-			secondIndex += 1;
-			if (secondIndex >= authors.size()) {
-				firstIndex += 1;
-				secondIndex = firstIndex + 1;
-			}
-		}
-
-		return rel;
-	}
-
-	public CoAuthorshipIterator(List<String> authors) {
-		this.authors = authors;
-		this.firstIndex = 0;
-		this.secondIndex = 1;
-		this.firstRelation = Boolean.TRUE;
-
-	}
-
-	private Relation getRelation(String orcid1, String orcid2) {
-		String source = PERSON_PREFIX + IdentifierFactory.md5(orcid1);
-		String target = PERSON_PREFIX + IdentifierFactory.md5(orcid2);
-		return OafMapperUtils
-			.getRelation(
-				source, target, ModelConstants.PERSON_PERSON_RELTYPE,
-				ModelConstants.PERSON_PERSON_SUBRELTYPE,
-				ModelConstants.PERSON_PERSON_HASCOAUTHORED,
-				Arrays.asList(OafMapperUtils.keyValue(ORCID_KEY, ModelConstants.ORCID_DS)),
-				OafMapperUtils
-					.dataInfo(
-						false, null, false, false,
-						OafMapperUtils
-							.qualifier(
-								ORCID_AUTHORS_CLASSID, ORCID_AUTHORS_CLASSNAME,
-								ModelConstants.DNET_PROVENANCE_ACTIONS, ModelConstants.DNET_PROVENANCE_ACTIONS),
-						"0.91"),
-				null);
-	}
-}

dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/personentity/Coauthors.java

@@ -1,20 +0,0 @@
-
-package eu.dnetlib.dhp.actionmanager.personentity;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import eu.dnetlib.dhp.schema.oaf.Relation;
-
-public class Coauthors implements Serializable {
-	private List<String> coauthors;
-
-	public List<String> getCoauthors() {
-		return coauthors;
-	}
-
-	public void setCoauthors(List<String> coauthors) {
-		this.coauthors = coauthors;
-	}
-}

dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/personentity/Couples.java

@@ -1,40 +0,0 @@
-
-package eu.dnetlib.dhp.actionmanager.personentity;
-
-import java.io.Serializable;
-
-import eu.dnetlib.dhp.schema.oaf.Person;
-import eu.dnetlib.dhp.schema.oaf.Relation;
-import scala.Tuple2;
-
-public class Couples implements Serializable {
-	Person p;
-	Relation r;
-
-	public Couples() {
-
-	}
-
-	public Person getP() {
-		return p;
-	}
-
-	public void setP(Person p) {
-		this.p = p;
-	}
-
-	public Relation getR() {
-		return r;
-	}
-
-	public void setR(Relation r) {
-		this.r = r;
-	}
-
-	public static <Tuples> Couples newInstance(Tuple2<Person, Relation> couple) {
-		Couples c = new Couples();
-		c.p = couple._1();
-		c.r = couple._2();
-		return c;
-	}
-}

dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/personentity/ExtractPerson.java

@@ -1,437 +0,0 @@
-
-package eu.dnetlib.dhp.actionmanager.personentity;
-
-import static eu.dnetlib.dhp.common.SparkSessionSupport.runWithSparkSession;
-import static org.apache.spark.sql.functions.*;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import org.apache.commons.cli.ParseException;
-import org.apache.commons.io.IOUtils;
-import org.apache.hadoop.io.Text;
-import org.apache.hadoop.io.compress.BZip2Codec;
-import org.apache.hadoop.mapred.SequenceFileOutputFormat;
-import org.apache.spark.SparkConf;
-import org.apache.spark.api.java.function.*;
-import org.apache.spark.sql.*;
-import org.jetbrains.annotations.NotNull;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.spark_project.jetty.util.StringUtil;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import eu.dnetlib.dhp.application.ArgumentApplicationParser;
-import eu.dnetlib.dhp.collection.orcid.model.Author;
-import eu.dnetlib.dhp.collection.orcid.model.Employment;
-import eu.dnetlib.dhp.collection.orcid.model.Work;
-import eu.dnetlib.dhp.common.HdfsSupport;
-import eu.dnetlib.dhp.schema.action.AtomicAction;
-import eu.dnetlib.dhp.schema.common.ModelConstants;
-import eu.dnetlib.dhp.schema.common.ModelSupport;
-import eu.dnetlib.dhp.schema.oaf.KeyValue;
-import eu.dnetlib.dhp.schema.oaf.Person;
-import eu.dnetlib.dhp.schema.oaf.Relation;
-import eu.dnetlib.dhp.schema.oaf.utils.IdentifierFactory;
-import eu.dnetlib.dhp.schema.oaf.utils.OafMapperUtils;
-import eu.dnetlib.dhp.schema.oaf.utils.PidCleaner;
-import eu.dnetlib.dhp.schema.oaf.utils.PidType;
-import eu.dnetlib.dhp.utils.DHPUtils;
-import scala.Tuple2;
-
-public class ExtractPerson implements Serializable {
-	private static final Logger log = LoggerFactory.getLogger(ExtractPerson.class);
-
-	private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
-	private static final String OPENAIRE_PREFIX = "openaire____";
-	private static final String SEPARATOR = "::";
-	private static final String orcidKey = "10|" + OPENAIRE_PREFIX + SEPARATOR
-		+ DHPUtils.md5(ModelConstants.ORCID.toLowerCase());
-
-	private static final String DOI_PREFIX = "50|doi_________::";
-
-	private static final String PMID_PREFIX = "50|pmid________::";
-	private static final String ARXIV_PREFIX = "50|arXiv_______::";
-
-	private static final String PMCID_PREFIX = "50|pmcid_______::";
-	private static final String ROR_PREFIX = "20|ror_________::";
-	private static final String PERSON_PREFIX = ModelSupport.getIdPrefix(Person.class) + "|orcid_______";
-	public static final String ORCID_AUTHORS_CLASSID = "sysimport:crosswalk:orcid";
-	public static final String ORCID_AUTHORS_CLASSNAME = "Imported from ORCID";
-
-	public static void main(final String[] args) throws IOException, ParseException {
-
-		final ArgumentApplicationParser parser = new ArgumentApplicationParser(
-			IOUtils
-				.toString(
-					Objects
-						.requireNonNull(
-							ExtractPerson.class
-								.getResourceAsStream(
-									"/eu/dnetlib/dhp/actionmanager/personentity/as_parameters.json"))));
-
-		parser.parseArgument(args);
-
-		Boolean isSparkSessionManaged = Optional
-			.ofNullable(parser.get("isSparkSessionManaged"))
-			.map(Boolean::valueOf)
-			.orElse(Boolean.TRUE);
-
-		log.info("isSparkSessionManaged: {}", isSparkSessionManaged);
-
-		final String inputPath = parser.get("inputPath");
-		log.info("inputPath {}", inputPath);
-
-		final String outputPath = parser.get("outputPath");
-		log.info("outputPath {}", outputPath);
-
-		final String workingDir = parser.get("workingDir");
-		log.info("workingDir {}", workingDir);
-
-		SparkConf conf = new SparkConf();
-		runWithSparkSession(
-			conf,
-			isSparkSessionManaged,
-			spark -> {
-				HdfsSupport.remove(outputPath, spark.sparkContext().hadoopConfiguration());
-				createActionSet(spark, inputPath, outputPath, workingDir);
-			});
-
-	}
-
-	private static void createActionSet(SparkSession spark, String inputPath, String outputPath, String workingDir) {
-
-		Dataset<Author> authors = spark
-			.read()
-			.parquet(inputPath + "Authors")
-			.as(Encoders.bean(Author.class));
-
-		Dataset<Work> works = spark
-			.read()
-			.parquet(inputPath + "Works")
-			.as(Encoders.bean(Work.class))
-			.filter(
-				(FilterFunction<Work>) w -> Optional.ofNullable(w.getPids()).isPresent() &&
-					w
-						.getPids()
-						.stream()
-						.anyMatch(
-							p -> p.getSchema().equalsIgnoreCase("doi") ||
-								p.getSchema().equalsIgnoreCase("pmc") ||
-								p.getSchema().equalsIgnoreCase("pmid") ||
-								p.getSchema().equalsIgnoreCase("arxiv")));
-
-		Dataset<Employment> employmentDataset = spark
-			.read()
-			.parquet(inputPath + "Employments")
-			.as(Encoders.bean(Employment.class));
-
-		Dataset<Author> peopleToMap = authors
-			.joinWith(works, authors.col("orcid").equalTo(works.col("orcid")))
-			.map((MapFunction<Tuple2<Author, Work>, Author>) t2 -> t2._1(), Encoders.bean(Author.class))
-			.groupByKey((MapFunction<Author, String>) a -> a.getOrcid(), Encoders.STRING())
-			.mapGroups((MapGroupsFunction<String, Author, Author>) (k, it) -> it.next(), Encoders.bean(Author.class));
-
-		Dataset<Employment> employment = employmentDataset
-			.joinWith(peopleToMap, employmentDataset.col("orcid").equalTo(peopleToMap.col("orcid")))
-			.map((MapFunction<Tuple2<Employment, Author>, Employment>) t2 -> t2._1(), Encoders.bean(Employment.class));
-
-		Dataset<Person> people;
-		peopleToMap.map((MapFunction<Author, Person>) op -> {
-			Person person = new Person();
-			person.setId(DHPUtils.generateIdentifier(op.getOrcid(), PERSON_PREFIX));
-			person
-				.setBiography(
-					Optional
-						.ofNullable(op.getBiography())
-
-						.orElse(""));
-			KeyValue kv = OafMapperUtils.keyValue(orcidKey, ModelConstants.ORCID_DS);
-			kv.setDataInfo(null);
-			person.setCollectedfrom(Arrays.asList(kv));
-			person
-				.setAlternativeNames(
-					Optional
-						.ofNullable(op.getOtherNames())
-
-						.orElse(new ArrayList<>()));
-			person
-				.setFamilyName(
-					Optional
-						.ofNullable(op.getFamilyName())
-
-						.orElse(""));
-			person
-				.setGivenName(
-					Optional
-						.ofNullable(op.getGivenName())
-
-						.orElse(""));
-			person
-				.setPid(
-					Optional
-						.ofNullable(op.getOtherPids())
-						.map(
-							v -> v
-								.stream()
-								.map(
-									p -> OafMapperUtils
-										.structuredProperty(
-											p.getValue(), p.getSchema(), p.getSchema(), ModelConstants.DNET_PID_TYPES,
-											ModelConstants.DNET_PID_TYPES, null))
-								.collect(Collectors.toList()))
-						.orElse(new ArrayList<>()));
-			person
-				.getPid()
-				.add(
-					OafMapperUtils
-						.structuredProperty(
-							op.getOrcid(), ModelConstants.ORCID, ModelConstants.ORCID_CLASSNAME,
-							ModelConstants.DNET_PID_TYPES, ModelConstants.DNET_PID_TYPES, null));
-			person.setDateofcollection(op.getLastModifiedDate());
-			person.setOriginalId(Arrays.asList(op.getOrcid()));
-			return person;
-		}, Encoders.bean(Person.class))
-			.write()
-			.option("compression", "gzip")
-			.mode(SaveMode.Overwrite)
-			.json(workingDir + "/people");
-
-		works
-			.flatMap(
-				(FlatMapFunction<Work, Relation>) ExtractPerson::getAuthorshipRelationIterator,
-				Encoders.bean(Relation.class))
-			.write()
-			.option("compression", "gzip")
-			.mode(SaveMode.Overwrite)
-			.json(workingDir + "/authorship");
-
-		Dataset<Relation> coauthorship = works
-			.flatMap((FlatMapFunction<Work, Tuple2<String, String>>) w -> {
-				List<Tuple2<String, String>> lista = new ArrayList<>();
-				w.getPids().stream().forEach(p -> {
-					if (p.getSchema().equalsIgnoreCase("doi") || p.getSchema().equalsIgnoreCase("pmc")
-						|| p.getSchema().equalsIgnoreCase("pmid") || p.getSchema().equalsIgnoreCase("arxiv"))
-						lista.add(new Tuple2<>(p.getValue(), w.getOrcid()));
-				});
-				return lista.iterator();
-			}, Encoders.tuple(Encoders.STRING(), Encoders.STRING()))
-			.groupByKey((MapFunction<Tuple2<String, String>, String>) Tuple2::_1, Encoders.STRING())
-			.mapGroups(
-				(MapGroupsFunction<String, Tuple2<String, String>, Coauthors>) (k, it) -> extractCoAuthors(it),
-				Encoders.bean(Coauthors.class))
-			.flatMap(
-				(FlatMapFunction<Coauthors, Relation>) c -> new CoAuthorshipIterator(c.getCoauthors()),
-				Encoders.bean(Relation.class))
-			.groupByKey((MapFunction<Relation, String>) r -> r.getSource() + r.getTarget(), Encoders.STRING())
-			.mapGroups(
-				(MapGroupsFunction<String, Relation, Relation>) (k, it) -> it.next(), Encoders.bean(Relation.class));
-
-		coauthorship
-			.write()
-			.option("compression", "gzip")
-			.mode(SaveMode.Overwrite)
-			.json(workingDir + "/coauthorship");
-
-		employment
-			.filter((FilterFunction<Employment>) e -> Optional.ofNullable(e.getAffiliationId()).isPresent())
-			.filter((FilterFunction<Employment>) e -> e.getAffiliationId().getSchema().equalsIgnoreCase("ror"))
-			.map(
-				(MapFunction<Employment, Relation>) ExtractPerson::getAffiliationRelation,
-				Encoders.bean(Relation.class))
-			.write()
-			.option("compression", "gzip")
-			.mode(SaveMode.Overwrite)
-			.json(workingDir + "/affiliation");
-
-		people = spark
-			.read()
-			.textFile(workingDir + "/people")
-			.map(
-				(MapFunction<String, Person>) value -> OBJECT_MAPPER
-					.readValue(value, Person.class),
-				Encoders.bean(Person.class));
-
-		people.show(false);
-		people
-			.toJavaRDD()
-			.map(p -> new AtomicAction(p.getClass(), p))
-			.union(
-				getRelations(spark, workingDir + "/authorship").toJavaRDD().map(r -> new AtomicAction(r.getClass(), r)))
-			.union(
-				getRelations(spark, workingDir + "/coauthorship")
-					.toJavaRDD()
-					.map(r -> new AtomicAction(r.getClass(), r)))
-			.union(
-				getRelations(spark, workingDir + "/affiliation")
-					.toJavaRDD()
-					.map(r -> new AtomicAction(r.getClass(), r)))
-			.mapToPair(
-				aa -> new Tuple2<>(new Text(aa.getClazz().getCanonicalName()),
-					new Text(OBJECT_MAPPER.writeValueAsString(aa))))
-			.saveAsHadoopFile(
-				outputPath, Text.class, Text.class, SequenceFileOutputFormat.class, BZip2Codec.class);
-	}
-
-	private static Dataset<Relation> getRelations(SparkSession spark, String path) {
-		return spark
-			.read()
-			.textFile(path)
-			.map(
-				(MapFunction<String, Relation>) value -> OBJECT_MAPPER
-					.readValue(value, Relation.class),
-				Encoders.bean(Relation.class));// spark.read().json(path).as(Encoders.bean(Relation.class));
-	}
-
-	private static Coauthors extractCoAuthors(Iterator<Tuple2<String, String>> it) {
-		Coauthors coauth = new Coauthors();
-		List<String> coauthors = new ArrayList<>();
-		while (it.hasNext())
-			coauthors.add(it.next()._2());
-		coauth.setCoauthors(coauthors);
-
-		return coauth;
-	}
-
-	private static Relation getAffiliationRelation(Employment row) {
-		String source = PERSON_PREFIX + IdentifierFactory.md5(row.getOrcid());
-		String target = ROR_PREFIX
-			+ IdentifierFactory.md5(PidCleaner.normalizePidValue("ROR", row.getAffiliationId().getValue()));
-		List<KeyValue> properties = new ArrayList<>();
-
-		Relation relation = OafMapperUtils
-			.getRelation(
-				source, target, ModelConstants.ORG_PERSON_RELTYPE, ModelConstants.ORG_PERSON_SUBRELTYPE,
-				ModelConstants.ORG_PERSON_PARTICIPATES,
-				Arrays.asList(OafMapperUtils.keyValue(orcidKey, ModelConstants.ORCID_DS)),
-				OafMapperUtils
-					.dataInfo(
-						false, null, false, false,
-						OafMapperUtils
-							.qualifier(
-								ORCID_AUTHORS_CLASSID, ORCID_AUTHORS_CLASSNAME, ModelConstants.DNET_PROVENANCE_ACTIONS,
-								ModelConstants.DNET_PROVENANCE_ACTIONS),
-						"0.91"),
-				null);
-
-		if (Optional.ofNullable(row.getStartDate()).isPresent() && StringUtil.isNotBlank(row.getStartDate())) {
-			KeyValue kv = new KeyValue();
-			kv.setKey("startDate");
-			kv.setValue(row.getStartDate());
-			properties.add(kv);
-		}
-		if (Optional.ofNullable(row.getEndDate()).isPresent() && StringUtil.isNotBlank(row.getEndDate())) {
-			KeyValue kv = new KeyValue();
-			kv.setKey("endDate");
-			kv.setValue(row.getEndDate());
-			properties.add(kv);
-		}
-
-		if (properties.size() > 0)
-			relation.setProperties(properties);
-		return relation;
-
-	}
-
-	private static Collection<? extends Relation> getCoAuthorshipRelations(String orcid1, String orcid2) {
-		String source = PERSON_PREFIX + "::" + IdentifierFactory.md5(orcid1);
-		String target = PERSON_PREFIX + "::" + IdentifierFactory.md5(orcid2);
-
-		return Arrays
-			.asList(
-				OafMapperUtils
-					.getRelation(
-						source, target, ModelConstants.PERSON_PERSON_RELTYPE,
-						ModelConstants.PERSON_PERSON_SUBRELTYPE,
-						ModelConstants.PERSON_PERSON_HASCOAUTHORED,
-						Arrays.asList(OafMapperUtils.keyValue(orcidKey, ModelConstants.ORCID_DS)),
-						OafMapperUtils
-							.dataInfo(
-								false, null, false, false,
-								OafMapperUtils
-									.qualifier(
-										ORCID_AUTHORS_CLASSID, ORCID_AUTHORS_CLASSNAME,
-										ModelConstants.DNET_PROVENANCE_ACTIONS, ModelConstants.DNET_PROVENANCE_ACTIONS),
-								"0.91"),
-						null),
-				OafMapperUtils
-					.getRelation(
-						target, source, ModelConstants.PERSON_PERSON_RELTYPE,
-						ModelConstants.PERSON_PERSON_SUBRELTYPE,
-						ModelConstants.PERSON_PERSON_HASCOAUTHORED,
-						Arrays.asList(OafMapperUtils.keyValue(orcidKey, ModelConstants.ORCID_DS)),
-						OafMapperUtils
-							.dataInfo(
-								false, null, false, false,
-								OafMapperUtils
-									.qualifier(
-										ORCID_AUTHORS_CLASSID, ORCID_AUTHORS_CLASSNAME,
-										ModelConstants.DNET_PROVENANCE_ACTIONS, ModelConstants.DNET_PROVENANCE_ACTIONS),
-								"0.91"),
-						null));
-
-	}
-
-	private static @NotNull Iterator<Relation> getAuthorshipRelationIterator(Work w) {
-
-		if (Optional.ofNullable(w.getPids()).isPresent())
-			return w
-				.getPids()
-				.stream()
-				.map(pid -> getRelation(w.getOrcid(), pid))
-				.filter(Objects::nonNull)
-				.collect(Collectors.toList())
-				.iterator();
-		List<Relation> ret = new ArrayList<>();
-		return ret.iterator();
-	}
-
-	private static Relation getRelation(String orcid, eu.dnetlib.dhp.collection.orcid.model.Pid pid) {
-		String target;
-		String source = PERSON_PREFIX + "::" + IdentifierFactory.md5(orcid);
-		switch (pid.getSchema()) {
-			case "doi":
-				target = DOI_PREFIX
-					+ IdentifierFactory
-						.md5(PidCleaner.normalizePidValue(PidType.doi.toString(), pid.getValue()));
-				break;
-			case "pmid":
-				target = PMID_PREFIX
-					+ IdentifierFactory
-						.md5(PidCleaner.normalizePidValue(PidType.pmid.toString(), pid.getValue()));
-				break;
-			case "arxiv":
-				target = ARXIV_PREFIX
-					+ IdentifierFactory
-						.md5(PidCleaner.normalizePidValue(PidType.arXiv.toString(), pid.getValue()));
-				break;
-			case "pmcid":
-				target = PMCID_PREFIX
-					+ IdentifierFactory
-						.md5(PidCleaner.normalizePidValue(PidType.pmc.toString(), pid.getValue()));
-				break;
-
-			default:
-				return null;
-		}
-
-		return OafMapperUtils
-			.getRelation(
-				source, target, ModelConstants.RESULT_PERSON_RELTYPE,
-				ModelConstants.RESULT_PERSON_SUBRELTYPE,
-				ModelConstants.RESULT_PERSON_HASAUTHORED,
-				Arrays.asList(OafMapperUtils.keyValue(orcidKey, ModelConstants.ORCID_DS)),
-				OafMapperUtils
-					.dataInfo(
-						false, null, false, false,
-						OafMapperUtils
-							.qualifier(
-								ORCID_AUTHORS_CLASSID, ORCID_AUTHORS_CLASSNAME, ModelConstants.DNET_PROVENANCE_ACTIONS,
-								ModelConstants.DNET_PROVENANCE_ACTIONS),
-						"0.91"),
-				null);
-	}
-}

dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/personentity/WorkList.java

@@ -1,25 +0,0 @@
-
-package eu.dnetlib.dhp.actionmanager.personentity;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-
-import org.apache.hadoop.yarn.webapp.hamlet.Hamlet;
-
-import eu.dnetlib.dhp.collection.orcid.model.Work;
-
-public class WorkList implements Serializable {
-	private ArrayList<Work> workArrayList;
-
-	public ArrayList<Work> getWorkArrayList() {
-		return workArrayList;
-	}
-
-	public void setWorkArrayList(ArrayList<Work> workArrayList) {
-		this.workArrayList = workArrayList;
-	}
-
-	public WorkList() {
-		workArrayList = new ArrayList<>();
-	}
-}

dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/sdgnodoi/CreateActionSetSparkJob.java

@@ -1,91 +0,0 @@
-
-package eu.dnetlib.dhp.actionmanager.sdgnodoi;
-
-import static eu.dnetlib.dhp.common.SparkSessionSupport.runWithSparkSession;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.Objects;
-import java.util.Optional;
-
-import org.apache.commons.cli.ParseException;
-import org.apache.commons.io.IOUtils;
-import org.apache.hadoop.fs.Hdfs;
-import org.apache.hadoop.io.Text;
-import org.apache.hadoop.io.compress.GzipCodec;
-import org.apache.hadoop.mapred.SequenceFileOutputFormat;
-import org.apache.spark.SparkConf;
-import org.apache.spark.api.java.function.MapFunction;
-import org.apache.spark.sql.Encoders;
-import org.apache.spark.sql.SparkSession;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import eu.dnetlib.dhp.application.ArgumentApplicationParser;
-import eu.dnetlib.dhp.common.HdfsSupport;
-import eu.dnetlib.dhp.schema.action.AtomicAction;
-import eu.dnetlib.dhp.schema.oaf.Result;
-import scala.Tuple2;
-
-public class CreateActionSetSparkJob implements Serializable {
-
-	private static final Logger log = LoggerFactory.getLogger(CreateActionSetSparkJob.class);
-
-	private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
-
-	public static void main(final String[] args) throws IOException, ParseException {
-
-		final ArgumentApplicationParser parser = new ArgumentApplicationParser(
-			IOUtils
-				.toString(
-					Objects
-						.requireNonNull(
-							CreateActionSetSparkJob.class
-								.getResourceAsStream(
-									"/eu/dnetlib/dhp/actionmanager/fosnodoi/as_parameters.json"))));
-
-		parser.parseArgument(args);
-
-		Boolean isSparkSessionManaged = Optional
-			.ofNullable(parser.get("isSparkSessionManaged"))
-			.map(Boolean::valueOf)
-			.orElse(Boolean.TRUE);
-
-		log.info("isSparkSessionManaged: {}", isSparkSessionManaged);
-
-		final String inputPath = parser.get("sourcePath");
-		log.info("inputPath {}", inputPath);
-
-		final String outputPath = parser.get("outputPath");
-		log.info("outputPath {}", outputPath);
-
-		SparkConf conf = new SparkConf();
-		runWithSparkSession(
-			conf,
-			isSparkSessionManaged,
-			spark -> {
-				HdfsSupport.remove(outputPath, spark.sparkContext().hadoopConfiguration());
-				createActionSet(spark, inputPath, outputPath);
-			});
-
-	}
-
-	private static void createActionSet(SparkSession spark, String inputPath, String outputPath) {
-		spark
-			.read()
-			.textFile(inputPath)
-			.map(
-				(MapFunction<String, Result>) value -> OBJECT_MAPPER.readValue(value, Result.class),
-				Encoders.bean(Result.class))
-			.toJavaRDD()
-			.map(p -> new AtomicAction(p.getClass(), p))
-			.mapToPair(
-				aa -> new Tuple2<>(new Text(aa.getClazz().getCanonicalName()),
-					new Text(OBJECT_MAPPER.writeValueAsString(aa))))
-			.saveAsHadoopFile(
-				outputPath, Text.class, Text.class, SequenceFileOutputFormat.class, GzipCodec.class);
-	}
-
-}

dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/webcrawl/CreateActionSetFromWebEntries.java

@@ -5,10 +5,11 @@ import static eu.dnetlib.dhp.common.SparkSessionSupport.runWithSparkSession;
 
 import java.io.Serializable;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.hadoop.io.Text;
-import org.apache.hadoop.io.compress.BZip2Codec;
+import org.apache.hadoop.io.compress.GzipCodec;
 import org.apache.hadoop.mapred.SequenceFileOutputFormat;
 import org.apache.spark.SparkConf;
 import org.apache.spark.api.java.function.FilterFunction;
@@ -29,6 +30,7 @@ import eu.dnetlib.dhp.schema.oaf.utils.IdentifierFactory;
 import eu.dnetlib.dhp.schema.oaf.utils.OafMapperUtils;
 import eu.dnetlib.dhp.schema.oaf.utils.PidCleaner;
 import eu.dnetlib.dhp.schema.oaf.utils.PidType;
+import io.netty.util.Constant;
 import scala.Tuple2;
 
 /**
@@ -103,6 +105,8 @@ public class CreateActionSetFromWebEntries implements Serializable {
 				final String ror = ROR_PREFIX
 					+ IdentifierFactory.md5(PidCleaner.normalizePidValue("ROR", row.getAs("ror")));
 				ret.addAll(createAffiliationRelationPairDOI(row.getAs("doi"), ror));
+//				ret.addAll(createAffiliationRelationPairPMID(row.getAs("pmid"), ror));
+//				ret.addAll(createAffiliationRelationPairPMCID(row.getAs("pmcid"), ror));
 
 				return ret
 					.iterator();
@@ -112,7 +116,7 @@ public class CreateActionSetFromWebEntries implements Serializable {
 			.mapToPair(
 				aa -> new Tuple2<>(new Text(aa.getClazz().getCanonicalName()),
 					new Text(OBJECT_MAPPER.writeValueAsString(aa))))
-			.saveAsHadoopFile(outputPath, Text.class, Text.class, SequenceFileOutputFormat.class, BZip2Codec.class);
+			.saveAsHadoopFile(outputPath, Text.class, Text.class, SequenceFileOutputFormat.class, GzipCodec.class);
 
 	}
 
@@ -142,13 +146,19 @@ public class CreateActionSetFromWebEntries implements Serializable {
 				"institution.country_code as country_code", "publication_year")
 			.distinct();
 
+//			.selectExpr(
+//				"id", "doi", "ids.pmcid as pmcid", "ids.pmid as pmid", "institution.ror as ror",
+//				"institution.country_code as country_code", "publication_year")
+//			.distinct();
+
 	}
 
 	private static Dataset<Row> readBlackList(SparkSession spark, String inputPath) {
 
 		return spark
 			.read()
-			.json(inputPath)
+			.option("header", true)
+			.csv(inputPath)
 			.select("OpenAlexId");
 	}
 

dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/actionmanager/webcrawl/RemoveRelationFromActionSet.java

@@ -1,158 +0,0 @@
-
-package eu.dnetlib.dhp.actionmanager.webcrawl;
-
-import static eu.dnetlib.dhp.common.SparkSessionSupport.runWithSparkSession;
-import static org.apache.spark.sql.functions.*;
-
-import java.io.File;
-import java.io.Serializable;
-import java.util.Arrays;
-import java.util.Optional;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.io.filefilter.DirectoryFileFilter;
-import org.apache.commons.io.filefilter.FileFileFilter;
-import org.apache.hadoop.io.Text;
-import org.apache.hadoop.io.compress.BZip2Codec;
-import org.apache.hadoop.io.compress.GzipCodec;
-import org.apache.hadoop.mapred.SequenceFileOutputFormat;
-import org.apache.spark.SparkConf;
-import org.apache.spark.api.java.JavaPairRDD;
-import org.apache.spark.api.java.JavaRDD;
-import org.apache.spark.api.java.JavaSparkContext;
-import org.apache.spark.api.java.function.FilterFunction;
-import org.apache.spark.api.java.function.MapFunction;
-import org.apache.spark.sql.*;
-import org.apache.spark.sql.types.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import eu.dnetlib.dhp.application.ArgumentApplicationParser;
-import eu.dnetlib.dhp.common.HdfsSupport;
-import eu.dnetlib.dhp.schema.action.AtomicAction;
-import eu.dnetlib.dhp.schema.oaf.Relation;
-import eu.dnetlib.dhp.schema.oaf.utils.IdentifierFactory;
-import scala.Tuple2;
-
-public class RemoveRelationFromActionSet
-	implements Serializable {
-	private static final Logger log = LoggerFactory.getLogger(CreateActionSetFromWebEntries.class);
-
-	private static final ObjectMapper MAPPER = new ObjectMapper();
-	private static final StructType KV_SCHEMA = StructType$.MODULE$
-		.apply(
-			Arrays
-				.asList(
-					StructField$.MODULE$.apply("key", DataTypes.StringType, false, Metadata.empty()),
-					StructField$.MODULE$.apply("value", DataTypes.StringType, false, Metadata.empty())));
-
-	private static final StructType ATOMIC_ACTION_SCHEMA = StructType$.MODULE$
-		.apply(
-			Arrays
-				.asList(
-					StructField$.MODULE$.apply("clazz", DataTypes.StringType, false, Metadata.empty()),
-					StructField$.MODULE$
-						.apply(
-							"payload", DataTypes.StringType, false, Metadata.empty())));
-
-	public static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
-
-	public static void main(String[] args) throws Exception {
-		String jsonConfiguration = IOUtils
-			.toString(
-				CreateActionSetFromWebEntries.class
-					.getResourceAsStream(
-						"/eu/dnetlib/dhp/actionmanager/webcrawl/as_parameters.json"));
-
-		final ArgumentApplicationParser parser = new ArgumentApplicationParser(jsonConfiguration);
-		parser.parseArgument(args);
-
-		Boolean isSparkSessionManaged = Optional
-			.ofNullable(parser.get("isSparkSessionManaged"))
-			.map(Boolean::valueOf)
-			.orElse(Boolean.TRUE);
-
-		log.info("isSparkSessionManaged: {}", isSparkSessionManaged);
-
-		// the actionSet path
-		final String inputPath = parser.get("sourcePath");
-		log.info("inputPath: {}", inputPath);
-
-		final String outputPath = parser.get("outputPath");
-		log.info("outputPath: {}", outputPath);
-
-		final String blackListInputPath = parser.get("blackListPath");
-		log.info("blackListInputPath: {}", blackListInputPath);
-
-		SparkConf conf = new SparkConf();
-
-		runWithSparkSession(
-			conf,
-			isSparkSessionManaged,
-			spark -> {
-
-				removeFromActionSet(spark, inputPath, outputPath, blackListInputPath);
-
-			});
-	}
-
-	private static void removeFromActionSet(SparkSession spark, String inputPath, String outputPath,
-		String blackListInputPath) {
-		// read the blacklist
-		Dataset<String> blackList = readBlackList(spark, blackListInputPath)
-			.map(
-				(MapFunction<Row, String>) r -> IdentifierFactory
-					.idFromPid("50", "doi", ((String) r.getAs("doi")).substring(16), true),
-				Encoders.STRING());
-
-		// read the old actionset and get the relations in the payload
-		JavaPairRDD<Text, Text> seq = JavaSparkContext
-			.fromSparkContext(spark.sparkContext())
-			.sequenceFile(inputPath, Text.class, Text.class);
-
-		JavaRDD<Row> rdd = seq
-			.map(x -> RowFactory.create(x._1().toString(), x._2().toString()));
-
-		Dataset<Row> actionSet = spark
-			.createDataFrame(rdd, KV_SCHEMA)
-			.withColumn("atomic_action", from_json(col("value"), ATOMIC_ACTION_SCHEMA))
-			.select(expr("atomic_action.*"));
-
-		Dataset<Relation> relation = actionSet
-			.map(
-				(MapFunction<Row, Relation>) r -> MAPPER.readValue((String) r.getAs("payload"), Relation.class),
-				Encoders.bean(Relation.class));
-
-		// select only the relation not matching any pid in the blacklist as source for the relation
-		Dataset<Relation> relNoSource = relation
-			.joinWith(blackList, relation.col("source").equalTo(blackList.col("value")), "left")
-			.filter((FilterFunction<Tuple2<Relation, String>>) t2 -> t2._2() == null)
-			.map((MapFunction<Tuple2<Relation, String>, Relation>) t2 -> t2._1(), Encoders.bean(Relation.class));
-
-		// select only the relation not matching any pid in the blacklist as target of the relation
-		relNoSource
-			.joinWith(blackList, relNoSource.col("target").equalTo(blackList.col("value")), "left")
-			.filter((FilterFunction<Tuple2<Relation, String>>) t2 -> t2._2() == null)
-			.map((MapFunction<Tuple2<Relation, String>, Relation>) t2 -> t2._1(), Encoders.bean(Relation.class))
-			.toJavaRDD()
-			.map(p -> new AtomicAction(p.getClass(), p))
-			.mapToPair(
-				aa -> new Tuple2<>(new Text(aa.getClazz().getCanonicalName()),
-					new Text(OBJECT_MAPPER.writeValueAsString(aa))))
-			.saveAsHadoopFile(outputPath, Text.class, Text.class, SequenceFileOutputFormat.class, BZip2Codec.class);
-		;
-
-	}
-
-	private static Dataset<Row> readBlackList(SparkSession spark, String inputPath) {
-
-		return spark
-			.read()
-			.json(inputPath)
-			.select("doi");
-	}
-
-}

dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/CollectorWorker.java

@@ -22,11 +22,9 @@ import eu.dnetlib.dhp.collection.plugin.CollectorPlugin;
 import eu.dnetlib.dhp.collection.plugin.base.BaseCollectorPlugin;
 import eu.dnetlib.dhp.collection.plugin.file.FileCollectorPlugin;
 import eu.dnetlib.dhp.collection.plugin.file.FileGZipCollectorPlugin;
-import eu.dnetlib.dhp.collection.plugin.gtr2.Gtr2PublicationsCollectorPlugin;
 import eu.dnetlib.dhp.collection.plugin.mongodb.MDStoreCollectorPlugin;
 import eu.dnetlib.dhp.collection.plugin.mongodb.MongoDbDumpCollectorPlugin;
 import eu.dnetlib.dhp.collection.plugin.oai.OaiCollectorPlugin;
-import eu.dnetlib.dhp.collection.plugin.osf.OsfPreprintsCollectorPlugin;
 import eu.dnetlib.dhp.collection.plugin.rest.RestCollectorPlugin;
 import eu.dnetlib.dhp.common.aggregation.AggregatorReport;
 import eu.dnetlib.dhp.common.collection.CollectorException;
@@ -60,7 +58,7 @@ public class CollectorWorker extends ReportingJob {
 
 	public void collect() throws UnknownCollectorPluginException, CollectorException, IOException {
 
-		final String outputPath = this.mdStoreVersion.getHdfsPath() + SEQUENCE_FILE_NAME;
+		final String outputPath = mdStoreVersion.getHdfsPath() + SEQUENCE_FILE_NAME;
 		log.info("outputPath path is {}", outputPath);
 
 		final CollectorPlugin plugin = getCollectorPlugin();
@@ -70,36 +68,36 @@ public class CollectorWorker extends ReportingJob {
 
 		try (SequenceFile.Writer writer = SequenceFile
 			.createWriter(
-				this.fileSystem.getConf(), SequenceFile.Writer.file(new Path(outputPath)), SequenceFile.Writer
-					.keyClass(IntWritable.class),
-				SequenceFile.Writer
-					.valueClass(Text.class),
+				fileSystem.getConf(),
+				SequenceFile.Writer.file(new Path(outputPath)),
+				SequenceFile.Writer.keyClass(IntWritable.class),
+				SequenceFile.Writer.valueClass(Text.class),
 				SequenceFile.Writer.compression(SequenceFile.CompressionType.BLOCK, new DeflateCodec()))) {
 			final IntWritable key = new IntWritable(counter.get());
 			final Text value = new Text();
 			plugin
-				.collect(this.api, this.report)
-				.forEach(content -> {
-					key.set(counter.getAndIncrement());
-					value.set(content);
-					try {
-						writer.append(key, value);
-					} catch (final Throwable e) {
-						throw new RuntimeException(e);
-					}
-				});
-		} catch (final Throwable e) {
-			this.report.put(e.getClass().getName(), e.getMessage());
+				.collect(api, report)
+				.forEach(
+					content -> {
+						key.set(counter.getAndIncrement());
+						value.set(content);
+						try {
+							writer.append(key, value);
+						} catch (Throwable e) {
+							throw new RuntimeException(e);
+						}
+					});
+		} catch (Throwable e) {
+			report.put(e.getClass().getName(), e.getMessage());
 			throw new CollectorException(e);
 		} finally {
 			shutdown();
-			this.report.ongoing(counter.longValue(), counter.longValue());
+			report.ongoing(counter.longValue(), counter.longValue());
 		}
 	}
 
-	private void scheduleReport(final AtomicInteger counter) {
+	private void scheduleReport(AtomicInteger counter) {
 		schedule(new ReporterCallback() {
-
 			@Override
 			public Long getCurrent() {
 				return counter.longValue();
@@ -114,37 +112,33 @@ public class CollectorWorker extends ReportingJob {
 
 	private CollectorPlugin getCollectorPlugin() throws UnknownCollectorPluginException {
 
-		switch (CollectorPlugin.NAME.valueOf(this.api.getProtocol())) {
+		switch (CollectorPlugin.NAME.valueOf(api.getProtocol())) {
 			case oai:
-				return new OaiCollectorPlugin(this.clientParams);
+				return new OaiCollectorPlugin(clientParams);
 			case rest_json2xml:
-				return new RestCollectorPlugin(this.clientParams);
+				return new RestCollectorPlugin(clientParams);
 			case file:
-				return new FileCollectorPlugin(this.fileSystem);
+				return new FileCollectorPlugin(fileSystem);
 			case fileGzip:
-				return new FileGZipCollectorPlugin(this.fileSystem);
+				return new FileGZipCollectorPlugin(fileSystem);
 			case baseDump:
 				return new BaseCollectorPlugin(this.fileSystem);
-			case gtr2Publications:
-				return new Gtr2PublicationsCollectorPlugin(this.clientParams);
-			case osfPreprints:
-				return new OsfPreprintsCollectorPlugin(this.clientParams);
 			case other:
 				final CollectorPlugin.NAME.OTHER_NAME plugin = Optional
-					.ofNullable(this.api.getParams().get("other_plugin_type"))
+					.ofNullable(api.getParams().get("other_plugin_type"))
 					.map(CollectorPlugin.NAME.OTHER_NAME::valueOf)
 					.orElseThrow(() -> new IllegalArgumentException("invalid other_plugin_type"));
 
 				switch (plugin) {
 					case mdstore_mongodb_dump:
-						return new MongoDbDumpCollectorPlugin(this.fileSystem);
+						return new MongoDbDumpCollectorPlugin(fileSystem);
 					case mdstore_mongodb:
 						return new MDStoreCollectorPlugin();
 					default:
 						throw new UnknownCollectorPluginException("plugin is not managed: " + plugin);
 				}
 			default:
-				throw new UnknownCollectorPluginException("protocol is not managed: " + this.api.getProtocol());
+				throw new UnknownCollectorPluginException("protocol is not managed: " + api.getProtocol());
 		}
 	}
 

dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/orcid/model/Author.java

@@ -20,9 +20,6 @@ public class Author extends ORCIDItem {
 
 	private String lastModifiedDate;
 
-	public Author() {
-	}
-
 	public String getBiography() {
 		return biography;
 	}

dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/orcid/model/ORCIDItem.java

@@ -11,7 +11,4 @@ public class ORCIDItem {
 	public void setOrcid(String orcid) {
 		this.orcid = orcid;
 	}
-
-	public ORCIDItem() {
-	}
 }

dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/orcid/model/Work.java

@@ -32,6 +32,4 @@ public class Work extends ORCIDItem {
 		pids.add(pid);
 	}
 
-	public Work() {
-	}
 }

dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/plugin/CollectorPlugin.java

@@ -11,7 +11,7 @@ public interface CollectorPlugin {
 
 	enum NAME {
 
-		oai, other, rest_json2xml, file, fileGzip, baseDump, gtr2Publications, osfPreprints;
+		oai, other, rest_json2xml, file, fileGzip, baseDump;
 
 		public enum OTHER_NAME {
 			mdstore_mongodb_dump, mdstore_mongodb

dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/plugin/gtr2/Gtr2PublicationsCollectorPlugin.java

@@ -1,43 +0,0 @@
-
-package eu.dnetlib.dhp.collection.plugin.gtr2;
-
-import java.util.Iterator;
-import java.util.Spliterator;
-import java.util.Spliterators;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
-import eu.dnetlib.dhp.collection.ApiDescriptor;
-import eu.dnetlib.dhp.collection.plugin.CollectorPlugin;
-import eu.dnetlib.dhp.common.aggregation.AggregatorReport;
-import eu.dnetlib.dhp.common.collection.CollectorException;
-import eu.dnetlib.dhp.common.collection.HttpClientParams;
-
-public class Gtr2PublicationsCollectorPlugin implements CollectorPlugin {
-
-	private final HttpClientParams clientParams;
-
-	public Gtr2PublicationsCollectorPlugin(final HttpClientParams clientParams) {
-		this.clientParams = clientParams;
-	}
-
-	@Override
-	public Stream<String> collect(final ApiDescriptor api, final AggregatorReport report) throws CollectorException {
-
-		final String baseUrl = api.getBaseUrl();
-		final String startPage = api.getParams().get("startPage");
-		final String endPage = api.getParams().get("endPage");
-		final String fromDate = api.getParams().get("fromDate");
-
-		if ((fromDate != null) && !fromDate.matches("\\d{4}-\\d{2}-\\d{2}")) {
-			throw new CollectorException("Invalid date (YYYY-MM-DD): " + fromDate);
-		}
-
-		final Iterator<String> iterator = new Gtr2PublicationsIterator(baseUrl, fromDate, startPage, endPage,
-			this.clientParams);
-		final Spliterator<String> spliterator = Spliterators.spliteratorUnknownSize(iterator, Spliterator.ORDERED);
-
-		return StreamSupport.stream(spliterator, false);
-	}
-
-}

dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/plugin/gtr2/Gtr2PublicationsIterator.java

@@ -1,215 +0,0 @@
-
-package eu.dnetlib.dhp.collection.plugin.gtr2;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Queue;
-import java.util.function.Function;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.math.NumberUtils;
-import org.dom4j.Document;
-import org.dom4j.DocumentException;
-import org.dom4j.DocumentHelper;
-import org.dom4j.Element;
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import eu.dnetlib.dhp.common.collection.CollectorException;
-import eu.dnetlib.dhp.common.collection.HttpClientParams;
-import eu.dnetlib.dhp.common.collection.HttpConnector2;
-
-public class Gtr2PublicationsIterator implements Iterator<String> {
-
-	public static final int PAGE_SIZE = 20;
-
-	private static final Logger log = LoggerFactory.getLogger(Gtr2PublicationsIterator.class);
-
-	private final HttpConnector2 connector;
-	private static final DateTimeFormatter simpleDateTimeFormatter = DateTimeFormat.forPattern("yyyy-MM-dd");
-
-	private static final int MAX_ATTEMPTS = 10;
-
-	private final String baseUrl;
-	private int currPage;
-	private int endPage;
-	private boolean incremental = false;
-	private DateTime fromDate;
-
-	private final Map<String, String> cache = new HashMap<>();
-
-	private final Queue<String> queue = new LinkedList<>();
-
-	private String nextElement;
-
-	public Gtr2PublicationsIterator(final String baseUrl, final String fromDate, final String startPage,
-		final String endPage,
-		final HttpClientParams clientParams)
-		throws CollectorException {
-
-		this.baseUrl = baseUrl;
-		this.currPage = NumberUtils.toInt(startPage, 1);
-		this.endPage = NumberUtils.toInt(endPage, Integer.MAX_VALUE);
-		this.incremental = StringUtils.isNotBlank(fromDate);
-		this.connector = new HttpConnector2(clientParams);
-
-		if (this.incremental) {
-			this.fromDate = parseDate(fromDate);
-		}
-
-		prepareNextElement();
-	}
-
-	@Override
-	public boolean hasNext() {
-		return this.nextElement != null;
-	}
-
-	@Override
-	public String next() {
-		try {
-			return this.nextElement;
-		} finally {
-			prepareNextElement();
-		}
-	}
-
-	@Override
-	public void remove() {
-		throw new UnsupportedOperationException();
-	}
-
-	private void prepareNextElement() {
-		while ((this.currPage <= this.endPage) && this.queue.isEmpty()) {
-			log.debug("FETCHING PAGE + " + this.currPage + "/" + this.endPage);
-			this.queue.addAll(fetchPage(this.currPage++));
-		}
-		this.nextElement = this.queue.poll();
-	}
-
-	private List<String> fetchPage(final int pageNumber) {
-
-		final List<String> res = new ArrayList<>();
-		try {
-			final Document doc = loadURL(cleanURL(this.baseUrl + "/outcomes/publications?p=" + pageNumber), 0);
-
-			if (this.endPage == Integer.MAX_VALUE) {
-				this.endPage = NumberUtils.toInt(doc.valueOf("/*/@*[local-name() = 'totalPages']"));
-			}
-
-			for (final Object po : doc.selectNodes("//*[local-name() = 'publication']")) {
-				final Element mainEntity = (Element) ((Element) po).detach();
-
-				if (filterIncremental(mainEntity)) {
-					res.add(expandMainEntity(mainEntity));
-				} else {
-					log.debug("Skipped entity");
-				}
-
-			}
-		} catch (final Throwable e) {
-			log.error("Exception fetching page " + pageNumber, e);
-			throw new RuntimeException("Exception fetching page " + pageNumber, e);
-		}
-
-		return res;
-	}
-
-	private void addLinkedEntities(final Element master, final String relType, final Element newRoot,
-		final Function<Document, Element> mapper) {
-
-		for (final Object o : master.selectNodes(".//*[local-name()='link']")) {
-			final String rel = ((Element) o).valueOf("@*[local-name()='rel']");
-			final String href = ((Element) o).valueOf("@*[local-name()='href']");
-
-			if (relType.equals(rel) && StringUtils.isNotBlank(href)) {
-				final String cacheKey = relType + "#" + href;
-				if (this.cache.containsKey(cacheKey)) {
-					try {
-						log.debug(" * from cache (" + relType + "): " + href);
-						newRoot.add(DocumentHelper.parseText(this.cache.get(cacheKey)).getRootElement());
-					} catch (final DocumentException e) {
-						log.error("Error retrieving cache element: " + cacheKey, e);
-						throw new RuntimeException("Error retrieving cache element: " + cacheKey, e);
-					}
-				} else {
-					final Document doc = loadURL(cleanURL(href), 0);
-					final Element elem = mapper.apply(doc);
-					newRoot.add(elem);
-					this.cache.put(cacheKey, elem.asXML());
-				}
-
-			}
-		}
-	}
-
-	private boolean filterIncremental(final Element e) {
-		if (!this.incremental || isAfter(e.valueOf("@*[local-name() = 'created']"), this.fromDate)
-			|| isAfter(e.valueOf("@*[local-name() = 'updated']"), this.fromDate)) {
-			return true;
-		}
-		return false;
-	}
-
-	private String expandMainEntity(final Element mainEntity) {
-		final Element newRoot = DocumentHelper.createElement("doc");
-		newRoot.add(mainEntity);
-		addLinkedEntities(mainEntity, "PROJECT", newRoot, this::asProjectElement);
-		return DocumentHelper.createDocument(newRoot).asXML();
-	}
-
-	private Element asProjectElement(final Document doc) {
-		final Element newOrg = DocumentHelper.createElement("project");
-		newOrg.addElement("id").setText(doc.valueOf("/*/@*[local-name()='id']"));
-		newOrg
-			.addElement("code")
-			.setText(doc.valueOf("//*[local-name()='identifier' and @*[local-name()='type'] = 'RCUK']"));
-		newOrg.addElement("title").setText(doc.valueOf("//*[local-name()='title']"));
-		return newOrg;
-	}
-
-	private static String cleanURL(final String url) {
-		String cleaned = url;
-		if (cleaned.contains("gtr.gtr")) {
-			cleaned = cleaned.replace("gtr.gtr", "gtr");
-		}
-		if (cleaned.startsWith("http://")) {
-			cleaned = cleaned.replaceFirst("http://", "https://");
-		}
-		return cleaned;
-	}
-
-	private Document loadURL(final String cleanUrl, final int attempt) {
-		try {
-			log.debug("  * Downloading Url: " + cleanUrl);
-			final byte[] bytes = this.connector.getInputSource(cleanUrl).getBytes("UTF-8");
-			return DocumentHelper.parseText(new String(bytes));
-		} catch (final Throwable e) {
-			log.error("Error dowloading url: " + cleanUrl + ", attempt = " + attempt, e);
-			if (attempt >= MAX_ATTEMPTS) {
-				throw new RuntimeException("Error dowloading url: " + cleanUrl, e);
-			}
-			try {
-				Thread.sleep(60000); // I wait for a minute
-			} catch (final InterruptedException e1) {
-				throw new RuntimeException("Error dowloading url: " + cleanUrl, e);
-			}
-			return loadURL(cleanUrl, attempt + 1);
-		}
-	}
-
-	private DateTime parseDate(final String s) {
-		return DateTime.parse(s.contains("T") ? s.substring(0, s.indexOf("T")) : s, simpleDateTimeFormatter);
-	}
-
-	private boolean isAfter(final String d, final DateTime fromDate) {
-		return StringUtils.isNotBlank(d) && parseDate(d).isAfter(fromDate);
-	}
-}

dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/plugin/osf/OsfPreprintsCollectorPlugin.java

@@ -1,52 +0,0 @@
-
-package eu.dnetlib.dhp.collection.plugin.osf;
-
-import java.util.Optional;
-import java.util.Spliterator;
-import java.util.Spliterators;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.math.NumberUtils;
-
-import eu.dnetlib.dhp.collection.ApiDescriptor;
-import eu.dnetlib.dhp.collection.plugin.CollectorPlugin;
-import eu.dnetlib.dhp.common.aggregation.AggregatorReport;
-import eu.dnetlib.dhp.common.collection.CollectorException;
-import eu.dnetlib.dhp.common.collection.HttpClientParams;
-
-public class OsfPreprintsCollectorPlugin implements CollectorPlugin {
-
-	public static final int PAGE_SIZE_VALUE_DEFAULT = 100;
-
-	private final HttpClientParams clientParams;
-
-	public OsfPreprintsCollectorPlugin(final HttpClientParams clientParams) {
-		this.clientParams = clientParams;
-	}
-
-	@Override
-	public Stream<String> collect(final ApiDescriptor api, final AggregatorReport report) throws CollectorException {
-		final String baseUrl = api.getBaseUrl();
-
-		final int pageSize = Optional
-			.ofNullable(api.getParams().get("pageSize"))
-			.filter(StringUtils::isNotBlank)
-			.map(s -> NumberUtils.toInt(s, PAGE_SIZE_VALUE_DEFAULT))
-			.orElse(PAGE_SIZE_VALUE_DEFAULT);
-
-		if (StringUtils.isBlank(baseUrl)) {
-			throw new CollectorException("Param 'baseUrl' is null or empty");
-		}
-
-		final OsfPreprintsIterator it = new OsfPreprintsIterator(baseUrl, pageSize, getClientParams());
-
-		return StreamSupport
-			.stream(Spliterators.spliteratorUnknownSize(it, Spliterator.ORDERED), false);
-	}
-
-	public HttpClientParams getClientParams() {
-		return this.clientParams;
-	}
-}

dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/plugin/osf/OsfPreprintsIterator.java

@@ -1,151 +0,0 @@
-
-package eu.dnetlib.dhp.collection.plugin.osf;
-
-import java.util.Iterator;
-import java.util.Queue;
-import java.util.concurrent.PriorityBlockingQueue;
-
-import org.apache.commons.lang3.StringUtils;
-import org.dom4j.Document;
-import org.dom4j.DocumentHelper;
-import org.dom4j.Element;
-import org.dom4j.Node;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import eu.dnetlib.dhp.collection.plugin.utils.JsonUtils;
-import eu.dnetlib.dhp.common.collection.CollectorException;
-import eu.dnetlib.dhp.common.collection.HttpClientParams;
-import eu.dnetlib.dhp.common.collection.HttpConnector2;
-
-public class OsfPreprintsIterator implements Iterator<String> {
-
-	private static final Logger log = LoggerFactory.getLogger(OsfPreprintsIterator.class);
-
-	private static final int MAX_ATTEMPTS = 5;
-
-	private final HttpClientParams clientParams;
-
-	private final String baseUrl;
-	private final int pageSize;
-
-	private String currentUrl;
-
-	private final Queue<String> recordQueue = new PriorityBlockingQueue<>();
-
-	public OsfPreprintsIterator(
-		final String baseUrl,
-		final int pageSize,
-		final HttpClientParams clientParams) {
-
-		this.clientParams = clientParams;
-		this.baseUrl = baseUrl;
-		this.pageSize = pageSize;
-
-		initQueue();
-	}
-
-	private void initQueue() {
-		this.currentUrl = this.baseUrl + "?filter:is_published:d=true&format=json&page[size]=" + this.pageSize;
-
-		log.info("REST calls starting with {}", this.currentUrl);
-	}
-
-	@Override
-	public boolean hasNext() {
-		synchronized (this.recordQueue) {
-			while (this.recordQueue.isEmpty() && StringUtils.isNotBlank(this.currentUrl)
-				&& this.currentUrl.startsWith("http")) {
-				try {
-					this.currentUrl = downloadPage(this.currentUrl);
-				} catch (final CollectorException e) {
-					log.debug("CollectorPlugin.next()-Exception: {}", e);
-					throw new RuntimeException(e);
-				}
-			}
-
-			if (!this.recordQueue.isEmpty()) {
-				return true;
-			}
-
-			return false;
-		}
-	}
-
-	@Override
-	public String next() {
-		synchronized (this.recordQueue) {
-			return this.recordQueue.poll();
-		}
-	}
-
-	private String downloadPage(final String url) throws CollectorException {
-
-		final Document doc = downloadUrl(url, 0);
-
-		for (final Object o : doc.selectNodes("/*/data")) {
-
-			final Element n = (Element) ((Element) o).detach();
-
-			final Element group = DocumentHelper.createElement("group");
-			group.addAttribute("id", n.valueOf("./id"));
-
-			group.addElement("preprint").add(n);
-
-			for (final Object o1 : n.selectNodes(".//contributors//href")) {
-				final String href = ((Node) o1).getText();
-				if (StringUtils.isNotBlank(href) && href.startsWith("http")) {
-					final Document doc1 = downloadUrl(href, 0);
-					group.addElement("contributors").add(doc1.getRootElement().detach());
-				}
-			}
-			for (final Object o1 : n.selectNodes(".//primary_file//href")) {
-				final String href = ((Node) o1).getText();
-				if (StringUtils.isNotBlank(href) && href.startsWith("http")) {
-					final Document doc1 = downloadUrl(href, 0);
-					group.addElement("primary_file").add(doc1.getRootElement().detach());
-				}
-			}
-
-			this.recordQueue.add(DocumentHelper.createDocument(group).asXML());
-		}
-
-		return doc.valueOf("/*/links/next");
-
-	}
-
-	private Document downloadUrl(final String url, final int attempt) throws CollectorException {
-		if (attempt > MAX_ATTEMPTS) {
-			throw new CollectorException("Max Number of attempts reached, url:" + url);
-		}
-
-		if (attempt > 0) {
-			final int delay = (attempt * 5000);
-			log.debug("Attempt {} with delay {}", attempt, delay);
-			try {
-				Thread.sleep(delay);
-			} catch (final InterruptedException e) {
-				new CollectorException(e);
-			}
-		}
-
-		try {
-			log.info("requesting URL [{}]", url);
-
-			final HttpConnector2 connector = new HttpConnector2(this.clientParams);
-
-			final String json = connector.getInputSource(url);
-			final String xml = JsonUtils.convertToXML(json);
-
-			return DocumentHelper.parseText(xml);
-
-		} catch (final Throwable e) {
-			log.warn(e.getMessage(), e);
-			if ((e instanceof CollectorException) && e.getMessage().contains("401")) {
-				final Element root = DocumentHelper.createElement("error_401_authorization_required");
-				return DocumentHelper.createDocument(root);
-			}
-			return downloadUrl(url, attempt + 1);
-		}
-	}
-}

dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/plugin/researchfi/ResearchFiCollectorPlugin.java

@@ -1,76 +0,0 @@
-
-package eu.dnetlib.dhp.collection.plugin.researchfi;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Spliterator;
-import java.util.Spliterators;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.message.BasicNameValuePair;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import eu.dnetlib.dhp.collection.ApiDescriptor;
-import eu.dnetlib.dhp.collection.plugin.CollectorPlugin;
-import eu.dnetlib.dhp.common.aggregation.AggregatorReport;
-import eu.dnetlib.dhp.common.collection.CollectorException;
-
-public class ResearchFiCollectorPlugin implements CollectorPlugin {
-
-	private static final Logger log = LoggerFactory.getLogger(ResearchFiCollectorPlugin.class);
-
-	@Override
-	public Stream<String> collect(final ApiDescriptor api, final AggregatorReport report)
-		throws CollectorException {
-
-		final String authUrl = api.getParams().get("auth_url");
-		final String clientId = api.getParams().get("auth_client_id");
-		final String clientSecret = api.getParams().get("auth_client_secret");
-
-		final String authToken = authenticate(authUrl, clientId, clientSecret);
-
-		final Iterator<String> iter = new ResearchFiIterator(api.getBaseUrl(), authToken);
-
-		return StreamSupport.stream(Spliterators.spliteratorUnknownSize(iter, Spliterator.ORDERED), false);
-	}
-
-	private String authenticate(final String authUrl, final String clientId, final String clientSecret)
-		throws CollectorException {
-		try (final CloseableHttpClient client = HttpClients.createDefault()) {
-			final HttpPost req = new HttpPost(authUrl);
-			final List<NameValuePair> params = new ArrayList<>();
-			params.add(new BasicNameValuePair("grant_type", "client_credentials"));
-			params.add(new BasicNameValuePair("client_id", clientId));
-			params.add(new BasicNameValuePair("client_secret", clientSecret));
-
-			req.setEntity(new UrlEncodedFormEntity(params, "UTF-8"));
-
-			try (final CloseableHttpResponse response = client.execute(req)) {
-				final String content = IOUtils.toString(response.getEntity().getContent());
-				final JSONObject obj = new JSONObject(content);
-				final String token = obj.getString("access_token");
-				if (StringUtils.isNotBlank(token)) {
-					return token;
-				}
-			}
-		} catch (final Throwable e) {
-			log.warn("Error obtaining access token", e);
-			throw new CollectorException("Error obtaining access token", e);
-		}
-		throw new CollectorException("Access token is missing");
-
-	}
-
-}

dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/plugin/researchfi/ResearchFiIterator.java

@@ -1,117 +0,0 @@
-
-package eu.dnetlib.dhp.collection.plugin.researchfi;
-
-import java.util.Iterator;
-import java.util.Queue;
-import java.util.concurrent.PriorityBlockingQueue;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.math.NumberUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.http.Header;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.json.JSONArray;
-
-import eu.dnetlib.dhp.collection.plugin.utils.JsonUtils;
-import eu.dnetlib.dhp.common.collection.CollectorException;
-
-public class ResearchFiIterator implements Iterator<String> {
-
-	private static final Log log = LogFactory.getLog(ResearchFiIterator.class);
-
-	private static final int PAGE_SIZE = 100;
-
-	private final String baseUrl;
-	private final String authToken;
-	private int currPage;
-	private int nPages;
-
-	private final Queue<String> queue = new PriorityBlockingQueue<>();
-
-	public ResearchFiIterator(final String baseUrl, final String authToken) {
-		this.baseUrl = baseUrl;
-		this.authToken = authToken;
-		this.currPage = 0;
-		this.nPages = 0;
-	}
-
-	private void verifyStarted() {
-		if (this.currPage == 0) {
-			try {
-				nextCall();
-			} catch (final CollectorException e) {
-				throw new IllegalStateException(e);
-			}
-		}
-	}
-
-	@Override
-	public boolean hasNext() {
-		synchronized (this.queue) {
-			verifyStarted();
-			return !this.queue.isEmpty();
-		}
-	}
-
-	@Override
-	public String next() {
-		synchronized (this.queue) {
-			verifyStarted();
-			final String res = this.queue.poll();
-			while (this.queue.isEmpty() && (this.currPage < this.nPages)) {
-				try {
-					nextCall();
-				} catch (final CollectorException e) {
-					throw new IllegalStateException(e);
-				}
-			}
-			return res;
-		}
-	}
-
-	private void nextCall() throws CollectorException {
-
-		this.currPage += 1;
-
-		final String url;
-		if (!this.baseUrl.contains("?")) {
-			url = String.format("%s?PageNumber=%d&PageSize=%d", this.baseUrl, this.currPage, PAGE_SIZE);
-		} else if (!this.baseUrl.contains("PageSize=")) {
-			url = String.format("%s&PageNumber=%d&PageSize=%d", this.baseUrl, this.currPage, PAGE_SIZE);
-		} else {
-			url = String.format("%s&PageNumber=%d", this.baseUrl, this.currPage);
-		}
-		log.info("Calling url: " + url);
-
-		try (final CloseableHttpClient client = HttpClients.createDefault()) {
-
-			final HttpGet req = new HttpGet(url);
-			req.addHeader("Authorization", "Bearer " + this.authToken);
-			try (final CloseableHttpResponse response = client.execute(req)) {
-				for (final Header header : response.getAllHeaders()) {
-					log.debug("HEADER: " + header.getName() + " = " + header.getValue());
-					if ("x-page-count".equals(header.getName())) {
-						final int totalPages = NumberUtils.toInt(header.getValue());
-						if (this.nPages != totalPages) {
-							this.nPages = NumberUtils.toInt(header.getValue());
-							log.info("Total pages: " + totalPages);
-						}
-					}
-				}
-
-				final String content = IOUtils.toString(response.getEntity().getContent());
-				final JSONArray jsonArray = new JSONArray(content);
-
-				jsonArray.forEach(obj -> this.queue.add(JsonUtils.convertToXML(obj.toString())));
-			}
-		} catch (final Throwable e) {
-			log.warn("Error calling url: " + url, e);
-			throw new CollectorException("Error calling url: " + url, e);
-		}
-	}
-
-}

dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/plugin/rest/RestCollectorPlugin.java

@@ -1,7 +1,6 @@
 
 package eu.dnetlib.dhp.collection.plugin.rest;
 
-import java.util.Map;
 import java.util.Optional;
 import java.util.Spliterator;
 import java.util.Spliterators;
@@ -10,8 +9,6 @@ import java.util.stream.StreamSupport;
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.google.gson.Gson;
-
 import eu.dnetlib.dhp.collection.ApiDescriptor;
 import eu.dnetlib.dhp.collection.plugin.CollectorPlugin;
 import eu.dnetlib.dhp.common.aggregation.AggregatorReport;
@@ -50,9 +47,6 @@ public class RestCollectorPlugin implements CollectorPlugin {
 		final String entityXpath = api.getParams().get("entityXpath");
 		final String authMethod = api.getParams().get("authMethod");
 		final String authToken = api.getParams().get("authToken");
-		final String requestHeaderMap = api.getParams().get("requestHeaderMap");
-		Gson gson = new Gson();
-		Map requestHeaders = gson.fromJson(requestHeaderMap, Map.class);
 		final String resultSizeValue = Optional
 			.ofNullable(api.getParams().get("resultSizeValue"))
 			.filter(StringUtils::isNotBlank)
@@ -70,6 +64,9 @@ public class RestCollectorPlugin implements CollectorPlugin {
 		if (StringUtils.isBlank(resultFormatValue)) {
 			throw new CollectorException("Param 'resultFormatValue' is null or empty");
 		}
+		if (StringUtils.isBlank(queryParams)) {
+			throw new CollectorException("Param 'queryParams' is null or empty");
+		}
 		if (StringUtils.isBlank(entityXpath)) {
 			throw new CollectorException("Param 'entityXpath' is null or empty");
 		}
@@ -95,8 +92,7 @@ public class RestCollectorPlugin implements CollectorPlugin {
 			entityXpath,
 			authMethod,
 			authToken,
-			resultOutputFormat,
-			requestHeaders);
+			resultOutputFormat);
 
 		return StreamSupport
 			.stream(

dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/plugin/rest/RestIterator.java

@@ -9,11 +9,8 @@ import java.net.URL;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.Iterator;
-import java.util.Map;
 import java.util.Queue;
 import java.util.concurrent.PriorityBlockingQueue;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Transformer;
@@ -21,18 +18,22 @@ import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
-import javax.xml.xpath.*;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpression;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpHeaders;
+import org.apache.http.entity.ContentType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 
-import com.google.common.collect.Maps;
-
 import eu.dnetlib.dhp.collection.plugin.utils.JsonUtils;
 import eu.dnetlib.dhp.common.collection.CollectorException;
 import eu.dnetlib.dhp.common.collection.HttpClientParams;
@@ -47,23 +48,20 @@ import eu.dnetlib.dhp.common.collection.HttpClientParams;
  *
  */
 public class RestIterator implements Iterator<String> {
+
 	private static final Logger log = LoggerFactory.getLogger(RestIterator.class);
 	public static final String UTF_8 = "UTF-8";
 	private static final int MAX_ATTEMPTS = 5;
 
 	private final HttpClientParams clientParams;
 
-	private final String AUTHBASIC = "basic";
-
-	private static final String XML_HEADER = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
-	private static final String EMPTY_XML = XML_HEADER + "<" + JsonUtils.XML_WRAP_TAG + "></" + JsonUtils.XML_WRAP_TAG
-		+ ">";
+	private final String BASIC = "basic";
 
 	private final String baseUrl;
 	private final String resumptionType;
 	private final String resumptionParam;
 	private final String resultFormatValue;
-	private String queryParams = "";
+	private String queryParams;
 	private final int resultSizeValue;
 	private int resumptionInt = 0; // integer resumption token (first record to harvest)
 	private int resultTotal = -1;
@@ -91,11 +89,6 @@ public class RestIterator implements Iterator<String> {
 	 */
 	private final String resultOutputFormat;
 
-	/*
-	 * Can be used to set additional request headers, like for content negotiation
-	 */
-	private Map<String, String> requestHeaders;
-
 	/**
 	 * RestIterator class compatible to version 1.3.33
 	 */
@@ -114,8 +107,7 @@ public class RestIterator implements Iterator<String> {
 		final String entityXpath,
 		final String authMethod,
 		final String authToken,
-		final String resultOutputFormat,
-		final Map<String, String> requestHeaders) {
+		final String resultOutputFormat) {
 
 		this.clientParams = clientParams;
 		this.baseUrl = baseUrl;
@@ -127,7 +119,6 @@ public class RestIterator implements Iterator<String> {
 		this.authMethod = authMethod;
 		this.authToken = authToken;
 		this.resultOutputFormat = resultOutputFormat;
-		this.requestHeaders = requestHeaders != null ? requestHeaders : Maps.newHashMap();
 
 		this.queryFormat = StringUtils.isNotBlank(resultFormatParam) ? "&" + resultFormatParam + "=" + resultFormatValue
 			: "";
@@ -157,12 +148,7 @@ public class RestIterator implements Iterator<String> {
 	}
 
 	private void initQueue() {
-		if (queryParams.equals("") && querySize.equals("") && queryFormat.equals("")) {
-			query = baseUrl;
-		} else {
-			query = baseUrl + "?" + queryParams + querySize + queryFormat;
-		}
-
+		this.query = this.baseUrl + "?" + this.queryParams + this.querySize + this.queryFormat;
 		log.info("REST calls starting with {}", this.query);
 	}
 
@@ -176,23 +162,11 @@ public class RestIterator implements Iterator<String> {
 	 */
 	@Override
 	public boolean hasNext() {
-		synchronized (this.recordQueue) {
-			while (this.recordQueue.isEmpty() && !this.query.isEmpty()) {
-				try {
-					this.query = downloadPage(this.query, 0);
-				} catch (final CollectorException e) {
-					log.debug("CollectorPlugin.next()-Exception: {}", e);
-					throw new RuntimeException(e);
-				}
-			}
-
-			if (!this.recordQueue.isEmpty()) {
-				return true;
-			}
-
+		if (this.recordQueue.isEmpty() && this.query.isEmpty()) {
 			disconnect();
 			return false;
 		}
+		return true;
 	}
 
 	/*
@@ -202,6 +176,14 @@ public class RestIterator implements Iterator<String> {
 	@Override
 	public String next() {
 		synchronized (this.recordQueue) {
+			while (this.recordQueue.isEmpty() && !this.query.isEmpty()) {
+				try {
+					this.query = downloadPage(this.query, 0);
+				} catch (final CollectorException e) {
+					log.debug("CollectorPlugin.next()-Exception: {}", e);
+					throw new RuntimeException(e);
+				}
+			}
 			return this.recordQueue.poll();
 		}
 	}
@@ -227,8 +209,9 @@ public class RestIterator implements Iterator<String> {
 
 		try {
 			String resultJson;
-			String resultXml = XML_HEADER;
+			String resultXml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
 			String nextQuery = "";
+			final String emptyXml = resultXml + "<" + JsonUtils.XML_WRAP_TAG + "></" + JsonUtils.XML_WRAP_TAG + ">";
 			Node resultNode = null;
 			NodeList nodeList = null;
 			String qUrlArgument = "";
@@ -243,48 +226,37 @@ public class RestIterator implements Iterator<String> {
 				}
 			}
 
-			// find pagination page start number in queryParam and remove before start the first query
-			if ((resumptionType.toLowerCase().equals("pagination") || resumptionType.toLowerCase().equals("page"))
-				&& (query.contains("paginationStart="))) {
-
-				final Matcher m = Pattern.compile("paginationStart=([0-9]+)").matcher(query);
-				m.find(); // guaranteed to be true for this regex
-
-				String[] pageVal = m.group(0).split("=");
-				pagination = Integer.parseInt(pageVal[1]);
-
-				// remove page start number from query and queryParams
-				queryParams = queryParams.replaceFirst("&?paginationStart=[0-9]+", "");
-				query = query.replaceFirst("&?paginationStart=[0-9]+", "");
-
-			}
-
 			try {
 				log.info("requesting URL [{}]", query);
 
 				final URL qUrl = new URL(query);
 				log.debug("authMethod: {}", this.authMethod);
-				if (this.authMethod == "bearer") {
-					log.trace("RestIterator.downloadPage():: authMethod before inputStream: " + resultXml);
-					requestHeaders.put("Authorization", "Bearer " + authToken);
-					// requestHeaders.put("Content-Type", "application/json");
-				} else if (AUTHBASIC.equalsIgnoreCase(this.authMethod)) {
-					log.trace("RestIterator.downloadPage():: authMethod before inputStream: " + resultXml);
-					requestHeaders.put("Authorization", "Basic " + authToken);
-					// requestHeaders.put("accept", "application/xml");
+				if ("bearer".equalsIgnoreCase(this.authMethod)) {
+					log.trace("authMethod before inputStream: {}", resultXml);
+					final HttpURLConnection conn = (HttpURLConnection) qUrl.openConnection();
+					conn.setRequestProperty(HttpHeaders.AUTHORIZATION, "Bearer " + this.authToken);
+					conn.setRequestProperty(HttpHeaders.CONTENT_TYPE, ContentType.APPLICATION_JSON.getMimeType());
+					conn.setRequestMethod("GET");
+					theHttpInputStream = conn.getInputStream();
+				} else if (this.BASIC.equalsIgnoreCase(this.authMethod)) {
+					log.trace("authMethod before inputStream: {}", resultXml);
+					final HttpURLConnection conn = (HttpURLConnection) qUrl.openConnection();
+					conn.setRequestProperty(HttpHeaders.AUTHORIZATION, "Basic " + this.authToken);
+					conn.setRequestProperty(HttpHeaders.ACCEPT, ContentType.APPLICATION_XML.getMimeType());
+					conn.setRequestMethod("GET");
+					theHttpInputStream = conn.getInputStream();
+				} else {
+					theHttpInputStream = qUrl.openStream();
 				}
-				HttpURLConnection conn = (HttpURLConnection) qUrl.openConnection();
-				conn.setRequestMethod("GET");
-				this.setRequestHeader(conn);
-				resultStream = conn.getInputStream();
 
+				this.resultStream = theHttpInputStream;
 				if ("json".equals(this.resultOutputFormat)) {
 					resultJson = IOUtils.toString(this.resultStream, StandardCharsets.UTF_8);
 					resultXml = JsonUtils.convertToXML(resultJson);
 					this.resultStream = IOUtils.toInputStream(resultXml, UTF_8);
 				}
 
-				if (!isEmptyXml(resultXml)) {
+				if (!(emptyXml).equalsIgnoreCase(resultXml)) {
 					resultNode = (Node) this.xpath
 						.evaluate("/", new InputSource(this.resultStream), XPathConstants.NODE);
 					nodeList = (NodeList) this.xprEntity.evaluate(resultNode, XPathConstants.NODESET);
@@ -293,7 +265,8 @@ public class RestIterator implements Iterator<String> {
 						final StringWriter sw = new StringWriter();
 						this.transformer.transform(new DOMSource(nodeList.item(i)), new StreamResult(sw));
 						final String toEnqueue = sw.toString();
-						if ((toEnqueue == null) || StringUtils.isBlank(toEnqueue) || isEmptyXml(toEnqueue)) {
+						if ((toEnqueue == null) || StringUtils.isBlank(toEnqueue)
+							|| emptyXml.equalsIgnoreCase(toEnqueue)) {
 							log
 								.warn(
 									"The following record resulted in empty item for the feeding queue: {}", resultXml);
@@ -321,7 +294,6 @@ public class RestIterator implements Iterator<String> {
 							throw new CollectorException("Mode: discover, Param 'resultSizeValue' is less than 2");
 						}
 						qUrlArgument = qUrl.getQuery();
-
 						final String[] arrayQUrlArgument = qUrlArgument.split("&");
 						for (final String arrayUrlArgStr : arrayQUrlArgument) {
 							if (arrayUrlArgStr.startsWith(this.resumptionParam)) {
@@ -335,7 +307,7 @@ public class RestIterator implements Iterator<String> {
 							}
 						}
 
-						if (isEmptyXml(resultXml)
+						if (((emptyXml).equalsIgnoreCase(resultXml))
 							|| ((nodeList != null) && (nodeList.getLength() < this.resultSizeValue))) {
 							// resumptionStr = "";
 							if (nodeList != null) {
@@ -354,13 +326,13 @@ public class RestIterator implements Iterator<String> {
 
 					case "pagination":
 					case "page": // pagination, iterate over page numbers
-						if (nodeList != null && nodeList.getLength() > 0) {
+						this.pagination += 1;
+						if (nodeList != null) {
 							this.discoverResultSize += nodeList.getLength();
 						} else {
 							this.resultTotal = this.discoverResultSize;
 							this.pagination = this.discoverResultSize;
 						}
-						this.pagination += 1;
 						this.resumptionInt = this.pagination;
 						this.resumptionStr = Integer.toString(this.resumptionInt);
 						break;
@@ -408,8 +380,7 @@ public class RestIterator implements Iterator<String> {
 			try {
 				if (this.resultTotal == -1) {
 					this.resultTotal = Integer.parseInt(this.xprResultTotalPath.evaluate(resultNode));
-					if ("page".equalsIgnoreCase(this.resumptionType)
-						&& !this.AUTHBASIC.equalsIgnoreCase(this.authMethod)) {
+					if ("page".equalsIgnoreCase(this.resumptionType) && !this.BASIC.equalsIgnoreCase(this.authMethod)) {
 						this.resultTotal += 1;
 					} // to correct the upper bound
 					log.info("resultTotal was -1 is now: " + this.resultTotal);
@@ -438,10 +409,6 @@ public class RestIterator implements Iterator<String> {
 
 	}
 
-	private boolean isEmptyXml(String s) {
-		return EMPTY_XML.equalsIgnoreCase(s);
-	}
-
 	private boolean isInteger(final String s) {
 		boolean isValidInteger = false;
 		try {
@@ -466,22 +433,6 @@ public class RestIterator implements Iterator<String> {
 		}
 	}
 
-	/**
-	 * setRequestHeader
-	 *
-	 * setRequestProperty: Sets the general request property. If a property with the key already exists, overwrite its value with the new value.
-	 * @param conn
-	 */
-	private void setRequestHeader(HttpURLConnection conn) {
-		if (requestHeaders != null) {
-			for (String key : requestHeaders.keySet()) {
-				conn.setRequestProperty(key, requestHeaders.get(key));
-			}
-			log.debug("Set Request Header with: " + requestHeaders);
-		}
-
-	}
-
 	public String getResultFormatValue() {
 		return this.resultFormatValue;
 	}

dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/collection/plugin/utils/XMLIterator.java

@@ -8,10 +8,7 @@ import java.io.StringWriter;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CodingErrorAction;
-import java.util.Arrays;
 import java.util.Iterator;
-import java.util.List;
-import java.util.stream.Collectors;
 
 import javax.xml.stream.XMLEventFactory;
 import javax.xml.stream.XMLEventReader;
@@ -22,7 +19,6 @@ import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.events.StartElement;
 import javax.xml.stream.events.XMLEvent;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -62,23 +58,13 @@ public class XMLIterator implements Iterator<String> {
 
 	private String element;
 
-	private List<String> elements;
-
 	private InputStream inputStream;
 
 	public XMLIterator(final String element, final InputStream inputStream) {
 		super();
 		this.element = element;
-		if (element.contains(",")) {
-			elements = Arrays
-				.stream(element.split(","))
-				.filter(StringUtils::isNoneBlank)
-				.map(String::toLowerCase)
-				.collect(Collectors.toList());
-		}
 		this.inputStream = inputStream;
 		this.parser = getParser();
-
 		try {
 			this.current = findElement(parser);
 		} catch (XMLStreamException e) {
@@ -127,7 +113,7 @@ public class XMLIterator implements Iterator<String> {
 				final XMLEvent event = parser.nextEvent();
 
 				// TODO: replace with depth tracking instead of close tag tracking.
-				if (event.isEndElement() && isCheckTag(event.asEndElement().getName().getLocalPart())) {
+				if (event.isEndElement() && event.asEndElement().getName().getLocalPart().equals(element)) {
 					writer.add(event);
 					break;
 				}
@@ -156,16 +142,18 @@ public class XMLIterator implements Iterator<String> {
 		XMLEvent peek = parser.peek();
 		if (peek != null && peek.isStartElement()) {
 			String name = peek.asStartElement().getName().getLocalPart();
-			if (isCheckTag(name))
+			if (element.equals(name)) {
 				return peek;
+			}
 		}
 
 		while (parser.hasNext()) {
-			XMLEvent event = parser.nextEvent();
+			final XMLEvent event = parser.nextEvent();
 			if (event != null && event.isStartElement()) {
 				String name = event.asStartElement().getName().getLocalPart();
-				if (isCheckTag(name))
+				if (element.equals(name)) {
 					return event;
+				}
 			}
 		}
 		return null;
@@ -173,31 +161,12 @@ public class XMLIterator implements Iterator<String> {
 
 	private XMLEventReader getParser() {
 		try {
-			XMLInputFactory xif = inputFactory.get();
-			xif.setProperty(XMLInputFactory.SUPPORT_DTD, false);
-			return xif.createXMLEventReader(sanitize(inputStream));
+			return inputFactory.get().createXMLEventReader(sanitize(inputStream));
 		} catch (XMLStreamException e) {
 			throw new RuntimeException(e);
 		}
 	}
 
-	private boolean isCheckTag(final String tagName) {
-		if (elements != null) {
-			final String found = elements
-				.stream()
-				.filter(e -> e.equalsIgnoreCase(tagName))
-				.findFirst()
-				.orElse(null);
-			if (found != null)
-				return true;
-		} else {
-			if (element.equalsIgnoreCase(tagName)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
 	private Reader sanitize(final InputStream in) {
 		final CharsetDecoder charsetDecoder = Charset.forName(UTF_8).newDecoder();
 		charsetDecoder.onMalformedInput(CodingErrorAction.REPLACE);

dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/transformation/xslt/DataFetcher.java

@@ -0,0 +1,134 @@
+package eu.dnetlib.dhp.transformation.xslt;
+
+import java.io.Serializable;
+import net.sf.saxon.s9api.*;
+
+import org.apache.commons.io.IOUtils;
+import org.json.JSONObject;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * This class fetches JSON from a provided link and returns
+ * a Dublin Core. This functionality is particularly needed for OSF Preprints
+ */
+
+
+public class DataFetcher implements ExtensionFunction, Serializable {
+
+    /**
+     * This method fetches JSON object from a given URL
+     * @param url a url in the metadata for fetching authors in JSON format
+     * @return
+     * @throws IOException
+     */
+    static JSONObject getJson(URL url) throws IOException {
+
+        String json = IOUtils.toString(url);
+        return new JSONObject(json);
+    }
+
+    /**
+     * This method extracts authors from a given JSON
+     *
+     * @param jsonObject
+     * @return
+     */
+    static List<String> getAuthorsFromJson(JSONObject jsonObject) {
+        List<String> authors = new ArrayList<>();
+        // count of authors
+        int countOfAuthors = jsonObject.getJSONArray("data").length();
+        for (int i = 0; i < countOfAuthors; i++) {
+
+            authors.add(jsonObject
+                    .getJSONArray("data")
+                    .getJSONObject(i)
+                    .getJSONObject("embeds")
+                    .getJSONObject("users")
+                    .getJSONObject("data")
+                    .getJSONObject("attributes")
+                    .getString("full_name"));
+        }
+        return authors;
+    }
+
+    /**
+     * This method transforms list of authors into Dublin Core
+     * @param authors
+     * @return Dublin Core list of authors
+     */
+    static List<String> transformListToDublinCore(List<String> authors) {
+
+        List<String> dublinCoreAuthors = new ArrayList<>();
+        for (String author : authors){
+
+            //splitting full name into first and last names according to OpenAIRE v3 guidelines at:
+            // https://guidelines.openaire.eu/en/latest/literature/field_creator.html
+            // “surname”, “initials” (“first name”) “prefix”.
+            String[] parts = author.split(" ");
+            String firstName = parts[0];
+            String lastName = parts[1];
+            char initialOfFirstName = firstName.charAt(0);
+
+            dublinCoreAuthors.add(
+                    "<dc:creator>" + lastName + ", " + initialOfFirstName +  ". (" + firstName + ")" + "</dc:creator>");
+        }
+        return dublinCoreAuthors;
+    }
+
+     /**
+     * This is a public method which fetches authors and transform them into Dublin Core
+     */
+    public static String getAndTransformAuthors(URL url) throws IOException{
+        return String.join(", ", transformListToDublinCore(getAuthorsFromJson(getJson(url))));
+    }
+
+
+    /**
+     * This method extracts link to fulltext from a given JSON
+     *
+     * @return
+     */
+    static private String getLinkToFulltextFromJson(JSONObject jsonObject) throws MalformedURLException {
+
+        // note: Link to JSON containing fulltextlink is in "primary_file" attribute.
+        // And in the resultant JSON,  “links->download” contains the URL to fulltext
+
+        return jsonObject
+                .getJSONObject("data")
+                .getJSONObject("links")
+                .getString("download");
+    }
+
+    /**
+     * This is a public method which fetches link to full text and returns it as a suitable format
+     */
+    public static String getFullTextLinkAndTransform (URL url )throws IOException{
+
+        return getLinkToFulltextFromJson(getJson(url));
+    }
+
+
+    @Override
+    public QName getName() {
+        return null;
+    }
+
+    @Override
+    public SequenceType getResultType() {
+        return null;
+    }
+
+    @Override
+    public SequenceType[] getArgumentTypes() {
+        return new SequenceType[0];
+    }
+
+    @Override
+    public XdmValue call(XdmValue[] xdmValues) throws SaxonApiException {
+        return null;
+    }
+}

dhp-workflows/dhp-aggregation/src/main/java/eu/dnetlib/dhp/transformation/xslt/XSLTTransformationFunction.java

@@ -55,6 +55,8 @@ public class XSLTTransformationFunction implements MapFunction<MetadataRecord, M
 		processor.registerExtensionFunction(new DateCleaner());
 		processor.registerExtensionFunction(new PersonCleaner());
 
+		processor.registerExtensionFunction(new DataFetcher());
+
 		final XsltCompiler comp = processor.newXsltCompiler();
 		QName datasourceIDParam = new QName(DATASOURCE_ID_PARAM);
 		comp.setParameter(datasourceIDParam, new XdmAtomicValue(value.getProvenance().getDatasourceId()));

dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/actionmanager/bipaffiliations/input_actionset_parameter.json

@@ -28,19 +28,13 @@
     "paramLongName": "dataciteInputPath",
     "paramDescription": "the path to get the input data from Datacite",
     "paramRequired": true
-  },
-  {
+  },{
   "paramName": "wip",
   "paramLongName": "webCrawlInputPath",
   "paramDescription": "the path to get the input data from Web Crawl",
   "paramRequired": true
-  },
-  {
-    "paramName": "pub",
-    "paramLongName": "publisherInputPath",
-    "paramDescription": "the path to get the input data from publishers",
-    "paramRequired": true
-  },
+}
+,
   {
     "paramName": "o",
     "paramLongName": "outputPath",

dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/actionmanager/bipaffiliations/oozie_app/workflow.xml

@@ -21,10 +21,6 @@
             <name>webCrawlInputPath</name>
             <description>the path where to find the inferred affiliation relations from webCrawl</description>
         </property>
-        <property>
-            <name>publisherInputPath</name>
-            <description>the path where to find the inferred affiliation relations from publisher websites</description>
-        </property>
         <property>
             <name>outputPath</name>
             <description>the path where to store the actionset</description>
@@ -121,7 +117,6 @@
             <arg>--openapcInputPath</arg><arg>${openapcInputPath}</arg>
             <arg>--dataciteInputPath</arg><arg>${dataciteInputPath}</arg>
             <arg>--webCrawlInputPath</arg><arg>${webCrawlInputPath}</arg>
-            <arg>--publisherInputPath</arg><arg>${publisherInputPath}</arg>
             <arg>--outputPath</arg><arg>${outputPath}</arg>
         </spark>
         <ok to="End"/>

dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/actionmanager/opencitations/input_readcoci_parameters.json

@@ -24,19 +24,12 @@
     "paramLongName": "outputPath",
     "paramDescription": "the hdfs name node",
     "paramRequired": true
-  },
-  {
-    "paramName": "nn",
-    "paramLongName": "hdfsNameNode",
-    "paramDescription": "the hdfs name node",
-    "paramRequired": true
-  },
-  {
-    "paramName": "bp",
-    "paramLongName": "backupPath",
-    "paramDescription": "the hdfs path to move the OC data after the extraction",
-    "paramRequired": true
-  }
+  },  {
+  "paramName": "nn",
+  "paramLongName": "hdfsNameNode",
+  "paramDescription": "the hdfs name node",
+  "paramRequired": true
+}
 ]
 
 

dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/actionmanager/opencitations/oozie_app/workflow.xml

@@ -129,7 +129,6 @@
             </spark-opts>
             <arg>--inputPath</arg><arg>${inputPath}/Extracted</arg>
             <arg>--outputPath</arg><arg>${inputPath}/JSON</arg>
-            <arg>--backupPath</arg><arg>${inputPath}/backup</arg>
             <arg>--delimiter</arg><arg>${delimiter}</arg>
             <arg>--hdfsNameNode</arg><arg>${nameNode}</arg>
         </spark>

dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/actionmanager/opencitations/remap_parameters.json

@@ -16,11 +16,10 @@
     "paramLongName": "isSparkSessionManged",
     "paramDescription": "the hdfs name node",
     "paramRequired": false
-  },
-  {
-    "paramName": "nn",
-    "paramLongName": "nameNode",
-    "paramDescription": "the hdfs name node",
-    "paramRequired": true
-  }
+  },{
+  "paramName": "nn",
+  "paramLongName": "nameNode",
+  "paramDescription": "the hdfs name node",
+  "paramRequired": true
+}
 ]

dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/actionmanager/personentity/as_parameters.json

@@ -1,25 +0,0 @@
-[
-  {
-    "paramName": "ip",
-    "paramLongName": "inputPath",
-    "paramDescription": "the zipped opencitations file",
-    "paramRequired": true
-  },
-  {
-    "paramName": "op",
-    "paramLongName": "outputPath",
-    "paramDescription": "the working path",
-    "paramRequired": true
-  },
-  {
-    "paramName": "issm",
-    "paramLongName": "isSparkSessionManaged",
-    "paramDescription": "the hdfs name node",
-    "paramRequired": false
-  }, {
-  "paramName": "wd",
-  "paramLongName": "workingDir",
-  "paramDescription": "the hdfs name node",
-  "paramRequired": false
-}
-]

dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/actionmanager/personentity/job.properties

@@ -1,2 +0,0 @@
-inputPath=/data/orcid_2023/tables/
-outputPath=/user/miriam.baglioni/peopleAS

dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/actionmanager/personentity/oozie_app/config-default.xml

@@ -1,30 +0,0 @@
-<configuration>
-    <property>
-        <name>jobTracker</name>
-        <value>yarnRM</value>
-    </property>
-    <property>
-        <name>nameNode</name>
-        <value>hdfs://nameservice1</value>
-    </property>
-    <property>
-        <name>oozie.use.system.libpath</name>
-        <value>true</value>
-    </property>
-    <property>
-        <name>hiveMetastoreUris</name>
-        <value>thrift://iis-cdh5-test-m3.ocean.icm.edu.pl:9083</value>
-    </property>
-    <property>
-        <name>hiveJdbcUrl</name>
-        <value>jdbc:hive2://iis-cdh5-test-m3.ocean.icm.edu.pl:10000</value>
-    </property>
-    <property>
-        <name>hiveDbName</name>
-        <value>openaire</value>
-    </property>
-    <property>
-        <name>oozie.launcher.mapreduce.user.classpath.first</name>
-        <value>true</value>
-    </property>
-</configuration>

dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/actionmanager/personentity/oozie_app/workflow.xml

@@ -1,111 +0,0 @@
-<workflow-app name="PersonEntity" xmlns="uri:oozie:workflow:0.5">
-    <parameters>
-
-        <property>
-            <name>inputPath</name>
-            <description>inputPath</description>
-        </property>
-        <property>
-            <name>outputPath</name>
-            <description>the path where to store the actionset</description>
-        </property>
-        <property>
-            <name>sparkDriverMemory</name>
-            <description>memory for driver process</description>
-        </property>
-        <property>
-            <name>sparkExecutorMemory</name>
-            <description>memory for individual executor</description>
-        </property>
-        <property>
-            <name>sparkExecutorCores</name>
-            <description>number of cores used by single executor</description>
-        </property>
-        <property>
-            <name>oozieActionShareLibForSpark2</name>
-            <description>oozie action sharelib for spark 2.*</description>
-        </property>
-        <property>
-            <name>spark2ExtraListeners</name>
-            <value>com.cloudera.spark.lineage.NavigatorAppListener</value>
-            <description>spark 2.* extra listeners classname</description>
-        </property>
-        <property>
-            <name>spark2SqlQueryExecutionListeners</name>
-            <value>com.cloudera.spark.lineage.NavigatorQueryListener</value>
-            <description>spark 2.* sql query execution listeners classname</description>
-        </property>
-        <property>
-            <name>spark2YarnHistoryServerAddress</name>
-            <description>spark 2.* yarn history server address</description>
-        </property>
-        <property>
-            <name>spark2EventLogDir</name>
-            <description>spark 2.* event log dir location</description>
-        </property>
-    </parameters>
-
-    <global>
-        <job-tracker>${jobTracker}</job-tracker>
-        <name-node>${nameNode}</name-node>
-        <configuration>
-            <property>
-                <name>mapreduce.job.queuename</name>
-                <value>${queueName}</value>
-            </property>
-            <property>
-                <name>oozie.launcher.mapred.job.queue.name</name>
-                <value>${oozieLauncherQueueName}</value>
-            </property>
-            <property>
-                <name>oozie.action.sharelib.for.spark</name>
-                <value>${oozieActionShareLibForSpark2}</value>
-            </property>
-
-        </configuration>
-    </global>
-    <start to="deleteoutputpath"/>
-    <kill name="Kill">
-        <message>Action failed, error message[${wf:errorMessage(wf:lastErrorNode())}]</message>
-    </kill>
-    <action name="deleteoutputpath">
-        <fs>
-            <delete path="${outputPath}"/>
-            <mkdir path="${outputPath}"/>
-            <delete path="${workingDir}"/>
-            <mkdir path="${workingDir}"/>
-        </fs>
-        <ok to="atomicactions"/>
-        <error to="Kill"/>
-    </action>
-
-
-    <action name="atomicactions">
-        <spark xmlns="uri:oozie:spark-action:0.2">
-            <master>yarn</master>
-            <mode>cluster</mode>
-            <name>Produces the ActionSet for Person entity and relevant relations</name>
-            <class>eu.dnetlib.dhp.actionmanager.personentity.ExtractPerson</class>
-            <jar>dhp-aggregation-${projectVersion}.jar</jar>
-            <spark-opts>
-                --executor-cores=4
-                --executor-memory=4G
-                --driver-memory=${sparkDriverMemory}
-                --conf spark.executor.memoryOverhead=5G
-                --conf spark.extraListeners=${spark2ExtraListeners}
-                --conf spark.sql.queryExecutionListeners=${spark2SqlQueryExecutionListeners}
-                --conf spark.yarn.historyServer.address=${spark2YarnHistoryServerAddress}
-                --conf spark.eventLog.dir=${nameNode}${spark2EventLogDir}
-                --conf spark.sql.warehouse.dir=${sparkSqlWarehouseDir}
-                --conf spark.sql.shuffle.partitions=15000
-            </spark-opts>
-            <arg>--inputPath</arg><arg>${inputPath}</arg>
-            <arg>--outputPath</arg><arg>${outputPath}</arg>
-            <arg>--workingDir</arg><arg>${workingDir}</arg>
-        </spark>
-        <ok to="End"/>
-        <error to="Kill"/>
-    </action>
-
-    <end name="End"/>
-</workflow-app>

dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/actionmanager/sdgnodoi/as_parameters.json

@@ -1,20 +0,0 @@
-[
-  {
-    "paramName": "sp",
-    "paramLongName": "sourcePath",
-    "paramDescription": "the zipped opencitations file",
-    "paramRequired": true
-  },
-  {
-    "paramName": "op",
-    "paramLongName": "outputPath",
-    "paramDescription": "the working path",
-    "paramRequired": true
-  },
-  {
-    "paramName": "issm",
-    "paramLongName": "isSparkSessionManaged",
-    "paramDescription": "the hdfs name node",
-    "paramRequired": false
-  }
-]

dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/actionmanager/sdgnodoi/oozie_app/config-default.xml

@@ -1,30 +0,0 @@
-<configuration>
-    <property>
-        <name>jobTracker</name>
-        <value>yarnRM</value>
-    </property>
-    <property>
-        <name>nameNode</name>
-        <value>hdfs://nameservice1</value>
-    </property>
-    <property>
-        <name>oozie.use.system.libpath</name>
-        <value>true</value>
-    </property>
-    <property>
-        <name>hiveMetastoreUris</name>
-        <value>thrift://iis-cdh5-test-m3.ocean.icm.edu.pl:9083</value>
-    </property>
-    <property>
-        <name>hiveJdbcUrl</name>
-        <value>jdbc:hive2://iis-cdh5-test-m3.ocean.icm.edu.pl:10000</value>
-    </property>
-    <property>
-        <name>hiveDbName</name>
-        <value>openaire</value>
-    </property>
-    <property>
-        <name>oozie.launcher.mapreduce.user.classpath.first</name>
-        <value>true</value>
-    </property>
-</configuration>

dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/actionmanager/sdgnodoi/oozie_app/workflow.xml

@@ -1,125 +0,0 @@
-
-<workflow-app name="SDG no doi" xmlns="uri:oozie:workflow:0.5">
-    <parameters>
-        <property>
-            <name>sdgPath</name>
-            <description>the input path of the resources to be extended</description>
-        </property>
-        <property>
-            <name>outputPath</name>
-            <description>the path where to store the actionset</description>
-        </property>
-        <property>
-            <name>sparkDriverMemory</name>
-            <description>memory for driver process</description>
-        </property>
-        <property>
-            <name>sparkExecutorMemory</name>
-            <description>memory for individual executor</description>
-        </property>
-        <property>
-            <name>sparkExecutorCores</name>
-            <description>number of cores used by single executor</description>
-        </property>
-        <property>
-            <name>oozieActionShareLibForSpark2</name>
-            <description>oozie action sharelib for spark 2.*</description>
-        </property>
-        <property>
-            <name>spark2ExtraListeners</name>
-            <value>com.cloudera.spark.lineage.NavigatorAppListener</value>
-            <description>spark 2.* extra listeners classname</description>
-        </property>
-        <property>
-            <name>spark2SqlQueryExecutionListeners</name>
-            <value>com.cloudera.spark.lineage.NavigatorQueryListener</value>
-            <description>spark 2.* sql query execution listeners classname</description>
-        </property>
-        <property>
-            <name>spark2YarnHistoryServerAddress</name>
-            <description>spark 2.* yarn history server address</description>
-        </property>
-        <property>
-            <name>spark2EventLogDir</name>
-            <description>spark 2.* event log dir location</description>
-        </property>
-    </parameters>
-
-    <global>
-        <job-tracker>${jobTracker}</job-tracker>
-        <name-node>${nameNode}</name-node>
-        <configuration>
-            <property>
-                <name>mapreduce.job.queuename</name>
-                <value>${queueName}</value>
-            </property>
-            <property>
-                <name>oozie.launcher.mapred.job.queue.name</name>
-                <value>${oozieLauncherQueueName}</value>
-            </property>
-            <property>
-                <name>oozie.action.sharelib.for.spark</name>
-                <value>${oozieActionShareLibForSpark2}</value>
-            </property>
-
-        </configuration>
-    </global>
-    <start to="prepareSDG"/>
-
-    <kill name="Kill">
-        <message>Action failed, error message[${wf:errorMessage(wf:lastErrorNode())}]</message>
-    </kill>
-
-    <action name="prepareSDG">
-        <spark xmlns="uri:oozie:spark-action:0.2">
-            <master>yarn</master>
-            <mode>cluster</mode>
-            <name>Produces the results from FOS</name>
-            <class>eu.dnetlib.dhp.actionmanager.createunresolvedentities.PrepareSDGSparkJob</class>
-            <jar>dhp-aggregation-${projectVersion}.jar</jar>
-            <spark-opts>
-                --executor-memory=${sparkExecutorMemory}
-                --executor-cores=${sparkExecutorCores}
-                --driver-memory=${sparkDriverMemory}
-                --conf spark.extraListeners=${spark2ExtraListeners}
-                --conf spark.sql.queryExecutionListeners=${spark2SqlQueryExecutionListeners}
-                --conf spark.yarn.historyServer.address=${spark2YarnHistoryServerAddress}
-                --conf spark.eventLog.dir=${nameNode}${spark2EventLogDir}
-                --conf spark.sql.warehouse.dir=${sparkSqlWarehouseDir}
-            </spark-opts>
-            <arg>--sourcePath</arg><arg>${sdgPath}</arg>
-            <arg>--outputPath</arg><arg>${workingDir}/prepared</arg>
-            <arg>--distributeDoi</arg><arg>false</arg>
-        </spark>
-        <ok to="produceActionSet"/>
-        <error to="Kill"/>
-    </action>
-
-
-
-    <action name="produceActionSet">
-        <spark xmlns="uri:oozie:spark-action:0.2">
-            <master>yarn</master>
-            <mode>cluster</mode>
-            <name>Save the action set grouping results with the same id</name>
-            <class>eu.dnetlib.dhp.actionmanager.sdgnodoi.CreateActionSetSparkJob</class>
-            <jar>dhp-aggregation-${projectVersion}.jar</jar>
-            <spark-opts>
-                --executor-memory=${sparkExecutorMemory}
-                --executor-cores=${sparkExecutorCores}
-                --driver-memory=${sparkDriverMemory}
-                --conf spark.extraListeners=${spark2ExtraListeners}
-                --conf spark.sql.queryExecutionListeners=${spark2SqlQueryExecutionListeners}
-                --conf spark.yarn.historyServer.address=${spark2YarnHistoryServerAddress}
-                --conf spark.eventLog.dir=${nameNode}${spark2EventLogDir}
-                --conf spark.sql.warehouse.dir=${sparkSqlWarehouseDir}
-            </spark-opts>
-            <arg>--sourcePath</arg><arg>${workingDir}/prepared/sdg</arg>
-            <arg>--outputPath</arg><arg>${outputPath}</arg>
-        </spark>
-        <ok to="End"/>
-        <error to="Kill"/>
-    </action>
-
-    <end name="End"/>
-</workflow-app>

dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/actionmanager/transformativeagreement/oozie_app/workflow.xml

@@ -24,7 +24,7 @@
 
     <decision name="resume_from">
         <switch>
-            <case to="reset_workingDir">${wf:conf('resumeFrom') eq 'DownloadDump'}</case>
+            <case to="download">${wf:conf('resumeFrom') eq 'DownloadDump'}</case>
             <default to="create_actionset"/> <!-- first action to be done when downloadDump is to be performed -->
         </switch>
     </decision>
@@ -33,14 +33,6 @@
         <message>Action failed, error message[${wf:errorMessage(wf:lastErrorNode())}]</message>
     </kill>
 
-    <action name="reset_workingDir">
-        <fs>
-            <delete path="${workingDir}"/>
-            <mkdir path="${workingDir}"/>
-        </fs>
-        <ok to="download"/>
-        <error to="Kill"/>
-    </action>
     <action name="download">
         <shell xmlns="uri:oozie:shell-action:0.2">
             <job-tracker>${jobTracker}</job-tracker>

dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/actionmanager/webcrawl/job.properties

@@ -1,11 +1,3 @@
-#PROPERTIES TO CREATE THE ACTION SET
-#sourcePath=/user/miriam.baglioni/openalex-snapshot/data/works/
-#outputPath=/tmp/miriam/webcrawlComplete/
-#blackListPath=/user/miriam.baglioni/openalex-blackList
-#resumeFrom=create
-
-#PROPERTIES TO REMOVE FROM THE ACTION SET
-sourcePath=/var/lib/dnet/actionManager_PROD/webcrawl/rawset_28247629-468b-478e-9a42-bc540877125d_1718121542061/
-outputPath=/tmp/miriam/webcrawlRemoved/
-blackListPath=/user/miriam.baglioni/oalexBlackListNormalized
-resumeFrom=remove
+sourcePath=/user/miriam.baglioni/openalex-snapshot/data/works/
+outputPath=/tmp/miriam/webcrawlComplete/
+blackListPath=/user/miriam.baglioni/openalex-blackList

dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/actionmanager/webcrawl/oozie_app/workflow.xml

@@ -20,19 +20,12 @@
         </configuration>
     </global>
 
-    <start to="resumeFrom"/>
+    <start to="create_actionset"/>
 
     <kill name="Kill">
         <message>Action failed, error message[${wf:errorMessage(wf:lastErrorNode())}]</message>
     </kill>
 
-    <decision name="resumeFrom">
-        <switch>
-            <case to="create_actionset">${wf:conf('resumeFrom') eq 'create'}</case>
-            <default to="remove_from_actionset"/>
-        </switch>
-    </decision>
-
     <action name="create_actionset">
         <spark xmlns="uri:oozie:spark-action:0.2">
             <master>yarn</master>
@@ -57,30 +50,5 @@
         <ok to="End"/>
         <error to="Kill"/>
     </action>
-
-    <action name="remove_from_actionset">
-        <spark xmlns="uri:oozie:spark-action:0.2">
-            <master>yarn</master>
-            <mode>cluster</mode>
-            <name>Removes some relations found to be wrong from the AS</name>
-            <class>eu.dnetlib.dhp.actionmanager.webcrawl.RemoveRelationFromActionSet</class>
-            <jar>dhp-aggregation-${projectVersion}.jar</jar>
-            <spark-opts>
-                --executor-memory=${sparkExecutorMemory}
-                --executor-cores=${sparkExecutorCores}
-                --driver-memory=${sparkDriverMemory}
-                --conf spark.extraListeners=${spark2ExtraListeners}
-                --conf spark.sql.queryExecutionListeners=${spark2SqlQueryExecutionListeners}
-                --conf spark.yarn.historyServer.address=${spark2YarnHistoryServerAddress}
-                --conf spark.eventLog.dir=${nameNode}${spark2EventLogDir}
-                --conf spark.sql.warehouse.dir=${sparkSqlWarehouseDir}
-            </spark-opts>
-            <arg>--sourcePath</arg><arg>${sourcePath}</arg>
-            <arg>--outputPath</arg><arg>${outputPath}</arg>
-            <arg>--blackListPath</arg><arg>${blackListPath}</arg>
-        </spark>
-        <ok to="End"/>
-        <error to="Kill"/>
-    </action>
     <end name="End"/>
 </workflow-app>

dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/collection/plugin/base/xml/base2odf.transformationRule.xml

@@ -1,54 +1,44 @@
 <RESOURCE_PROFILE>
-    <HEADER>
-        <RESOURCE_IDENTIFIER
-            value="2ad0cdd9-c96c-484c-8b0e-ed56d86891fe_VHJhbnNmb3JtYXRpb25SdWxlRFNSZXNvdXJjZXMvVHJhbnNmb3JtYXRpb25SdWxlRFNSZXNvdXJjZVR5cGU="/>
-        <RESOURCE_TYPE value="TransformationRuleDSResourceType"/>
-        <RESOURCE_KIND value="TransformationRuleDSResources"/>
-        <RESOURCE_URI value=""/>
-        <DATE_OF_CREATION value="2024-03-05T11:23:00+00:00"/>
-    </HEADER>
-    <BODY>
-        <CONFIGURATION>
-            <SOURCE_METADATA_FORMAT interpretation="cleaned" layout="store" name="dc"/>
-            <SINK_METADATA_FORMAT name="odf_hbase"/>
-            <IMPORTED/>
-            <SCRIPT>
-                <TITLE>xslt_base2odf_hadoop</TITLE>
-                <CODE>
-                    <xsl:stylesheet xmlns:oaire="http://namespace.openaire.eu/schema/oaire/"
-                        xmlns:dateCleaner="http://eu/dnetlib/transform/dateISO"
-                        xmlns:base_dc="http://oai.base-search.net/base_dc/"
-                        xmlns:datacite="http://datacite.org/schema/kernel-4"
-                        xmlns:dr="http://www.driver-repository.eu/namespace/dr"
-                        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                        xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                        xmlns:vocabulary="http://eu/dnetlib/transform/clean"
-                        xmlns:oaf="http://namespace.openaire.eu/oaf"
-                        xmlns:oai="http://www.openarchives.org/OAI/2.0/"
-                        xmlns:dri="http://www.driver-repository.eu/namespace/dri"
-                        xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                        xmlns:dc="http://purl.org/dc/elements/1.1/"
-                        exclude-result-prefixes="xsl vocabulary dateCleaner base_dc" version="2.0">
-                        <xsl:param name="varOfficialName"/>
-                        <xsl:param name="varDataSourceId"/>
-                        <xsl:param name="varFP7" select="'corda_______::'"/>
-                        <xsl:param name="varH2020" select="'corda__h2020::'"/>
-                        <xsl:param name="repoCode"
-                            select="substring-before(//*[local-name() = 'header']/*[local-name()='recordIdentifier'], ':')"/>
-                        <xsl:param name="index" select="0"/>
-                        <xsl:param name="transDate" select="current-dateTime()"/>
+	<HEADER>
+		<RESOURCE_IDENTIFIER value="2ad0cdd9-c96c-484c-8b0e-ed56d86891fe_VHJhbnNmb3JtYXRpb25SdWxlRFNSZXNvdXJjZXMvVHJhbnNmb3JtYXRpb25SdWxlRFNSZXNvdXJjZVR5cGU=" />
+		<RESOURCE_TYPE value="TransformationRuleDSResourceType" />
+		<RESOURCE_KIND value="TransformationRuleDSResources" />
+		<RESOURCE_URI value="" />
+		<DATE_OF_CREATION value="2024-03-05T11:23:00+00:00" />
+	</HEADER>
+	<BODY>
+		<CONFIGURATION>
+			<SOURCE_METADATA_FORMAT interpretation="cleaned" layout="store" name="dc" />
+			<SINK_METADATA_FORMAT name="odf_hbase" />
+			<IMPORTED />
+			<SCRIPT>
+				<TITLE>xslt_base2odf_hadoop</TITLE>
+				<CODE>
+					<xsl:stylesheet xmlns:oaire="http://namespace.openaire.eu/schema/oaire/" xmlns:dateCleaner="http://eu/dnetlib/transform/dateISO" xmlns:base_dc="http://oai.base-search.net/base_dc/"
+						xmlns:datacite="http://datacite.org/schema/kernel-4" xmlns:dr="http://www.driver-repository.eu/namespace/dr" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+						xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:vocabulary="http://eu/dnetlib/transform/clean" xmlns:oaf="http://namespace.openaire.eu/oaf"
+						xmlns:oai="http://www.openarchives.org/OAI/2.0/" xmlns:dri="http://www.driver-repository.eu/namespace/dri" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dc="http://purl.org/dc/elements/1.1/"
+						exclude-result-prefixes="xsl vocabulary dateCleaner base_dc" version="2.0">
+						<xsl:param name="varOfficialName" />
+						<xsl:param name="varDataSourceId" />
+						<xsl:param name="varFP7" select="'corda_______::'" />
+						<xsl:param name="varH2020" select="'corda__h2020::'" />
+						<xsl:param name="repoCode" select="substring-before(//*[local-name() = 'header']/*[local-name()='recordIdentifier'], ':')" />
+						<xsl:param name="index" select="0" />
+						<xsl:param name="transDate" select="current-dateTime()" />
 
-                        <xsl:template name="terminate">
-                            <xsl:message terminate="yes"> record is not compliant, transformation is
-                                interrupted. </xsl:message>
-                        </xsl:template>
+						<xsl:template name="terminate">
+							<xsl:message terminate="yes">
+								record is not compliant, transformation is interrupted.
+							</xsl:message>
+						</xsl:template>
 
-                        <xsl:template match="/">
-                            <record>
-                                <xsl:apply-templates select="//*[local-name() = 'header']"/>
+						<xsl:template match="/">
+							<record>
+								<xsl:apply-templates select="//*[local-name() = 'header']" />
 
 
-                                <!-- NOT USED 
+								<!-- NOT USED 
 									base_dc:global_id (I used oai:identifier) 
 									base_dc:collection/text() 
 									base_dc:continent 
@@ -61,481 +51,422 @@
 									base_dc:link (I used dc:identifier)
 								 -->
 
-                                <metadata>
-                                    <datacite:resource>
+								<metadata>
+									<datacite:resource>
 
-                                        <xsl:for-each select="//base_dc:doi">
-                                            <datacite:identifier identifierType="DOI">
-                                                <xsl:value-of select="."/>
-                                            </datacite:identifier>
-                                        </xsl:for-each>
+										<xsl:for-each select="//base_dc:doi">
+											<datacite:identifier identifierType="DOI">
+												<xsl:value-of select="." />
+											</datacite:identifier>
+										</xsl:for-each>										
 
-                                        <datacite:alternateIdentifiers>
-                                            <xsl:for-each
-                                                select="distinct-values(//dc:identifier[starts-with(., 'http') and (not(contains(., '://dx.doi.org/') or contains(., '://doi.org/') or contains(., '://hdl.handle.net/')))])">
-                                                <datacite:identifier alternateIdentifierType="url">
-                                                  <xsl:value-of select="."/>
-                                                </datacite:identifier>
-                                            </xsl:for-each>
+										<datacite:alternateIdentifiers>
+											<xsl:for-each
+												select="distinct-values(//dc:identifier[starts-with(., 'http') and (not(contains(., '://dx.doi.org/') or contains(., '://doi.org/') or contains(., '://hdl.handle.net/')))])">
+												<datacite:identifier alternateIdentifierType="url">
+													<xsl:value-of select="." />
+												</datacite:identifier>
+											</xsl:for-each>
 
-                                            <xsl:for-each
-                                                select="distinct-values(//dc:identifier[starts-with(., 'http') and contains(., '://hdl.handle.net/')]/substring-after(., 'hdl.handle.net/'))">
-                                                <datacite:identifier
-                                                  alternateIdentifierType="handle">
-                                                  <xsl:value-of select="."/>
-                                                </datacite:identifier>
-                                            </xsl:for-each>
+											<xsl:for-each select="distinct-values(//dc:identifier[starts-with(., 'http') and contains(., '://hdl.handle.net/')]/substring-after(., 'hdl.handle.net/'))">
+												<datacite:identifier alternateIdentifierType="handle">
+													<xsl:value-of select="." />
+												</datacite:identifier>
+											</xsl:for-each>
 
-                                            <xsl:for-each
-                                                select="distinct-values(//dc:identifier[starts-with(., 'urn:nbn:nl:') or starts-with(., 'URN:NBN:NL:')])">
-                                                <datacite:identifier alternateIdentifierType="urn">
-                                                  <xsl:value-of select="."/>
-                                                </datacite:identifier>
-                                            </xsl:for-each>
+											<xsl:for-each select="distinct-values(//dc:identifier[starts-with(., 'urn:nbn:nl:') or starts-with(., 'URN:NBN:NL:')])">
+												<datacite:identifier alternateIdentifierType='urn'>
+													<xsl:value-of select="." />
+												</datacite:identifier>
+											</xsl:for-each>
 
-                                            <datacite:identifier
-                                                alternateIdentifierType="oai-original">
-                                                <xsl:value-of select="//oai:header/oai:identifier"/>
-                                            </datacite:identifier>
+											<datacite:identifier alternateIdentifierType="oai-original">
+												<xsl:value-of
+													select="//oai:header/oai:identifier" />
+											</datacite:identifier>
+											
+										</datacite:alternateIdentifiers>
 
-                                        </datacite:alternateIdentifiers>
-
-                                        <datacite:relatedIdentifiers/>
+										<datacite:relatedIdentifiers />
 
 
-                                        <xsl:for-each select="//base_dc:typenorm">
-                                            <datacite:resourceType>
-                                                <xsl:value-of
-                                                  select="vocabulary:clean(., 'base:normalized_types')"
-                                                />
-                                            </datacite:resourceType>
-                                        </xsl:for-each>
+										<xsl:for-each select="//base_dc:typenorm">
+											<datacite:resourceType><xsl:value-of select="vocabulary:clean(., 'base:normalized_types')" /></datacite:resourceType>
+										</xsl:for-each>
 
-                                        <datacite:titles>
-                                            <xsl:for-each select="//dc:title">
-                                                <datacite:title>
-                                                  <xsl:value-of select="normalize-space(.)"/>
-                                                </datacite:title>
-                                            </xsl:for-each>
-                                        </datacite:titles>
+										<datacite:titles>
+											<xsl:for-each select="//dc:title">
+												<datacite:title>
+													<xsl:value-of select="normalize-space(.)" />
+												</datacite:title>
+											</xsl:for-each>
+										</datacite:titles>
 
-                                        <datacite:creators>
-                                            <xsl:for-each select="//dc:creator">
-                                                <xsl:variable name="author"
-                                                  select="normalize-space(.)"/>
-                                                <datacite:creator>
-                                                  <datacite:creatorName>
-                                                  <xsl:value-of select="$author"/>
-                                                  </datacite:creatorName>
-                                                  <xsl:for-each
-                                                  select="//base_dc:authod_id[normalize-space(./base_dc:creator_name) = $author]/base_dc:creator_id ">
-                                                  <xsl:if test="contains(.,'https://orcid.org/')">
-                                                  <nameIdentifier schemeURI="https://orcid.org/"
-                                                  nameIdentifierScheme="ORCID">
-                                                  <xsl:value-of
-                                                  select="substring-after(., 'https://orcid.org/')"
-                                                  />
-                                                  </nameIdentifier>
-                                                  </xsl:if>
-                                                  </xsl:for-each>
-                                                </datacite:creator>
-                                            </xsl:for-each>
-                                        </datacite:creators>
+										<datacite:creators>
+											<xsl:for-each select="//dc:creator">
+												<xsl:variable name="author" select="normalize-space(.)" />
+												<datacite:creator>
+													<datacite:creatorName>
+														<xsl:value-of select="$author" />
+													</datacite:creatorName>
+													<xsl:for-each select="//base_dc:authod_id[normalize-space(./base_dc:creator_name) = $author]/base_dc:creator_id ">
+														<xsl:if test="contains(.,'https://orcid.org/')">
+															<nameIdentifier schemeURI="https://orcid.org/" nameIdentifierScheme="ORCID">
+																<xsl:value-of select="substring-after(., 'https://orcid.org/')" />
+															</nameIdentifier>
+														</xsl:if>
+													</xsl:for-each>
+												</datacite:creator>
+											</xsl:for-each>
+										</datacite:creators>
 
-                                        <datacite:contributors>
-                                            <xsl:for-each select="//dc:contributor">
-                                                <datacite:contributor>
-                                                  <datacite:contributorName>
-                                                  <xsl:value-of select="normalize-space(.)"/>
-                                                  </datacite:contributorName>
-                                                </datacite:contributor>
-                                            </xsl:for-each>
-                                        </datacite:contributors>
+										<datacite:contributors>
+											<xsl:for-each select="//dc:contributor">
+												<datacite:contributor>
+													<datacite:contributorName>
+														<xsl:value-of select="normalize-space(.)" />
+													</datacite:contributorName>
+												</datacite:contributor>
+											</xsl:for-each>
+										</datacite:contributors>
 
-                                        <datacite:descriptions>
-                                            <xsl:for-each select="//dc:description">
-                                                <datacite:description descriptionType="Abstract">
-                                                  <xsl:value-of select="normalize-space(.)"/>
-                                                </datacite:description>
-                                            </xsl:for-each>
-                                        </datacite:descriptions>
+										<datacite:descriptions>
+											<xsl:for-each select="//dc:description">
+												<datacite:description descriptionType="Abstract">
+													<xsl:value-of select="normalize-space(.)" />
+												</datacite:description>
+											</xsl:for-each>
+										</datacite:descriptions>
 
-                                        <datacite:subjects>
-                                            <xsl:for-each select="//dc:subject">
-                                                <datacite:subject>
-                                                  <xsl:value-of select="normalize-space(.)"/>
-                                                </datacite:subject>
-                                            </xsl:for-each>
+										<datacite:subjects>
+											<xsl:for-each select="//dc:subject">
+												<datacite:subject>
+													<xsl:value-of select="normalize-space(.)" />
+												</datacite:subject>
+											</xsl:for-each>
+											
+											<xsl:for-each select="//base_dc:classcode|//base_dc:autoclasscode">
+												<datacite:subject subjectScheme="{@type}" classificationCode="{normalize-space(.)}">
+													<!-- TODO the value should be obtained by the Code -->
+													<xsl:value-of select="normalize-space(.)" />
+												</datacite:subject>
+											</xsl:for-each>
+										</datacite:subjects>
+										
+										<xsl:for-each select="//dc:publisher">
+											<datacite:publisher>
+												<xsl:value-of select="normalize-space(.)" />
+											</datacite:publisher>
+										</xsl:for-each>
+										
+										<xsl:for-each select="//base_dc:year">
+											<datacite:publicationYear>
+												<xsl:value-of select="normalize-space(.)" />
+											</datacite:publicationYear>
+										</xsl:for-each>
+																				
+										<datacite:formats>
+											<xsl:for-each select="//dc:format">
+												<datacite:format>
+													<xsl:value-of select="normalize-space(.)" />
+												</datacite:format>
+											</xsl:for-each>
+										</datacite:formats>
+										
+										<datacite:language>
+											<xsl:value-of select="vocabulary:clean( //base_dc:lang, 'dnet:languages')" />
+										</datacite:language>
 
-                                            <xsl:for-each
-                                                select="//base_dc:classcode|//base_dc:autoclasscode">
-                                                <datacite:subject subjectScheme="{@type}"
-                                                  classificationCode="{normalize-space(.)}">
-                                                  <!-- TODO the value should be obtained by the Code -->
-                                                  <xsl:value-of select="normalize-space(.)"/>
-                                                </datacite:subject>
-                                            </xsl:for-each>
-                                        </datacite:subjects>
+										<oaf:accessrights>
+											<xsl:if test="//base_dc:oa[.='0']">
+												<datacite:rights rightsURI="http://purl.org/coar/access_right/c_16ec">restricted access</datacite:rights>
+											</xsl:if>
+											<xsl:if test="//base_dc:oa[.='1']">
+												<datacite:rights rightsURI="http://purl.org/coar/access_right/c_abf2">open access</datacite:rights>
+											</xsl:if>
+											<xsl:for-each select="//dc:rights|//base_dc:rightsnorm">
+												<datacite:rights><xsl:value-of select="vocabulary:clean(., 'dnet:access_modes')" /></datacite:rights>	
+											</xsl:for-each>
+										</oaf:accessrights>
 
-                                        <xsl:for-each select="//dc:publisher">
-                                            <datacite:publisher>
-                                                <xsl:value-of select="normalize-space(.)"/>
-                                            </datacite:publisher>
-                                        </xsl:for-each>
+									</datacite:resource>
 
-                                        <xsl:for-each select="//base_dc:year">
-                                            <datacite:publicationYear>
-                                                <xsl:value-of select="normalize-space(.)"/>
-                                            </datacite:publicationYear>
-                                        </xsl:for-each>
+									<xsl:for-each select="//dc:relation">
+										<xsl:if test="matches(normalize-space(.), '(info:eu-repo/grantagreement/ec/fp7/)(\d\d\d\d\d\d)(.*)', 'i')">
+											<oaf:projectid>
+												<xsl:value-of select="concat($varFP7, replace(normalize-space(.), '(info:eu-repo/grantagreement/ec/fp7/)(\d\d\d\d\d\d)(.*)', '$2', 'i'))" />
+											</oaf:projectid>
+										</xsl:if>
+										<xsl:if test="matches(normalize-space(.), '(info:eu-repo/grantagreement/ec/h2020/)(\d\d\d\d\d\d)(.*)', 'i')">
+											<oaf:projectid>
+												<xsl:value-of select="concat($varH2020, replace(normalize-space(.), '(info:eu-repo/grantagreement/ec/h2020/)(\d\d\d\d\d\d)(.*)', '$2', 'i'))" />
+											</oaf:projectid>
+										</xsl:if>
+									</xsl:for-each>
 
-                                        <datacite:formats>
-                                            <xsl:for-each select="//dc:format">
-                                                <datacite:format>
-                                                  <xsl:value-of select="normalize-space(.)"/>
-                                                </datacite:format>
-                                            </xsl:for-each>
-                                        </datacite:formats>
+									<xsl:choose>
+										<!-- I used an inline mapping because the field typenorm could be repeated and I have to specify a list of priority  -->
+										
+										<!-- Book part -->
+										<xsl:when test="//base_dc:typenorm = '111'">
+											<dr:CobjCategory type="publication">0013</dr:CobjCategory>
+										</xsl:when>
+										
+										<!-- Book -->
+										<xsl:when test="//base_dc:typenorm = '11'">
+											<dr:CobjCategory type="publication">0002</dr:CobjCategory>
+										</xsl:when>
+										
+										<!-- Article contribution -->
+										<xsl:when test="//base_dc:typenorm = '121'">
+											<dr:CobjCategory type="publication">0001</dr:CobjCategory>
+										</xsl:when>
+										
+																				
+										<!-- Journal/Newspaper -->
+										<xsl:when test="//base_dc:typenorm = '12'">
+											<dr:CobjCategory type="publication">0043</dr:CobjCategory>
+										</xsl:when>
+										
+										<!-- Report -->
+										<xsl:when test="//base_dc:typenorm = '14'">
+											<dr:CobjCategory type="publication">0017</dr:CobjCategory>
+										</xsl:when>
+										
+										<!-- Review -->
+										<xsl:when test="//base_dc:typenorm = '15'">
+											<dr:CobjCategory type="publication">0015</dr:CobjCategory>
+										</xsl:when>
+										
+										<!-- Lecture -->
+										<xsl:when test="//base_dc:typenorm = '17'">
+											<dr:CobjCategory type="publication">0010</dr:CobjCategory>
+										</xsl:when>
+										
+										<!-- Bachelor's thesis -->
+										<xsl:when test="//base_dc:typenorm = '181'">
+											<dr:CobjCategory type="publication">0008</dr:CobjCategory>
+										</xsl:when>
+										
+										<!-- Master's thesis -->
+										<xsl:when test="//base_dc:typenorm = '182'">
+											<dr:CobjCategory type="publication">0007</dr:CobjCategory>
+										</xsl:when>
+										
+										<!-- Doctoral and postdoctoral thesis -->
+										<xsl:when test="//base_dc:typenorm = '183'">
+											<dr:CobjCategory type="publication">0006</dr:CobjCategory>
+										</xsl:when>
+										
+										<!-- Thesis -->
+										<xsl:when test="//base_dc:typenorm = '18'">
+											<dr:CobjCategory type="publication">0044</dr:CobjCategory>
+										</xsl:when>
+										
+										<!-- Patent -->
+										<xsl:when test="//base_dc:typenorm = '1A'">
+											<dr:CobjCategory type="publication">0019</dr:CobjCategory>
+										</xsl:when>
+										
+										<!-- Text -->
+										<xsl:when test="//base_dc:typenorm = '1'">
+											<dr:CobjCategory type="publication">0001</dr:CobjCategory>
+										</xsl:when>
+										
+										<!-- Software -->
+										<xsl:when test="//base_dc:typenorm = '6'">
+											<dr:CobjCategory type="software">0029</dr:CobjCategory>
+										</xsl:when>
+										
+										<!-- Dataset -->										
+										<xsl:when test="//base_dc:typenorm = '7'">
+											<dr:CobjCategory type="dataset">0021</dr:CobjCategory>
+										</xsl:when>										
+																				
+										<!-- Still image -->
+										<xsl:when test="//base_dc:typenorm = '51'">
+											<dr:CobjCategory type="other">0025</dr:CobjCategory>
+										</xsl:when>
+										
+										<!-- Moving image/Video -->										
+										<xsl:when test="//base_dc:typenorm = '52'">
+											<dr:CobjCategory type="other">0024</dr:CobjCategory>
+										</xsl:when>
+										
+										<!-- Image/Video -->
+										<xsl:when test="//base_dc:typenorm = '5'">
+											<dr:CobjCategory type="other">0033</dr:CobjCategory>
+										</xsl:when>
 
-                                        <datacite:language>
-                                            <xsl:value-of
-                                                select="vocabulary:clean( //base_dc:lang, 'dnet:languages')"
-                                            />
-                                        </datacite:language>
+										<!-- Audio -->
+										<xsl:when test="//base_dc:typenorm = '4'">
+											<dr:CobjCategory type="other">0030</dr:CobjCategory>
+										</xsl:when>
+										
+										<!-- Musical notation -->
+										<xsl:when test="//base_dc:typenorm = '2'">
+											<dr:CobjCategory type="other">0020</dr:CobjCategory>
+										</xsl:when>
+										
+										<!-- Map -->
+										<xsl:when test="//base_dc:typenorm = '3'">
+											<dr:CobjCategory type="other">0020</dr:CobjCategory>
+										</xsl:when>										
+										
+										<!-- Other non-article -->
+										<xsl:when test="//base_dc:typenorm = '122'">
+											<dr:CobjCategory type="publication">0038</dr:CobjCategory>
+										</xsl:when>
+										
+										<!-- Course material -->
+										<xsl:when test="//base_dc:typenorm = '16'">
+											<dr:CobjCategory type="publication">0038</dr:CobjCategory>
+										</xsl:when>
+										
+										<!-- Manuscript -->
+										<xsl:when test="//base_dc:typenorm = '19'">
+											<dr:CobjCategory type="publication">0038</dr:CobjCategory>
+										</xsl:when>
+										
+										<!-- Conference object -->
+										<xsl:when test="//base_dc:typenorm = '13'">
+											<dr:CobjCategory type="publication">0004</dr:CobjCategory>
+										</xsl:when>
 
-                                    	<!--<datacite:rightsList>
-                                            <xsl:if test="//base_dc:oa[.='0']">
-                                                <datacite:rights rightsURI="http://purl.org/coar/access_right/c_16ec">restricted access</datacite:rights>
-                                            </xsl:if>
-                                            <xsl:if test="//base_dc:oa[.='1']">
-                                                <datacite:rights rightsURI="http://purl.org/coar/access_right/c_abf2">open access</datacite:rights>
-                                            </xsl:if>
-                                            <xsl:for-each select="//dc:rights|//base_dc:rightsnorm">
-                                                <datacite:rights>
-                                                    <xsl:value-of select="vocabulary:clean(., 'dnet:access_modes')"/>
-                                                </datacite:rights>
-                                            </xsl:for-each>
-                                        </datacite:rightsList>-->
+										<!-- Unknown -->
+										<xsl:when test="//base_dc:typenorm = 'F'">
+											<dr:CobjCategory type="other">0000</dr:CobjCategory>
+										</xsl:when>
+										<xsl:otherwise>
+											<dr:CobjCategory type="other">0000</dr:CobjCategory>
+										</xsl:otherwise>
+									</xsl:choose>
+									
+									<oaf:accessrights>
+										<xsl:choose>
+											<xsl:when test="//base_dc:oa[.='0']">CLOSED</xsl:when>
+											<xsl:when test="//base_dc:oa[.='1']">OPEN</xsl:when>
+											<xsl:when test="//base_dc:oa[.='2']">UNKNOWN</xsl:when>
+											<xsl:when test="//base_dc:rightsnorm">
+												<xsl:value-of select="vocabulary:clean(//base_dc:rightsnorm, 'dnet:access_modes')" />
+											</xsl:when>
+											<xsl:when test="//dc:rights">
+												<xsl:value-of select="vocabulary:clean( //dc:rights, 'dnet:access_modes')" />
+											</xsl:when>
+											<xsl:otherwise>UNKNOWN</xsl:otherwise>
+										</xsl:choose>
+									</oaf:accessrights>
 
-                                    </datacite:resource>
+									<xsl:for-each select="//base_dc:doi">
+										<oaf:identifier identifierType="doi">
+											<xsl:value-of select="." />
+										</oaf:identifier>
+									</xsl:for-each>
 
-                                    <xsl:for-each select="//dc:relation">
-                                        <xsl:if
-                                            test="matches(normalize-space(.), '(info:eu-repo/grantagreement/ec/fp7/)(\d\d\d\d\d\d)(.*)', 'i')">
-                                            <oaf:projectid>
-                                                <xsl:value-of
-                                                  select="concat($varFP7, replace(normalize-space(.), '(info:eu-repo/grantagreement/ec/fp7/)(\d\d\d\d\d\d)(.*)', '$2', 'i'))"
-                                                />
-                                            </oaf:projectid>
-                                        </xsl:if>
-                                        <xsl:if
-                                            test="matches(normalize-space(.), '(info:eu-repo/grantagreement/ec/h2020/)(\d\d\d\d\d\d)(.*)', 'i')">
-                                            <oaf:projectid>
-                                                <xsl:value-of
-                                                  select="concat($varH2020, replace(normalize-space(.), '(info:eu-repo/grantagreement/ec/h2020/)(\d\d\d\d\d\d)(.*)', '$2', 'i'))"
-                                                />
-                                            </oaf:projectid>
-                                        </xsl:if>
-                                    </xsl:for-each>
+									<xsl:for-each
+										select="distinct-values(//dc:identifier[starts-with(., 'http') and ( not(contains(., '://dx.doi.org/') or contains(., '://doi.org/') or contains(., '://hdl.handle.net/')))])">
+										<oaf:identifier identifierType="url">
+											<xsl:value-of select="." />
+										</oaf:identifier>
+									</xsl:for-each>
 
-                                    <xsl:choose>
-                                        <!-- I used an inline mapping because the field typenorm could be repeated and I have to specify a list of priority  -->
+									<xsl:for-each select="distinct-values(//dc:identifier[starts-with(., 'http') and contains(., '://hdl.handle.net/')]/substring-after(., 'hdl.handle.net/'))">
+										<oaf:identifier identifierType="handle">
+											<xsl:value-of select="." />
+										</oaf:identifier>
+									</xsl:for-each>
 
-                                        <!-- Book part -->
-                                        <xsl:when test="//base_dc:typenorm = '111'">
-                                            <dr:CobjCategory type="publication"
-                                                >0013</dr:CobjCategory>
-                                        </xsl:when>
+									<xsl:for-each select="distinct-values(//dc:identifier[starts-with(., 'urn:nbn:nl:') or starts-with(., 'URN:NBN:NL:')])">
+										<oaf:identifier identifierType='urn'>
+											<xsl:value-of select="." />
+										</oaf:identifier>
+									</xsl:for-each>
 
-                                        <!-- Book -->
-                                        <xsl:when test="//base_dc:typenorm = '11'">
-                                            <dr:CobjCategory type="publication"
-                                                >0002</dr:CobjCategory>
-                                        </xsl:when>
+									<oaf:identifier identifierType="oai-original">
+										<xsl:value-of
+											select="//oai:header/oai:identifier" />
+									</oaf:identifier>
 
-                                        <!-- Article contribution -->
-                                        <xsl:when test="//base_dc:typenorm = '121'">
-                                            <dr:CobjCategory type="publication"
-                                                >0001</dr:CobjCategory>
-                                        </xsl:when>
+									<oaf:hostedBy>
+										<xsl:attribute name="name">
+											<xsl:value-of select="//base_dc:collname" />
+										</xsl:attribute>
+										<xsl:attribute name="id">
+											<xsl:value-of select="concat('opendoar____::', //base_dc:collection/@opendoar_id)" />
+										</xsl:attribute>
+									</oaf:hostedBy>
 
+									<oaf:collectedFrom>
+										<xsl:attribute name="name">
+											<xsl:value-of select="$varOfficialName" />
+										</xsl:attribute>
+										<xsl:attribute name="id">
+											<xsl:value-of select="$varDataSourceId" />
+										</xsl:attribute>
+									</oaf:collectedFrom>
 
-                                        <!-- Journal/Newspaper -->
-                                        <xsl:when test="//base_dc:typenorm = '12'">
-                                            <dr:CobjCategory type="publication"
-                                                >0043</dr:CobjCategory>
-                                        </xsl:when>
+									<oaf:dateAccepted>
+										<xsl:value-of select="dateCleaner:dateISO( //dc:date[1] )" />
+									</oaf:dateAccepted>
 
-                                        <!-- Report -->
-                                        <xsl:when test="//base_dc:typenorm = '14'">
-                                            <dr:CobjCategory type="publication"
-                                                >0017</dr:CobjCategory>
-                                        </xsl:when>
+									<xsl:if test="//base_dc:oa[.='1']">
+										<xsl:for-each select="//dc:relation[starts-with(., 'http')]">
+											<oaf:fulltext>
+												<xsl:value-of select="normalize-space(.)" />
+											</oaf:fulltext>
+										</xsl:for-each>
+									</xsl:if>
 
-                                        <!-- Review -->
-                                        <xsl:when test="//base_dc:typenorm = '15'">
-                                            <dr:CobjCategory type="publication"
-                                                >0015</dr:CobjCategory>
-                                        </xsl:when>
+									<xsl:for-each select="//base_dc:collection/@ror_id">
+										<oaf:relation relType="resultOrganization" subRelType="affiliation" relClass="hasAuthorInstitution" targetType="organization">
+											<xsl:choose>
+												<xsl:when test="contains(.,'https://ror.org/')">
+													<xsl:value-of select="concat('ror_________::', normalize-space(.))" />
+												</xsl:when>
+												<xsl:otherwise>
+													<xsl:value-of select="concat('ror_________::https://ror.org/', normalize-space(.))" />
+												</xsl:otherwise>
+											</xsl:choose>
+										</oaf:relation>
+									</xsl:for-each>
+									
+									<oaf:datainfo>
+										<oaf:inferred>false</oaf:inferred>
+										<oaf:deletedbyinference>false</oaf:deletedbyinference>
+										<oaf:trust>0.89</oaf:trust>
+										<oaf:inferenceprovenance/>
+										<oaf:provenanceaction classid="sysimport:crosswalk:aggregator"
+											classname="sysimport:crosswalk:aggregator"
+											schemeid="dnet:provenanceActions"
+											schemename="dnet:provenanceActions"/>
+									</oaf:datainfo>
+								</metadata>
+								<xsl:copy-of select="//*[local-name() = 'about']" />
+							</record>
+						</xsl:template>
 
-                                        <!-- Lecture -->
-                                        <xsl:when test="//base_dc:typenorm = '17'">
-                                            <dr:CobjCategory type="publication"
-                                                >0010</dr:CobjCategory>
-                                        </xsl:when>
+						<xsl:template match="//*[local-name() = 'header']">
+							<xsl:if test="//oai:header/@status='deleted'">
+								<xsl:call-template name="terminate" />
+							</xsl:if>
+							<xsl:copy>
+								<xsl:apply-templates select="node()|@*" />
+								<xsl:element name="dr:dateOfTransformation">
+									<xsl:value-of select="$transDate" />
+								</xsl:element>
+							</xsl:copy>
+						</xsl:template>
 
-                                        <!-- Bachelor's thesis -->
-                                        <xsl:when test="//base_dc:typenorm = '181'">
-                                            <dr:CobjCategory type="publication"
-                                                >0008</dr:CobjCategory>
-                                        </xsl:when>
-
-                                        <!-- Master's thesis -->
-                                        <xsl:when test="//base_dc:typenorm = '182'">
-                                            <dr:CobjCategory type="publication"
-                                                >0007</dr:CobjCategory>
-                                        </xsl:when>
-
-                                        <!-- Doctoral and postdoctoral thesis -->
-                                        <xsl:when test="//base_dc:typenorm = '183'">
-                                            <dr:CobjCategory type="publication"
-                                                >0006</dr:CobjCategory>
-                                        </xsl:when>
-
-                                        <!-- Thesis -->
-                                        <xsl:when test="//base_dc:typenorm = '18'">
-                                            <dr:CobjCategory type="publication"
-                                                >0044</dr:CobjCategory>
-                                        </xsl:when>
-
-                                        <!-- Patent -->
-                                        <xsl:when test="//base_dc:typenorm = '1A'">
-                                            <dr:CobjCategory type="publication"
-                                                >0019</dr:CobjCategory>
-                                        </xsl:when>
-
-                                        <!-- Text -->
-                                        <xsl:when test="//base_dc:typenorm = '1'">
-                                            <dr:CobjCategory type="publication"
-                                                >0001</dr:CobjCategory>
-                                        </xsl:when>
-
-                                        <!-- Software -->
-                                        <xsl:when test="//base_dc:typenorm = '6'">
-                                            <dr:CobjCategory type="software">0029</dr:CobjCategory>
-                                        </xsl:when>
-
-                                        <!-- Dataset -->
-                                        <xsl:when test="//base_dc:typenorm = '7'">
-                                            <dr:CobjCategory type="dataset">0021</dr:CobjCategory>
-                                        </xsl:when>
-
-                                        <!-- Still image -->
-                                        <xsl:when test="//base_dc:typenorm = '51'">
-                                            <dr:CobjCategory type="other">0025</dr:CobjCategory>
-                                        </xsl:when>
-
-                                        <!-- Moving image/Video -->
-                                        <xsl:when test="//base_dc:typenorm = '52'">
-                                            <dr:CobjCategory type="other">0024</dr:CobjCategory>
-                                        </xsl:when>
-
-                                        <!-- Image/Video -->
-                                        <xsl:when test="//base_dc:typenorm = '5'">
-                                            <dr:CobjCategory type="other">0033</dr:CobjCategory>
-                                        </xsl:when>
-
-                                        <!-- Audio -->
-                                        <xsl:when test="//base_dc:typenorm = '4'">
-                                            <dr:CobjCategory type="other">0030</dr:CobjCategory>
-                                        </xsl:when>
-
-                                        <!-- Musical notation -->
-                                        <xsl:when test="//base_dc:typenorm = '2'">
-                                            <dr:CobjCategory type="other">0020</dr:CobjCategory>
-                                        </xsl:when>
-
-                                        <!-- Map -->
-                                        <xsl:when test="//base_dc:typenorm = '3'">
-                                            <dr:CobjCategory type="other">0020</dr:CobjCategory>
-                                        </xsl:when>
-
-                                        <!-- Other non-article -->
-                                        <xsl:when test="//base_dc:typenorm = '122'">
-                                            <dr:CobjCategory type="publication"
-                                                >0038</dr:CobjCategory>
-                                        </xsl:when>
-
-                                        <!-- Course material -->
-                                        <xsl:when test="//base_dc:typenorm = '16'">
-                                            <dr:CobjCategory type="publication"
-                                                >0038</dr:CobjCategory>
-                                        </xsl:when>
-
-                                        <!-- Manuscript -->
-                                        <xsl:when test="//base_dc:typenorm = '19'">
-                                            <dr:CobjCategory type="publication"
-                                                >0038</dr:CobjCategory>
-                                        </xsl:when>
-
-                                        <!-- Conference object -->
-                                        <xsl:when test="//base_dc:typenorm = '13'">
-                                            <dr:CobjCategory type="publication"
-                                                >0004</dr:CobjCategory>
-                                        </xsl:when>
-
-                                        <!-- Unknown -->
-                                        <xsl:when test="//base_dc:typenorm = 'F'">
-                                            <dr:CobjCategory type="other">0000</dr:CobjCategory>
-                                        </xsl:when>
-                                        <xsl:otherwise>
-                                            <dr:CobjCategory type="other">0000</dr:CobjCategory>
-                                        </xsl:otherwise>
-                                    </xsl:choose>
-
-                                    <oaf:accessrights>
-                                        <xsl:choose>
-                                            <xsl:when test="//base_dc:oa[.='0']">CLOSED</xsl:when>
-                                            <xsl:when test="//base_dc:oa[.='1']">OPEN</xsl:when>
-                                            <xsl:when test="//base_dc:oa[.='2']">UNKNOWN</xsl:when>
-                                            <xsl:when test="//base_dc:rightsnorm">
-                                                <xsl:value-of
-                                                  select="vocabulary:clean(//base_dc:rightsnorm, 'dnet:access_modes')"
-                                                />
-                                            </xsl:when>
-                                            <xsl:when test="//dc:rights">
-                                                <xsl:value-of
-                                                  select="vocabulary:clean( //dc:rights, 'dnet:access_modes')"
-                                                />
-                                            </xsl:when>
-                                            <xsl:otherwise>UNKNOWN</xsl:otherwise>
-                                        </xsl:choose>
-                                    </oaf:accessrights>
-
-                                	<xsl:if test="//base_dc:rightsnorm and not(contains(//base_dc:rightsnorm, ';'))">
-                                		<oaf:license><xsl:value-of select="vocabulary:clean(//base_dc:rightsnorm, 'dnet:licenses')" /></oaf:license>
-                                	</xsl:if>
-                                	
-                                    <xsl:for-each select="//base_dc:doi">
-                                        <oaf:identifier identifierType="doi">
-                                            <xsl:value-of select="."/>
-                                        </oaf:identifier>
-                                    </xsl:for-each>
-
-                                    <xsl:for-each
-                                        select="distinct-values(//dc:identifier[starts-with(., 'http') and ( not(contains(., '://dx.doi.org/') or contains(., '://doi.org/') or contains(., '://hdl.handle.net/')))])">
-                                        <oaf:identifier identifierType="url">
-                                            <xsl:value-of select="."/>
-                                        </oaf:identifier>
-                                    </xsl:for-each>
-
-                                    <xsl:for-each
-                                        select="distinct-values(//dc:identifier[starts-with(., 'http') and contains(., '://hdl.handle.net/')]/substring-after(., 'hdl.handle.net/'))">
-                                        <oaf:identifier identifierType="handle">
-                                            <xsl:value-of select="."/>
-                                        </oaf:identifier>
-                                    </xsl:for-each>
-
-                                    <xsl:for-each
-                                        select="distinct-values(//dc:identifier[starts-with(., 'urn:nbn:nl:') or starts-with(., 'URN:NBN:NL:')])">
-                                        <oaf:identifier identifierType="urn">
-                                            <xsl:value-of select="."/>
-                                        </oaf:identifier>
-                                    </xsl:for-each>
-
-                                    <oaf:identifier identifierType="oai-original">
-                                        <xsl:value-of select="//oai:header/oai:identifier"/>
-                                    </oaf:identifier>
-
-                                    <oaf:hostedBy>
-                                        <xsl:attribute name="name">
-                                            <xsl:value-of select="//base_dc:collname"/>
-                                        </xsl:attribute>
-                                        <xsl:attribute name="id">
-                                            <xsl:value-of
-                                                select="concat('opendoar____::', //base_dc:collection/@opendoar_id)"
-                                            />
-                                        </xsl:attribute>
-                                    </oaf:hostedBy>
-
-                                    <oaf:collectedFrom>
-                                        <xsl:attribute name="name">
-                                            <xsl:value-of select="$varOfficialName"/>
-                                        </xsl:attribute>
-                                        <xsl:attribute name="id">
-                                            <xsl:value-of select="$varDataSourceId"/>
-                                        </xsl:attribute>
-                                    </oaf:collectedFrom>
-
-                                    <oaf:dateAccepted>
-                                        <xsl:value-of select="dateCleaner:dateISO( //dc:date[1] )"/>
-                                    </oaf:dateAccepted>
-
-                                    <xsl:if test="//base_dc:oa[.='1']">
-                                        <xsl:for-each select="//dc:relation[starts-with(., 'http')]">
-                                            <oaf:fulltext>
-                                                <xsl:value-of select="normalize-space(.)"/>
-                                            </oaf:fulltext>
-                                        </xsl:for-each>
-                                    </xsl:if>
-
-                                    <xsl:for-each select="//base_dc:collection/@ror_id">
-                                        <oaf:relation relType="resultOrganization"
-                                            subRelType="affiliation" relClass="hasAuthorInstitution"
-                                            targetType="organization">
-                                            <xsl:choose>
-                                                <xsl:when test="contains(.,'https://ror.org/')">
-                                                  <xsl:value-of
-                                                  select="concat('ror_________::', normalize-space(.))"
-                                                  />
-                                                </xsl:when>
-                                                <xsl:otherwise>
-                                                  <xsl:value-of
-                                                  select="concat('ror_________::https://ror.org/', normalize-space(.))"
-                                                  />
-                                                </xsl:otherwise>
-                                            </xsl:choose>
-                                        </oaf:relation>
-                                    </xsl:for-each>
-
-                                    <oaf:datainfo>
-                                        <oaf:inferred>false</oaf:inferred>
-                                        <oaf:deletedbyinference>false</oaf:deletedbyinference>
-                                        <oaf:trust>0.89</oaf:trust>
-                                        <oaf:inferenceprovenance/>
-                                        <oaf:provenanceaction
-                                            classid="sysimport:crosswalk:aggregator"
-                                            classname="sysimport:crosswalk:aggregator"
-                                            schemeid="dnet:provenanceActions"
-                                            schemename="dnet:provenanceActions"/>
-                                    </oaf:datainfo>
-                                </metadata>
-                                <xsl:copy-of select="//*[local-name() = 'about']"/>
-                            </record>
-                        </xsl:template>
-
-                        <xsl:template match="//*[local-name() = 'header']">
-                            <xsl:if test="//oai:header/@status='deleted'">
-                                <xsl:call-template name="terminate"/>
-                            </xsl:if>
-                            <xsl:copy>
-                                <xsl:apply-templates select="node()|@*"/>
-                                <xsl:element name="dr:dateOfTransformation">
-                                    <xsl:value-of select="$transDate"/>
-                                </xsl:element>
-                            </xsl:copy>
-                        </xsl:template>
-
-                        <xsl:template match="node()|@*">
-                            <xsl:copy>
-                                <xsl:apply-templates select="node()|@*"/>
-                            </xsl:copy>
-                        </xsl:template>
-                    </xsl:stylesheet>
-                </CODE>
-            </SCRIPT>
-        </CONFIGURATION>
-        <STATUS/>
-        <SECURITY_PARAMETERS/>
-    </BODY>
-</RESOURCE_PROFILE>
+						<xsl:template match="node()|@*">
+							<xsl:copy>
+								<xsl:apply-templates select="node()|@*" />
+							</xsl:copy>
+						</xsl:template>
+					</xsl:stylesheet>
+				</CODE>
+			</SCRIPT>
+		</CONFIGURATION>
+		<STATUS />
+		<SECURITY_PARAMETERS />
+	</BODY>
+</RESOURCE_PROFILE>

dhp-workflows/dhp-aggregation/src/main/scala/eu/dnetlib/dhp/collection/crossref/Crossref2Oaf.scala

@@ -93,7 +93,7 @@ case object Crossref2Oaf {
 
     val cf = new KeyValue
     cf.setValue("UnpayWall")
-    cf.setKey(s"10|openaire____::${DHPUtils.md5("UnpayWall".toLowerCase)}")
+    cf.setKey(s"10|openaire____:${DHPUtils.md5("UnpayWall".toLowerCase)}")
     cf
 
   }
@@ -332,7 +332,7 @@ case object Crossref2Oaf {
     implicit lazy val formats: DefaultFormats.type = org.json4s.DefaultFormats
 
     //MAPPING Crossref DOI into PID
-    val doi: String = DoiCleaningRule.clean((json \ "DOI").extract[String])
+    val doi: String = DoiCleaningRule.normalizeDoi((json \ "DOI").extract[String])
     result.setPid(
       List(
         structuredProperty(
@@ -504,24 +504,6 @@ case object Crossref2Oaf {
       )
     }
 
-    val is_review = json \ "relation" \ "is-review-of" \ "id"
-
-    if (is_review != JNothing) {
-      instance.setInstancetype(
-        OafMapperUtils.qualifier(
-          "0015",
-          "peerReviewed",
-          ModelConstants.DNET_REVIEW_LEVELS,
-          ModelConstants.DNET_REVIEW_LEVELS
-        )
-      )
-    }
-
-    if (doi.startsWith("10.3410") || doi.startsWith("10.12703"))
-      instance.setHostedby(
-        OafMapperUtils.keyValue(OafMapperUtils.createOpenaireId(10, "openaire____::H1Connect", true), "H1Connect")
-      )
-
     instance.setAccessright(
       decideAccessRight(instance.getLicense, result.getDateofacceptance.getValue)
     )
@@ -673,7 +655,7 @@ case object Crossref2Oaf {
     val doi = input.getString(0)
     val rorId = input.getString(1)
 
-    val pubId = s"50|${PidType.doi.toString.padTo(12, "_")}::${DoiCleaningRule.clean(doi)}"
+    val pubId = s"50|${PidType.doi.toString.padTo(12, "_")}::${DoiCleaningRule.normalizeDoi(doi)}"
     val affId = GenerateRorActionSetJob.calculateOpenaireId(rorId)
 
     val r: Relation = new Relation
@@ -906,11 +888,7 @@ case object Crossref2Oaf {
               val targetId = getProjectId("cihr________", "1e5e62235d094afd01cd56e65112fc63")
               queue += generateRelation(sourceId, targetId, ModelConstants.IS_PRODUCED_BY)
               queue += generateRelation(targetId, sourceId, ModelConstants.PRODUCES)
-//              Added mapping for DFG
-            case "10.13039/501100001659" =>
-              val targetId = getProjectId("dfgf________", "1e5e62235d094afd01cd56e65112fc63")
-              queue += generateRelation(sourceId, targetId, ModelConstants.IS_PRODUCED_BY)
-              queue += generateRelation(targetId, sourceId, ModelConstants.PRODUCES)
+
             case "10.13039/100020031" =>
               val targetId = getProjectId("tara________", "1e5e62235d094afd01cd56e65112fc63")
               queue += generateRelation(sourceId, targetId, ModelConstants.IS_PRODUCED_BY)
@@ -1047,7 +1025,6 @@ case object Crossref2Oaf {
             tp._1 match {
               case "electronic" => journal.setIssnOnline(tp._2)
               case "print"      => journal.setIssnPrinted(tp._2)
-              case _            =>
             }
           })
         }

dhp-workflows/dhp-aggregation/src/main/scala/eu/dnetlib/dhp/sx/bio/ebi/SparkCreateBaselineDataFrame.scala

@@ -2,9 +2,12 @@ package eu.dnetlib.dhp.sx.bio.ebi
 
 import eu.dnetlib.dhp.application.ArgumentApplicationParser
 import eu.dnetlib.dhp.collection.CollectionUtils
+import eu.dnetlib.dhp.common.Constants.{MDSTORE_DATA_PATH, MDSTORE_SIZE_PATH}
 import eu.dnetlib.dhp.common.vocabulary.VocabularyGroup
-import eu.dnetlib.dhp.schema.oaf.Oaf
+import eu.dnetlib.dhp.schema.mdstore.MDStoreVersion
+import eu.dnetlib.dhp.schema.oaf.{Oaf, Result}
 import eu.dnetlib.dhp.sx.bio.pubmed._
+import eu.dnetlib.dhp.utils.DHPUtils.{MAPPER, writeHdfsFile}
 import eu.dnetlib.dhp.utils.ISLookupClientFactory
 import org.apache.commons.io.IOUtils
 import org.apache.hadoop.conf.Configuration
@@ -14,13 +17,13 @@ import org.apache.http.client.methods.HttpGet
 import org.apache.http.impl.client.HttpClientBuilder
 import org.apache.spark.SparkConf
 import org.apache.spark.rdd.RDD
-import org.apache.spark.sql._
 import org.apache.spark.sql.expressions.Aggregator
+import org.apache.spark.sql._
 import org.slf4j.{Logger, LoggerFactory}
 
-import java.io.{ByteArrayInputStream, InputStream}
-import java.nio.charset.Charset
-import javax.xml.stream.XMLInputFactory
+import java.io.InputStream
+import scala.io.Source
+import scala.xml.pull.XMLEventReader
 
 object SparkCreateBaselineDataFrame {
 
@@ -83,7 +86,7 @@ object SparkCreateBaselineDataFrame {
           if (response.getStatusLine.getStatusCode > 400) {
             tries -= 1
           } else
-            return IOUtils.toString(response.getEntity.getContent, Charset.defaultCharset())
+            return IOUtils.toString(response.getEntity.getContent)
         } catch {
           case e: Throwable =>
             println(s"Error on requesting ${r.getURI}")
@@ -155,8 +158,7 @@ object SparkCreateBaselineDataFrame {
       IOUtils.toString(
         SparkEBILinksToOaf.getClass.getResourceAsStream(
           "/eu/dnetlib/dhp/sx/bio/ebi/baseline_to_oaf_params.json"
-        ),
-        Charset.defaultCharset()
+        )
       )
     )
     parser.parseArgument(args)
@@ -165,11 +167,15 @@ object SparkCreateBaselineDataFrame {
     val workingPath = parser.get("workingPath")
     log.info("workingPath: {}", workingPath)
 
-    val targetPath = parser.get("targetPath")
-    log.info("targetPath: {}", targetPath)
+    val mdstoreOutputVersion = parser.get("mdstoreOutputVersion")
+    log.info("mdstoreOutputVersion: {}", mdstoreOutputVersion)
+
+    val cleanedMdStoreVersion = MAPPER.readValue(mdstoreOutputVersion, classOf[MDStoreVersion])
+    val outputBasePath = cleanedMdStoreVersion.getHdfsPath
+    log.info("outputBasePath: {}", outputBasePath)
 
     val hdfsServerUri = parser.get("hdfsServerUri")
-    log.info("hdfsServerUri: {}", targetPath)
+    log.info("hdfsServerUri: {}", hdfsServerUri)
 
     val skipUpdate = parser.get("skipUpdate")
     log.info("skipUpdate: {}", skipUpdate)
@@ -195,11 +201,10 @@ object SparkCreateBaselineDataFrame {
     if (!"true".equalsIgnoreCase(skipUpdate)) {
       downloadBaseLineUpdate(s"$workingPath/baseline", hdfsServerUri)
       val k: RDD[(String, String)] = sc.wholeTextFiles(s"$workingPath/baseline", 2000)
-      val inputFactory = XMLInputFactory.newInstance
       val ds: Dataset[PMArticle] = spark.createDataset(
         k.filter(i => i._1.endsWith(".gz"))
           .flatMap(i => {
-            val xml = inputFactory.createXMLEventReader(new ByteArrayInputStream(i._2.getBytes()))
+            val xml = new XMLEventReader(Source.fromBytes(i._2.getBytes()))
             new PMParser(xml)
           })
       )
@@ -218,8 +223,11 @@ object SparkCreateBaselineDataFrame {
         .map(a => PubMedToOaf.convert(a, vocabularies))
         .as[Oaf]
         .filter(p => p != null),
-      targetPath
+      s"$outputBasePath/$MDSTORE_DATA_PATH"
     )
 
+    val df = spark.read.text(s"$outputBasePath/$MDSTORE_DATA_PATH")
+    val mdStoreSize = df.count
+    writeHdfsFile(spark.sparkContext.hadoopConfiguration, s"$mdStoreSize", s"$outputBasePath/$MDSTORE_SIZE_PATH")
   }
 }

dhp-workflows/dhp-aggregation/src/main/scala/eu/dnetlib/dhp/sx/bio/pubmed/PMParser.scala

@@ -1,8 +1,7 @@
 package eu.dnetlib.dhp.sx.bio.pubmed
 
 import scala.xml.MetaData
-import javax.xml.stream.XMLEventReader
-import scala.xml.pull.{EvElemEnd, EvElemStart, EvText}
+import scala.xml.pull.{EvElemEnd, EvElemStart, EvText, XMLEventReader}
 
 /** @param xml
   */

dhp-workflows/dhp-aggregation/src/test/java/eu/dnetlib/dhp/actionmanager/bipaffiliations/PrepareAffiliationRelationsTest.java

@@ -30,7 +30,6 @@ import eu.dnetlib.dhp.schema.common.ModelConstants;
 import eu.dnetlib.dhp.schema.oaf.Relation;
 import eu.dnetlib.dhp.schema.oaf.utils.CleaningFunctions;
 import eu.dnetlib.dhp.schema.oaf.utils.IdentifierFactory;
-import eu.dnetlib.dhp.schema.oaf.utils.PidCleaner;
 
 public class PrepareAffiliationRelationsTest {
 
@@ -75,20 +74,8 @@ public class PrepareAffiliationRelationsTest {
 	@Test
 	void testMatch() throws Exception {
 
-		String crossrefAffiliationRelationPathNew = getClass()
-			.getResource("/eu/dnetlib/dhp/actionmanager/bipaffiliations/doi_to_ror.json")
-			.getPath();
-
 		String crossrefAffiliationRelationPath = getClass()
-			.getResource("/eu/dnetlib/dhp/actionmanager/bipaffiliations/doi_to_ror_old.json")
-			.getPath();
-
-		String publisherAffiliationRelationPath = getClass()
-			.getResource("/eu/dnetlib/dhp/actionmanager/bipaffiliations/publishers")
-			.getPath();
-
-		String publisherAffiliationRelationOldPath = getClass()
-			.getResource("/eu/dnetlib/dhp/actionmanager/bipaffiliations/publichers_old")
+			.getResource("/eu/dnetlib/dhp/actionmanager/bipaffiliations/doi_to_ror.json")
 			.getPath();
 
 		String outputPath = workingDir.toString() + "/actionSet";
@@ -97,12 +84,11 @@ public class PrepareAffiliationRelationsTest {
 			.main(
 				new String[] {
 					"-isSparkSessionManaged", Boolean.FALSE.toString(),
-					"-crossrefInputPath", crossrefAffiliationRelationPathNew,
+					"-crossrefInputPath", crossrefAffiliationRelationPath,
 					"-pubmedInputPath", crossrefAffiliationRelationPath,
-					"-openapcInputPath", crossrefAffiliationRelationPathNew,
+					"-openapcInputPath", crossrefAffiliationRelationPath,
 					"-dataciteInputPath", crossrefAffiliationRelationPath,
 					"-webCrawlInputPath", crossrefAffiliationRelationPath,
-					"-publisherInputPath", publisherAffiliationRelationOldPath,
 					"-outputPath", outputPath
 				});
 
@@ -113,8 +99,13 @@ public class PrepareAffiliationRelationsTest {
 			.map(value -> OBJECT_MAPPER.readValue(value._2().toString(), AtomicAction.class))
 			.map(aa -> ((Relation) aa.getPayload()));
 
+//        for (Relation r : tmp.collect()) {
+//            System.out.println(
+//                    r.getSource() + "\t" + r.getTarget() + "\t" + r.getRelType() + "\t" + r.getRelClass() + "\t" + r.getSubRelType() + "\t" + r.getValidationDate() + "\t" + r.getDataInfo().getTrust() + "\t" + r.getDataInfo().getInferred()
+//            );
+//        }
 		// count the number of relations
-		assertEquals(150, tmp.count());// 18 + 24 *3 + 30 * 2 =
+		assertEquals(120, tmp.count());
 
 		Dataset<Relation> dataset = spark.createDataset(tmp.rdd(), Encoders.bean(Relation.class));
 		dataset.createOrReplaceTempView("result");
@@ -125,7 +116,7 @@ public class PrepareAffiliationRelationsTest {
 		// verify that we have equal number of bi-directional relations
 		Assertions
 			.assertEquals(
-				75, execVerification
+				60, execVerification
 					.filter(
 						"relClass='" + ModelConstants.HAS_AUTHOR_INSTITUTION + "'")
 					.collectAsList()
@@ -133,56 +124,26 @@ public class PrepareAffiliationRelationsTest {
 
 		Assertions
 			.assertEquals(
-				75, execVerification
+				60, execVerification
 					.filter(
 						"relClass='" + ModelConstants.IS_AUTHOR_INSTITUTION_OF + "'")
 					.collectAsList()
 					.size());
 
 		// check confidence value of a specific relation
-		String sourceDOI = "10.1089/10872910260066679";
+		String sourceDOI = "10.1061/(asce)0733-9399(2002)128:7(759)";
 
 		final String sourceOpenaireId = ID_PREFIX
-			+ IdentifierFactory.md5(PidCleaner.normalizePidValue("doi", sourceDOI));
+			+ IdentifierFactory.md5(CleaningFunctions.normalizePidValue("doi", sourceDOI));
 
 		Assertions
 			.assertEquals(
-				"1.0", execVerification
+				"0.7071067812", execVerification
 					.filter(
 						"source='" + sourceOpenaireId + "'")
 					.collectAsList()
 					.get(0)
 					.getString(4));
 
-		final String publisherid = ID_PREFIX
-			+ IdentifierFactory.md5(PidCleaner.normalizePidValue("doi", "10.1089/10872910260066679"));
-		final String rorId = "20|ror_________::" + IdentifierFactory.md5("https://ror.org/05cf8a891");
-
-		Assertions
-			.assertEquals(
-				2, execVerification.filter("source = '" + publisherid + "' and target = '" + rorId + "'").count());
-
-		Assertions
-			.assertEquals(
-				1, execVerification
-					.filter(
-						"source = '" + ID_PREFIX
-							+ IdentifierFactory
-								.md5(PidCleaner.normalizePidValue("doi", "10.1007/s00217-010-1268-9"))
-							+ "' and target = '" + "20|ror_________::"
-							+ IdentifierFactory.md5("https://ror.org/03265fv13") + "'")
-					.count());
-
-		Assertions
-			.assertEquals(
-				3, execVerification
-					.filter(
-						"source = '" + ID_PREFIX
-							+ IdentifierFactory
-								.md5(PidCleaner.normalizePidValue("doi", "10.1007/3-540-47984-8_14"))
-							+ "' and target = '" + "20|ror_________::"
-							+ IdentifierFactory.md5("https://ror.org/00a0n9e72") + "'")
-					.count());
-
 	}
 }

dhp-workflows/dhp-aggregation/src/test/java/eu/dnetlib/dhp/actionmanager/createunresolvedentities/ProduceTest.java

@@ -15,7 +15,10 @@ import org.apache.spark.SparkConf;
 import org.apache.spark.api.java.JavaRDD;
 import org.apache.spark.api.java.JavaSparkContext;
 import org.apache.spark.sql.SparkSession;
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

dhp-workflows/dhp-aggregation/src/test/java/eu/dnetlib/dhp/actionmanager/opencitations/CreateOpenCitationsASTest.java

@@ -31,7 +31,6 @@ import eu.dnetlib.dhp.schema.oaf.Publication;
 import eu.dnetlib.dhp.schema.oaf.Relation;
 import eu.dnetlib.dhp.schema.oaf.utils.CleaningFunctions;
 import eu.dnetlib.dhp.schema.oaf.utils.IdentifierFactory;
-import eu.dnetlib.dhp.schema.oaf.utils.PidCleaner;
 
 public class CreateOpenCitationsASTest {
 
@@ -281,17 +280,17 @@ public class CreateOpenCitationsASTest {
 	@Test
 	void testRelationsSourceTargetCouple() throws Exception {
 		final String doi1 = "50|doi_________::"
-			+ IdentifierFactory.md5(PidCleaner.normalizePidValue("doi", "10.1007/s10854-015-3684-x"));
+			+ IdentifierFactory.md5(CleaningFunctions.normalizePidValue("doi", "10.1007/s10854-015-3684-x"));
 		final String doi2 = "50|doi_________::"
-			+ IdentifierFactory.md5(PidCleaner.normalizePidValue("doi", "10.1111/j.1551-2916.2008.02408.x"));
+			+ IdentifierFactory.md5(CleaningFunctions.normalizePidValue("doi", "10.1111/j.1551-2916.2008.02408.x"));
 		final String doi3 = "50|doi_________::"
-			+ IdentifierFactory.md5(PidCleaner.normalizePidValue("doi", "10.1007/s10854-014-2114-9"));
+			+ IdentifierFactory.md5(CleaningFunctions.normalizePidValue("doi", "10.1007/s10854-014-2114-9"));
 		final String doi4 = "50|doi_________::"
-			+ IdentifierFactory.md5(PidCleaner.normalizePidValue("doi", "10.1016/j.ceramint.2013.09.069"));
+			+ IdentifierFactory.md5(CleaningFunctions.normalizePidValue("doi", "10.1016/j.ceramint.2013.09.069"));
 		final String doi5 = "50|doi_________::"
-			+ IdentifierFactory.md5(PidCleaner.normalizePidValue("doi", "10.1007/s10854-009-9913-4"));
+			+ IdentifierFactory.md5(CleaningFunctions.normalizePidValue("doi", "10.1007/s10854-009-9913-4"));
 		final String doi6 = "50|doi_________::"
-			+ IdentifierFactory.md5(PidCleaner.normalizePidValue("doi", "10.1016/0038-1098(72)90370-5"));
+			+ IdentifierFactory.md5(CleaningFunctions.normalizePidValue("doi", "10.1016/0038-1098(72)90370-5"));
 
 		String inputPath = getClass()
 			.getResource(

dhp-workflows/dhp-aggregation/src/test/java/eu/dnetlib/dhp/actionmanager/opencitations/ReadCOCITest.java

@@ -119,9 +119,7 @@ public class ReadCOCITest {
 					workingDir.toString() + "/COCI",
 					"-outputPath",
 					workingDir.toString() + "/COCI_json/",
-					"-inputFile", "input1;input2;input3;input4;input5",
-					"-format",
-					"COCI"
+					"-inputFile", "input1;input2;input3;input4;input5"
 				});
 
 		final JavaSparkContext sc = JavaSparkContext.fromSparkContext(spark.sparkContext());

dhp-workflows/dhp-aggregation/src/test/java/eu/dnetlib/dhp/actionmanager/opencitations/RemapTest.java

@@ -77,13 +77,13 @@ public class RemapTest {
 		MapOCIdsInPids
 			.main(
 				new String[] {
-					"--isSparkSessionManged",
+					"-isSparkSessionManged",
 					Boolean.FALSE.toString(),
-					"--inputPath",
+					"-inputPath",
 					inputPath,
-					"--outputPath",
+					"-outputPath",
 					workingDir.toString() + "/out/",
-					"--nameNode", "hdfs://localhost"
+					"-nameNode", "input1;input2;input3;input4;input5"
 				});
 
 	}

dhp-workflows/dhp-aggregation/src/test/java/eu/dnetlib/dhp/actionmanager/person/CreatePersonAS.java

@@ -1,213 +0,0 @@
-
-package eu.dnetlib.dhp.actionmanager.person;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.hadoop.io.Text;
-import org.apache.spark.SparkConf;
-import org.apache.spark.api.java.JavaRDD;
-import org.apache.spark.api.java.JavaSparkContext;
-import org.apache.spark.sql.SparkSession;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import eu.dnetlib.dhp.actionmanager.personentity.ExtractPerson;
-import eu.dnetlib.dhp.schema.action.AtomicAction;
-import eu.dnetlib.dhp.schema.common.ModelConstants;
-import eu.dnetlib.dhp.schema.oaf.Person;
-import eu.dnetlib.dhp.schema.oaf.Relation;
-import eu.dnetlib.dhp.utils.DHPUtils;
-
-public class CreatePersonAS {
-
-	private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
-
-	private static SparkSession spark;
-
-	private static Path workingDir;
-	private static final Logger log = LoggerFactory
-		.getLogger(CreatePersonAS.class);
-
-	@BeforeAll
-	public static void beforeAll() throws IOException {
-		workingDir = Files
-			.createTempDirectory(CreatePersonAS.class.getSimpleName());
-		log.info("using work dir {}", workingDir);
-
-		SparkConf conf = new SparkConf();
-		conf.setAppName(CreatePersonAS.class.getSimpleName());
-
-		conf.setMaster("local[*]");
-		conf.set("spark.driver.host", "localhost");
-		conf.set("hive.metastore.local", "true");
-		conf.set("spark.ui.enabled", "false");
-		conf.set("spark.sql.codegen.wholeStage", "false");
-		conf.set("spark.sql.warehouse.dir", workingDir.toString());
-		conf.set("hive.metastore.warehouse.dir", workingDir.resolve("warehouse").toString());
-
-		spark = SparkSession
-			.builder()
-			.appName(CreatePersonAS.class.getSimpleName())
-			.config(conf)
-			.getOrCreate();
-	}
-
-	@AfterAll
-	public static void afterAll() throws IOException {
-		FileUtils.deleteDirectory(workingDir.toFile());
-		spark.stop();
-	}
-
-	@Test
-	void testAuthors() throws Exception {
-
-		String inputPath = getClass()
-			.getResource(
-				"/eu/dnetlib/dhp/actionmanager/person/")
-			.getPath();
-
-//		spark
-//				.read()
-//				.parquet(inputPath + "Authors")
-//				.as(Encoders.bean(Author.class))
-//						.filter((FilterFunction<Author>) a -> Optional.ofNullable(a.getOtherNames()).isPresent() &&
-//								Optional.ofNullable(a.getBiography()).isPresent())
-//								.write()
-//										.mode(SaveMode.Overwrite)
-//												.parquet(workingDir.toString() + "AuthorsSubset");
-
-		ExtractPerson
-			.main(
-				new String[] {
-					"-isSparkSessionManaged",
-					Boolean.FALSE.toString(),
-					"-inputPath",
-					inputPath,
-					"-outputPath",
-					workingDir.toString() + "/actionSet1",
-					"-workingDir",
-					workingDir.toString() + "/working"
-				});
-
-		final JavaSparkContext sc = new JavaSparkContext(spark.sparkContext());
-
-		JavaRDD<Relation> relations = sc
-			.sequenceFile(workingDir.toString() + "/actionSet1", Text.class, Text.class)
-			.filter(v -> "eu.dnetlib.dhp.schema.oaf.Relation".equalsIgnoreCase(v._1().toString()))
-			.map(value -> OBJECT_MAPPER.readValue(value._2().toString(), AtomicAction.class))
-			.map(aa -> ((Relation) aa.getPayload()));
-//
-		JavaRDD<Person> people = sc
-			.sequenceFile(workingDir.toString() + "/actionSet1", Text.class, Text.class)
-			.filter(v -> "eu.dnetlib.dhp.schema.oaf.Person".equalsIgnoreCase(v._1().toString()))
-			.map(value -> OBJECT_MAPPER.readValue(value._2().toString(), AtomicAction.class))
-			.map(aa -> ((Person) aa.getPayload()));
-//
-		Assertions.assertEquals(7, people.count());
-		Assertions
-			.assertEquals(
-				"Paulo",
-				people
-					.filter(
-						p -> p.getPid().stream().anyMatch(id -> id.getValue().equalsIgnoreCase("0000-0002-3210-3034")))
-					.first()
-					.getGivenName());
-		Assertions
-			.assertEquals(
-				"Tavares",
-				people
-					.filter(
-						p -> p.getPid().stream().anyMatch(id -> id.getValue().equalsIgnoreCase("0000-0002-3210-3034")))
-					.first()
-					.getFamilyName());
-		Assertions
-			.assertEquals(
-				4,
-				people
-					.filter(
-						p -> p.getPid().stream().anyMatch(id -> id.getValue().equalsIgnoreCase("0000-0002-3210-3034")))
-					.first()
-					.getAlternativeNames()
-					.size());
-		Assertions
-			.assertEquals(
-				4,
-				people
-					.filter(
-						p -> p.getPid().stream().anyMatch(id -> id.getValue().equalsIgnoreCase("0000-0002-3210-3034")))
-					.first()
-					.getPid()
-					.size());
-		Assertions
-			.assertTrue(
-				people
-					.filter(
-						p -> p.getPid().stream().anyMatch(id -> id.getValue().equalsIgnoreCase("0000-0002-3210-3034")))
-					.first()
-					.getPid()
-					.stream()
-					.anyMatch(
-						p -> p.getQualifier().getSchemename().equalsIgnoreCase("Scopus Author ID")
-							&& p.getValue().equalsIgnoreCase("15119405200")));
-
-		Assertions
-			.assertEquals(
-				16,
-				relations
-					.filter(r -> r.getRelClass().equalsIgnoreCase(ModelConstants.RESULT_PERSON_HASAUTHORED))
-					.count());
-		Assertions
-			.assertEquals(
-				14,
-				relations
-					.filter(r -> r.getRelClass().equalsIgnoreCase(ModelConstants.PERSON_PERSON_HASCOAUTHORED))
-					.count());
-		Assertions
-			.assertEquals(
-				3,
-				relations
-					.filter(
-						r -> r.getSource().equalsIgnoreCase("30|orcid_______::" + DHPUtils.md5("0000-0001-6291-9619"))
-							&& r.getRelClass().equalsIgnoreCase(ModelConstants.RESULT_PERSON_HASAUTHORED))
-					.count());
-		Assertions
-			.assertEquals(
-				2,
-				relations
-					.filter(
-						r -> r.getSource().equalsIgnoreCase("30|orcid_______::" + DHPUtils.md5("0000-0001-6291-9619"))
-							&& r.getRelClass().equalsIgnoreCase(ModelConstants.RESULT_PERSON_HASAUTHORED)
-							&& r.getTarget().startsWith("50|doi"))
-					.count());
-		Assertions
-			.assertEquals(
-				1,
-				relations
-					.filter(
-						r -> r.getSource().equalsIgnoreCase("30|orcid_______::" + DHPUtils.md5("0000-0001-6291-9619"))
-							&& r.getRelClass().equalsIgnoreCase(ModelConstants.RESULT_PERSON_HASAUTHORED)
-							&& r.getTarget().startsWith("50|arXiv"))
-					.count());
-
-		Assertions
-			.assertEquals(
-				1,
-				relations
-					.filter(
-						r -> r.getSource().equalsIgnoreCase("30|orcid_______::" + DHPUtils.md5("0000-0001-6291-9619"))
-							&& r.getRelClass().equalsIgnoreCase(ModelConstants.PERSON_PERSON_HASCOAUTHORED))
-					.count());
-		Assertions.assertEquals(33, relations.count());
-
-	}
-
-}

dhp-workflows/dhp-aggregation/src/test/java/eu/dnetlib/dhp/actionmanager/transformativeagreement/CreateTAActionSetTest.java

@@ -28,7 +28,6 @@ import eu.dnetlib.dhp.schema.common.ModelConstants;
 import eu.dnetlib.dhp.schema.oaf.Relation;
 import eu.dnetlib.dhp.schema.oaf.utils.CleaningFunctions;
 import eu.dnetlib.dhp.schema.oaf.utils.IdentifierFactory;
-import eu.dnetlib.dhp.schema.oaf.utils.PidCleaner;
 
 /**
  * @author miriam.baglioni
@@ -271,17 +270,17 @@ public class CreateTAActionSetTest {
 	@Test
 	void testRelationsSourceTargetCouple() throws Exception {
 		final String doi1 = "50|doi_________::"
-			+ IdentifierFactory.md5(PidCleaner.normalizePidValue("doi", "10.1007/s10854-015-3684-x"));
+			+ IdentifierFactory.md5(CleaningFunctions.normalizePidValue("doi", "10.1007/s10854-015-3684-x"));
 		final String doi2 = "50|doi_________::"
-			+ IdentifierFactory.md5(PidCleaner.normalizePidValue("doi", "10.1111/j.1551-2916.2008.02408.x"));
+			+ IdentifierFactory.md5(CleaningFunctions.normalizePidValue("doi", "10.1111/j.1551-2916.2008.02408.x"));
 		final String doi3 = "50|doi_________::"
-			+ IdentifierFactory.md5(PidCleaner.normalizePidValue("doi", "10.1007/s10854-014-2114-9"));
+			+ IdentifierFactory.md5(CleaningFunctions.normalizePidValue("doi", "10.1007/s10854-014-2114-9"));
 		final String doi4 = "50|doi_________::"
-			+ IdentifierFactory.md5(PidCleaner.normalizePidValue("doi", "10.1016/j.ceramint.2013.09.069"));
+			+ IdentifierFactory.md5(CleaningFunctions.normalizePidValue("doi", "10.1016/j.ceramint.2013.09.069"));
 		final String doi5 = "50|doi_________::"
-			+ IdentifierFactory.md5(PidCleaner.normalizePidValue("doi", "10.1007/s10854-009-9913-4"));
+			+ IdentifierFactory.md5(CleaningFunctions.normalizePidValue("doi", "10.1007/s10854-009-9913-4"));
 		final String doi6 = "50|doi_________::"
-			+ IdentifierFactory.md5(PidCleaner.normalizePidValue("doi", "10.1016/0038-1098(72)90370-5"));
+			+ IdentifierFactory.md5(CleaningFunctions.normalizePidValue("doi", "10.1016/0038-1098(72)90370-5"));
 
 		String inputPath = getClass()
 			.getResource(