From c04ead37ee48babb58f54b7c8a7cec6843885ccb Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Wed, 8 Jun 2016 16:07:35 +0000 Subject: [PATCH] 4184: Create datacatalogue-metadata-discovery library Task-Url: https://support.d4science.org/issues/4184 Added implements Serializable for Jaxb Beans git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/gcubedatacatalogue-metadata-discovery@129018 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../metadatadiscovery/bean/jaxb/MetadataField.java | 9 ++++++++- .../bean/jaxb/MetadataFormat.java | 14 +++++++++++++- .../bean/jaxb/MetadataValidator.java | 8 ++++---- .../bean/jaxb/MetadataVocabulary.java | 10 +++++++--- 4 files changed, 32 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/gcube/datacatalogue/metadatadiscovery/bean/jaxb/MetadataField.java b/src/main/java/org/gcube/datacatalogue/metadatadiscovery/bean/jaxb/MetadataField.java index 838fd66..bc4855f 100644 --- a/src/main/java/org/gcube/datacatalogue/metadatadiscovery/bean/jaxb/MetadataField.java +++ b/src/main/java/org/gcube/datacatalogue/metadatadiscovery/bean/jaxb/MetadataField.java @@ -3,6 +3,8 @@ */ package org.gcube.datacatalogue.metadatadiscovery.bean.jaxb; +import java.io.Serializable; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; @@ -18,7 +20,12 @@ import javax.xml.bind.annotation.XmlRootElement; */ @XmlRootElement(name="metadatafield") @XmlAccessorType(XmlAccessType.FIELD) -public class MetadataField { +public class MetadataField implements Serializable{ + + /** + * + */ + private static final long serialVersionUID = 1740491173451633254L; private String fieldName; private Boolean mandatory = false; diff --git a/src/main/java/org/gcube/datacatalogue/metadatadiscovery/bean/jaxb/MetadataFormat.java b/src/main/java/org/gcube/datacatalogue/metadatadiscovery/bean/jaxb/MetadataFormat.java index 125d6e9..abe4bd3 100644 --- a/src/main/java/org/gcube/datacatalogue/metadatadiscovery/bean/jaxb/MetadataFormat.java +++ b/src/main/java/org/gcube/datacatalogue/metadatadiscovery/bean/jaxb/MetadataFormat.java @@ -3,6 +3,7 @@ */ package org.gcube.datacatalogue.metadatadiscovery.bean.jaxb; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -21,7 +22,18 @@ import javax.xml.bind.annotation.XmlRootElement; */ @XmlRootElement(name="metadataformat") @XmlAccessorType(XmlAccessType.FIELD) -public class MetadataFormat { +public class MetadataFormat implements Serializable{ + + /** + * + */ + private static final long serialVersionUID = -5881074882343424963L; + + /** + * + */ + public MetadataFormat() { + } @XmlElement(name = "metadatafield") private List metadataFields; diff --git a/src/main/java/org/gcube/datacatalogue/metadatadiscovery/bean/jaxb/MetadataValidator.java b/src/main/java/org/gcube/datacatalogue/metadatadiscovery/bean/jaxb/MetadataValidator.java index c87023b..9dcc598 100644 --- a/src/main/java/org/gcube/datacatalogue/metadatadiscovery/bean/jaxb/MetadataValidator.java +++ b/src/main/java/org/gcube/datacatalogue/metadatadiscovery/bean/jaxb/MetadataValidator.java @@ -3,6 +3,8 @@ */ package org.gcube.datacatalogue.metadatadiscovery.bean.jaxb; +import java.io.Serializable; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; @@ -16,20 +18,18 @@ import javax.xml.bind.annotation.XmlRootElement; */ @XmlRootElement(name = "metadatavalidator") @XmlAccessorType (XmlAccessType.FIELD) -public class MetadataValidator { +public class MetadataValidator implements Serializable{ + private static final long serialVersionUID = -5394122378302593873L; private String regularExpression; - /** * Instantiates a new metadata validator. */ public MetadataValidator() { - super(); } - /** * Instantiates a new metadata validator. * diff --git a/src/main/java/org/gcube/datacatalogue/metadatadiscovery/bean/jaxb/MetadataVocabulary.java b/src/main/java/org/gcube/datacatalogue/metadatadiscovery/bean/jaxb/MetadataVocabulary.java index 56ecf22..ce079b3 100644 --- a/src/main/java/org/gcube/datacatalogue/metadatadiscovery/bean/jaxb/MetadataVocabulary.java +++ b/src/main/java/org/gcube/datacatalogue/metadatadiscovery/bean/jaxb/MetadataVocabulary.java @@ -3,6 +3,7 @@ */ package org.gcube.datacatalogue.metadatadiscovery.bean.jaxb; +import java.io.Serializable; import java.util.List; import javax.xml.bind.annotation.XmlAccessType; @@ -19,7 +20,12 @@ import javax.xml.bind.annotation.XmlRootElement; */ @XmlRootElement(name = "metadatavocabulary") @XmlAccessorType (XmlAccessType.FIELD) -public class MetadataVocabulary { +public class MetadataVocabulary implements Serializable{ + + /** + * + */ + private static final long serialVersionUID = 6697274733224694581L; private List vocabularyField; @@ -27,8 +33,6 @@ public class MetadataVocabulary { * Instantiates a new metadata vocabulary. */ public MetadataVocabulary() { - - super(); }