code formatting

dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/NormalizeDate.java

@@ -5,12 +5,13 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import org.apache.commons.lang3.StringUtils;
+
 import net.sf.saxon.expr.XPathContext;
 import net.sf.saxon.om.Sequence;
 import net.sf.saxon.trans.XPathException;
 import net.sf.saxon.value.SequenceType;
 import net.sf.saxon.value.StringValue;
-import org.apache.commons.lang3.StringUtils;
 
 public class NormalizeDate extends AbstractExtensionFunction {
 

dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/clean/CleaningFunctions.java

@@ -6,9 +6,10 @@ import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import com.clearspring.analytics.util.Lists;
 import org.apache.commons.lang3.StringUtils;
 
+import com.clearspring.analytics.util.Lists;
+
 import eu.dnetlib.dhp.oa.graph.raw.AbstractMdRecordToOafMapper;
 import eu.dnetlib.dhp.oa.graph.raw.common.OafMapperUtils;
 import eu.dnetlib.dhp.schema.common.ModelConstants;
@@ -144,22 +145,29 @@ public class CleaningFunctions {
 						author.setRank(i++);
 					}
 				}
-				for(Author a : r.getAuthor()) {
+				for (Author a : r.getAuthor()) {
 					if (Objects.isNull(a.getPid())) {
 						a.setPid(Lists.newArrayList());
 					} else {
-						a.setPid(
+						a
-							a.getPid().stream()
+							.setPid(
-								.filter(p -> Objects.nonNull(p.getQualifier()))
+								a
-								.filter(p -> StringUtils.isNotBlank(p.getValue()))
+									.getPid()
-								.map(p -> {
+									.stream()
-									p.setValue(p.getValue().trim().replaceAll(ORCID_PREFIX_REGEX, ""));
+									.filter(p -> Objects.nonNull(p.getQualifier()))
-									return p;
+									.filter(p -> StringUtils.isNotBlank(p.getValue()))
-								})
+									.map(p -> {
-								.collect(Collectors.toMap(StructuredProperty::getValue, Function.identity(), (p1, p2) -> p1, LinkedHashMap::new))
+										p.setValue(p.getValue().trim().replaceAll(ORCID_PREFIX_REGEX, ""));
-								.values()
+										return p;
-								.stream()
+									})
-								.collect(Collectors.toList()));
+									.collect(
+										Collectors
+											.toMap(
+												StructuredProperty::getValue, Function.identity(), (p1, p2) -> p1,
+												LinkedHashMap::new))
+									.values()
+									.stream()
+									.collect(Collectors.toList()));
 					}
 				}
 

dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/MigrateDbEntitiesApplication.java

@@ -195,11 +195,14 @@ public class MigrateDbEntitiesApplication extends AbstractMigrationApplication i
 			final Datasource ds = new Datasource();
 
 			ds.setId(createOpenaireId(10, rs.getString("datasourceid"), true));
-			ds.setOriginalId(Arrays.asList(
+			ds
-					(String[]) rs.getArray("identities").getArray())
+				.setOriginalId(
-					.stream()
+					Arrays
-					.filter(StringUtils::isNotBlank)
+						.asList(
-					.collect(Collectors.toList()));
+							(String[]) rs.getArray("identities").getArray())
+						.stream()
+						.filter(StringUtils::isNotBlank)
+						.collect(Collectors.toList()));
 			ds
 				.setCollectedfrom(
 					listKeyValues(
@@ -244,13 +247,14 @@ public class MigrateDbEntitiesApplication extends AbstractMigrationApplication i
 			ds.setPidsystems(field(rs.getString("pidsystems"), info));
 			ds.setCertificates(field(rs.getString("certificates"), info));
 			ds.setPolicies(new ArrayList<>()); // The sql query returns an empty array
-			ds.setJournal(
+			ds
+				.setJournal(
 					journal(
-							rs.getString("officialname"),
+						rs.getString("officialname"),
-							rs.getString("issnPrinted"),
+						rs.getString("issnPrinted"),
-							rs.getString("issnOnline"),
+						rs.getString("issnOnline"),
-							rs.getString("issnLinking"),
+						rs.getString("issnLinking"),
-							info)); // Journal
+						info)); // Journal
 			ds.setDataInfo(info);
 			ds.setLastupdatetimestamp(lastUpdateTimestamp);
 
@@ -579,7 +583,9 @@ public class MigrateDbEntitiesApplication extends AbstractMigrationApplication i
 			return null;
 		} else {
 
-			return journal(rs.getString("officialname"), rs.getString("issnPrinted"), rs.getString("issnOnline"), rs.getString("issnLinking"), info);
+			return journal(
+				rs.getString("officialname"), rs.getString("issnPrinted"), rs.getString("issnOnline"),
+				rs.getString("issnLinking"), info);
 		}
 	}
 

dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/common/OafMapperUtils.java

@@ -154,24 +154,24 @@ public class OafMapperUtils {
 	}
 
 	public static Journal journal(
-			final String name,
+		final String name,
-			final String issnPrinted,
+		final String issnPrinted,
-			final String issnOnline,
+		final String issnOnline,
-			final String issnLinking,
+		final String issnLinking,
-			final DataInfo dataInfo) {
+		final DataInfo dataInfo) {
 		return journal(
-				name,
+			name,
-				issnPrinted,
+			issnPrinted,
-				issnOnline,
+			issnOnline,
-				issnLinking,
+			issnLinking,
-				null,
+			null,
-				null,
+			null,
-				null,
+			null,
-				null,
+			null,
-				null,
+			null,
-				null,
+			null,
-				null,
+			null,
-				dataInfo);
+			dataInfo);
 	}
 
 	public static Journal journal(