diff --git a/pom.xml b/pom.xml index bf7b73a56..2330ae68e 100644 --- a/pom.xml +++ b/pom.xml @@ -2,14 +2,14 @@ 4.0.0 - org.avaje.ebean + io.ebean ebean-postgis 0.1.3-SNAPSHOT org.avaje java8-parent - 1.2 + 1.3 @@ -25,9 +25,9 @@ - org.avaje.ebean + io.ebean ebean - 8.6.1 + 10.1.1 provided @@ -61,20 +61,6 @@ provided - - javax.persistence - persistence-api - 1.0 - test - - - - - - - - - org.avaje.composite composite-testing @@ -87,16 +73,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.2 - - 1.6 - 1.6 - - - io.repaint.maven @@ -105,7 +81,7 @@ true - org.avaje.ebean.tile:enhancement:1.1 + io.ebean.tile:enhancement:2.1 diff --git a/src/main/java/com/avaje/ebean/postgis/RegisterFactory.java b/src/main/java/io/ebean/postgis/RegisterFactory.java similarity index 62% rename from src/main/java/com/avaje/ebean/postgis/RegisterFactory.java rename to src/main/java/io/ebean/postgis/RegisterFactory.java index 125c1dfd7..775b8fb38 100644 --- a/src/main/java/com/avaje/ebean/postgis/RegisterFactory.java +++ b/src/main/java/io/ebean/postgis/RegisterFactory.java @@ -1,14 +1,14 @@ -package com.avaje.ebean.postgis; +package io.ebean.postgis; -import com.avaje.ebean.config.ServerConfig; -import com.avaje.ebean.plugin.ExtraTypeFactory; -import com.avaje.ebean.postgis.latte.ScalarTypeGeoLatteLineString; -import com.avaje.ebean.postgis.latte.ScalarTypeGeoLatteMultiLineString; -import com.avaje.ebean.postgis.latte.ScalarTypeGeoLatteMultiPoint; -import com.avaje.ebean.postgis.latte.ScalarTypeGeoLatteMultiPolygon; -import com.avaje.ebean.postgis.latte.ScalarTypeGeoLattePoint; -import com.avaje.ebean.postgis.latte.ScalarTypeGeoLattePolygon; -import com.avaje.ebeaninternal.server.type.ScalarType; +import io.ebean.config.ServerConfig; +import io.ebean.plugin.ExtraTypeFactory; +import io.ebean.postgis.latte.ScalarTypeGeoLatteLineString; +import io.ebean.postgis.latte.ScalarTypeGeoLatteMultiLineString; +import io.ebean.postgis.latte.ScalarTypeGeoLatteMultiPoint; +import io.ebean.postgis.latte.ScalarTypeGeoLatteMultiPolygon; +import io.ebean.postgis.latte.ScalarTypeGeoLattePoint; +import io.ebean.postgis.latte.ScalarTypeGeoLattePolygon; +import io.ebeaninternal.server.type.ScalarType; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/avaje/ebean/postgis/ScalarTypePgisBase.java b/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java similarity index 87% rename from src/main/java/com/avaje/ebean/postgis/ScalarTypePgisBase.java rename to src/main/java/io/ebean/postgis/ScalarTypePgisBase.java index b8bf477b3..7f0e4e64a 100644 --- a/src/main/java/com/avaje/ebean/postgis/ScalarTypePgisBase.java +++ b/src/main/java/io/ebean/postgis/ScalarTypePgisBase.java @@ -1,10 +1,9 @@ -package com.avaje.ebean.postgis; +package io.ebean.postgis; -import com.avaje.ebeaninternal.server.type.CtCompoundTypeScalarList; -import com.avaje.ebeaninternal.server.type.DataBind; -import com.avaje.ebeaninternal.server.type.DataReader; -import com.avaje.ebeaninternal.server.type.ScalarType; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebeaninternal.server.type.DataBind; +import io.ebeaninternal.server.type.DataReader; +import io.ebeaninternal.server.type.ScalarType; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import org.postgis.Geometry; @@ -112,11 +111,6 @@ abstract class ScalarTypePgisBase implements ScalarType { } - @Override - public void accumulateScalarTypes(String propName, CtCompoundTypeScalarList list) { - - } - @Override public Object toJdbcType(Object value) { return null; diff --git a/src/main/java/com/avaje/ebean/postgis/ScalarTypePgisLineString.java b/src/main/java/io/ebean/postgis/ScalarTypePgisLineString.java similarity index 65% rename from src/main/java/com/avaje/ebean/postgis/ScalarTypePgisLineString.java rename to src/main/java/io/ebean/postgis/ScalarTypePgisLineString.java index ac5148cc7..ac4b010d1 100644 --- a/src/main/java/com/avaje/ebean/postgis/ScalarTypePgisLineString.java +++ b/src/main/java/io/ebean/postgis/ScalarTypePgisLineString.java @@ -1,8 +1,7 @@ -package com.avaje.ebean.postgis; +package io.ebean.postgis; -import com.avaje.ebean.config.dbplatform.ExtraDbTypes; +import io.ebean.config.dbplatform.ExtraDbTypes; import org.postgis.LineString; -import org.postgis.Point; public class ScalarTypePgisLineString extends ScalarTypePgisBase { diff --git a/src/main/java/com/avaje/ebean/postgis/ScalarTypePgisMultiLineString.java b/src/main/java/io/ebean/postgis/ScalarTypePgisMultiLineString.java similarity index 67% rename from src/main/java/com/avaje/ebean/postgis/ScalarTypePgisMultiLineString.java rename to src/main/java/io/ebean/postgis/ScalarTypePgisMultiLineString.java index b7b6e1711..e352f0c7d 100644 --- a/src/main/java/com/avaje/ebean/postgis/ScalarTypePgisMultiLineString.java +++ b/src/main/java/io/ebean/postgis/ScalarTypePgisMultiLineString.java @@ -1,7 +1,6 @@ -package com.avaje.ebean.postgis; +package io.ebean.postgis; -import com.avaje.ebean.config.dbplatform.ExtraDbTypes; -import org.postgis.LineString; +import io.ebean.config.dbplatform.ExtraDbTypes; import org.postgis.MultiLineString; public class ScalarTypePgisMultiLineString extends ScalarTypePgisBase { diff --git a/src/main/java/com/avaje/ebean/postgis/ScalarTypePgisMultiPoint.java b/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPoint.java similarity index 63% rename from src/main/java/com/avaje/ebean/postgis/ScalarTypePgisMultiPoint.java rename to src/main/java/io/ebean/postgis/ScalarTypePgisMultiPoint.java index 31783832b..9b2a2ec6e 100644 --- a/src/main/java/com/avaje/ebean/postgis/ScalarTypePgisMultiPoint.java +++ b/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPoint.java @@ -1,7 +1,6 @@ -package com.avaje.ebean.postgis; +package io.ebean.postgis; -import com.avaje.ebean.config.dbplatform.ExtraDbTypes; -import org.postgis.MultiLineString; +import io.ebean.config.dbplatform.ExtraDbTypes; import org.postgis.MultiPoint; public class ScalarTypePgisMultiPoint extends ScalarTypePgisBase { diff --git a/src/main/java/com/avaje/ebean/postgis/ScalarTypePgisMultiPolygon.java b/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPolygon.java similarity index 71% rename from src/main/java/com/avaje/ebean/postgis/ScalarTypePgisMultiPolygon.java rename to src/main/java/io/ebean/postgis/ScalarTypePgisMultiPolygon.java index 728ff31ab..eca6f2bcd 100644 --- a/src/main/java/com/avaje/ebean/postgis/ScalarTypePgisMultiPolygon.java +++ b/src/main/java/io/ebean/postgis/ScalarTypePgisMultiPolygon.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.postgis; +package io.ebean.postgis; -import com.avaje.ebean.config.dbplatform.ExtraDbTypes; +import io.ebean.config.dbplatform.ExtraDbTypes; import org.postgis.MultiPolygon; public class ScalarTypePgisMultiPolygon extends ScalarTypePgisBase { diff --git a/src/main/java/com/avaje/ebean/postgis/ScalarTypePgisPoint.java b/src/main/java/io/ebean/postgis/ScalarTypePgisPoint.java similarity index 67% rename from src/main/java/com/avaje/ebean/postgis/ScalarTypePgisPoint.java rename to src/main/java/io/ebean/postgis/ScalarTypePgisPoint.java index 1294ce7bb..69f1e4414 100644 --- a/src/main/java/com/avaje/ebean/postgis/ScalarTypePgisPoint.java +++ b/src/main/java/io/ebean/postgis/ScalarTypePgisPoint.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.postgis; +package io.ebean.postgis; -import com.avaje.ebean.config.dbplatform.ExtraDbTypes; +import io.ebean.config.dbplatform.ExtraDbTypes; import org.postgis.Point; public class ScalarTypePgisPoint extends ScalarTypePgisBase { diff --git a/src/main/java/com/avaje/ebean/postgis/ScalarTypePgisPolygon.java b/src/main/java/io/ebean/postgis/ScalarTypePgisPolygon.java similarity index 68% rename from src/main/java/com/avaje/ebean/postgis/ScalarTypePgisPolygon.java rename to src/main/java/io/ebean/postgis/ScalarTypePgisPolygon.java index 07cf01329..d6cc70f2c 100644 --- a/src/main/java/com/avaje/ebean/postgis/ScalarTypePgisPolygon.java +++ b/src/main/java/io/ebean/postgis/ScalarTypePgisPolygon.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.postgis; +package io.ebean.postgis; -import com.avaje.ebean.config.dbplatform.ExtraDbTypes; +import io.ebean.config.dbplatform.ExtraDbTypes; import org.postgis.Polygon; public class ScalarTypePgisPolygon extends ScalarTypePgisBase { diff --git a/src/main/java/com/avaje/ebean/postgis/latte/ScalarTypeGeoLatteBase.java b/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java similarity index 87% rename from src/main/java/com/avaje/ebean/postgis/latte/ScalarTypeGeoLatteBase.java rename to src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java index b95f0d654..4d5f8dbba 100644 --- a/src/main/java/com/avaje/ebean/postgis/latte/ScalarTypeGeoLatteBase.java +++ b/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java @@ -1,10 +1,9 @@ -package com.avaje.ebean.postgis.latte; +package io.ebean.postgis.latte; -import com.avaje.ebeaninternal.server.type.CtCompoundTypeScalarList; -import com.avaje.ebeaninternal.server.type.DataBind; -import com.avaje.ebeaninternal.server.type.DataReader; -import com.avaje.ebeaninternal.server.type.ScalarType; -import com.avaje.ebeanservice.docstore.api.mapping.DocPropertyType; +import io.ebeaninternal.server.type.DataBind; +import io.ebeaninternal.server.type.DataReader; +import io.ebeaninternal.server.type.ScalarType; +import io.ebeanservice.docstore.api.mapping.DocPropertyType; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import org.geolatte.geom.Geometry; @@ -106,11 +105,6 @@ abstract class ScalarTypeGeoLatteBase implements ScalarType< } - @Override - public void accumulateScalarTypes(String propName, CtCompoundTypeScalarList list) { - - } - @Override public Object toJdbcType(Object value) { return null; diff --git a/src/main/java/com/avaje/ebean/postgis/latte/ScalarTypeGeoLatteLineString.java b/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteLineString.java similarity index 62% rename from src/main/java/com/avaje/ebean/postgis/latte/ScalarTypeGeoLatteLineString.java rename to src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteLineString.java index 248947163..4898d3c50 100644 --- a/src/main/java/com/avaje/ebean/postgis/latte/ScalarTypeGeoLatteLineString.java +++ b/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteLineString.java @@ -1,8 +1,7 @@ -package com.avaje.ebean.postgis.latte; +package io.ebean.postgis.latte; -import com.avaje.ebean.config.dbplatform.ExtraDbTypes; +import io.ebean.config.dbplatform.ExtraDbTypes; import org.geolatte.geom.LineString; -import org.geolatte.geom.MultiLineString; public class ScalarTypeGeoLatteLineString extends ScalarTypeGeoLatteBase { diff --git a/src/main/java/com/avaje/ebean/postgis/latte/ScalarTypeGeoLatteMultiLineString.java b/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiLineString.java similarity index 66% rename from src/main/java/com/avaje/ebean/postgis/latte/ScalarTypeGeoLatteMultiLineString.java rename to src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiLineString.java index 312dc4cd8..ad2e56d3c 100644 --- a/src/main/java/com/avaje/ebean/postgis/latte/ScalarTypeGeoLatteMultiLineString.java +++ b/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiLineString.java @@ -1,8 +1,7 @@ -package com.avaje.ebean.postgis.latte; +package io.ebean.postgis.latte; -import com.avaje.ebean.config.dbplatform.ExtraDbTypes; +import io.ebean.config.dbplatform.ExtraDbTypes; import org.geolatte.geom.MultiLineString; -import org.geolatte.geom.MultiPolygon; public class ScalarTypeGeoLatteMultiLineString extends ScalarTypeGeoLatteBase { diff --git a/src/main/java/com/avaje/ebean/postgis/latte/ScalarTypeGeoLatteMultiPoint.java b/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPoint.java similarity index 70% rename from src/main/java/com/avaje/ebean/postgis/latte/ScalarTypeGeoLatteMultiPoint.java rename to src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPoint.java index f9bb4ce60..0ca6c4b06 100644 --- a/src/main/java/com/avaje/ebean/postgis/latte/ScalarTypeGeoLatteMultiPoint.java +++ b/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPoint.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.postgis.latte; +package io.ebean.postgis.latte; -import com.avaje.ebean.config.dbplatform.ExtraDbTypes; +import io.ebean.config.dbplatform.ExtraDbTypes; import org.geolatte.geom.MultiPoint; public class ScalarTypeGeoLatteMultiPoint extends ScalarTypeGeoLatteBase { diff --git a/src/main/java/com/avaje/ebean/postgis/latte/ScalarTypeGeoLatteMultiPolygon.java b/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPolygon.java similarity index 72% rename from src/main/java/com/avaje/ebean/postgis/latte/ScalarTypeGeoLatteMultiPolygon.java rename to src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPolygon.java index 0d7000a2b..502eee28e 100644 --- a/src/main/java/com/avaje/ebean/postgis/latte/ScalarTypeGeoLatteMultiPolygon.java +++ b/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPolygon.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.postgis.latte; +package io.ebean.postgis.latte; -import com.avaje.ebean.config.dbplatform.ExtraDbTypes; +import io.ebean.config.dbplatform.ExtraDbTypes; import org.geolatte.geom.MultiPolygon; public class ScalarTypeGeoLatteMultiPolygon extends ScalarTypeGeoLatteBase { diff --git a/src/main/java/com/avaje/ebean/postgis/latte/ScalarTypeGeoLattePoint.java b/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePoint.java similarity index 67% rename from src/main/java/com/avaje/ebean/postgis/latte/ScalarTypeGeoLattePoint.java rename to src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePoint.java index a196a6fc4..1bb4cf313 100644 --- a/src/main/java/com/avaje/ebean/postgis/latte/ScalarTypeGeoLattePoint.java +++ b/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePoint.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.postgis.latte; +package io.ebean.postgis.latte; -import com.avaje.ebean.config.dbplatform.ExtraDbTypes; +import io.ebean.config.dbplatform.ExtraDbTypes; import org.geolatte.geom.Point; public class ScalarTypeGeoLattePoint extends ScalarTypeGeoLatteBase { diff --git a/src/main/java/com/avaje/ebean/postgis/latte/ScalarTypeGeoLattePolygon.java b/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePolygon.java similarity index 69% rename from src/main/java/com/avaje/ebean/postgis/latte/ScalarTypeGeoLattePolygon.java rename to src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePolygon.java index 069e31b56..0e2fc9f42 100644 --- a/src/main/java/com/avaje/ebean/postgis/latte/ScalarTypeGeoLattePolygon.java +++ b/src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePolygon.java @@ -1,6 +1,6 @@ -package com.avaje.ebean.postgis.latte; +package io.ebean.postgis.latte; -import com.avaje.ebean.config.dbplatform.ExtraDbTypes; +import io.ebean.config.dbplatform.ExtraDbTypes; import org.geolatte.geom.Polygon; public class ScalarTypeGeoLattePolygon extends ScalarTypeGeoLatteBase { diff --git a/src/main/resources/META-INF/services/com.avaje.ebean.plugin.ExtraTypeFactory b/src/main/resources/META-INF/services/com.avaje.ebean.plugin.ExtraTypeFactory deleted file mode 100644 index 58c0418c2..000000000 --- a/src/main/resources/META-INF/services/com.avaje.ebean.plugin.ExtraTypeFactory +++ /dev/null @@ -1 +0,0 @@ -com.avaje.ebean.postgis.RegisterFactory \ No newline at end of file diff --git a/src/main/resources/META-INF/services/io.ebean.plugin.ExtraTypeFactory b/src/main/resources/META-INF/services/io.ebean.plugin.ExtraTypeFactory new file mode 100644 index 000000000..9ec14fff0 --- /dev/null +++ b/src/main/resources/META-INF/services/io.ebean.plugin.ExtraTypeFactory @@ -0,0 +1 @@ +io.ebean.postgis.RegisterFactory \ No newline at end of file diff --git a/src/test/java/org/example/domain/TestInsertQuery.java b/src/test/java/org/example/domain/TestInsertQuery.java index ec7b4600e..b7e67baea 100644 --- a/src/test/java/org/example/domain/TestInsertQuery.java +++ b/src/test/java/org/example/domain/TestInsertQuery.java @@ -1,6 +1,6 @@ package org.example.domain; -import com.avaje.ebean.Ebean; +import io.ebean.Ebean; import jdk.nashorn.internal.ir.annotations.Ignore; import org.postgis.LineString; import org.postgis.MultiLineString; diff --git a/src/test/java/org/example/domain/TestOtherInsertQuery.java b/src/test/java/org/example/domain/TestOtherInsertQuery.java index 02a0490db..33686f8e8 100644 --- a/src/test/java/org/example/domain/TestOtherInsertQuery.java +++ b/src/test/java/org/example/domain/TestOtherInsertQuery.java @@ -1,6 +1,6 @@ package org.example.domain; -import com.avaje.ebean.Ebean; +import io.ebean.Ebean; import jdk.nashorn.internal.ir.annotations.Ignore; import org.geolatte.geom.Point; import org.geolatte.geom.Polygon; diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml index e4ad1ed0d..6d6d92bf4 100644 --- a/src/test/resources/logback-test.xml +++ b/src/test/resources/logback-test.xml @@ -1,39 +1,38 @@ - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - log/application.log - - log/application.%d{yyyy-MM-dd}.log - 90 - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + - - - - + + log/application.log + + log/application.%d{yyyy-MM-dd}.log + 90 + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + - - - - - - - - - + + + + - + + + + + + + + + + \ No newline at end of file