diff --git a/pom.xml b/pom.xml index 4583320be..8898b1ca6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ io.ebean ebean-postgis - 12.2.2-SNAPSHOT + 12.4.1-SNAPSHOT org.avaje java8-oss - 2.1 + 2.2 @@ -27,7 +27,7 @@ io.ebean ebean - 12.2.1 + 12.4.1 provided @@ -64,7 +64,7 @@ io.ebean ebean-test - 12.2.1 + 12.4.1 test @@ -91,11 +91,11 @@ io.repaint.maven tiles-maven-plugin - 2.15 + 2.17 true - io.ebean.tile:enhancement:12.2.1 + io.ebean.tile:enhancement:12.4.1 diff --git a/src/main/java/io/ebean/postgis/RegisterFactory.java b/src/main/java/io/ebean/postgis/RegisterFactory.java index 2b1896b43..8e1f3c5b8 100644 --- a/src/main/java/io/ebean/postgis/RegisterFactory.java +++ b/src/main/java/io/ebean/postgis/RegisterFactory.java @@ -1,13 +1,13 @@ package io.ebean.postgis; -import io.ebean.config.ServerConfig; -import io.ebeaninternal.api.ExtraTypeFactory; +import io.ebean.config.DatabaseConfig; 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.api.ExtraTypeFactory; import io.ebeaninternal.server.type.ScalarType; import java.util.ArrayList; @@ -15,9 +15,8 @@ import java.util.List; public class RegisterFactory implements ExtraTypeFactory { - @Override - public List> createTypes(ServerConfig serverConfig, Object objectMapper) { + public List> createTypes(DatabaseConfig config, Object objectMapper) { List> list = new ArrayList>(); list.add(new ScalarTypePgisPoint()); @@ -27,7 +26,7 @@ public class RegisterFactory implements ExtraTypeFactory { list.add(new ScalarTypePgisMultiPoint()); list.add(new ScalarTypePgisMultiLineString()); - if (serverConfig.getClassLoadConfig().isPresent("org.geolatte.geom.Geometry")) { + if (config.getClassLoadConfig().isPresent("org.geolatte.geom.Geometry")) { list.add(new ScalarTypeGeoLattePoint()); list.add(new ScalarTypeGeoLattePolygon()); list.add(new ScalarTypeGeoLatteLineString());