[Bypass Action Set] Created the OAF for Bip!Finder by putting the measures at the level of the instance. Changed also the test classes

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

@@ -6,6 +6,7 @@ import static eu.dnetlib.dhp.actionmanager.createunresolvedentities.Constants.UP
 import static eu.dnetlib.dhp.common.SparkSessionSupport.runWithSparkSession;
 
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -29,6 +30,7 @@ import eu.dnetlib.dhp.actionmanager.createunresolvedentities.model.BipScore;
 import eu.dnetlib.dhp.application.ArgumentApplicationParser;
 import eu.dnetlib.dhp.common.HdfsSupport;
 import eu.dnetlib.dhp.schema.common.ModelConstants;
+import eu.dnetlib.dhp.schema.oaf.Instance;
 import eu.dnetlib.dhp.schema.oaf.KeyValue;
 import eu.dnetlib.dhp.schema.oaf.Measure;
 import eu.dnetlib.dhp.schema.oaf.Result;
@@ -93,9 +95,10 @@ public class PrepareBipFinder implements Serializable {
 			}).collect(Collectors.toList()).iterator()).rdd(), Encoders.bean(BipScore.class))
 			.map((MapFunction<BipScore, Result>) v -> {
 				Result r = new Result();
-
 				r.setId(DHPUtils.generateUnresolvedIdentifier(v.getId(), DOI));
-				r.setMeasures(getMeasure(v));
+				Instance inst = new Instance();
+				inst.setMeasures(getMeasure(v));
+				r.setInstance(Arrays.asList(inst));
 				return r;
 			}, Encoders.bean(Result.class))
 			.write()

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

@@ -96,13 +96,16 @@ public class PrepareTest {
 		String doi1 = "unresolved::10.0000/096020199389707::doi";
 
 		Assertions.assertEquals(1, tmp.filter(r -> r.getId().equals(doi1)).count());
-		Assertions.assertEquals(3, tmp.filter(r -> r.getId().equals(doi1)).collect().get(0).getMeasures().size());
+		Assertions.assertEquals(1, tmp.filter(r -> r.getId().equals(doi1)).collect().get(0).getInstance().size());
+		Assertions.assertEquals(3, tmp.filter(r -> r.getId().equals(doi1)).collect().get(0).getInstance().get(0).getMeasures().size());
 		Assertions
 			.assertEquals(
 				"6.34596412687e-09", tmp
 					.filter(r -> r.getId().equals(doi1))
 					.collect()
 					.get(0)
+							.getInstance()
+							.get(0)
 					.getMeasures()
 					.stream()
 					.filter(sl -> sl.getId().equals("influence"))
@@ -117,6 +120,8 @@ public class PrepareTest {
 					.filter(r -> r.getId().equals(doi1))
 					.collect()
 					.get(0)
+							.getInstance()
+							.get(0)
 					.getMeasures()
 					.stream()
 					.filter(sl -> sl.getId().equals("popularity_alt"))
@@ -131,6 +136,8 @@ public class PrepareTest {
 					.filter(r -> r.getId().equals(doi1))
 					.collect()
 					.get(0)
+							.getInstance()
+							.get(0)
 					.getMeasures()
 					.stream()
 					.filter(sl -> sl.getId().equals("popularity"))

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

@@ -126,6 +126,8 @@ public class ProduceTest {
 					.filter(row -> row.getId().equals("unresolved::10.3390/s18072310::doi"))
 					.collect()
 					.get(0)
+							.getInstance()
+							.get(0)
 					.getMeasures()
 					.size());
 
@@ -179,7 +181,8 @@ public class ProduceTest {
 
 		List<Measure> measures = tmp
 			.filter(row -> row.getId().equals("unresolved::10.3390/s18072310::doi"))
-			.flatMap(row -> row.getMeasures().iterator())
+			.flatMap(row -> row.getInstance().iterator())
+				.flatMap(inst -> inst.getMeasures().iterator())
 			.collect();
 		Assertions
 			.assertEquals(