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
This commit is contained in:
parent
127fe4acc5
commit
044928bcda
|
@ -3,7 +3,7 @@
|
||||||
<metadatafield>
|
<metadatafield>
|
||||||
<fieldName>Name</fieldName>
|
<fieldName>Name</fieldName>
|
||||||
<mandatory>true</mandatory>
|
<mandatory>true</mandatory>
|
||||||
<dataType>Date</dataType>
|
<dataType>Time</dataType>
|
||||||
<defaulValue>default value</defaulValue>
|
<defaulValue>default value</defaulValue>
|
||||||
<note>shown as suggestions in the insert/update metadata form of CKAN</note>
|
<note>shown as suggestions in the insert/update metadata form of CKAN</note>
|
||||||
<vocabulary isMultiSelection="true">
|
<vocabulary isMultiSelection="true">
|
||||||
|
|
|
@ -37,7 +37,7 @@ public class MetadataField implements Serializable{
|
||||||
// private Boolean isBoolean = false;
|
// private Boolean isBoolean = false;
|
||||||
@XmlJavaTypeAdapter(DataTypeAdapter.class)
|
@XmlJavaTypeAdapter(DataTypeAdapter.class)
|
||||||
private DataType dataType = DataType.String;
|
private DataType dataType = DataType.String;
|
||||||
private String defaulValue;
|
private String defaultValue;
|
||||||
private String note;
|
private String note;
|
||||||
|
|
||||||
//It's the list of eligible values;
|
//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(mandatory);
|
||||||
builder.append(", dataType=");
|
builder.append(", dataType=");
|
||||||
builder.append(dataType);
|
builder.append(dataType);
|
||||||
builder.append(", defaulValue=");
|
builder.append(", defaultValue=");
|
||||||
builder.append(defaulValue);
|
builder.append(defaultValue);
|
||||||
builder.append(", note=");
|
builder.append(", note=");
|
||||||
builder.append(note);
|
builder.append(note);
|
||||||
builder.append(", vocabulary=");
|
builder.append(", vocabulary=");
|
||||||
|
|
|
@ -26,7 +26,7 @@ public class TestDataCatalogueMetadataFormatReader {
|
||||||
@Test
|
@Test
|
||||||
public void test() {
|
public void test() {
|
||||||
try {
|
try {
|
||||||
String scopeString = "/gcube/devsec/devVRE";
|
String scopeString = "/gcube/devNext/NextNext";
|
||||||
ScopeProvider.instance.set(scopeString);
|
ScopeProvider.instance.set(scopeString);
|
||||||
DataCalogueMetadataFormatReader reader = new DataCalogueMetadataFormatReader();
|
DataCalogueMetadataFormatReader reader = new DataCalogueMetadataFormatReader();
|
||||||
logger.trace(""+reader.getListOfMetadataTypes());
|
logger.trace(""+reader.getListOfMetadataTypes());
|
||||||
|
|
|
@ -43,7 +43,7 @@ public class TestJaxbMetadataMarshUnmarsh {
|
||||||
ckanMetadata = new MetadataField();
|
ckanMetadata = new MetadataField();
|
||||||
ckanMetadata.setFieldName("Name");
|
ckanMetadata.setFieldName("Name");
|
||||||
ckanMetadata.setMandatory(true);
|
ckanMetadata.setMandatory(true);
|
||||||
ckanMetadata.setDefaulValue("default value");
|
ckanMetadata.setDefaultValue("default value");
|
||||||
ckanMetadata.setDataType(DataType.Time);
|
ckanMetadata.setDataType(DataType.Time);
|
||||||
List<String> vocabulary = new ArrayList<String>();
|
List<String> vocabulary = new ArrayList<String>();
|
||||||
vocabulary.add("field1");
|
vocabulary.add("field1");
|
||||||
|
@ -60,7 +60,7 @@ public class TestJaxbMetadataMarshUnmarsh {
|
||||||
ckanMetadata = new MetadataField();
|
ckanMetadata = new MetadataField();
|
||||||
ckanMetadata.setFieldName("Accessibility");
|
ckanMetadata.setFieldName("Accessibility");
|
||||||
ckanMetadata.setMandatory(true);
|
ckanMetadata.setMandatory(true);
|
||||||
ckanMetadata.setDefaulValue("virtual/public");
|
ckanMetadata.setDefaultValue("virtual/public");
|
||||||
List<String> vocabulary2 = new ArrayList<String>();
|
List<String> vocabulary2 = new ArrayList<String>();
|
||||||
vocabulary2.add("virtual/public");
|
vocabulary2.add("virtual/public");
|
||||||
vocabulary2.add("virtual/private");
|
vocabulary2.add("virtual/private");
|
||||||
|
@ -75,7 +75,7 @@ public class TestJaxbMetadataMarshUnmarsh {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|
||||||
marshalingExample();
|
// marshalingExample();
|
||||||
unMarshalingExample();
|
unMarshalingExample();
|
||||||
}
|
}
|
||||||
catch (JAXBException e) {
|
catch (JAXBException e) {
|
||||||
|
|
|
@ -3,7 +3,9 @@
|
||||||
*/
|
*/
|
||||||
package org.gcube.datacatalogue.metadatadiscovery;
|
package org.gcube.datacatalogue.metadatadiscovery;
|
||||||
|
|
||||||
|
import org.gcube.common.scope.api.ScopeProvider;
|
||||||
import org.gcube.common.scope.impl.ScopeBean;
|
import org.gcube.common.scope.impl.ScopeBean;
|
||||||
|
import org.gcube.datacatalogue.metadatadiscovery.bean.MetadataType;
|
||||||
import org.gcube.datacatalogue.metadatadiscovery.reader.MedataFormatDiscovery;
|
import org.gcube.datacatalogue.metadatadiscovery.reader.MedataFormatDiscovery;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
|
@ -22,13 +24,18 @@ public class TestMetadataFormatDiscovery {
|
||||||
@Test
|
@Test
|
||||||
public void test() {
|
public void test() {
|
||||||
|
|
||||||
String scopeString = "/gcube/devsec/devVRE";
|
String scopeString = "/gcube/devNext/NextNext";
|
||||||
final ScopeBean scope = new ScopeBean(scopeString);
|
final ScopeBean scope = new ScopeBean(scopeString);
|
||||||
MedataFormatDiscovery reader;
|
MedataFormatDiscovery reader;
|
||||||
try {
|
try {
|
||||||
|
ScopeProvider.instance.set(scopeString);
|
||||||
reader = new MedataFormatDiscovery(scope);
|
reader = new MedataFormatDiscovery(scope);
|
||||||
System.out.println(reader.getMetadataTypes());
|
System.out.println(reader.getMetadataTypes());
|
||||||
|
|
||||||
|
for (MetadataType type : reader.getMetadataTypes()) {
|
||||||
|
System.out.println(type);
|
||||||
|
}
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue