From 847574920648595be97f08c8e0e943f2c87183c3 Mon Sep 17 00:00:00 2001 From: darms Date: Tue, 19 Sep 2023 13:55:10 +0200 Subject: [PATCH] Remove unused `DatasetDistributor`, `DefaultValueSet` and `DatasetFieldDefaultValue` from codebase. --- .../iq/dataverse/DatasetDistributor.java | 97 ------------- .../dataverse/DatasetFieldDefaultValue.java | 136 ------------------ .../iq/dataverse/DatasetFieldType.java | 11 -- .../harvard/iq/dataverse/DatasetKeyword.java | 68 --------- .../harvard/iq/dataverse/DatasetVersion.java | 19 --- .../harvard/iq/dataverse/DefaultValueSet.java | 56 -------- .../iq/dataverse/util/json/JsonPrinter.java | 11 -- 7 files changed, 398 deletions(-) delete mode 100644 src/main/java/edu/harvard/iq/dataverse/DatasetDistributor.java delete mode 100644 src/main/java/edu/harvard/iq/dataverse/DatasetFieldDefaultValue.java delete mode 100644 src/main/java/edu/harvard/iq/dataverse/DatasetKeyword.java delete mode 100644 src/main/java/edu/harvard/iq/dataverse/DefaultValueSet.java diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetDistributor.java b/src/main/java/edu/harvard/iq/dataverse/DatasetDistributor.java deleted file mode 100644 index 3252b7f0367..00000000000 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetDistributor.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ - -package edu.harvard.iq.dataverse; - -import java.util.Comparator; -import jakarta.persistence.Version; - -/** - * - * @author skraffmiller - */ -public class DatasetDistributor { - - public static Comparator DisplayOrder = new Comparator() { - @Override - public int compare(DatasetDistributor o1, DatasetDistributor o2) { - return o1.getDisplayOrder()-o2.getDisplayOrder(); - } - }; - - /** Creates a new instance of DatasetDistributor */ - public DatasetDistributor() { - } - - - private int displayOrder; - public int getDisplayOrder() { - return this.displayOrder; - } - public void setDisplayOrder(int displayOrder) { - this.displayOrder = displayOrder; - } - - private DatasetField name; - public DatasetField getName() { - return this.name; - } - public void setName(DatasetField name) { - this.name = name; - } - - - @Version - private Long version; - public Long getVersion() { - return this.version; - } - public void setVersion(Long version) { - this.version = version; - } - - private DatasetField url; - public DatasetField getUrl() { - return this.url; - } - public void setUrl(DatasetField url) { - this.url = url; - } - - private DatasetField logo; - public DatasetField getLogo() { - return this.logo; - } - public void setLogo(DatasetField logo) { - this.logo = logo; - } - - private DatasetField affiliation; - public DatasetField getAffiliation() { - return this.affiliation; - } - public void setAffiliation(DatasetField affiliation) { - this.affiliation = affiliation; - } - - private DatasetField abbreviation; - public DatasetField getAbbreviation() { - return this.abbreviation; - } - public void setAbbreviation(DatasetField abbreviation) { - this.abbreviation = abbreviation; - } - - public boolean isEmpty() { - return ((abbreviation==null || abbreviation.getValue().trim().equals("")) - && (affiliation==null || affiliation.getValue().trim().equals("")) - && (logo==null || logo.getValue().trim().equals("")) - && (name==null || name.getValue().trim().equals("")) - && (url==null || url.getValue().trim().equals(""))); - } - - -} diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldDefaultValue.java b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldDefaultValue.java deleted file mode 100644 index 7746099818e..00000000000 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldDefaultValue.java +++ /dev/null @@ -1,136 +0,0 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ - -package edu.harvard.iq.dataverse; - -import java.io.Serializable; -import java.util.Collection; -import jakarta.persistence.CascadeType; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Index; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.OneToMany; -import jakarta.persistence.OrderBy; -import jakarta.persistence.Table; - -/** - * - * @author skraffmiller - */ -@Entity -@Table(indexes = {@Index(columnList="datasetfield_id"), - @Index(columnList="defaultvalueset_id"), - @Index(columnList="parentdatasetfielddefaultvalue_id"), - @Index(columnList="displayorder")}) -public class DatasetFieldDefaultValue implements Serializable { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - public Long getId() { - return id; - } - public void setId(Long id) { - this.id = id; - } - - public DatasetFieldDefaultValue() { - - } - - public DatasetFieldDefaultValue(DatasetFieldType sf, DefaultValueSet dvs, String val) { - setDatasetField(sf); - setDefaultValueSet(dvs); - setStrValue(val); - } - - @ManyToOne - @JoinColumn(nullable=false) - private DatasetFieldType datasetField; - public DatasetFieldType getDatasetField() { - return datasetField; - } - public void setDatasetField(DatasetFieldType datasetField) { - this.datasetField = datasetField; - } - - @ManyToOne - @JoinColumn(nullable=false) - private DefaultValueSet defaultValueSet; - public DefaultValueSet getDefaultValueSet() { - return defaultValueSet; - } - public void setDefaultValueSet(DefaultValueSet defaultValueSet) { - this.defaultValueSet = defaultValueSet; - } - - @OneToMany(mappedBy = "parentDatasetFieldDefaultValue", cascade = {CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST}) - @OrderBy("displayOrder ASC") - private Collection childDatasetFieldDefaultValues; - - public Collection getChildDatasetFieldDefaultValues() { - return this.childDatasetFieldDefaultValues; - } - public void setChildDatasetFieldDefaultValues(Collection childDatasetFieldDefaultValues) { - this.childDatasetFieldDefaultValues = childDatasetFieldDefaultValues; - } - - @ManyToOne(cascade = CascadeType.MERGE) - private DatasetFieldDefaultValue parentDatasetFieldDefaultValue; - public DatasetFieldDefaultValue getParentDatasetFieldDefaultValue() { - return parentDatasetFieldDefaultValue; - } - public void setParentDatasetFieldValue(DatasetFieldDefaultValue parentDatasetFieldDefaultValue) { - this.parentDatasetFieldDefaultValue = parentDatasetFieldDefaultValue; - } - - @Column(columnDefinition="TEXT", nullable=false ) - private String strValue; - - public String getStrValue() { - return strValue; - } - - public void setStrValue(String strValue) { - this.strValue = strValue; - - } - - @Override - public int hashCode() { - int hash = 0; - hash += (id != null ? id.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - if (!(object instanceof DatasetField)) { - return false; - } - DatasetFieldDefaultValue other = (DatasetFieldDefaultValue) object; - return !((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))); - } - - @Override - public String toString() { - return "edu.harvard.iq.dataverse.DatasetFieldDefaultValue[ id=" + id + " ]"; - } - - public boolean isEmpty() { - return ((strValue==null || strValue.trim().equals(""))); - } - - private int displayOrder; - public int getDisplayOrder() { return this.displayOrder;} - public void setDisplayOrder(int displayOrder) {this.displayOrder = displayOrder;} - -} diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java index 5207eb90b91..7f04a9a181b 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java @@ -517,17 +517,6 @@ public void setDatasetFields(List datasetFieldValues) { this.datasetFields = datasetFieldValues; } - @OneToMany(mappedBy = "datasetField", cascade = {CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST}) - private List datasetFieldDefaultValues; - - public List getDatasetFieldDefaultValues() { - return datasetFieldDefaultValues; - } - - public void setDatasetFieldDefaultValues(List datasetFieldDefaultValues) { - this.datasetFieldDefaultValues = datasetFieldDefaultValues; - } - @Override public int compareTo(DatasetFieldType o) { return Integer.compare(this.getDisplayOrder(), (o.getDisplayOrder())); diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetKeyword.java b/src/main/java/edu/harvard/iq/dataverse/DatasetKeyword.java deleted file mode 100644 index 747e3c068f1..00000000000 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetKeyword.java +++ /dev/null @@ -1,68 +0,0 @@ -package edu.harvard.iq.dataverse; - -/** - * - * @author skraffmiller - */ - -public class DatasetKeyword { - - private int displayOrder; - public int getDisplayOrder() { - return this.displayOrder; - } - public void setDisplayOrder(int displayOrder) { - this.displayOrder = displayOrder; - } - - private DatasetField value; - public DatasetField getValue() { - return this.value; - } - public void setValue(DatasetField value) { - this.value = value; - } - - private DatasetVersion datasetVersion; - public DatasetVersion getDatasetVersion() { - return datasetVersion; - } - public void setDatasetVersion(DatasetVersion metadata) { - this.datasetVersion = metadata; - } - /* - @Version - private Long version; - public Long getVersion() { - return this.version; - } - public void setVersion(Long version) { - this.version = version; - } */ - - private DatasetField vocab; - public DatasetField getVocab() { - return this.vocab; - } - public void setVocab(DatasetField vocab) { - this.vocab = vocab; - } - - private DatasetField vocabURI; - public DatasetField getVocabURI() { - return this.vocabURI; - } - public void setVocabURI(DatasetField vocabURI) { - this.vocabURI = vocabURI; - } - - - public boolean isEmpty() { - /*return ((value==null || value.getValue().trim().equals("")) - && (vocab==null || vocab.getValue().trim().equals("")) - && (vocabURI==null || vocabURI.getValue().trim().equals("")));*/ - return false; - } - - -} diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java index 93f45bd288e..d41afe5e27b 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java @@ -1508,25 +1508,6 @@ public String getDistributorName() { return null; } - public List getDatasetDistributors() { - //todo get distributors from DatasetfieldValues - return new ArrayList<>(); - } - - public void setDatasetDistributors(List distributors) { - //todo implement - } - - public String getDistributorNames() { - String str = ""; - for (DatasetDistributor sd : this.getDatasetDistributors()) { - if (str.trim().length() > 1) { - str += ";"; - } - str += sd.getName(); - } - return str; - } public String getAuthorsStr() { return getAuthorsStr(true); diff --git a/src/main/java/edu/harvard/iq/dataverse/DefaultValueSet.java b/src/main/java/edu/harvard/iq/dataverse/DefaultValueSet.java deleted file mode 100644 index a2dc785c470..00000000000 --- a/src/main/java/edu/harvard/iq/dataverse/DefaultValueSet.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ - -package edu.harvard.iq.dataverse; - -import java.io.Serializable; -import java.util.List; -import jakarta.persistence.CascadeType; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.OneToMany; - -/** - * - * @author skraffmiller - */ -@Entity -public class DefaultValueSet implements Serializable{ - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - public Long getId() { - return this.id; - } - public void setId(Long id) { - this.id = id; - } - - @Column( nullable = false ) - private String name; - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - - @OneToMany(mappedBy="defaultValueSet", cascade={CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST}) - private List datasetFieldDefaultValues; - - public List getDatasetFieldDefaultValues() { - return datasetFieldDefaultValues; - } - - public void setDatasetFieldDefaultValues(List datasetFieldDefaultValues) { - this.datasetFieldDefaultValues = datasetFieldDefaultValues; - } - -} diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java index b6026998bb7..bc6b0753ff8 100644 --- a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java +++ b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java @@ -6,7 +6,6 @@ import edu.harvard.iq.dataverse.DataFile; import edu.harvard.iq.dataverse.DataFileTag; import edu.harvard.iq.dataverse.Dataset; -import edu.harvard.iq.dataverse.DatasetDistributor; import edu.harvard.iq.dataverse.DatasetFieldType; import edu.harvard.iq.dataverse.DatasetField; import edu.harvard.iq.dataverse.DatasetFieldCompoundValue; @@ -480,16 +479,6 @@ public static JsonArrayBuilder jsonFileMetadatas(Collection fmds) return filesArr; } - public static JsonObjectBuilder json(DatasetDistributor dist) { - return jsonObjectBuilder() - .add("displayOrder", dist.getDisplayOrder()) - .add("version", dist.getVersion()) - .add("abbreviation", JsonPrinter.json(dist.getAbbreviation())) - .add("affiliation", JsonPrinter.json(dist.getAffiliation())) - .add("logo", JsonPrinter.json(dist.getLogo())) - .add("name", JsonPrinter.json(dist.getName())) - .add("url", JsonPrinter.json(dist.getUrl())); - } public static JsonObjectBuilder jsonByBlocks(List fields) { return jsonByBlocks(fields, null);