Skip to content
This repository has been archived by the owner on Jan 5, 2021. It is now read-only.

Updated the library to be compatible with the new JTS after they changed ownership #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated the library to be compatible with the new JTS after they changed ownership #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
<version>${mysql.version}</version>
</dependency>
<dependency>
<groupId>com.vividsolutions</groupId>
<artifactId>jts</artifactId>
<version>1.13</version>
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
<version>1.16.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down Expand Up @@ -95,7 +95,7 @@
<customTypes>
<customType>
<name>Geometry</name>
<type>com.vividsolutions.jts.geom.Geometry</type>
<type>org.locationtech.jts.geom.Geometry</type>
<converter>net.gquintana.jooq.mysql.GeometryConverter</converter>
</customType>
</customTypes>
Expand Down
24 changes: 12 additions & 12 deletions src/main/java/net/gquintana/jooq/mysql/GeometryConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
*/
package net.gquintana.jooq.mysql;

import com.vividsolutions.jts.geom.CoordinateSequenceFactory;
import com.vividsolutions.jts.geom.Geometry;
import com.vividsolutions.jts.geom.GeometryFactory;
import com.vividsolutions.jts.geom.PrecisionModel;
import com.vividsolutions.jts.geom.impl.CoordinateArraySequenceFactory;
import com.vividsolutions.jts.io.ByteOrderValues;
import com.vividsolutions.jts.io.InputStreamInStream;
import com.vividsolutions.jts.io.OutputStreamOutStream;
import com.vividsolutions.jts.io.ParseException;
import com.vividsolutions.jts.io.WKBReader;
import com.vividsolutions.jts.io.WKBWriter;
import org.locationtech.jts.geom.CoordinateSequenceFactory;
import org.locationtech.jts.geom.Geometry;
import org.locationtech.jts.geom.GeometryFactory;
import org.locationtech.jts.geom.PrecisionModel;
import org.locationtech.jts.geom.impl.CoordinateArraySequenceFactory;
import org.locationtech.jts.io.ByteOrderValues;
import org.locationtech.jts.io.InputStreamInStream;
import org.locationtech.jts.io.OutputStreamOutStream;
import org.locationtech.jts.io.ParseException;
import org.locationtech.jts.io.WKBReader;
import org.locationtech.jts.io.WKBWriter;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
Expand Down Expand Up @@ -136,7 +136,7 @@ public void setOutputDimension(int outputDimension) {
/**
* Manually register de {@link org.jooq.impl.ConvertedDataType} to avoid the dreaded
* "org.jooq.exception.SQLDialectNotSupportedException:
* Type class com.vividsolutions.jts.geom.Geometry is not supported in dialect SQL99"
* Type class org.locationtech.jts.geom.Geometry is not supported in dialect SQL99"
* @return ConvertedDataType
*/
public DataType<Geometry> registerDataType() {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/gquintana/jooq/mysql/MySQLSpatialDSL.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

package net.gquintana.jooq.mysql;

import com.vividsolutions.jts.geom.Geometry;
import org.locationtech.jts.geom.Geometry;
import org.jooq.DataType;
import org.jooq.Field;
import org.jooq.Param;
Expand Down