Skip to content

version upgrades, fix for Oracle STRUCT input. #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bamaer wants to merge 2 commits into from
Closed

version upgrades, fix for Oracle STRUCT input. #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8122f3b
cleanup, hop and dependency upgrades
bamaer Mar 12, 2025
cd5bb93
upgrade to Apache Hop 2.13 and fix for Oracle input (STRUCT). #16
bamaer May 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions concave-hull/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,6 @@
<name>jboss.org</name>
<url>https://repository.jboss.org</url>
</repository>
<repository>
<id>pentaho-releases</id>
<url>https://nexus.pentaho.org/content/groups/omni</url>
</repository>
<repository>
<id>maven-us.nuxeo.org</id>
<name>maven-us.nuxeo.org</name>
Expand All @@ -94,7 +90,7 @@
<dependency>
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
<version>1.19.0</version>
<version>1.20.0</version>
</dependency>
</dependencies>

Expand Down
6 changes: 1 addition & 5 deletions dxf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,6 @@
<name>jboss.org</name>
<url>https://repository.jboss.org</url>
</repository>
<repository>
<id>pentaho-releases</id>
<url>https://repository.pentaho.org/artifactory/repo/</url>
</repository>
<repository>
<id>maven-us.nuxeo.org</id>
<name>maven-us.nuxeo.org</name>
Expand All @@ -94,7 +90,7 @@
<dependency>
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
<version>1.19.0</version>
<version>1.20.0</version>
</dependency>
<!-- In the local repository -->
<dependency>
Expand Down
12 changes: 4 additions & 8 deletions geojson/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,6 @@
<name>jboss.org</name>
<url>https://repository.jboss.org</url>
</repository>
<repository>
<id>pentaho-releases</id>
<url>https://nexus.pentaho.org/content/groups/omni</url>
</repository>
<repository>
<id>maven-us.nuxeo.org</id>
<name>maven-us.nuxeo.org</name>
Expand All @@ -94,22 +90,22 @@
<dependency>
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
<version>1.19.0</version>
<version>1.20.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.17.1</version>
<version>2.18.3</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>2.17.1</version>
<version>2.18.3</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.17.1</version>
<version>2.18.3</version>
</dependency>
</dependencies>

Expand Down
6 changes: 1 addition & 5 deletions gpx/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,6 @@
<name>jboss.org</name>
<url>https://repository.jboss.org</url>
</repository>
<repository>
<id>pentaho-releases</id>
<url>https://nexus.pentaho.org/content/groups/omni/</url>
</repository>
<repository>
<id>maven-us.nuxeo.org</id>
<name>maven-us.nuxeo.org</name>
Expand All @@ -94,7 +90,7 @@
<dependency>
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
<version>1.19.0</version>
<version>1.20.0</version>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
Expand Down
17 changes: 14 additions & 3 deletions hop-gis-plugins/src/main/java/com/atolcd/hop/core/row/value/ValueMetaGeometry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();

Expand All @@ -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
Expand Down Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion hop-gis-plugins/src/main/java/com/atolcd/hop/pipeline/transforms/gisgroupby/GisGroupBy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ public boolean processRow() throws HopException {
data.previous = data.inputRowMeta.cloneRow(r);

if (checkFeedback(getLinesRead())) {
if (log.isBasic()) {
if (isBasic()) {
logBasic(BaseMessages.getString(PKG, "GroupBy.LineNumber") + getLinesRead());
}
}
Expand Down
6 changes: 1 addition & 5 deletions mifmid/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,6 @@
<name>jboss.org</name>
<url>https://repository.jboss.org</url>
</repository>
<repository>
<id>pentaho-releases</id>
<url>https://repository.pentaho.org/artifactory/repo/</url>
</repository>
<repository>
<id>maven-us.nuxeo.org</id>
<name>maven-us.nuxeo.org</name>
Expand All @@ -94,7 +90,7 @@
<dependency>
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
<version>1.19.0</version>
<version>1.20.0</version>
</dependency>
</dependencies>

Expand Down
7 changes: 1 addition & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<properties>
<!-- Set this to the Hop version you want to debug against-->
<hop.version>2.10.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-->
Expand Down Expand Up @@ -164,11 +164,6 @@
<name>jboss.org</name>
<url>https://repository.jboss.org</url>
</repository>
<repository>
<id>spring-repo</id>
<name>Spring Repository</name>
<url>https://repo.spring.io/release</url>
</repository>
<repository>
<id>maven-us.nuxeo.org</id>
<name>maven-us.nuxeo.org</name>
Expand Down
6 changes: 1 addition & 5 deletions shp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,6 @@
<name>jboss.org</name>
<url>https://repository.jboss.org</url>
</repository>
<repository>
<id>pentaho-releases</id>
<url>https://repository.pentaho.org/artifactory/repo/</url>
</repository>
<repository>
<id>maven-us.nuxeo.org</id>
<name>maven-us.nuxeo.org</name>
Expand All @@ -94,7 +90,7 @@
<dependency>
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
<version>1.19.0</version>
<version>1.20.0</version>
</dependency>
</dependencies>

Expand Down
6 changes: 1 addition & 5 deletions spatialite/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,6 @@
<name>jboss.org</name>
<url>https://repository.jboss.org</url>
</repository>
<repository>
<id>pentaho-releases</id>
<url>https://nexus.pentaho.org/content/groups/omni</url>
</repository>
<repository>
<id>maven-us.nuxeo.org</id>
<name>maven-us.nuxeo.org</name>
Expand All @@ -99,7 +95,7 @@
<dependency>
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
<version>1.19.0</version>
<version>1.20.0</version>
</dependency>
<dependency>
<groupId>org.xerial</groupId>
Expand Down
6 changes: 1 addition & 5 deletions svg/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,6 @@
<name>jboss.org</name>
<url>https://repository.jboss.org</url>
</repository>
<repository>
<id>pentaho-releases</id>
<url>https://nexus.pentaho.org/content/groups/omni/</url>
</repository>
<repository>
<id>maven-us.nuxeo.org</id>
<name>maven-us.nuxeo.org</name>
Expand All @@ -94,7 +90,7 @@
<dependency>
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
<version>1.19.0</version>
<version>1.20.0</version>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
Expand Down
Loading