This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git
commit ee858dc267006250cc5b1ae3d3106d88427807f4
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Fri Jan 7 20:47:07 2022 +0100
Following the addition of a minimalist `org.opengis.temporal`
implementation, remove some checks for the (not yet existant) "sis-temporal"
module.
---
.../apache/sis/internal/jaxb/gml/TM_Primitive.java | 4 +-
.../sis/internal/jaxb/gts/TM_PeriodDuration.java | 18 +-----
.../metadata/iso/extent/DefaultTemporalExtent.java | 5 --
.../apache/sis/internal/jaxb/gml/DummyInstant.java | 67 ----------------------
.../sis/internal/jaxb/gml/TimePeriodTest.java | 28 ++++++---
.../sis/metadata/PropertyConsistencyCheck.java | 6 +-
.../apache/sis/metadata/iso/MarshallingTest.java | 2 +-
.../sis/metadata/iso/extent/DefaultExtentTest.java | 2 +-
.../apache/sis/io/wkt/GeodeticObjectParser.java | 15 ++---
.../referencing/ServicesForMetadataTest.java | 2 -
.../apache/sis/test/integration/MetadataTest.java | 2 +-
.../sis/test/integration/MetadataVerticalTest.java | 1 -
.../sis/internal/util/TemporalUtilities.java | 9 ---
.../apache/sis/util/logging/MonolineFormatter.java | 2 +-
.../apache/sis/storage/landsat/MetadataReader.java | 7 +--
.../apache/sis/storage/geotiff/XMLMetadata.java | 6 +-
.../apache/sis/storage/netcdf/MetadataReader.java | 6 +-
.../sis/internal/storage/MetadataBuilder.java | 1 -
.../org/apache/sis/internal/storage/csv/Store.java | 6 --
19 files changed, 34 insertions(+), 155 deletions(-)
diff --git
a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TM_Primitive.java
b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TM_Primitive.java
index 9903cd0..6362bc0 100644
---
a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TM_Primitive.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TM_Primitive.java
@@ -164,9 +164,7 @@ public class TM_Primitive extends
PropertyType<TM_Primitive, TemporalPrimitive>
* @param e the exception.
*/
private static void warningOccured(final String method, final Exception e)
{
- if (TemporalUtilities.REPORT_MISSING_MODULE ||
!e.getMessage().contains("sis-temporal")) {
- Context.warningOccured(Context.current(), TM_Primitive.class,
method, e, true);
- }
+ Context.warningOccured(Context.current(), TM_Primitive.class, method,
e, true);
}
/**
diff --git
a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_PeriodDuration.java
b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_PeriodDuration.java
index 6a83fc9..da8bd38 100644
---
a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_PeriodDuration.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_PeriodDuration.java
@@ -131,7 +131,7 @@ public class TM_PeriodDuration extends
PropertyType<TM_PeriodDuration, PeriodDur
}
return factory.newDuration(true, years, months, days, hours,
minutes, seconds);
} catch (DatatypeConfigurationException e) {
- warningOccured("toXML", e);
+ Context.warningOccured(Context.current(), TM_PeriodDuration.class,
"toXML", e, true);
}
return null;
}
@@ -150,7 +150,7 @@ public class TM_PeriodDuration extends
PropertyType<TM_PeriodDuration, PeriodDur
* Converts the given Java XML duration into an ISO 19108 duration.
*/
static PeriodDuration toISO(final Duration duration) {
- if (duration != null) try {
+ if (duration != null) {
final TemporalFactory factory =
TemporalUtilities.getTemporalFactory();
InternationalString years = null;
int value;
@@ -179,25 +179,11 @@ public class TM_PeriodDuration extends
PropertyType<TM_PeriodDuration, PeriodDur
seconds = new
SimpleInternationalString(Integer.toString(value));
}
return factory.createPeriodDuration(years, months, weeks, days,
hours, minutes, seconds);
- } catch (UnsupportedOperationException e) {
- warningOccured("toISO", e);
}
return null;
}
/**
- * Reports a failure to execute the operation because of missing {@code
sis-temporal} module.
- *
- * @param methodName the method name.
- * @param e the exception.
- */
- private static void warningOccured(final String methodName, final
Exception e) {
- if (TemporalUtilities.REPORT_MISSING_MODULE ||
!e.getMessage().contains("sis-temporal")) {
- Context.warningOccured(Context.current(), TM_PeriodDuration.class,
methodName, e, true);
- }
- }
-
- /**
* Wraps the value only if marshalling an element from the ISO 19115:2003
metadata model.
* Otherwise (i.e. if marshalling according legacy ISO 19115:2014 model),
omits the element.
*/
diff --git
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java
index d169d0a..ecec2e8 100644
---
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java
@@ -201,13 +201,8 @@ public class DefaultTemporalExtent extends ISOMetadata
implements TemporalExtent
* Sets the temporal extent to the specified values. This convenience
method creates a temporal
* primitive for the given dates, then invokes {@link
#setExtent(TemporalPrimitive)}.
*
- * <p><b>Note:</b> this method is available only if the {@code
sis-temporal} module is available on the classpath,
- * or any other module providing an implementation of the {@link
org.opengis.temporal.TemporalFactory} interface.</p>
- *
* @param startTime the start date and time for the content of the
dataset, or {@code null} if none.
* @param endTime the end date and time for the content of the
dataset, or {@code null} if none.
- * @throws UnsupportedOperationException if no implementation of {@code
TemporalFactory} has been found
- * on the classpath.
*/
public void setBounds(final Date startTime, final Date endTime) throws
UnsupportedOperationException {
TemporalPrimitive value = null;
diff --git
a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/DummyInstant.java
b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/DummyInstant.java
deleted file mode 100644
index 12a8693..0000000
---
a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/DummyInstant.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sis.internal.jaxb.gml;
-
-import java.util.Date;
-import org.opengis.temporal.Instant;
-import org.opengis.temporal.Duration;
-import org.opengis.temporal.RelativePosition;
-import org.opengis.temporal.TemporalPosition;
-import org.opengis.temporal.TemporalPrimitive;
-import org.opengis.temporal.TemporalGeometricPrimitive;
-import org.apache.sis.internal.simple.SimpleIdentifiedObject;
-
-
-/**
- * A dummy {@link Instant} implementation, for testing the JAXB elements
without dependency
- * toward the {@code sis-temporal} module.
- *
- * @author Martin Desruisseaux (Geomatys)
- * @version 0.5
- * @since 0.3
- * @module
- */
-@SuppressWarnings("serial")
-final class DummyInstant extends SimpleIdentifiedObject implements Instant {
- /**
- * The time, in milliseconds elapsed since January 1st, 1970.
- */
- private final long time;
-
- /**
- * Creates a new instant initialized to the given value.
- */
- DummyInstant(final Date time) {
- this.time = time.getTime();
- }
-
- /**
- * Returns the date of this instant object.
- */
- @Override
- public Date getDate() {
- return new Date(time);
- }
-
- /**
- * Unsupported operations.
- */
- @Override public Duration length()
{throw new UnsupportedOperationException();}
- @Override public RelativePosition relativePosition(TemporalPrimitive
other) {throw new UnsupportedOperationException();}
- @Override public Duration distance(TemporalGeometricPrimitive
other) {throw new UnsupportedOperationException();}
- @Override public TemporalPosition getTemporalPosition()
{throw new UnsupportedOperationException();}
-}
diff --git
a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/TimePeriodTest.java
b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/TimePeriodTest.java
index 9fb6888..6174f22 100644
---
a/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/TimePeriodTest.java
+++
b/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/gml/TimePeriodTest.java
@@ -28,6 +28,7 @@ import org.apache.sis.xml.XML;
import org.apache.sis.xml.Namespaces;
import org.apache.sis.xml.MarshallerPool;
import org.apache.sis.internal.xml.XmlUtilities;
+import org.apache.sis.internal.temporal.DefaultTemporalFactory;
import org.apache.sis.test.xml.TestCase;
import org.junit.BeforeClass;
import org.junit.AfterClass;
@@ -37,13 +38,15 @@ import static org.apache.sis.test.MetadataAssert.*;
import static org.apache.sis.test.TestUtilities.date;
import static org.apache.sis.test.TestUtilities.format;
+import org.opengis.temporal.Instant;
+
/**
* Tests the {@link TimePeriod} class. The XML fragments used in this test
cases are derived from
* <a
href="http://toyoda-eizi.blogspot.fr/2011/02/examples-of-gml-fragment-in-iso.html";>here</a>.
*
* @author Martin Desruisseaux (Geomatys)
- * @version 0.3
+ * @version 1.2
* @since 0.3
* @module
*/
@@ -62,6 +65,13 @@ public final strictfp class TimePeriodTest extends TestCase {
}
/**
+ * Creates a GeoAPI instant object for the given date.
+ */
+ private static Instant instant(final String date) {
+ return DefaultTemporalFactory.INSTANCE.createInstant(date(date));
+ }
+
+ /**
* Creates the XML (un)marshaller pool to be shared by all test methods.
* The (un)marshallers locale and timezone will be set to fixed values.
*
@@ -121,8 +131,8 @@ public final strictfp class TimePeriodTest extends TestCase
{
@Test
public void testPeriodGML2() throws JAXBException {
createContext();
- final TimePeriodBound begin = new TimePeriodBound.GML2(new
DummyInstant(date("1992-01-01 00:00:00")));
- final TimePeriodBound end = new TimePeriodBound.GML2(new
DummyInstant(date("2007-12-31 00:00:00")));
+ final TimePeriodBound begin = new
TimePeriodBound.GML2(instant("1992-01-01 00:00:00"));
+ final TimePeriodBound end = new
TimePeriodBound.GML2(instant("2007-12-31 00:00:00"));
testPeriod(begin, end,
"<gml:TimePeriod xmlns:gml=\"" + Namespaces.GML + "\">\n" +
" <gml:begin>\n" +
@@ -173,8 +183,8 @@ public final strictfp class TimePeriodTest extends TestCase
{
@Test
public void testPeriodGML3() throws JAXBException {
createContext();
- final TimePeriodBound begin = new TimePeriodBound.GML3(new
DummyInstant(date("1992-01-01 00:00:00")), "before");
- final TimePeriodBound end = new TimePeriodBound.GML3(new
DummyInstant(date("2007-12-31 00:00:00")), "after");
+ final TimePeriodBound begin = new
TimePeriodBound.GML3(instant("1992-01-01 00:00:00"), "before");
+ final TimePeriodBound end = new
TimePeriodBound.GML3(instant("2007-12-31 00:00:00"), "after");
testPeriod(begin, end,
"<gml:TimePeriod xmlns:gml=\"" + Namespaces.GML + "\">\n" +
"
<gml:beginPosition>1992-01-01T01:00:00+01:00</gml:beginPosition>\n" +
@@ -191,8 +201,8 @@ public final strictfp class TimePeriodTest extends TestCase
{
@Test
public void testSimplifiedPeriodGML3() throws JAXBException {
createContext();
- final TimePeriodBound begin = new TimePeriodBound.GML3(new
DummyInstant(date("1992-01-01 23:00:00")), "before");
- final TimePeriodBound end = new TimePeriodBound.GML3(new
DummyInstant(date("2007-12-30 23:00:00")), "after");
+ final TimePeriodBound begin = new
TimePeriodBound.GML3(instant("1992-01-01 23:00:00"), "before");
+ final TimePeriodBound end = new
TimePeriodBound.GML3(instant("2007-12-30 23:00:00"), "after");
testPeriod(begin, end,
"<gml:TimePeriod xmlns:gml=\"" + Namespaces.GML + "\">\n" +
" <gml:beginPosition>1992-01-02</gml:beginPosition>\n" +
@@ -210,7 +220,7 @@ public final strictfp class TimePeriodTest extends TestCase
{
public void testBeforePeriodGML3() throws JAXBException {
createContext();
final TimePeriodBound begin = new TimePeriodBound.GML3(null, "before");
- final TimePeriodBound end = new TimePeriodBound.GML3(new
DummyInstant(date("2007-12-30 23:00:00")), "after");
+ final TimePeriodBound end = new
TimePeriodBound.GML3(instant("2007-12-30 23:00:00"), "after");
testPeriod(begin, end,
"<gml:TimePeriod xmlns:gml=\"" + Namespaces.GML + "\">\n" +
" <gml:beginPosition indeterminatePosition=\"before\"/>\n" +
@@ -227,7 +237,7 @@ public final strictfp class TimePeriodTest extends TestCase
{
@Test
public void testAfterPeriodGML3() throws JAXBException {
createContext();
- final TimePeriodBound begin = new TimePeriodBound.GML3(new
DummyInstant(date("1992-01-01 23:00:00")), "before");
+ final TimePeriodBound begin = new
TimePeriodBound.GML3(instant("1992-01-01 23:00:00"), "before");
final TimePeriodBound end = new TimePeriodBound.GML3(null, "after");
testPeriod(begin, end,
"<gml:TimePeriod xmlns:gml=\"" + Namespaces.GML + "\">\n" +
diff --git
a/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyConsistencyCheck.java
b/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyConsistencyCheck.java
index 1fd7067..12ecac1 100644
---
a/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyConsistencyCheck.java
+++
b/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyConsistencyCheck.java
@@ -49,7 +49,7 @@ import org.junit.Test;
* package-private classes.
*
* @author Martin Desruisseaux (Geomatys)
- * @version 1.0
+ * @version 1.2
* @since 0.3
* @module
*/
@@ -275,10 +275,6 @@ public abstract strictfp class PropertyConsistencyCheck
extends AnnotationConsis
fail("Non writable property: " + accessor + '.' + property);
}
if (isWritable) {
- if (Date.class.isAssignableFrom(accessor.type(i,
TypeValuePolicy.ELEMENT_TYPE))) {
- // Dates requires sis-temporal module, which is not
available for sis-metadata.
- continue;
- }
if (isMap) {
continue;
}
diff --git
a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/MarshallingTest.java
b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/MarshallingTest.java
index 7032e35..2b11069 100644
---
a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/MarshallingTest.java
+++
b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/MarshallingTest.java
@@ -425,7 +425,7 @@ public final class MarshallingTest extends TestUsingFile
implements Filter {
cit.getDates().add(new DefaultCitationDate(new Date(1523224800000L),
DateType.CREATION));
cit.getIdentifierMap().putSpecialized(IdentifierSpace.ID,
"lost-island");
dataId.setCitation(cit);
- dataId.setTemporalResolutions(Collections.emptySet()); //
TODO: depends on sis-temporal
+ dataId.setTemporalResolutions(Collections.emptySet()); //
TODO: need a more complete sis-temporal.
final Collection<MaintenanceInformation> resourceMaintenances;
{
/*
diff --git
a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java
b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java
index 88e6401..8a19f7c 100644
---
a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java
+++
b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java
@@ -112,7 +112,7 @@ public final strictfp class DefaultExtentTest extends
TestUsingFile {
bbox.getIdentifierMap().put(IdentifierSpace.ID, "bbox");
final DefaultTemporalExtent temporal = new DefaultTemporalExtent();
if (PENDING_FUTURE_SIS_VERSION) {
- // This block needs sis-temporal module.
+ // This block needs a more complete sis-temporal module.
temporal.setBounds(date("2010-01-27 13:26:10"), date("2010-08-27
13:26:10"));
}
final DefaultExtent extent = new DefaultExtent(null, bbox, null,
temporal);
diff --git
a/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java
b/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java
index ec9ea74..2d30f41 100644
---
a/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java
+++
b/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/GeodeticObjectParser.java
@@ -525,9 +525,6 @@ class GeodeticObjectParser extends MathTransformParser
implements Comparator<Coo
*
* TODO: syntax like TIMEEXTENT[“Jurassic”, “Quaternary”] is not
yet supported.
* See https://issues.apache.org/jira/browse/SIS-163
- *
- * This operation requires the the sis-temporal module. If not
available,
- * we will report a warning and leave the temporal extent missing.
*/
while ((element = parent.pullElement(OPTIONAL,
WKTKeywords.TimeExtent)) != null) {
if (element.peekValue() instanceof String) {
@@ -539,14 +536,10 @@ class GeodeticObjectParser extends MathTransformParser
implements Comparator<Coo
final Date startTime = element.pullDate("startTime");
final Date endTime = element.pullDate("endTime");
element.close(ignoredElements);
- try {
- final DefaultTemporalExtent t = new
DefaultTemporalExtent();
- t.setBounds(startTime, endTime);
- if (extent == null) extent = new DefaultExtent();
- extent.getTemporalElements().add(t);
- } catch (UnsupportedOperationException e) {
- warning(parent, element, null, e);
- }
+ final DefaultTemporalExtent t = new
DefaultTemporalExtent();
+ t.setBounds(startTime, endTime);
+ if (extent == null) extent = new DefaultExtent();
+ extent.getTemporalElements().add(t);
}
}
if (extent != null) {
diff --git
a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ServicesForMetadataTest.java
b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ServicesForMetadataTest.java
index 698bbb0..d44444b 100644
---
a/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ServicesForMetadataTest.java
+++
b/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ServicesForMetadataTest.java
@@ -33,7 +33,6 @@ import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.TestUtilities;
-import org.junit.Ignore;
import org.junit.Test;
import static org.apache.sis.test.Assert.*;
@@ -213,7 +212,6 @@ public final strictfp class ServicesForMetadataTest extends
TestCase {
* @since 0.8
*/
@Test
- @Ignore("This operation requires the sis-temporal module.")
public void testTemporalIntersection() throws TransformException {
final DefaultTemporalExtent e1 = new DefaultTemporalExtent();
final DefaultTemporalExtent e2 = new DefaultTemporalExtent();
diff --git
a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
index 4656208..1d2e044 100644
---
a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
+++
b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
@@ -392,7 +392,7 @@ public final strictfp class MetadataTest extends TestCase {
replace(xml, "<gcol:CharacterString>4326</gcol:CharacterString>",
"<gmx:Anchor
xlink:href=\"SDN:L101:2:4326\">4326</gmx:Anchor>");
/*
- * The <gmd:EX_TemporalExtent> block can not be marshalled yet, since
it requires the sis-temporal module.
+ * The <gmd:EX_TemporalExtent> block can not be marshalled es expected
yet (need a "sis-temporal" module).
* We need to instruct the XML comparator to ignore this block during
the comparison. We also ignore for
* now the "gml:id" attribute since SIS generates different values
than the ones in our test XML file,
* and those values may change in future SIS version.
diff --git
a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataVerticalTest.java
b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataVerticalTest.java
index 7178e51..6a8809c 100644
---
a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataVerticalTest.java
+++
b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataVerticalTest.java
@@ -89,7 +89,6 @@ public strictfp class MetadataVerticalTest extends TestCase {
*/
@After
public void assertNoUnexpectedLog() {
- loggings.skipNextLogIfContains("sis-temporal");
loggings.assertNoUnexpectedLog();
}
diff --git
a/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java
b/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java
index c4f697d..d3cdfb1 100644
---
a/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java
+++
b/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java
@@ -38,15 +38,6 @@ import
org.apache.sis.internal.temporal.DefaultTemporalFactory;
*/
public final class TemporalUtilities extends Static {
/**
- * {@code true} if the SIS library should log the "This operation requires
the sis-temporal module" warning.
- * This flag can be {@code true} during development phase, but should be
set to {@code false} in SIS releases
- * until we can really provide a sis-temporal module.
- *
- * This constant will be removed after SIS release a sis-temporal module.
- */
- public static final boolean REPORT_MISSING_MODULE = true;
-
- /**
* Do not allow instantiation of this class.
*/
private TemporalUtilities() {
diff --git
a/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java
b/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java
index c8b352d..89c2d7b 100644
---
a/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java
+++
b/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java
@@ -58,7 +58,7 @@ import static
org.apache.sis.internal.util.StandardDateFormat.UTC;
* <tr><td><code>00:03</code></td><td
style="background:green"><code>INFO</code></td>
* <td><code><b>[EPSGFactory]</b> Connected to the EPSG database version
9.1 on Derby 10.14.</code></td></tr>
* <tr><td><code>00:12</code></td><td
style="background:goldenrod"><code>WARNING</code></td>
- * <td><code><b>[DefaultTemporalExtent]</b> This operation requires the
“sis-temporal” module.</code></td></tr>
+ * <td><code><b>[NetcdfStore]</b> Read “foo.nc” in 0.2
second.</code></td></tr>
* </table></blockquote>
*
* By default, {@code MonolineFormatter} shows only the level and the message.
One or two additional
diff --git
a/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/landsat/MetadataReader.java
b/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/landsat/MetadataReader.java
index a08ed14..ce215e7 100644
---
a/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/landsat/MetadataReader.java
+++
b/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/landsat/MetadataReader.java
@@ -816,12 +816,7 @@ final class MetadataReader extends MetadataBuilder {
sceneTime = null; // Clear now in case an
exception it thrown below.
final Date t = StandardDateFormat.toDate(st);
addAcquisitionTime(t);
- try {
- addTemporalExtent(t, t);
- } catch (UnsupportedOperationException e) {
- // May happen if the temporal module (which is optional) is
not on the classpath.
- warning(null, null, e);
- }
+ addTemporalExtent(t, t);
}
}
diff --git
a/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/XMLMetadata.java
b/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/XMLMetadata.java
index 5c94f25..c8b444f 100644
---
a/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/XMLMetadata.java
+++
b/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/XMLMetadata.java
@@ -460,11 +460,7 @@ final class XMLMetadata implements Filter {
* Writes to {@link MetadataBuilder} all information that were pending
parsing completion.
*/
void flush() {
- try {
- metadata.addTemporalExtent(toDate(startTime), toDate(endTime));
- } catch (UnsupportedOperationException e) {
- // Ignore (this operation requires "sis-temporal" module).
- }
+ metadata.addTemporalExtent(toDate(startTime), toDate(endTime));
}
}
diff --git
a/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
b/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
index be567fd..cff4023 100644
---
a/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
+++
b/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
@@ -789,14 +789,10 @@ split: while ((start =
CharSequences.skipLeadingWhitespaces(value, start, lengt
}
/*
* If at least one time value above is available, add a temporal
extent.
- * This operation requires the sis-temporal module. If not available,
- * we will report a warning and leave the temporal extent missing.
*/
- if (startTime != null || endTime != null) try {
+ if (startTime != null || endTime != null) {
addTemporalExtent(startTime, endTime);
hasExtent = true;
- } catch (UnsupportedOperationException e) {
- warning(e);
}
return hasExtent;
}
diff --git
a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
index a10e3e3..ede11a6 100644
---
a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
+++
b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
@@ -1876,7 +1876,6 @@ parse: for (int i = 0; i < length;) {
*
* @param startTime when the data begins, or {@code null} if unbounded.
* @param endTime when the data ends, or {@code null} if unbounded.
- * @throws UnsupportedOperationException if the temporal module is not on
the classpath.
*
* @see #addAcquisitionTime(Date)
*/
diff --git
a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java
b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java
index 41a7841..7d369ce 100644
---
a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java
+++
b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java
@@ -650,12 +650,6 @@ final class Store extends URIDataStore implements
FeatureSet {
builder.addExtent(envelope);
} catch (TransformException e) {
throw new DataStoreReferencingException(getLocale(),
StoreProvider.NAME, getDisplayName(), source).initCause(e);
- } catch (UnsupportedOperationException e) {
- /*
- * Failed to set the temporal components if the sis-temporal
module was
- * not on the classpath, but the other dimensions still have
been set.
- */
- listeners.warning(e);
}
builder.addFeatureType(featureType, -1);
addTitleOrIdentifier(builder);
