Bump to 12.4.1

This commit is contained in:
rob bygrave
2020-09-18 01:21:50 +12:00
parent 73ea91d4c9
commit 06b1babed9
2 changed files with 10 additions and 11 deletions
@@ -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<ScalarType<?>> createTypes(ServerConfig serverConfig, Object objectMapper) {
public List<ScalarType<?>> createTypes(DatabaseConfig config, Object objectMapper) {
List<ScalarType<?>> list = new ArrayList<ScalarType<?>>();
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());