From 526d629d8a7a0c6ab4e196f7b82fba949f26a62a Mon Sep 17 00:00:00 2001 From: darms Date: Tue, 19 Sep 2023 14:37:31 +0200 Subject: [PATCH] Remove further unused classes related to Datasets --- .../iq/dataverse/DatasetRelMaterial.java | 89 ------------------- .../iq/dataverse/DatasetTopicClass.java | 77 ---------------- .../DatasetVersionDatasetUserId.java | 49 ---------- 3 files changed, 215 deletions(-) delete mode 100644 src/main/java/edu/harvard/iq/dataverse/DatasetRelMaterial.java delete mode 100644 src/main/java/edu/harvard/iq/dataverse/DatasetTopicClass.java delete mode 100644 src/main/java/edu/harvard/iq/dataverse/DatasetVersionDatasetUserId.java diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetRelMaterial.java b/src/main/java/edu/harvard/iq/dataverse/DatasetRelMaterial.java deleted file mode 100644 index 53ea62f566a..00000000000 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetRelMaterial.java +++ /dev/null @@ -1,89 +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 jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.Version; - -/** - * - * @author skraffmiller - */ - -public class DatasetRelMaterial { - - - - private String text; - public String getText() { - return this.text; - } - public void setText(String text) { - this.text = text; - } - - private int displayOrder; - public int getDisplayOrder() { - return this.displayOrder; - } - public void setDisplayOrder(int displayOrder) { - this.displayOrder = displayOrder; - } - - - - /** - * Holds value of property version. - */ - @Version - private Long version; - - /** - * Getter for property version. - * @return Value of property version. - */ - public Long getVersion() { - return this.version; - } - - /** - * Setter for property version. - * @param version New value of property version. - */ - public void setVersion(Long version) { - this.version = version; - } - - - public boolean isEmpty() { - return ((text==null || text.trim().equals(""))); - } - - @Override - public int hashCode() { - int hash = 0; - //hash += (this.id != null ? this.id.hashCode() : 0); - return hash; - } - - @Override - public boolean equals(Object object) { - if (!(object instanceof DatasetRelMaterial)) { - return false; - } - DatasetRelMaterial other = (DatasetRelMaterial)object; - //if (this.id != other.id && (this.id == null || !this.id.equals(other.id))) return false; - return true; - } - -} diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetTopicClass.java b/src/main/java/edu/harvard/iq/dataverse/DatasetTopicClass.java deleted file mode 100644 index 91a4ff3cf5a..00000000000 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetTopicClass.java +++ /dev/null @@ -1,77 +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 jakarta.persistence.Column; -import jakarta.persistence.Version; - -/** - * - * @author skraffmiller - */ -public class DatasetTopicClass { - - private DatasetVersion datasetVersion; - public DatasetVersion getDatasetVersion() { - return datasetVersion; - } - public void setDatasetVersion(DatasetVersion metadata) { - this.datasetVersion = metadata; - } - - 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 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/DatasetVersionDatasetUserId.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersionDatasetUserId.java deleted file mode 100644 index 8ac50e1ece1..00000000000 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetVersionDatasetUserId.java +++ /dev/null @@ -1,49 +0,0 @@ -package edu.harvard.iq.dataverse; -import java.io.Serializable; - -/** - * Id Class for {@link DatasetVersionUser}, representing a composite key. - * @author skraffmiller - */ - -public class DatasetVersionDatasetUserId implements Serializable { - - private String userIdentifier; - private long datasetversionid; - - @Override - public int hashCode() { - return (int) (userIdentifier.hashCode() ^ datasetversionid); - } - - @Override - public boolean equals(Object object) { - if (!(object instanceof DatasetVersionDatasetUserId)) { - return false; - } - DatasetVersionDatasetUserId other = (DatasetVersionDatasetUserId) object; - return (this.userIdentifier.equals(other.userIdentifier) && this.datasetversionid == other.datasetversionid ); - } - - @Override - public String toString() { - return "DatasetVersionDatasetUserId{" + "userIdentifier=" + userIdentifier + ", datasetversionid=" + datasetversionid + '}'; - } - - public String getUserIdentifier() { - return userIdentifier; - } - - public void setUserIdentifier(String userIdentifier) { - this.userIdentifier = userIdentifier; - } - - public long getDatasetversionid() { - return datasetversionid; - } - - public void setDatasetversionid(long datasetversionid) { - this.datasetversionid = datasetversionid; - } - -}