diff --git a/.classpath b/.classpath index d64ebcb..fcd4e72 100644 --- a/.classpath +++ b/.classpath @@ -6,12 +6,6 @@ - - - - - - diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index e2ceea1..a0e69ab 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -8,7 +8,9 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.7 diff --git a/.settings/org.eclipse.wst.validation.prefs b/.settings/org.eclipse.wst.validation.prefs new file mode 100644 index 0000000..04cad8c --- /dev/null +++ b/.settings/org.eclipse.wst.validation.prefs @@ -0,0 +1,2 @@ +disabled=06target +eclipse.preferences.version=1 diff --git a/src/main/java/org/gcube/common/metadataprofilediscovery/MetadataProfileReader.java b/src/main/java/org/gcube/common/metadataprofilediscovery/MetadataProfileReader.java index 6911357..2ee96dd 100644 --- a/src/main/java/org/gcube/common/metadataprofilediscovery/MetadataProfileReader.java +++ b/src/main/java/org/gcube/common/metadataprofilediscovery/MetadataProfileReader.java @@ -173,7 +173,7 @@ public class MetadataProfileReader implements MetadataProfileDiscovery { namespaceCategories.addAll(rd.getNamespaces().getNamespaceCategories()); } } catch (Exception e) { - logger.debug("An error occurred during read namespaces for categories: ", e); + logger.warn("An error occurred during read namespaces for categories: ", e); throw e; } } diff --git a/src/test/java/org/gcube/common/metadataprofilediscovery/TestMetadataFormatReader.java b/src/test/java/org/gcube/common/metadataprofilediscovery/TestMetadataFormatReader.java index 26f29af..b3359be 100644 --- a/src/test/java/org/gcube/common/metadataprofilediscovery/TestMetadataFormatReader.java +++ b/src/test/java/org/gcube/common/metadataprofilediscovery/TestMetadataFormatReader.java @@ -3,11 +3,8 @@ */ package org.gcube.common.metadataprofilediscovery; -import java.io.InputStream; - -import org.gcube.common.metadataprofilediscovery.jaxb.MetadataField; -import org.gcube.common.metadataprofilediscovery.jaxb.MetadataFormat; -import org.gcube.common.metadataprofilediscovery.reader.MetadataFormatReader; +import org.gcube.common.metadataprofilediscovery.bean.MetadataProfile; +import org.gcube.common.metadataprofilediscovery.jaxb.NamespaceCategory; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.common.scope.impl.ScopeBean; @@ -19,35 +16,28 @@ import org.gcube.common.scope.impl.ScopeBean; */ public class TestMetadataFormatReader { -// @Test + //@Test public void test() { String scopeString = "/gcube/devsec/devVRE"; final ScopeBean scope = new ScopeBean(scopeString); - MetadataFormatReader reader; + MetadataProfileReader reader; try { ScopeProvider.instance.set(scopeString); - reader = new MetadataFormatReader(scope, "0d29d7a9-d779-478c-a13d-d70708dc66c4"); - System.out.println(reader.getMetadataFormat()); - } catch (Exception e) { - e.printStackTrace(); - } - } - - //@Test - public void testReadInputStream() { - String fileNameMeatadataProfile = "HarvestedObject.xml"; - try { - InputStream in = ClassLoader.getSystemResourceAsStream(fileNameMeatadataProfile); - //InputStream in = TestMetadataFormatReader.class.getResourceAsStream(fileNameMeatadataProfile); - MetadataFormat mf = MetadataProfileReader.toMetadataFormat(in); - System.out.println("Source: "+mf.getMetadataSource()); + reader = new MetadataProfileReader("GeoNaMetadata"); + + int i = 0; + for (MetadataProfile metadataProfile : reader.getListOfMetadataProfiles()) { + System.out.println(i++ +")"+metadataProfile); + } - for (MetadataField field : mf.getMetadataFields()) { - System.out.println(field); + i = 0; + for (NamespaceCategory namespaceCategory : reader.getListOfNamespaceCategories()) { + System.out.println(i++ +")"+namespaceCategory); } } catch (Exception e) { e.printStackTrace(); } } + } diff --git a/src/test/java/org/gcube/common/metadataprofilediscovery/TestMetadataProfileReader.java b/src/test/java/org/gcube/common/metadataprofilediscovery/TestMetadataProfileReader.java new file mode 100644 index 0000000..48f0ca9 --- /dev/null +++ b/src/test/java/org/gcube/common/metadataprofilediscovery/TestMetadataProfileReader.java @@ -0,0 +1,53 @@ +/** + * + */ +package org.gcube.common.metadataprofilediscovery; + +import java.io.InputStream; + +import org.gcube.common.metadataprofilediscovery.jaxb.MetadataField; +import org.gcube.common.metadataprofilediscovery.jaxb.MetadataFormat; +import org.gcube.common.metadataprofilediscovery.reader.MetadataFormatReader; +import org.gcube.common.scope.api.ScopeProvider; +import org.gcube.common.scope.impl.ScopeBean; + + +/** + * + * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it + * Jun 8, 2016 + */ +public class TestMetadataProfileReader { + +// @Test + public void test() { + + String scopeString = "/gcube/devsec/devVRE"; + final ScopeBean scope = new ScopeBean(scopeString); + MetadataFormatReader reader; + try { + ScopeProvider.instance.set(scopeString); + reader = new MetadataFormatReader(scope, "0d29d7a9-d779-478c-a13d-d70708dc66c4"); + System.out.println(reader.getMetadataFormat()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + //@Test + public void testReadInputStream() { + String fileNameMeatadataProfile = "HarvestedObject.xml"; + try { + InputStream in = ClassLoader.getSystemResourceAsStream(fileNameMeatadataProfile); + //InputStream in = TestMetadataFormatReader.class.getResourceAsStream(fileNameMeatadataProfile); + MetadataFormat mf = MetadataProfileReader.toMetadataFormat(in); + System.out.println("Source: "+mf.getMetadataSource()); + + for (MetadataField field : mf.getMetadataFields()) { + System.out.println(field); + } + } catch (Exception e) { + e.printStackTrace(); + } + } +}