gCubeSystem
/
gcubedatacatalogue-metadata-discovery
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixing metadata tagging and grouping 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/gcubedatacatalogue-metadata-discovery@146270 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2017-03-22 15:11:20 +00:00
parent ec53a4028e
commit 8b2b2e6d2f
3 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/org/gcube/datacatalogue/metadatadiscovery/bean/jaxb/MetadataTagging.java
View File

@ -25,6 +25,9 @@ import org.gcube.datacatalogue.metadatadiscovery.adapter.TaggingGroupingAdapter;
@XmlAccessorType (XmlAccessType.FIELD) @XmlAccessorType (XmlAccessType.FIELD)
public class MetadataTagging implements Serializable{ public class MetadataTagging implements Serializable{
public static final String DEFAULT_SEPARATOR = ":";
/** /**
* *
*/ */
@ -34,7 +37,7 @@ public class MetadataTagging implements Serializable{
private Boolean create = false; private Boolean create = false;
@XmlAttribute @XmlAttribute
private String separator = ":"; private String separator = DEFAULT_SEPARATOR;
@XmlJavaTypeAdapter(TaggingGroupingAdapter.class) @XmlJavaTypeAdapter(TaggingGroupingAdapter.class)
@XmlValue @XmlValue
@ -48,13 +51,15 @@ public class MetadataTagging implements Serializable{
public MetadataTagging() { public MetadataTagging() {
} }
/** /**
* @param create * Instantiates a new metadata tagging.
* @param separator *
* @param taggingValue * @param create the create
* @param separator the separator
* @param taggingValue the tagging value
*/ */
public MetadataTagging( public MetadataTagging(Boolean create, String separator, TaggingGroupingValue taggingValue) {
Boolean create, String separator, TaggingGroupingValue taggingValue) {
super(); super();
this.create = create; this.create = create;

5
src/main/java/org/gcube/datacatalogue/metadatadiscovery/bean/jaxb/TaggingGroupingValue.java
View File

@ -17,8 +17,8 @@ public enum TaggingGroupingValue {
onFieldName("onFieldName"), onFieldName("onFieldName"),
onValue("onValue"), onValue("onValue"),
onFieldName_onValue("onFieldName onValue"), onFieldName_onValue("onFieldName_onValue"),
onValue_onFieldName("onValue onFieldName"); onValue_onFieldName("onValue_onFieldName");
private String value; private String value;
@ -53,6 +53,7 @@ public enum TaggingGroupingValue {
try{ try{
for (TaggingGroupingValue tgv : TaggingGroupingValue.values()) { for (TaggingGroupingValue tgv : TaggingGroupingValue.values()) {
System.out.println("Comparing input value: "+value +" with "+tgv.value );
if(tgv.value.equals(value)) if(tgv.value.equals(value))
return tgv; return tgv;
} }

14
src/test/java/org/gcube/datacatalogue/metadatadiscovery/TestJaxbMetadataMarshUnmarsh.java
View File

@ -5,23 +5,15 @@ package org.gcube.datacatalogue.metadatadiscovery;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException; import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller; import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller; import javax.xml.bind.Unmarshaller;
import org.gcube.datacatalogue.metadatadiscovery.bean.jaxb.DataType;
import org.gcube.datacatalogue.metadatadiscovery.bean.jaxb.MetadataCategory; import org.gcube.datacatalogue.metadatadiscovery.bean.jaxb.MetadataCategory;
import org.gcube.datacatalogue.metadatadiscovery.bean.jaxb.MetadataField; import org.gcube.datacatalogue.metadatadiscovery.bean.jaxb.MetadataField;
import org.gcube.datacatalogue.metadatadiscovery.bean.jaxb.MetadataFormat; import org.gcube.datacatalogue.metadatadiscovery.bean.jaxb.MetadataFormat;
import org.gcube.datacatalogue.metadatadiscovery.bean.jaxb.MetadataGrouping;
import org.gcube.datacatalogue.metadatadiscovery.bean.jaxb.MetadataTagging;
import org.gcube.datacatalogue.metadatadiscovery.bean.jaxb.MetadataValidator;
import org.gcube.datacatalogue.metadatadiscovery.bean.jaxb.MetadataVocabulary;
import org.gcube.datacatalogue.metadatadiscovery.bean.jaxb.TaggingGroupingValue;
import org.junit.Test; import org.junit.Test;
@ -45,7 +37,7 @@ public class TestJaxbMetadataMarshUnmarsh {
@Test @Test
public void test() { public void test() {
metadatas = new MetadataFormat(); /*metadatas = new MetadataFormat();
ckanCategories = new ArrayList<MetadataCategory>(); ckanCategories = new ArrayList<MetadataCategory>();
@ -96,11 +88,11 @@ public class TestJaxbMetadataMarshUnmarsh {
MetadataValidator validator2 = new MetadataValidator("a regular expression for validating values"); MetadataValidator validator2 = new MetadataValidator("a regular expression for validating values");
ckanMetadata.setValidator(validator2); ckanMetadata.setValidator(validator2);
metadatas.addMetadata(ckanMetadata); metadatas.addMetadata(ckanMetadata);*/
try { try {
marshalingExample(); //marshalingExample();
unMarshalingExample(); unMarshalingExample();
} }
catch (JAXBException e) { catch (JAXBException e) {