Fix: do not import joda

formatting

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

@@ -1,10 +1,5 @@
-package eu.dnetlib.pace.tree;
 
-import com.wcohen.ss.AbstractStringDistance;
+package eu.dnetlib.pace.tree;
-import eu.dnetlib.pace.config.Config;
-import eu.dnetlib.pace.tree.support.AbstractStringComparator;
-import eu.dnetlib.pace.tree.support.ComparatorClass;
-import org.joda.time.DateTime;
 
 import java.time.DateTimeException;
 import java.time.LocalDate;
@@ -13,6 +8,12 @@ import java.time.format.DateTimeFormatter;
 import java.util.Locale;
 import java.util.Map;
 
+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("dateRange")
 public class DateRange extends AbstractStringComparator {
 
@@ -48,8 +49,7 @@ public class DateRange extends AbstractStringComparator {
 			Period period = Period.between(d1, d2);
 
 			return period.getYears() <= YEAR_RANGE ? 1.0 : 0.0;
-        }
+		} catch (DateTimeException e) {
-        catch (DateTimeException e) {
 			return -1.0;
 		}
 

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

@@ -72,14 +72,34 @@ public class ComparatorTest extends AbstractPaceTest {
 		CodeMatch codeMatch = new CodeMatch(params);
 
 		// names have different codes
-		assertEquals(0.0, codeMatch.distance("physical oceanography at ctd station june 1998 ev02a", "physical oceanography at ctd station june 1998 ir02", conf));
+		assertEquals(
+			0.0,
+			codeMatch
+				.distance(
+					"physical oceanography at ctd station june 1998 ev02a",
+					"physical oceanography at ctd station june 1998 ir02", conf));
 
 		// names have same code
-		assertEquals(1.0, codeMatch.distance("physical oceanography at ctd station june 1998 ev02a", "physical oceanography at ctd station june 1998 ev02a", conf));
+		assertEquals(
+			1.0,
+			codeMatch
+				.distance(
+					"physical oceanography at ctd station june 1998 ev02a",
+					"physical oceanography at ctd station june 1998 ev02a", conf));
 
 		// code is not in both names
-		assertEquals(-1, codeMatch.distance("physical oceanography at ctd station june 1998", "physical oceanography at ctd station june 1998 ev02a", conf));
+		assertEquals(
-		assertEquals(1.0, codeMatch.distance("physical oceanography at ctd station june 1998", "physical oceanography at ctd station june 1998", conf));
+			-1,
+			codeMatch
+				.distance(
+					"physical oceanography at ctd station june 1998",
+					"physical oceanography at ctd station june 1998 ev02a", conf));
+		assertEquals(
+			1.0,
+			codeMatch
+				.distance(
+					"physical oceanography at ctd station june 1998", "physical oceanography at ctd station june 1998",
+					conf));
 	}
 
 	@Test

dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/oa/graph/raw/MappersTest.java

@@ -915,7 +915,8 @@ class MappersTest {
 
 	@Test
 	void testODFRecord_guidelines4() throws IOException {
-		final String xml = IOUtils.toString(Objects.requireNonNull(getClass().getResourceAsStream("odf_guidelines4.xml")));
+		final String xml = IOUtils
+			.toString(Objects.requireNonNull(getClass().getResourceAsStream("odf_guidelines4.xml")));
 		final List<Oaf> list = new OdfToOafMapper(vocs, false, true).processMdRecord(xml);
 
 		final Publication p = (Publication) list.get(0);

dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/model/ProvisionModelSupport.java

@@ -5,7 +5,6 @@ import java.io.StringReader;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import eu.dnetlib.dhp.schema.solr.PersonTopic;
 import org.apache.commons.lang3.StringUtils;
 import org.dom4j.Document;
 import org.dom4j.DocumentException;
@@ -40,6 +39,7 @@ import eu.dnetlib.dhp.schema.solr.OpenAccessColor;
 import eu.dnetlib.dhp.schema.solr.OpenAccessRoute;
 import eu.dnetlib.dhp.schema.solr.Organization;
 import eu.dnetlib.dhp.schema.solr.Person;
+import eu.dnetlib.dhp.schema.solr.PersonTopic;
 import eu.dnetlib.dhp.schema.solr.Pid;
 import eu.dnetlib.dhp.schema.solr.Project;
 import eu.dnetlib.dhp.schema.solr.Result;
@@ -216,8 +216,11 @@ public class ProvisionModelSupport {
 	}
 
 	private static List<PersonTopic> mapPersonTopics(List<eu.dnetlib.dhp.schema.oaf.PersonTopic> subjects) {
-		return Optional.ofNullable(subjects)
+		return Optional
-				.map(ss -> ss.stream()
+			.ofNullable(subjects)
+			.map(
+				ss -> ss
+					.stream()
 					.map(ProvisionModelSupport::mapPersonTopic)
 					.collect(Collectors.toList()))
 			.orElse(null);