github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update for Ebean 10.1.1

Browse Source
This commit is contained in:
Rob Bygrave
2016-12-13 21:58:56 +13:00
parent 17f28ba0aa
commit 016cd3fb71
21 changed files with 83 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+5 -29
View File
@@ -2,14 +2,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.avaje.ebean</groupId>
<groupId>io.ebean</groupId>
<artifactId>ebean-postgis</artifactId>
<version>0.1.3-SNAPSHOT</version>
<parent>
<groupId>org.avaje</groupId>
<artifactId>java8-parent</artifactId>
<version>1.2</version>
<version>1.3</version>
</parent>
<properties>
@@ -25,9 +25,9 @@
<!-- Needs Ebean 8.6.1 or later -->
<dependency>
<groupId>org.avaje.ebean</groupId>
<groupId>io.ebean</groupId>
<artifactId>ebean</artifactId>
<version>8.6.1</version>
<version>10.1.1</version>
<scope>provided</scope>
</dependency>
@@ -61,20 +61,6 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
<version>1.0</version>
<scope>test</scope>
</dependency>
<!--<dependency>-->
<!--<groupId>ch.qos.logback</groupId>-->
<!--<artifactId>logback-classic</artifactId>-->
<!--<version>1.1.6</version>-->
<!--<scope>test</scope>-->
<!--</dependency>-->
<dependency>
<groupId>org.avaje.composite</groupId>
<artifactId>composite-testing</artifactId>
@@ -87,16 +73,6 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
<!-- for testing -->
<plugin>
<groupId>io.repaint.maven</groupId>
@@ -105,7 +81,7 @@
<extensions>true</extensions>
<configuration>
<tiles>
<tile>org.avaje.ebean.tile:enhancement:1.1</tile>
<tile>io.ebean.tile:enhancement:2.1</tile>
</tiles>
</configuration>
</plugin>
src/main/java/com/avaje/ebean/postgis/RegisterFactory.java → src/main/java/io/ebean/postgis/RegisterFactory.java
+10 -10
View File
@@ -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;
src/main/java/com/avaje/ebean/postgis/ScalarTypePgisBase.java → src/main/java/io/ebean/postgis/ScalarTypePgisBase.java
+5 -11
View File
@@ -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<T extends Geometry> implements ScalarType<T> {
}
@Override
public void accumulateScalarTypes(String propName, CtCompoundTypeScalarList list) {
}
@Override
public Object toJdbcType(Object value) {
return null;
src/main/java/com/avaje/ebean/postgis/ScalarTypePgisLineString.java → src/main/java/io/ebean/postgis/ScalarTypePgisLineString.java
+2 -3
View File
@@ -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<LineString> {
src/main/java/com/avaje/ebean/postgis/ScalarTypePgisMultiLineString.java → src/main/java/io/ebean/postgis/ScalarTypePgisMultiLineString.java
+2 -3
View File
@@ -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<MultiLineString> {
src/main/java/com/avaje/ebean/postgis/ScalarTypePgisMultiPoint.java → src/main/java/io/ebean/postgis/ScalarTypePgisMultiPoint.java
+2 -3
View File
@@ -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<MultiPoint> {
src/main/java/com/avaje/ebean/postgis/ScalarTypePgisMultiPolygon.java → src/main/java/io/ebean/postgis/ScalarTypePgisMultiPolygon.java
+2 -2
View File
@@ -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<MultiPolygon> {
src/main/java/com/avaje/ebean/postgis/ScalarTypePgisPoint.java → src/main/java/io/ebean/postgis/ScalarTypePgisPoint.java
+2 -2
View File
@@ -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<Point> {
src/main/java/com/avaje/ebean/postgis/ScalarTypePgisPolygon.java → src/main/java/io/ebean/postgis/ScalarTypePgisPolygon.java
+2 -2
View File
@@ -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<Polygon> {
src/main/java/com/avaje/ebean/postgis/latte/ScalarTypeGeoLatteBase.java → src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteBase.java
+5 -11
View File
@@ -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<T extends Geometry> implements ScalarType<
}
@Override
public void accumulateScalarTypes(String propName, CtCompoundTypeScalarList list) {
}
@Override
public Object toJdbcType(Object value) {
return null;
src/main/java/com/avaje/ebean/postgis/latte/ScalarTypeGeoLatteLineString.java → src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteLineString.java
+2 -3
View File
@@ -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<LineString> {
src/main/java/com/avaje/ebean/postgis/latte/ScalarTypeGeoLatteMultiLineString.java → src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiLineString.java
+2 -3
View File
@@ -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<MultiLineString> {
src/main/java/com/avaje/ebean/postgis/latte/ScalarTypeGeoLatteMultiPoint.java → src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPoint.java
+2 -2
View File
@@ -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<MultiPoint> {
src/main/java/com/avaje/ebean/postgis/latte/ScalarTypeGeoLatteMultiPolygon.java → src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLatteMultiPolygon.java
+2 -2
View File
@@ -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<MultiPolygon> {
src/main/java/com/avaje/ebean/postgis/latte/ScalarTypeGeoLattePoint.java → src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePoint.java
+2 -2
View File
@@ -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<Point> {
src/main/java/com/avaje/ebean/postgis/latte/ScalarTypeGeoLattePolygon.java → src/main/java/io/ebean/postgis/latte/ScalarTypeGeoLattePolygon.java
+2 -2
View File
@@ -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<Polygon> {
src/main/resources/META-INF/services/com.avaje.ebean.plugin.ExtraTypeFactory
-1
View File
@@ -1 +0,0 @@
com.avaje.ebean.postgis.RegisterFactory
src/main/resources/META-INF/services/io.ebean.plugin.ExtraTypeFactory
+1
View File
@@ -0,0 +1 @@
io.ebean.postgis.RegisterFactory
src/test/java/org/example/domain/TestInsertQuery.java
+1 -1
View File
@@ -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;
src/test/java/org/example/domain/TestOtherInsertQuery.java
+1 -1
View File
@@ -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;
src/test/resources/logback-test.xml
+31 -32
View File
@@ -1,39 +1,38 @@
<configuration scan="true" scanPeriod="3 seconds">
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
</Pattern>
</encoder>
</appender>
<appender name="APPLICATION"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<File>log/application.log</File>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<FileNamePattern>log/application.%d{yyyy-MM-dd}.log</FileNamePattern>
<MaxHistory>90</MaxHistory>
</rollingPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
</encoder>
</appender>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
</Pattern>
</encoder>
</appender>
<root level="INFO">
<appender-ref ref="APPLICATION" />
<appender-ref ref="STDOUT" />
</root>
<appender name="APPLICATION"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<File>log/application.log</File>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<FileNamePattern>log/application.%d{yyyy-MM-dd}.log</FileNamePattern>
<MaxHistory>90</MaxHistory>
</rollingPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
</encoder>
</appender>
<logger name="org.avaje" level="INFO" />
<logger name="com.avaje" level="INFO" />
<!-- Logging for SQL etc -->
<logger name="org.avaje.ebean.SQL" level="TRACE" />
<logger name="org.avaje.ebean.TXN" level="TRACE" />
<logger name="org.avaje.ebean.SUM" level="TRACE" />
<root level="INFO">
<appender-ref ref="APPLICATION"/>
<appender-ref ref="STDOUT"/>
</root>
<logger name="com.avaje.ebean.dbmigration.DdlRunner" level="INFO"/>
<logger name="org.avaje" level="INFO"/>
<logger name="com.avaje" level="INFO"/>
<!-- Logging for SQL etc -->
<logger name="io.ebean.SQL" level="TRACE"/>
<logger name="io.ebean.TXN" level="TRACE"/>
<logger name="io.ebean.SUM" level="TRACE"/>
<logger name="io.ebean.DDL" level="TRACE"/>
</configuration>