Merge pull request #1391 from ebocher/h2_230

Upgrade to H2 2.3.230

docs/CHANGELOG.md

@@ -7,4 +7,5 @@
 - Add the name of the file in the FGB header
 - Fix null way id on OSM file- 
 - Use new sonatype auth
-- Add ST_SnapToSelf function
+- Add ST_SnapToSelf function
+- Upgrade to H2 2.3.230

h2gis-functions/src/main/java/org/h2gis/functions/factory/H2GISFunctions.java

@@ -525,7 +525,7 @@ public static void unRegisterFunction(Statement st, Function function) throws SQ
      * @param connection JDBC Connection
      * @param packagePrepend For OSGi environment only, use
      * Bundle-SymbolicName:Bundle-Version:
-     * @throws SQLException
+     * @throws SQLException Throw an exception if the functions are not registered
      */
     private static void registerH2GISFunctions(Connection connection, String packagePrepend) throws SQLException {
         Statement st = connection.createStatement();

h2gis-functions/src/main/java/org/h2gis/functions/io/asc/AscRead.java

@@ -63,8 +63,8 @@ public String getJavaStaticMethod() {
     /**
      * Read the ASCII file.
      *
-     * @param connection
-     * @param fileName
+     * @param connection input database connection
+     * @param fileName file to read
      * @throws IOException
      * @throws SQLException
      */

h2gis-functions/src/main/java/org/h2gis/functions/io/file_table/DummyIndex.java

@@ -63,7 +63,7 @@ public void remove(SessionLocal session, Row row) {
     }
 
     @Override
-    public Cursor find(SessionLocal session, SearchRow first, SearchRow last) {
+    public Cursor find(SessionLocal session, SearchRow first, SearchRow last, boolean b) {
         return new DummyCursor();
     }
 
@@ -106,7 +106,7 @@ public long getRowCountApproximation(SessionLocal session) {
     }
 
     @Override
-    public long getDiskSpaceUsed() {
+    public long getDiskSpaceUsed(boolean approximate) {
         return 0;
     }    
 

h2gis-functions/src/main/java/org/h2gis/functions/io/file_table/DummyMVTable.java

@@ -142,7 +142,7 @@ public long getRowCountApproximation(SessionLocal session) {
     }
 
     @Override
-    public long getDiskSpaceUsed() {
+    public long getDiskSpaceUsed(boolean total, boolean approximate) {
         return 0;
     }
 

h2gis-functions/src/main/java/org/h2gis/functions/io/file_table/H2MVTable.java

@@ -160,7 +160,7 @@ private void rebuild(SessionLocal session, Index index){
         Index scan = getScanIndex(session);
         long remaining = scan.getRowCount(session);
         long total = remaining;
-        Cursor cursor = scan.find(session, null, null);
+        Cursor cursor = scan.find(session, null, null, false);
         long i = 0;
         int bufferSize = (int) Math.min(total, database.getMaxMemoryRows());
         ArrayList<Row> buffer = new ArrayList<>(bufferSize);
@@ -287,7 +287,7 @@ public long getRowCountApproximation(SessionLocal session) {
     }
 
     @Override
-    public long getDiskSpaceUsed() {
+    public long getDiskSpaceUsed(boolean total, boolean approximate) {
         return 0;
     }
 

h2gis-functions/src/main/java/org/h2gis/functions/io/file_table/H2TableIndex.java

@@ -109,7 +109,7 @@ public void remove(SessionLocal session, Row row) {
     }
 
     @Override
-    public Cursor find(SessionLocal session, SearchRow first, SearchRow last) {
+    public Cursor find(SessionLocal session, SearchRow first, SearchRow last, boolean reverse) {
         if (!isScanIndex) {
             Row remakefirst = Row.get(null, 0);
             if(first != null) {
@@ -177,7 +177,7 @@ public long getRowCountApproximation(SessionLocal session) {
     }
 
     @Override
-    public long getDiskSpaceUsed() {
+    public long getDiskSpaceUsed(boolean approximate) {
         return 0;
     }
 

h2gis-functions/src/test/java/org/h2gis/functions/BaseTest.java

@@ -30,12 +30,11 @@
 
 /**
  * Abstract class for test classes.
- * <p>
+ *
  * This abstract class contains method to create a test database and give access to a {@link Statement} to perform SQL
  * queries. To initiate the {@link Statement}, call the {@link BaseTest#statementInit()} or
  * {@link BaseTest#statementInit(String)} method.
- * <p>
- * <p>
+ *
  * This abstract class contains geometries of each kind :
  * ┬─ POINT              ─────────────────┬──┬─ (0 0) centered ─┬──┬─ 2D    ─┬─
  * ├─ LINESTRING         ─────────────────┤  └─ not centered   ─┘  ├─ 3D    ─┤

h2gis-functions/src/test/java/org/h2gis/functions/TestUtilities.java

@@ -30,8 +30,8 @@ public class TestUtilities {
 
     /**
      * A basic utilities to print the column names and values
-     * @param res
-     * @throws SQLException
+     * @param res data to print
+     * @throws SQLException Table read error.
      */
     public static void printValues(ResultSet res) throws SQLException {
         List<String> columns = JDBCUtilities.getColumnNames(res.getMetaData());
@@ -42,8 +42,8 @@ public static void printValues(ResultSet res) throws SQLException {
 
     /**
      * A basic utilities to print the column informations
-     * @param res
-     * @throws SQLException
+     * @param res data to print
+     * @throws SQLException Table read error.
      */
     public static void printColumns(ResultSet res) throws SQLException {
         ResultSetMetaData metadata = res.getMetaData();

h2gis-functions/src/test/java/org/h2gis/functions/io/asc/AscReaderDriverTest.java

@@ -100,8 +100,6 @@ public void testReadPrecip() throws IOException, SQLException {
     /**
      * Test reading two time the same asc by pushing more lines
      * asc files may be tiled, it is interesting to have a method to read all asc files into the same output table
-     * @throws IOException
-     * @throws SQLException
      */
     @Test
     public void testReadPrecipTwoTimes() throws IOException, SQLException {

h2gis-functions/src/test/java/org/h2gis/functions/io/dbf/DBFEngineTest.java

@@ -195,7 +195,7 @@ public void testReopenMovedDbf() throws Exception {
 
     /**
      * Read a DBF where the encoding is missing in header. Then write it with a good header. Then check the content.
-     * @throws SQLException
+     *
      */
     @Test
     public void readDBFRussianWrongEncodingThenWriteThenRead() throws SQLException {

h2gis-functions/src/test/java/org/h2gis/functions/io/dbf/DBFImportExportTest.java

@@ -135,7 +135,6 @@ public void importTableTestGeomEnd() throws SQLException, IOException {
 
     /**
      * Read a DBF where the encoding is missing in header.
-     * @throws SQLException
      */
     @Test
     public void readDBFRussianEncodingTest() throws SQLException {

h2gis-functions/src/test/java/org/h2gis/functions/io/osm/OSMImportTest.java

@@ -332,7 +332,6 @@ public void downloadOSMFileAndImport() throws SQLException, IOException {
     /**
      * A method to test if the internet network is active.
      *
-     * @return
      */
     public static boolean IsNetworkAvailable() {
         try {

h2gis-functions/src/test/java/org/h2gis/functions/io/shp/SHPEngineTest.java

@@ -374,8 +374,7 @@ private static boolean hasIndex(Connection connection, TableLocation tableLocati
     }
 
     /**
-     * Check the call of special case {@link H2TableIndex#find(org.h2.engine.SessionLocal, org.h2.result.SearchRow, org.h2.result.SearchRow)} with null at first and last
-     * @throws SQLException
+     * Check the call of special case {@link H2TableIndex} with null at first and last
      */
     @Test
     public void readSHPOrderDataTest() throws SQLException {
@@ -405,8 +404,7 @@ public void readSHPOrderDataTest() throws SQLException {
     }
 
     /**
-     * Check the call of special case {@link H2TableIndex#find(org.h2.engine.SessionLocal, org.h2.result.SearchRow, org.h2.result.SearchRow)} with null at last part only.
-     * @throws SQLException
+     * Check the call of special case {@link H2TableIndex} with null at last part only.
      */
     @Test
     public void readSHPFilteredOrderDataTest() throws SQLException {
@@ -437,7 +435,6 @@ public void readSHPFilteredOrderDataTest() throws SQLException {
     /**
      * About #806
      * Fix were a pk Index of linked table return a superior cost than spatial index.
-     * @throws SQLException
      */
     @Test
     public void linkedShpSpatialIndexFlatQueryTest() throws SQLException {

h2gis-functions/src/test/java/org/h2gis/functions/spatial/create/CreateFunctionTest.java

@@ -511,7 +511,6 @@ public void testST_MakeGridFromGeometryLatLon3() throws Exception {
     /**
      * Test to create a regular square grid from a subquery
      *
-     * @throws Exception
      */
     @Test
     public void testST_MakeGridFromSubquery1() throws Exception {
@@ -540,7 +539,6 @@ public void testST_MakeGridFromSubquery1() throws Exception {
     /**
      * Test to create a regular square grid from a complex subquery
      *
-     * @throws Exception
      */
     @Test
     public void testST_MakeGridFromSubquery2() throws Exception {

h2gis-functions/src/test/java/org/h2gis/functions/spatial/crs/CRSFunctionTest.java

@@ -215,9 +215,8 @@ public void test_ST_Transform_envelope() throws Exception {
 
     /**
      * Check the projected geometry using the POSTGIS EWKT style
-     * @param inputGeom
-     * @param expectedGeom
-     * @throws SQLException 
+     * @param inputGeom input geometry
+     * @param expectedGeom expected geometry
      */
     private void checkProjectedGeom(String inputGeom, String expectedGeom) throws SQLException {
         int outPutSRID = ValueGeometry.get(expectedGeom).getSRID();
@@ -226,9 +225,8 @@ private void checkProjectedGeom(String inputGeom, String expectedGeom) throws SQ
 
      /**
      * Check the projected geometry using the POSTGIS EWKT style
-     * @param inputGeom
-     * @param expectedGeom
-     * @throws SQLException 
+     * @param inputGeom input geometry
+     * @param expectedGeom expected geometry
      */
     private void checkProjectedGeom(String inputGeom, String expectedGeom, double tolerance) throws SQLException {
         int outPutSRID = ValueGeometry.get(expectedGeom).getSRID();

h2gis-functions/src/test/java/org/h2gis/functions/spatial/metadata/FindGeometryMetadataTest.java

@@ -197,15 +197,15 @@ public void testCheckSRID() throws SQLException {
         st.execute("DROP TABLE IF EXISTS geotable; CREATE TABLE geotable (the_geom GEOMETRY); ");
         ResultSet res = st.executeQuery(
                 "SELECT   "
-                        + "GEOMETRY_SRID as srid, "
+                        + "GEOMETRY_SRID as srid "
                         + " FROM INFORMATION_SCHEMA.COLUMNS"
                         + " WHERE DATA_TYPE = 'GEOMETRY' and TABLE_NAME='GEOTABLE';");
         assertTrue(res.next());
         assertNull(res.getObject("SRID"));
 
         res = st.executeQuery(
                 "SELECT   "
-                        + "CASE WHEN GEOMETRY_SRID IS NULL THEN 0 ELSE GEOMETRY_SRID END as srid, "
+                        + "CASE WHEN GEOMETRY_SRID IS NULL THEN 0 ELSE GEOMETRY_SRID END as srid "
                         + " FROM INFORMATION_SCHEMA.COLUMNS"
                         + " WHERE DATA_TYPE = 'GEOMETRY' and TABLE_NAME='GEOTABLE';");
         assertTrue(res.next());

h2gis-functions/src/test/java/org/h2gis/functions/spatial/ogc/OGCConformance1Test.java

@@ -57,7 +57,6 @@ public static void tearUp() throws Exception {
     /**
      *  For this test, we will check to see that all of the feature tables are
      *  represented by entries in the GEOMETRY_COLUMNS table/view.
-     *  @throws Exception
      */
     @Test
     public void N1() throws Exception {
@@ -82,7 +81,6 @@ public void N1() throws Exception {
     /**
      * For this test, we will check to see that all of the geometry tables are
      * represented by entries in the GEOMETRY_COLUMNS table/view.
-     * @throws Exception
      */
     @Test
     public void N2() throws Exception {
@@ -108,7 +106,6 @@ public void N2() throws Exception {
     /**
      * For this test, we will check to see that the correct storage type for
      * the streams table is represented in the GEOMETRY_COLUMNS table/view.
-     * @throws Exception
      */
     @Test
     public void N3() throws Exception {
@@ -121,7 +118,6 @@ public void N3() throws Exception {
     /**
      * For this test, we will check to see that the correct geometry type for
      * the streams table is represented in the GEOMETRY_COLUMNS table/view.
-     * @throws Exception
      */
     @Test
     public void N4() throws Exception {
@@ -134,7 +130,6 @@ public void N4() throws Exception {
     /**
      * For this test, we will check to see that the correct coordinate dimension for
      * the streams table is represented in the GEOMETRY_COLUMNS table/view.
-     * @throws Exception
      */
     @Test
     public void N5() throws Exception {
@@ -147,7 +142,6 @@ public void N5() throws Exception {
     /**
      * For this test, we will check to see that the correct value of max_ppr
      * for the streams table is represented in the GEOMETRY_COLUMNS table/view.
-     * @throws Exception
      */
     @Test
     public void N6() throws Exception {
@@ -160,7 +154,6 @@ public void N6() throws Exception {
     /**
      * For this test, we will check to see that the correct value of srid for
      * the streams table is represented in the GEOMETRY_COLUMNS table/view.
-     * @throws Exception
      */
     @Test
     public void N7() throws Exception {
@@ -173,7 +166,6 @@ public void N7() throws Exception {
     /**
      * For this test, we will check to see that the correct value of srtext is
      * represented in the SPATIAL_REF_SYS table/view.
-     * @throws Exception
      */
     @Test
     public void N8() throws Exception {

h2gis-functions/src/test/java/org/h2gis/functions/spatial/ogc/OGCConformance2Test.java

@@ -59,7 +59,6 @@ public static void tearUp() throws Exception {
     /**
      *  For this test, we will check to see that all of the feature tables are
      *  represented by entries in the GEOMETRY_COLUMNS table/view.
-     *  @throws Exception
      */
     @Test
     public void B1() throws Exception {
@@ -84,7 +83,6 @@ public void B1() throws Exception {
     /**
      * For this test, we will check to see that all of the geometry tables are
      * represented by entries in the GEOMETRY_COLUMNS table/view.
-     * @throws Exception
      */
     @Test
     public void B2() throws Exception {
@@ -110,7 +108,6 @@ public void B2() throws Exception {
     /**
      * For this test, we will check to see that the correct storage type for
      * the streams table is represented in the GEOMETRY_COLUMNS table/view.
-     * @throws Exception
      */
     @Test
     public void B3() throws Exception {
@@ -123,7 +120,6 @@ public void B3() throws Exception {
     /**
      * For this test, we will check to see that the correct geometry type for
      * the streams table is represented in the GEOMETRY_COLUMNS table/view.
-     * @throws Exception
      */
     @Test
     public void B4() throws Exception {
@@ -136,7 +132,6 @@ public void B4() throws Exception {
     /**
      * For this test, we will check to see that the correct coordinate dimension for
      * the streams table is represented in the GEOMETRY_COLUMNS table/view.
-     * @throws Exception
      */
     @Test
     public void B5() throws Exception {
@@ -149,7 +144,6 @@ public void B5() throws Exception {
     /**
      * For this test, we will check to see that the correct value of srid for
      * the streams table is represented in the GEOMETRY_COLUMNS table/view.
-     * @throws Exception
      */
     @Test
     public void B6() throws Exception {
@@ -162,7 +156,6 @@ public void B6() throws Exception {
     /**
      * For this test, we will check to see that the correct value of srtext is
      * represented in the SPATIAL_REF_SYS table/view.
-     * @throws Exception
      */
     @Test
     public void B7() throws Exception {