upgrade to Apache Hop 2.13 and fix for Oracle input (STRUCT). #16

Author: bamaer

hop-gis-plugins/src/main/java/com/atolcd/hop/core/row/value/ValueMetaGeometry.java

@@ -38,7 +38,6 @@
 import java.util.Date;
 import oracle.spatial.geometry.JGeometry;
 import oracle.spatial.util.WKT;
-import oracle.sql.STRUCT;
 import org.apache.hop.core.Const;
 import org.apache.hop.core.database.DatabaseMeta;
 import org.apache.hop.core.database.IDatabase;
@@ -624,7 +623,7 @@ public Object getValueFromResultSet(IDatabase databaseInterface, ResultSet resul
 
         if (resultSet.getObject(index + 1) != null) {
 
-          STRUCT st = (oracle.sql.STRUCT) resultSet.getObject(index + 1);
+          byte[] st = resultSet.getBytes(index + 1);
           JGeometry ociGeometry = JGeometry.load(st);
           srid = ociGeometry.getSRID();
 
@@ -647,7 +646,18 @@ public Object getValueFromResultSet(IDatabase databaseInterface, ResultSet resul
           }
 
           String wkt = new String(ociWktReaderWriter.fromJGeometry(ociGeometry));
-          geometry = new WKTReader().read(wkt);
+          try {
+            geometry = new WKTReader().read(wkt);
+          } catch (ParseException e) {
+            throw new HopDatabaseException(
+                toStringMeta()
+                    + " : Unable to get Geometry item '"
+                    + wkt
+                    + "' from resultset at index "
+                    + index
+                    + " for "
+                    + databaseInterface.getDriverClass().toString());
+          }
         }
 
         // MySQL
@@ -831,6 +841,7 @@ public void setPreparedStatementValue(
           if (geometry.getSRID() > 0) {
             ociGeometry.setSRID(geometry.getSRID());
           }
+
           preparedStatement.setObject(
               index, JGeometry.store(ociGeometry, preparedStatement.getConnection()), Types.STRUCT);
 

pom.xml

@@ -14,7 +14,7 @@
 
   <properties>
     <!-- Set this to the Hop version you want to debug against-->
-    <hop.version>2.12.0</hop.version>
+    <hop.version>2.13.0</hop.version>
 
     <!-- Path You will be using to debug the application >
     <hop.debug.path>TODO ?</hop.debug.path-->