diff --git a/pom.xml b/pom.xml
index 796be6d..e6c57af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
org.gcube.data-catalogue
gcubedatacatalogue-metadata-discovery
jar
- 3.2.0-SNAPSHOT
+ 3.3.0-SNAPSHOT
The gCube data catalogue metadata discovery library
The gCube data catalogue metadata discovery library
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 f73c0ec..1a4c389 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
@@ -43,6 +43,9 @@ public class MetadataField implements Serializable{
private String fieldName;
@XmlElement(required = true)
private Boolean mandatory = false;
+
+ @XmlElement(name = "maxOccurs")
+ private String maxOccurs;
// private Boolean isBoolean = false;
@XmlJavaTypeAdapter(DataTypeAdapter.class)
private DataType dataType = DataType.String;
@@ -166,6 +169,25 @@ public class MetadataField implements Serializable{
}
+ /**
+ * Gets the max occurs.
+ *
+ * @return the maxOccurs
+ */
+ public String getMaxOccurs() {
+
+ return maxOccurs;
+ }
+
+
+ /**
+ * @param maxOccurs the maxOccurs to set
+ */
+ public void setMaxOccurs(String maxOccurs) {
+
+ this.maxOccurs = maxOccurs;
+ }
+
/**
* Gets the default value.
*
@@ -343,6 +365,8 @@ public class MetadataField implements Serializable{
builder.append(fieldName);
builder.append(", mandatory=");
builder.append(mandatory);
+ builder.append(", maxOccurs=");
+ builder.append(maxOccurs);
builder.append(", dataType=");
builder.append(dataType);
builder.append(", defaultValue=");
@@ -361,4 +385,5 @@ public class MetadataField implements Serializable{
return builder.toString();
}
+
}
diff --git a/src/test/java/org/gcube/datacatalogue/metadatadiscovery/TestJaxbMetadataMarshUnmarsh.java b/src/test/java/org/gcube/datacatalogue/metadatadiscovery/TestJaxbMetadataMarshUnmarsh.java
index d8f58cc..76ff590 100644
--- a/src/test/java/org/gcube/datacatalogue/metadatadiscovery/TestJaxbMetadataMarshUnmarsh.java
+++ b/src/test/java/org/gcube/datacatalogue/metadatadiscovery/TestJaxbMetadataMarshUnmarsh.java
@@ -17,7 +17,6 @@ import org.gcube.datacatalogue.metadatadiscovery.bean.jaxb.NamespaceCategories;
import org.gcube.datacatalogue.metadatadiscovery.bean.jaxb.NamespaceCategory;
import org.junit.Test;
-
/**
* The Class TestJaxbMetadataMarshUnmarsh.
*
@@ -131,7 +130,7 @@ public class TestJaxbMetadataMarshUnmarsh {
*/
private static void unMarshalingMetadataFields() throws JAXBException
{
- unMarshalingCategories();
+ //unMarshalingCategories();
JAXBContext jaxbContext = JAXBContext.newInstance(MetadataFormat.class);
Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller();
@@ -155,6 +154,7 @@ public class TestJaxbMetadataMarshUnmarsh {
System.out.println("Category Ref: "+field.getCategoryRef());
System.out.println("Category CategoryField Q Name: "+field.getCategoryFieldQName());
System.out.println("QName: "+field.getCategoryFieldQName());
+ System.out.println("MaxOccurs: "+field.getMaxOccurs());
// System.out.println(field.getGrouping());
// System.out.println(field.getTagging());
@@ -199,5 +199,12 @@ public class TestJaxbMetadataMarshUnmarsh {
public static void main(String[] args) {
//System.out.println(DataType.valueOf("aa"));
+ try {
+ unMarshalingMetadataFields();
+ }
+ catch (JAXBException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
}
}
diff --git a/src/test/java/org/gcube/datacatalogue/metadatadiscovery/TestMetadataFormatDiscovery.java b/src/test/java/org/gcube/datacatalogue/metadatadiscovery/TestMetadataFormatDiscovery.java
index 5334e63..ed6b985 100644
--- a/src/test/java/org/gcube/datacatalogue/metadatadiscovery/TestMetadataFormatDiscovery.java
+++ b/src/test/java/org/gcube/datacatalogue/metadatadiscovery/TestMetadataFormatDiscovery.java
@@ -33,7 +33,7 @@ public class TestMetadataFormatDiscovery {
//System.out.println(reader.getMetadataProfiles());
for (MetadataProfile metaProfile : reader.getMetadataProfiles()) {
- System.out.println(metaProfile.getId() +" name: "+metaProfile.getName() +" type: "+metaProfile.getMetadataType());
+ System.out.println(metaProfile.getId() +", name: "+metaProfile.getName() +", type: "+metaProfile.getMetadataType());
}
} catch (Exception e) {