From 80a29910169b3ea0ad7b7831be2496ebcf3a6292 Mon Sep 17 00:00:00 2001
From: "miriam.baglioni" <miriam.baglioni@isti.cnr.it>
Date: Mon, 15 Nov 2021 16:26:32 +0100
Subject: [PATCH] [Graph Dump] Moving the measure at the level of the instance

---
 .../java/eu/dnetlib/dhp/schema/dump/oaf/Instance.java | 11 +++++++++++
 .../java/eu/dnetlib/dhp/schema/dump/oaf/Result.java   | 10 ++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Instance.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Instance.java
index abfcc2c..c6c186a 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Instance.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Instance.java
@@ -19,9 +19,12 @@ import java.util.List;
  * -pid of type List<ControlledField> that is the list of pids associated to the result coming from authoritative sources for that pid
  * -alternateIdentifier of type List<ControlledField> that is the list of pids associated to the result coming from NON authoritative
  * sources for that pid
+ * -measure list<KeyValue> to represent the measure of beepFinder. It corresponds to measures in the model
  */
 public class Instance implements Serializable {
 
+	private List<KeyValue> measures;
+
 	private List<ControlledField> pid;
 
 	private List<ControlledField> alternateIdentifier;
@@ -111,4 +114,12 @@ public class Instance implements Serializable {
 	public void setAlternateIdentifier(List<ControlledField> alternateIdentifier) {
 		this.alternateIdentifier = alternateIdentifier;
 	}
+
+	public List<KeyValue> getMeasures() {
+		return measures;
+	}
+
+	public void setMeasures(List<KeyValue> measures) {
+		this.measures = measures;
+	}
 }
diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Result.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Result.java
index 6412bfe..e5ee9b2 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Result.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Result.java
@@ -60,11 +60,11 @@ import java.util.List;
  * to store information about the time OpenAIRE collected the record. It corresponds to dateofcollection of the result
  * represented in the internal model - lasteupdatetimestamp of type String to store the timestamp of the last update of
  * the record. It corresponds to lastupdatetimestamp of the resord represented in the internal model
- * -measure list<KeyValue> to represent the measure of beepFinder. It corresponds to measures in the model
+ *
  */
 public class Result implements Serializable {
 
-	private List<KeyValue> measures;
+
 
 	private List<Author> author;
 
@@ -378,11 +378,5 @@ public class Result implements Serializable {
 		this.geolocation = geolocation;
 	}
 
-	public List<KeyValue> getMeasures() {
-		return measures;
-	}
 
-	public void setMeasures(List<KeyValue> measures) {
-		this.measures = measures;
-	}
 }