From 6897c920a293caa5ba254d80f45458cb60797d42 Mon Sep 17 00:00:00 2001 From: "miriam.baglioni" Date: Sat, 11 Apr 2020 16:35:26 +0200 Subject: [PATCH] classes in support of new implementation of country propagation --- .../eu/dnetlib/dhp/countrypropagation/CountrySbs.java | 2 +- .../dnetlib/dhp/countrypropagation/DatasourceCountry.java | 6 +++--- .../dnetlib/dhp/countrypropagation/ResultCountrySet.java | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dhp-workflows/dhp-propagation/src/main/java/eu/dnetlib/dhp/countrypropagation/CountrySbs.java b/dhp-workflows/dhp-propagation/src/main/java/eu/dnetlib/dhp/countrypropagation/CountrySbs.java index accd278d7..32c893261 100644 --- a/dhp-workflows/dhp-propagation/src/main/java/eu/dnetlib/dhp/countrypropagation/CountrySbs.java +++ b/dhp-workflows/dhp-propagation/src/main/java/eu/dnetlib/dhp/countrypropagation/CountrySbs.java @@ -2,7 +2,7 @@ package eu.dnetlib.dhp.countrypropagation; import java.io.Serializable; -public class Country implements Serializable { +public class CountrySbs implements Serializable { private String classid; private String classname; diff --git a/dhp-workflows/dhp-propagation/src/main/java/eu/dnetlib/dhp/countrypropagation/DatasourceCountry.java b/dhp-workflows/dhp-propagation/src/main/java/eu/dnetlib/dhp/countrypropagation/DatasourceCountry.java index 3cce8f4bb..0ac8b108e 100644 --- a/dhp-workflows/dhp-propagation/src/main/java/eu/dnetlib/dhp/countrypropagation/DatasourceCountry.java +++ b/dhp-workflows/dhp-propagation/src/main/java/eu/dnetlib/dhp/countrypropagation/DatasourceCountry.java @@ -4,7 +4,7 @@ import java.io.Serializable; public class DatasourceCountry implements Serializable { private String dataSourceId; - private Country country; + private CountrySbs country; public String getDataSourceId() { return dataSourceId; @@ -14,11 +14,11 @@ public class DatasourceCountry implements Serializable { this.dataSourceId = dataSourceId; } - public Country getCountry() { + public CountrySbs getCountry() { return country; } - public void setCountry(Country country) { + public void setCountry(CountrySbs country) { this.country = country; } } diff --git a/dhp-workflows/dhp-propagation/src/main/java/eu/dnetlib/dhp/countrypropagation/ResultCountrySet.java b/dhp-workflows/dhp-propagation/src/main/java/eu/dnetlib/dhp/countrypropagation/ResultCountrySet.java index 4978d9182..69f7a59e9 100644 --- a/dhp-workflows/dhp-propagation/src/main/java/eu/dnetlib/dhp/countrypropagation/ResultCountrySet.java +++ b/dhp-workflows/dhp-propagation/src/main/java/eu/dnetlib/dhp/countrypropagation/ResultCountrySet.java @@ -1,11 +1,11 @@ package eu.dnetlib.dhp.countrypropagation; import java.io.Serializable; -import java.util.Set; +import java.util.ArrayList; public class ResultCountrySet implements Serializable { private String resultId; - private Set countrySet; + private ArrayList countrySet; public String getResultId() { return resultId; @@ -15,11 +15,11 @@ public class ResultCountrySet implements Serializable { this.resultId = resultId; } - public Set getCountrySet() { + public ArrayList getCountrySet() { return countrySet; } - public void setCountrySet(Set countrySet) { + public void setCountrySet(ArrayList countrySet) { this.countrySet = countrySet; } }