From 044928bcdaba1ca51de35a5b46281a7de430cd57 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Fri, 16 Sep 2016 14:21:55 +0000 Subject: [PATCH] Renamed property defaultValue git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/gcubedatacatalogue-metadata-discovery@131458 82a268e6-3cf1-43bd-a215-b396298e98cf --- META-INF/CkanMetadatas.xml | 2 +- .../bean/jaxb/MetadataField.java | 18 +++++++++--------- .../TestDataCatalogueMetadataFormatReader.java | 2 +- .../TestJaxbMetadataMarshUnmarsh.java | 6 +++--- .../TestMetadataFormatDiscovery.java | 9 ++++++++- 5 files changed, 22 insertions(+), 15 deletions(-) diff --git a/META-INF/CkanMetadatas.xml b/META-INF/CkanMetadatas.xml index 45c9893..ed9de38 100644 --- a/META-INF/CkanMetadatas.xml +++ b/META-INF/CkanMetadatas.xml @@ -3,7 +3,7 @@ Name true - Date + Time default value shown as suggestions in the insert/update metadata form of CKAN 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 b0ea857..08451da 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 @@ -37,7 +37,7 @@ public class MetadataField implements Serializable{ // private Boolean isBoolean = false; @XmlJavaTypeAdapter(DataTypeAdapter.class) private DataType dataType = DataType.String; - private String defaulValue; + private String defaultValue; private String note; //It's the list of eligible values; @@ -93,11 +93,11 @@ public class MetadataField implements Serializable{ /** - * @return the defaulValue + * @return the defaultValue */ - public String getDefaulValue() { + public String getDefaultValue() { - return defaulValue; + return defaultValue; } @@ -156,11 +156,11 @@ public class MetadataField implements Serializable{ /** - * @param defaulValue the defaulValue to set + * @param defaultValue the defaultValue to set */ - public void setDefaulValue(String defaulValue) { + public void setDefaultValue(String defaultValue) { - this.defaulValue = defaulValue; + this.defaultValue = defaultValue; } @@ -203,8 +203,8 @@ public class MetadataField implements Serializable{ builder.append(mandatory); builder.append(", dataType="); builder.append(dataType); - builder.append(", defaulValue="); - builder.append(defaulValue); + builder.append(", defaultValue="); + builder.append(defaultValue); builder.append(", note="); builder.append(note); builder.append(", vocabulary="); diff --git a/src/test/java/org/gcube/datacatalogue/metadatadiscovery/TestDataCatalogueMetadataFormatReader.java b/src/test/java/org/gcube/datacatalogue/metadatadiscovery/TestDataCatalogueMetadataFormatReader.java index 29ef419..dd34602 100644 --- a/src/test/java/org/gcube/datacatalogue/metadatadiscovery/TestDataCatalogueMetadataFormatReader.java +++ b/src/test/java/org/gcube/datacatalogue/metadatadiscovery/TestDataCatalogueMetadataFormatReader.java @@ -26,7 +26,7 @@ public class TestDataCatalogueMetadataFormatReader { @Test public void test() { try { - String scopeString = "/gcube/devsec/devVRE"; + String scopeString = "/gcube/devNext/NextNext"; ScopeProvider.instance.set(scopeString); DataCalogueMetadataFormatReader reader = new DataCalogueMetadataFormatReader(); logger.trace(""+reader.getListOfMetadataTypes()); diff --git a/src/test/java/org/gcube/datacatalogue/metadatadiscovery/TestJaxbMetadataMarshUnmarsh.java b/src/test/java/org/gcube/datacatalogue/metadatadiscovery/TestJaxbMetadataMarshUnmarsh.java index 67967fb..bb59f8b 100644 --- a/src/test/java/org/gcube/datacatalogue/metadatadiscovery/TestJaxbMetadataMarshUnmarsh.java +++ b/src/test/java/org/gcube/datacatalogue/metadatadiscovery/TestJaxbMetadataMarshUnmarsh.java @@ -43,7 +43,7 @@ public class TestJaxbMetadataMarshUnmarsh { ckanMetadata = new MetadataField(); ckanMetadata.setFieldName("Name"); ckanMetadata.setMandatory(true); - ckanMetadata.setDefaulValue("default value"); + ckanMetadata.setDefaultValue("default value"); ckanMetadata.setDataType(DataType.Time); List vocabulary = new ArrayList(); vocabulary.add("field1"); @@ -60,7 +60,7 @@ public class TestJaxbMetadataMarshUnmarsh { ckanMetadata = new MetadataField(); ckanMetadata.setFieldName("Accessibility"); ckanMetadata.setMandatory(true); - ckanMetadata.setDefaulValue("virtual/public"); + ckanMetadata.setDefaultValue("virtual/public"); List vocabulary2 = new ArrayList(); vocabulary2.add("virtual/public"); vocabulary2.add("virtual/private"); @@ -75,7 +75,7 @@ public class TestJaxbMetadataMarshUnmarsh { try { - marshalingExample(); +// marshalingExample(); unMarshalingExample(); } catch (JAXBException e) { diff --git a/src/test/java/org/gcube/datacatalogue/metadatadiscovery/TestMetadataFormatDiscovery.java b/src/test/java/org/gcube/datacatalogue/metadatadiscovery/TestMetadataFormatDiscovery.java index fd8c6f1..d81eb53 100644 --- a/src/test/java/org/gcube/datacatalogue/metadatadiscovery/TestMetadataFormatDiscovery.java +++ b/src/test/java/org/gcube/datacatalogue/metadatadiscovery/TestMetadataFormatDiscovery.java @@ -3,7 +3,9 @@ */ package org.gcube.datacatalogue.metadatadiscovery; +import org.gcube.common.scope.api.ScopeProvider; import org.gcube.common.scope.impl.ScopeBean; +import org.gcube.datacatalogue.metadatadiscovery.bean.MetadataType; import org.gcube.datacatalogue.metadatadiscovery.reader.MedataFormatDiscovery; import org.junit.Test; @@ -22,13 +24,18 @@ public class TestMetadataFormatDiscovery { @Test public void test() { - String scopeString = "/gcube/devsec/devVRE"; + String scopeString = "/gcube/devNext/NextNext"; final ScopeBean scope = new ScopeBean(scopeString); MedataFormatDiscovery reader; try { + ScopeProvider.instance.set(scopeString); reader = new MedataFormatDiscovery(scope); System.out.println(reader.getMetadataTypes()); + for (MetadataType type : reader.getMetadataTypes()) { + System.out.println(type); + } + } catch (Exception e) { e.printStackTrace(); }