hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-17 23:13:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix dspace-api module per new code style

Browse Source
This commit is contained in:
Tim Donohue
2018-02-14 10:53:46 -06:00
parent 8ffc97f7f9
commit 8a48f782ea
1051 changed files with 53347 additions and 63373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
dspace-api/src/main/java/org/dspace/content/MetadataField.java
View File

@@ -7,14 +7,24 @@
*/
package org.dspace.content;
import javax.persistence.Cacheable;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import org.dspace.core.Context;
import org.dspace.core.ReloadableEntity;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.hibernate.proxy.HibernateProxyHelper;
import javax.persistence.*;
/**
* DSpace object that represents a metadata field, which is
@@ -29,17 +39,18 @@ import javax.persistence.*;
@Entity
@Cacheable
@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
@Table(name="metadatafieldregistry")
@Table(name = "metadatafieldregistry")
public class MetadataField implements ReloadableEntity<Integer> {
@Id
@Column(name="metadata_field_id", nullable = false, unique = true)
@GeneratedValue(strategy = GenerationType.SEQUENCE ,generator="metadatafieldregistry_seq")
@SequenceGenerator(name="metadatafieldregistry_seq", sequenceName="metadatafieldregistry_seq", allocationSize = 1, initialValue = 1)
@Column(name = "metadata_field_id", nullable = false, unique = true)
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "metadatafieldregistry_seq")
@SequenceGenerator(name = "metadatafieldregistry_seq", sequenceName = "metadatafieldregistry_seq", allocationSize
= 1, initialValue = 1)
private Integer id;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "metadata_schema_id",nullable = false)
@JoinColumn(name = "metadata_schema_id", nullable = false)
private MetadataSchema metadataSchema;
@Column(name = "element", length = 64)
@@ -48,18 +59,16 @@ public class MetadataField implements ReloadableEntity<Integer> {
@Column(name = "qualifier", length = 64)
private String qualifier = null;
// @Column(name = "scope_note")
// @Column(name = "scope_note")
// @Lob
@Column(name="scope_note", columnDefinition = "text")
@Column(name = "scope_note", columnDefinition = "text")
private String scopeNote;
/**
* Protected constructor, create object using:
* {@link org.dspace.content.service.MetadataFieldService#create(Context, MetadataSchema, String, String, String)}
*
*/
protected MetadataField()
{
protected MetadataField() {
}
@@ -68,8 +77,7 @@ public class MetadataField implements ReloadableEntity<Integer> {
*
* @return metadata field id
*/
public Integer getID()
{
public Integer getID() {
return id;
}
@@ -78,8 +86,7 @@ public class MetadataField implements ReloadableEntity<Integer> {
*
* @return element name
*/
public String getElement()
{
public String getElement() {
return element;
}
@@ -88,8 +95,7 @@ public class MetadataField implements ReloadableEntity<Integer> {
*
* @param element new value for element
*/
public void setElement(String element)
{
public void setElement(String element) {
this.element = element;
}
@@ -98,8 +104,7 @@ public class MetadataField implements ReloadableEntity<Integer> {
*
* @return qualifier
*/
public String getQualifier()
{
public String getQualifier() {
return qualifier;
}
@@ -108,8 +113,7 @@ public class MetadataField implements ReloadableEntity<Integer> {
*
* @param qualifier new value for qualifier
*/
public void setQualifier(String qualifier)
{
public void setQualifier(String qualifier) {
this.qualifier = qualifier;
}
@@ -118,8 +122,7 @@ public class MetadataField implements ReloadableEntity<Integer> {
*
* @return scope note
*/
public String getScopeNote()
{
public String getScopeNote() {
return scopeNote;
}
@@ -128,8 +131,7 @@ public class MetadataField implements ReloadableEntity<Integer> {
*
* @param scopeNote new value for scope note
*/
public void setScopeNote(String scopeNote)
{
public void setScopeNote(String scopeNote) {
this.scopeNote = scopeNote;
}
@@ -152,44 +154,35 @@ public class MetadataField implements ReloadableEntity<Integer> {
}
/**
* Return <code>true</code> if <code>other</code> is the same MetadataField
* as this object, <code>false</code> otherwise
*
* @param obj
* object to compare to
*
* @param obj object to compare to
* @return <code>true</code> if object passed in represents the same
* MetadataField as this object
* MetadataField as this object
*/
@Override
public boolean equals(Object obj)
{
if (obj == null)
{
public boolean equals(Object obj) {
if (obj == null) {
return false;
}
Class<?> objClass = HibernateProxyHelper.getClassWithoutInitializingProxy(obj);
if (getClass() != objClass)
{
if (getClass() != objClass) {
return false;
}
final MetadataField other = (MetadataField) obj;
if (this.getID() != other.getID())
{
if (this.getID() != other.getID()) {
return false;
}
if (!getMetadataSchema().equals(other.getMetadataSchema()))
{
if (!getMetadataSchema().equals(other.getMetadataSchema())) {
return false;
}
return true;
}
@Override
public int hashCode()
{
public int hashCode() {
int hash = 7;
hash = 47 * hash + getID();
hash = 47 * hash + getMetadataSchema().getID();
@@ -197,12 +190,9 @@ public class MetadataField implements ReloadableEntity<Integer> {
}
public String toString(char separator) {
if (qualifier == null)
{
if (qualifier == null) {
return getMetadataSchema().getName() + separator + element;
}
else
{
} else {
return getMetadataSchema().getName() + separator + element + separator + qualifier;
}
}