sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1630658 [2/2] - in /sis/branches/JDK8: core/sis-metadata/src/main/java/org/apache/sis/metadata/ core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/ core/sis-met...
Date Fri, 10 Oct 2014 06:46:05 GMT
Modified: sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/mock/MetadataMock.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/mock/MetadataMock.java?rev=1630658&r1=1630657&r2=1630658&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/mock/MetadataMock.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/mock/MetadataMock.java
[UTF-8] Fri Oct 10 06:46:04 2014
@@ -23,12 +23,17 @@ import java.nio.charset.Charset;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.opengis.metadata.Identifier;
 import org.opengis.metadata.Metadata;
+import org.opengis.metadata.MetadataScope;
 import org.opengis.metadata.MetadataExtensionInformation;
 import org.opengis.metadata.ApplicationSchemaInformation;
 import org.opengis.metadata.PortrayalCatalogueReference;
 import org.opengis.metadata.acquisition.AcquisitionInformation;
-import org.opengis.metadata.citation.ResponsibleParty;
+import org.opengis.metadata.citation.Citation;
+import org.opengis.metadata.citation.CitationDate;
+import org.opengis.metadata.citation.OnlineResource;
+import org.opengis.metadata.citation.Responsibility;
 import org.opengis.metadata.constraint.Constraints;
 import org.opengis.metadata.content.ContentInformation;
 import org.opengis.metadata.distribution.Distribution;
@@ -36,6 +41,7 @@ import org.opengis.metadata.identificati
 import org.opengis.metadata.maintenance.MaintenanceInformation;
 import org.opengis.metadata.maintenance.ScopeCode;
 import org.opengis.metadata.quality.DataQuality;
+import org.opengis.metadata.lineage.Lineage;
 import org.opengis.metadata.spatial.SpatialRepresentation;
 import org.opengis.referencing.ReferenceSystem;
 import org.apache.sis.internal.jaxb.gmd.LocaleAdapter;
@@ -47,7 +53,7 @@ import org.apache.sis.xml.Namespaces;
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.4
- * @version 0.4
+ * @version 0.5
  * @module
  */
 @XmlRootElement(name = "MD_Metadata", namespace = Namespaces.GMD)
@@ -81,16 +87,36 @@ public final strictfp class MetadataMock
      * @return {@code null}.
      */
     @Override
+    public Identifier getMetadataIdentifier() {
+        return null;
+    }
+
+    /**
+     * Undefined property.
+     * @return {@code null}.
+     */
+    @Override
+    @Deprecated
     public String getFileIdentifier() {
         return null;
     }
 
     /**
+     * Undefined property.
+     * @return {@code null}.
+     */
+    @Override
+    public Collection<Locale> getLanguages() {
+        return null;
+    }
+
+    /**
      * Returns {@link #language}.
      *
      * @return {@link #language}
      */
     @Override
+    @Deprecated
     public Locale getLanguage() {
         return language;
     }
@@ -100,6 +126,26 @@ public final strictfp class MetadataMock
      * @return {@code null}.
      */
     @Override
+    @Deprecated
+    public Collection<Locale> getLocales() {
+        return null;
+    }
+
+    /**
+     * Undefined property.
+     * @return {@code null}.
+     */
+    @Override
+    public Collection<Charset> getCharacterSets() {
+        return null;
+    }
+
+    /**
+     * Undefined property.
+     * @return {@code null}.
+     */
+    @Override
+    @Deprecated
     public Charset getCharacterSet() {
         return null;
     }
@@ -109,6 +155,16 @@ public final strictfp class MetadataMock
      * @return {@code null}.
      */
     @Override
+    public Citation getParentMetadata() {
+        return null;
+    }
+
+    /**
+     * Undefined property.
+     * @return {@code null}.
+     */
+    @Override
+    @Deprecated
     public String getParentIdentifier() {
         return null;
     }
@@ -118,6 +174,16 @@ public final strictfp class MetadataMock
      * @return {@code null}.
      */
     @Override
+    public Collection<? extends MetadataScope> getMetadataScopes() {
+        return null;
+    }
+
+    /**
+     * Undefined property.
+     * @return {@code null}.
+     */
+    @Override
+    @Deprecated
     public Collection<ScopeCode> getHierarchyLevels() {
         return null;
     }
@@ -127,6 +193,7 @@ public final strictfp class MetadataMock
      * @return {@code null}.
      */
     @Override
+    @Deprecated
     public Collection<String> getHierarchyLevelNames() {
         return null;
     }
@@ -136,7 +203,16 @@ public final strictfp class MetadataMock
      * @return {@code null}.
      */
     @Override
-    public Collection<? extends ResponsibleParty> getContacts() {
+    public Collection<? extends Responsibility> getContacts() {
+        return null;
+    }
+
+    /**
+     * Undefined property.
+     * @return {@code null}.
+     */
+    @Override
+    public Collection<? extends CitationDate> getDates() {
         return null;
     }
 
@@ -145,6 +221,7 @@ public final strictfp class MetadataMock
      * @return {@code null}.
      */
     @Override
+    @Deprecated
     public Date getDateStamp() {
         return null;
     }
@@ -154,6 +231,16 @@ public final strictfp class MetadataMock
      * @return {@code null}.
      */
     @Override
+    public Collection<? extends Citation> getMetadataStandards() {
+        return null;
+    }
+
+    /**
+     * Undefined property.
+     * @return {@code null}.
+     */
+    @Override
+    @Deprecated
     public String getMetadataStandardName() {
         return null;
     }
@@ -163,6 +250,7 @@ public final strictfp class MetadataMock
      * @return {@code null}.
      */
     @Override
+    @Deprecated
     public String getMetadataStandardVersion() {
         return null;
     }
@@ -172,7 +260,7 @@ public final strictfp class MetadataMock
      * @return {@code null}.
      */
     @Override
-    public String getDataSetUri() {
+    public Collection<? extends Citation> getMetadataProfiles() {
         return null;
     }
 
@@ -181,7 +269,26 @@ public final strictfp class MetadataMock
      * @return {@code null}.
      */
     @Override
-    public Collection<Locale> getLocales() {
+    public Collection<? extends Citation> getAlternativeMetadataReferences() {
+        return null;
+    }
+
+    /**
+     * Undefined property.
+     * @return {@code null}.
+     */
+    @Override
+    public Collection<? extends OnlineResource> getMetadataLinkages() {
+        return null;
+    }
+
+    /**
+     * Undefined property.
+     * @return {@code null}.
+     */
+    @Override
+    @Deprecated
+    public String getDataSetUri() {
         return null;
     }
 
@@ -235,7 +342,7 @@ public final strictfp class MetadataMock
      * @return {@code null}.
      */
     @Override
-    public Distribution getDistributionInfo() {
+    public Collection<? extends Distribution> getDistributionInfo() {
         return null;
     }
 
@@ -292,4 +399,13 @@ public final strictfp class MetadataMock
     public Collection<? extends AcquisitionInformation> getAcquisitionInformation()
{
         return null;
     }
+
+    /**
+     * Undefined property.
+     * @return {@code null}.
+     */
+    @Override
+    public Collection<? extends Lineage> getResourceLineages() {
+        return null;
+    }
 }

Modified: sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java?rev=1630658&r1=1630657&r2=1630658&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
[UTF-8] Fri Oct 10 06:46:04 2014
@@ -884,7 +884,7 @@ final class MetadataReader {
             if (party != null) {
                 if (distribution == null) {
                     distribution = new DefaultDistribution();
-                    metadata.setDistributionInfo(distribution);
+                    metadata.setDistributionInfo(singleton(distribution));
                 }
                 final DefaultDistributor distributor = new DefaultDistributor(party);
                 // TODO: There is some transfert option, etc. that we could set there.

Modified: sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/ConformanceTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/ConformanceTest.java?rev=1630658&r1=1630657&r2=1630658&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/ConformanceTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/ConformanceTest.java
[UTF-8] Fri Oct 10 06:46:04 2014
@@ -112,7 +112,7 @@ public final strictfp class ConformanceT
         assertNull(expected.put("contentInfo.dimension.sequenceIdentifier",    "z"));
         super.testTHREDDS();
         assertEquals("hierarchyLevel", new HashSet<>(Arrays.asList(ScopeCode.DATASET,
ScopeCode.SERVICE)),
-                metadata.getHierarchyLevels());
+                new HashSet<>(metadata.getHierarchyLevels()));
         /*
          * In the SIS case, the Metadata/Contact and Metadata/Identification/PointOfContact
          * proprties are not just equals - they are expected to be the exact same instance.

Modified: sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java?rev=1630658&r1=1630657&r2=1630658&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java
[UTF-8] Fri Oct 10 06:46:04 2014
@@ -84,14 +84,10 @@ public final strictfp class MetadataRead
         final String text = formatNameAndValue(DefaultMetadata.castOrCopy(actual).asTreeTable());
         assertMultilinesEquals(
             "Metadata\n" +
-            "  ├─File identifier…………………………………………………………………………
edu.ucar.unidata:NCEP/SST/Global_5x2p5deg/SST_Global_5x2p5deg_20050922_0000.nc\n" +
-            "  ├─Hierarchy level…………………………………………………………………………
Dataset\n" +
             "  ├─Contact\n" +
             "  │   ├─Role……………………………………………………………………………………………
Point of contact\n" +
             "  │   └─Party\n" +
             "  │       └─Name…………………………………………………………………………………
NOAA/NWS/NCEP\n" +
-            "  ├─Metadata standard name………………………………………………………
ISO 19115-2 Geographic Information - Metadata Part 2 Extensions for imagery and gridded data\n"
+
-            "  ├─Metadata standard version………………………………………………
ISO 19115-2:2009(E)\n" +
             "  ├─Spatial representation info\n" +
             "  │   ├─Number of dimensions…………………………………………………
3\n" +
             "  │   ├─Axis dimension properties (1 of 3)\n" +
@@ -147,9 +143,16 @@ public final strictfp class MetadataRead
             "  │       └─Attribute\n" +
             "  │           ├─Sequence identifier………………………………
SST\n" +
             "  │           └─Description……………………………………………………
Sea temperature\n" +
-            "  └─Data quality info\n" +
-            "      └─Lineage\n" +
-            "          └─Statement……………………………………………………………………
2003-04-07 12:12:50 - created by gribtocdl" +
-            "              2005-09-26T21:50:00 - edavis - add attributes for dataset discovery\n",
text);
+            "  ├─Data quality info\n" +
+            "  │   └─Lineage\n" +
+            "  │       └─Statement……………………………………………………………………
2003-04-07 12:12:50 - created by gribtocdl" +
+            "              2005-09-26T21:50:00 - edavis - add attributes for dataset discovery\n"
+
+            "  ├─Metadata scope\n" +
+            "  │   └─Resource scope…………………………………………………………………
Dataset\n" +
+            "  ├─Metadata identifier\n" +
+            "  │   └─Code……………………………………………………………………………………………
edu.ucar.unidata:NCEP/SST/Global_5x2p5deg/SST_Global_5x2p5deg_20050922_0000.nc\n" +
+            "  └─Metadata standard\n" +
+            "      ├─Title…………………………………………………………………………………………
ISO 19115-2 Geographic Information - Metadata Part 2 Extensions for imagery and gridded data\n"
+
+            "      └─Edition……………………………………………………………………………………
ISO 19115-2:2009(E)\n", text);
     }
 }

Modified: sis/branches/JDK8/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/XMLStoreTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/XMLStoreTest.java?rev=1630658&r1=1630657&r2=1630658&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/XMLStoreTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/XMLStoreTest.java
[UTF-8] Fri Oct 10 06:46:04 2014
@@ -98,7 +98,7 @@ public final strictfp class XMLStoreTest
             metadata = store.getMetadata();
             assertSame("Expected cached value.", metadata, store.getMetadata());
         }
-        final ResponsibleParty party  = getSingleton(metadata.getContacts());
+        final ResponsibleParty party  = (ResponsibleParty) getSingleton(metadata.getContacts());
         final OnlineResource resource = party.getContactInfo().getOnlineResource();
 
         assertEquals(Locale.ENGLISH,              metadata.getLanguage());



Mime
View raw message