From 890c039a919634ad72a836792f131171eb1082b9 Mon Sep 17 00:00:00 2001
From: Claudio Atzori <claudio.atzori@isti.cnr.it>
Date: Mon, 4 Mar 2024 16:28:37 +0100
Subject: [PATCH] WIP: updated static builders

---
 src/main/java/eu/dnetlib/dhp/schema/solr/AccessRight.java | 7 +++++++
 src/main/java/eu/dnetlib/dhp/schema/solr/Category.java    | 2 +-
 src/main/java/eu/dnetlib/dhp/schema/solr/Concept.java     | 2 +-
 src/main/java/eu/dnetlib/dhp/schema/solr/Context.java     | 2 +-
 src/main/java/eu/dnetlib/dhp/schema/solr/Funding.java     | 6 +++---
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/java/eu/dnetlib/dhp/schema/solr/AccessRight.java b/src/main/java/eu/dnetlib/dhp/schema/solr/AccessRight.java
index db22675..b6e853d 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/solr/AccessRight.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/solr/AccessRight.java
@@ -12,6 +12,13 @@ public class AccessRight {
 
 	private OpenAccessRoute openAccessRoute;
 
+	public static AccessRight newInstance(String value, OpenAccessRoute openAccessRoute) {
+		AccessRight accessRight = new AccessRight();
+		accessRight.setValue(value);
+		accessRight.setOpenAccessRoute(openAccessRoute);
+		return accessRight;
+	}
+
 	public String getValue() {
 		return value;
 	}
diff --git a/src/main/java/eu/dnetlib/dhp/schema/solr/Category.java b/src/main/java/eu/dnetlib/dhp/schema/solr/Category.java
index 6015e05..8adfd72 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/solr/Category.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/solr/Category.java
@@ -9,7 +9,7 @@ public class Category implements Serializable {
     private String label;
     private List<Concept> concept;
 
-    public Category newInstance(String id, String label) {
+    public static Category newInstance(String id, String label) {
         Category category = new Category();
         category.setId(id);
         category.setLabel(label);
diff --git a/src/main/java/eu/dnetlib/dhp/schema/solr/Concept.java b/src/main/java/eu/dnetlib/dhp/schema/solr/Concept.java
index 686219b..71b5b19 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/solr/Concept.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/solr/Concept.java
@@ -7,7 +7,7 @@ public class Concept implements Serializable {
     private String id;
     private String label;
 
-    public Concept newInstance(String id, String label) {
+    public static Concept newInstance(String id, String label) {
         Concept concept = new Concept();
         concept.setId(id);
         concept.setLabel(label);
diff --git a/src/main/java/eu/dnetlib/dhp/schema/solr/Context.java b/src/main/java/eu/dnetlib/dhp/schema/solr/Context.java
index 599e1b3..e3c76b7 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/solr/Context.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/solr/Context.java
@@ -10,7 +10,7 @@ public class Context implements Serializable {
     private String type;
     private List<Category> category;
 
-    public Context newInstance(String id, String label, String type, List<Category> category) {
+    public static Context newInstance(String id, String label, String type, List<Category> category) {
         Context context = new Context();
         context.setId(id);
         context.setLabel(label);
diff --git a/src/main/java/eu/dnetlib/dhp/schema/solr/Funding.java b/src/main/java/eu/dnetlib/dhp/schema/solr/Funding.java
index 60c3178..04612be 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/solr/Funding.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/solr/Funding.java
@@ -9,15 +9,15 @@ public class Funding implements Serializable {
     private FundingLevel level1;
     private FundingLevel level2;
 
-    public Funding newInstance(Funder funder, FundingLevel level0) {
+    public static Funding newInstance(Funder funder, FundingLevel level0) {
         return newInstance(funder, level0, null, null);
     }
 
-    public Funding newInstance(Funder funder, FundingLevel level0, FundingLevel level1) {
+    public static Funding newInstance(Funder funder, FundingLevel level0, FundingLevel level1) {
         return newInstance(funder, level0, level1, null);
     }
 
-    public Funding newInstance(Funder funder, FundingLevel level0, FundingLevel level1, FundingLevel level2) {
+    public static Funding newInstance(Funder funder, FundingLevel level0, FundingLevel level1, FundingLevel level2) {
         Funding funding = new Funding();
         funding.setFunder(funder);
         funding.setLevel0(level0);