sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1553457 [4/4] - in /sis/trunk: ./ 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/test/java/org/apache/sis/metadata/iso/ core/sis-metadata/src/test...
Date Thu, 26 Dec 2013 06:04:00 GMT
Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/XMLComparator.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/XMLComparator.java?rev=1553457&r1=1553456&r2=1553457&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/XMLComparator.java [UTF-8]
(original)
+++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/XMLComparator.java [UTF-8]
Thu Dec 26 06:03:57 2013
@@ -634,7 +634,7 @@ public strictfp class XMLComparator {
         actual   = trim(actual);
         if ((expected != actual) && (expected == null || !expected.equals(actual)))
{
             // Before to declare a test failure, compares again as numerical values if possible.
-            if (tolerance > 0 && abs(doubleValue(expected) - doubleValue(actual))
<= tolerance) {
+            if (abs(doubleValue(expected) - doubleValue(actual)) <= tolerance) {
                 return;
             }
             final String lineSeparator = JDK7.lineSeparator();

Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java?rev=1553457&r1=1553456&r2=1553457&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
[UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
[UTF-8] Thu Dec 26 06:03:57 2013
@@ -78,7 +78,8 @@ import org.junit.BeforeClass;
     org.apache.sis.internal.util.CollectionsExtTest.class,
 
     // GeoAPI most basic types.
-    org.apache.sis.internal.util.URIParserTest.class,
+    org.apache.sis.internal.util.DefinitionURITest.class,
+    org.apache.sis.internal.util.XPathsTest.class,
     org.apache.sis.util.iso.TypesTest.class,
     org.apache.sis.util.iso.SimpleInternationalStringTest.class,
     org.apache.sis.util.iso.DefaultInternationalStringTest.class,

Modified: sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java?rev=1553457&r1=1553456&r2=1553457&view=diff
==============================================================================
--- sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java
[UTF-8] (original)
+++ sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java
[UTF-8] Thu Dec 26 06:03:57 2013
@@ -103,6 +103,8 @@ public class NetcdfStore extends DataSto
     /**
      * Returns a string representation of this NetCDF store for debugging purpose.
      * The content of the string returned by this method may change in any future SIS version.
+     *
+     * @return A string representation of this datastore for debugging purpose.
      */
     @Debug
     @Override

Modified: sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java?rev=1553457&r1=1553456&r2=1553457&view=diff
==============================================================================
--- sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java
[UTF-8] (original)
+++ sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java
[UTF-8] Thu Dec 26 06:03:57 2013
@@ -36,7 +36,6 @@ import org.apache.sis.storage.DataStoreE
 import org.apache.sis.storage.ProbeResult;
 import org.apache.sis.util.logging.WarningListeners;
 import org.apache.sis.util.logging.Logging;
-import org.apache.sis.util.ThreadSafe;
 import org.apache.sis.util.Version;
 
 
@@ -47,6 +46,10 @@ import org.apache.sis.util.Version;
  * on the classpath, then this class tries to instantiate a {@code NetcdfStore} backed by
  * the UCAR library.
  *
+ * {@section Thread safety}
+ * The same {@code NetcdfStoreProvider} instance can be safely used by many threads without
synchronization on
+ * the part of the caller. However the {@link NetcdfStore} instances created by this factory
are not thread-safe.
+ *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3
  * @version 0.4
@@ -54,7 +57,6 @@ import org.apache.sis.util.Version;
  *
  * @see NetcdfStore
  */
-@ThreadSafe
 public class NetcdfStoreProvider extends DataStoreProvider {
     /**
      * The MIME type for NetCDF files.
@@ -199,7 +201,9 @@ public class NetcdfStoreProvider extends
     /**
      * Returns a {@link NetcdfStore} implementation associated with this provider.
      *
-     * @param storage Information about the storage (URL, stream, {@link ucar.nc2.NetcdfFile}
instance, <i>etc</i>).
+     * @param  storage Information about the storage (URL, stream, {@link ucar.nc2.NetcdfFile}
instance, <i>etc</i>).
+     * @return A data store implementation associated with this provider for the given storage.
+     * @throws DataStoreException If an error occurred while creating the data store instance.
      */
     @Override
     public DataStore open(final StorageConnector storage) throws DataStoreException {

Modified: sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreProvider.java
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreProvider.java?rev=1553457&r1=1553456&r2=1553457&view=diff
==============================================================================
--- sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreProvider.java
[UTF-8] (original)
+++ sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreProvider.java
[UTF-8] Thu Dec 26 06:03:57 2013
@@ -16,8 +16,6 @@
  */
 package org.apache.sis.storage;
 
-import org.apache.sis.util.ThreadSafe;
-
 
 /**
  * Provides information about a specific {@link DataStore} implementation.
@@ -42,7 +40,7 @@ import org.apache.sis.util.ThreadSafe;
  * where each line is the fully qualified name of the implementation class.
  * See {@link java.util.ServiceLoader} for more general discussion about this lookup mechanism.
  *
- * {@section Thread safety policy}
+ * {@section Thread safety}
  * All {@code DataStoreProvider} implementations shall be thread-safe.
  * However the {@code DataStore} instances created by the providers do not need to be thread-safe.
  *
@@ -51,7 +49,6 @@ import org.apache.sis.util.ThreadSafe;
  * @version 0.4
  * @module
  */
-@ThreadSafe
 public abstract class DataStoreProvider {
     /**
      * Creates a new provider.
@@ -123,7 +120,6 @@ public abstract class DataStoreProvider 
      *
      * @param  storage Information about the storage (URL, stream, JDBC connection, <i>etc</i>).
      * @return A data store implementation associated with this provider for the given storage.
-     * @throws IllegalArgumentException If the set contains an invalid combination of options.
      * @throws DataStoreException If an error occurred while creating the data store instance.
      *
      * @see DataStores#open(Object)

Modified: sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreRegistry.java
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreRegistry.java?rev=1553457&r1=1553456&r2=1553457&view=diff
==============================================================================
--- sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreRegistry.java
[UTF-8] (original)
+++ sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreRegistry.java
[UTF-8] Thu Dec 26 06:03:57 2013
@@ -20,7 +20,6 @@ import java.util.List;
 import java.util.LinkedList;
 import java.util.Iterator;
 import java.util.ServiceLoader;
-import org.apache.sis.util.ThreadSafe;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.resources.Errors;
 
@@ -33,12 +32,15 @@ import org.apache.sis.util.resources.Err
  * {@note This class is package-private for now in order to get more experience about what
could be a good API.
  *        This class may become public in a future SIS version.}
  *
+ * {@section Thread safety}
+ * The same {@code DataStoreRegistry} instance can be safely used by many threads without
synchronization
+ * on the part of the caller.
+ *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.4
  * @version 0.4
  * @module
  */
-@ThreadSafe
 final class DataStoreRegistry {
     /**
      * The loader to use for searching for {@link DataStoreProvider} implementations.



Mime
View raw message