Restore return type of ValueGeometry.getGeometry()

h2/src/main/org/h2/value/ValueGeometry.java

@@ -167,7 +167,7 @@ public class ValueGeometry extends Value {
      *
      * @return a copy of the geometry object
      */
-    public Object getGeometry() {
+    public Geometry getGeometry() {
         if (geometry == null) {
             try {
                 geometry = JTSUtils.ewkb2geometry(bytes, getDimensionSystem());

h2/src/test/org/h2/test/db/TestSpatial.java

@@ -612,7 +612,7 @@ public class TestSpatial extends TestDb {
         ValueGeometry geom3d = ValueGeometry.get(ewkt);
         assertEquals(ewkt, geom3d.getString());
         ValueGeometry copy = ValueGeometry.get(geom3d.getBytes());
-        Geometry g = (Geometry) copy.getGeometry();
+        Geometry g = copy.getGeometry();
         assertEquals(6, g.getCoordinates()[0].z);
         assertEquals(5, g.getCoordinates()[1].z);
         assertEquals(4, g.getCoordinates()[2].z);
@@ -697,7 +697,7 @@ public class TestSpatial extends TestDb {
         assertFalse(valueGeometry.equals(valueGeometry2));
         ValueGeometry valueGeometry3 = ValueGeometry.getFromGeometry(geometry);
         assertEquals(valueGeometry, valueGeometry3);
-        assertEquals(geometry.getSRID(), ((Geometry) valueGeometry3.getGeometry()).getSRID());
+        assertEquals(geometry.getSRID(), valueGeometry3.getGeometry().getSRID());
     }
 
     /**