From 57d1b88746a651e6ece3b1b4037e43fabd7ec474 Mon Sep 17 00:00:00 2001
From: Claudio Atzori <claudio.atzori@isti.cnr.it>
Date: Thu, 2 Feb 2023 17:01:22 +0100
Subject: [PATCH] WIP: pruning out non necessary fields from the internal model

---
 .../java/eu/dnetlib/dhp/schema/oaf/Measure.java    | 12 ++++--------
 .../eu/dnetlib/dhp/schema/oaf/MeasureUnit.java     | 14 ++++++++++++++
 .../java/eu/dnetlib/dhp/schema/oaf/Relation.java   |  2 +-
 .../eu/dnetlib/dhp/schema/oaf/MeasureTest.java     |  4 ++--
 4 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 src/main/java/eu/dnetlib/dhp/schema/oaf/MeasureUnit.java

diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Measure.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Measure.java
index 78a4c68..6063a8e 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Measure.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Measure.java
@@ -17,10 +17,10 @@ public class Measure implements Serializable {
 	private String id;
 
 	/**
-	 * List of units associated with this measure. KeyValue provides a pair to store the label (key) and the value, plus
+	 * List of units associated with this measure. MeasureUnit provides a pair to store the label (key) and the value, plus
 	 * common provenance information.
 	 */
-	private List<KeyValue> unit;
+	private List<MeasureUnit> unit;
 
 	public String getId() {
 		return id;
@@ -30,18 +30,14 @@ public class Measure implements Serializable {
 		this.id = id;
 	}
 
-	public List<KeyValue> getUnit() {
+	public List<MeasureUnit> getUnit() {
 		return unit;
 	}
 
-	public void setUnit(List<KeyValue> unit) {
+	public void setUnit(List<MeasureUnit> unit) {
 		this.unit = unit;
 	}
 
-	public void mergeFrom(Measure m) {
-		// TODO
-	}
-
 	@Override
 	public boolean equals(Object o) {
 		if (this == o)
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/MeasureUnit.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/MeasureUnit.java
new file mode 100644
index 0000000..7a5fcb2
--- /dev/null
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/MeasureUnit.java
@@ -0,0 +1,14 @@
+package eu.dnetlib.dhp.schema.oaf;
+
+public class MeasureUnit extends KeyValue {
+
+    private DataInfo dataInfo;
+
+    public DataInfo getDataInfo() {
+        return dataInfo;
+    }
+
+    public void setDataInfo(DataInfo dataInfo) {
+        this.dataInfo = dataInfo;
+    }
+}
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Relation.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Relation.java
index 9ff7c19..b03bf6f 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Relation.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Relation.java
@@ -51,7 +51,7 @@ public class Relation extends Oaf implements Serializable {
 	private String validationDate;
 
 	private List<Provenance> provenance;
-	
+
 	/**
 	 * List of relation specific properties. Values include 'similarityLevel', indicating the similarity score between a
 	 * pair of publications.
diff --git a/src/test/java/eu/dnetlib/dhp/schema/oaf/MeasureTest.java b/src/test/java/eu/dnetlib/dhp/schema/oaf/MeasureTest.java
index c6f8aa8..cc54ea1 100644
--- a/src/test/java/eu/dnetlib/dhp/schema/oaf/MeasureTest.java
+++ b/src/test/java/eu/dnetlib/dhp/schema/oaf/MeasureTest.java
@@ -47,8 +47,8 @@ class MeasureTest {
 		Assertions.assertNotNull(mm);
 	}
 
-	private KeyValue unit(String key, String value) {
-		KeyValue unit = new KeyValue();
+	private MeasureUnit unit(String key, String value) {
+		MeasureUnit unit = new MeasureUnit();
 		unit.setKey(key);
 		unit.setValue(value);
 		return unit;