github/ebean
4
0 Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2026-11-13 06:42:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ebean/master' into pr/bugfix/reuse_update_collection_parameters

Browse Source
This commit is contained in:
Jonas Pöhler committed 2021-10-06 11:57:50 +02:00
2 parents db6f93e383 0a0d67585c
commit a592717c77
21 files changed
+119 -71
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ebean-api/pom.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</parent> </parent>
<name>ebean api</name> <name>ebean api</name>
ebean-autotune/pom.xml
+2 -2
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</parent> </parent>
<!-- <parent>--> <!-- <parent>-->
<!-- <groupId>org.avaje</groupId>--> <!-- <groupId>org.avaje</groupId>-->
@@ -26,7 +26,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
ebean-bom/pom.xml
+15 -15
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</parent> </parent>
<name>ebean bom</name> <name>ebean bom</name>
@@ -71,88 +71,88 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean</artifactId> <artifactId>ebean</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core-type</artifactId> <artifactId>ebean-core-type</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-ddl-generator</artifactId> <artifactId>ebean-ddl-generator</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-externalmapping-api</artifactId> <artifactId>ebean-externalmapping-api</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-externalmapping-xml</artifactId> <artifactId>ebean-externalmapping-xml</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-autotune</artifactId> <artifactId>ebean-autotune</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId> <artifactId>ebean-querybean</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>querybean-generator</artifactId> <artifactId>querybean-generator</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>kotlin-querybean-generator</artifactId> <artifactId>kotlin-querybean-generator</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-test</artifactId> <artifactId>ebean-test</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-postgis</artifactId> <artifactId>ebean-postgis</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-redis</artifactId> <artifactId>ebean-redis</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
ebean-core-type/pom.xml
+2 -2
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</parent> </parent>
<artifactId>ebean-core-type</artifactId> <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
ebean-core/pom.xml
+4 -4
View File
@@ -3,7 +3,7 @@
<parent> <parent>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</parent> </parent>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
@@ -41,19 +41,19 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core-type</artifactId> <artifactId>ebean-core-type</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-externalmapping-api</artifactId> <artifactId>ebean-externalmapping-api</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
ebean-ddl-generator/pom.xml
+3 -3
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</parent> </parent>
<name>ebean ddl generation</name> <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core-type</artifactId> <artifactId>ebean-core-type</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
ebean-externalmapping-api/pom.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</parent> </parent>
<name>ebean external mapping api</name> <name>ebean external mapping api</name>
ebean-externalmapping-xml/pom.xml
+4 -4
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</parent> </parent>
<!-- <parent>--> <!-- <parent>-->
<!-- <groupId>org.avaje</groupId>--> <!-- <groupId>org.avaje</groupId>-->
@@ -33,7 +33,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-externalmapping-api</artifactId> <artifactId>ebean-externalmapping-api</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
@@ -59,14 +59,14 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-ddl-generator</artifactId> <artifactId>ebean-ddl-generator</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
ebean-postgis/pom.xml
+3 -3
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</parent> </parent>
<name>ebean postgis</name> <name>ebean postgis</name>
@@ -23,7 +23,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@@ -74,7 +74,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-test</artifactId> <artifactId>ebean-test</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
ebean-querybean/pom.xml
+5 -5
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</parent> </parent>
<name>ebean querybean</name> <name>ebean querybean</name>
@@ -17,7 +17,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@@ -57,21 +57,21 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-ddl-generator</artifactId> <artifactId>ebean-ddl-generator</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>querybean-generator</artifactId> <artifactId>querybean-generator</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-test</artifactId> <artifactId>ebean-test</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
ebean-redis/pom.xml
+6 -6
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</parent> </parent>
<artifactId>ebean-redis</artifactId> <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId> <artifactId>ebean-querybean</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>querybean-generator</artifactId> <artifactId>querybean-generator</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-test</artifactId> <artifactId>ebean-test</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
ebean-test/pom.xml
+3 -3
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</parent> </parent>
<name>ebean test</name> <name>ebean test</name>
@@ -29,14 +29,14 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-ddl-generator</artifactId> <artifactId>ebean-ddl-generator</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
ebean-test/src/test/java/org/tests/o2m/TestOneToManyEnhancement.java
+29
View File
@@ -0,0 +1,29 @@
package org.tests.o2m;
import io.ebean.BaseTestCase;
import io.ebean.common.BeanList;
import org.junit.jupiter.api.Test;
import org.tests.model.json.EBasicJsonMap;
import org.tests.o2m.lazy.OmlBaz;
import org.tests.o2m.lazy.OmlFoo;
import static org.assertj.core.api.Assertions.assertThat;
class TestOneToManyEnhancement extends BaseTestCase {
@Test
void test_when_constructorAddsEntry() {
OmlFoo foo = new OmlFoo(new OmlBaz());
assertThat(foo.getBazList()).isInstanceOf(BeanList.class);
assertThat(foo.getBazList()).isNotEmpty();
}
@Test
void test_commonCase() {
EBasicJsonMap bean = new EBasicJsonMap();
assertThat(bean.getDetails()).isInstanceOf(BeanList.class);
assertThat(bean.getDetails()).isEmpty();
}
}
ebean-test/src/test/java/org/tests/o2m/lazy/OmlFoo.java
+6 -1
View File
@@ -15,7 +15,12 @@ public class OmlFoo {
private OmlBar bar; private OmlBar bar;
@OneToMany(mappedBy = "foo", cascade = CascadeType.ALL) @OneToMany(mappedBy = "foo", cascade = CascadeType.ALL)
private List<OmlBaz> bazList = new ArrayList<OmlBaz>(); private List<OmlBaz> bazList = new ArrayList<>();
public OmlFoo(OmlBaz baz) {
bazList.add(baz);
baz.setFoo(this);
}
public Long getId() { public Long getId() {
return id; return id;
ebean-test/src/test/java/org/tests/o2m/lazy/TestLazyManyViaPath.java
+4 -8
View File
@@ -13,11 +13,9 @@ public class TestLazyManyViaPath extends BaseTestCase {
@Test @Test
public void test() { public void test() {
OmlBar bar = new OmlBar(); OmlBar bar = new OmlBar();
List<OmlFoo> fooList = new ArrayList<>(); List<OmlFoo> fooList = new ArrayList<>();
fooList.add(createNewFooWithBar(bar)); fooList.add(createNewFooWithBar(bar));
bar.setFooList(fooList); bar.setFooList(fooList);
DB.save(bar); DB.save(bar);
@@ -30,26 +28,24 @@ public class TestLazyManyViaPath extends BaseTestCase {
// This works // This works
List<OmlFoo> foosList = fooFromDb.getBar().getFooList(); List<OmlFoo> foosList = fooFromDb.getBar().getFooList();
assertThat(fooList.size()).isEqualTo(1); assertThat(foosList).hasSize(1);
assertThat(fooList).hasSize(1);
OmlBaz bazFromDb = DB OmlBaz bazFromDb = DB
.find(OmlBaz.class) .find(OmlBaz.class)
.where() .where()
.eq("id", bar.getFooList().get(0).getBazList().get(0).getId()) .eq("id", bar.getFooList().get(0).getBazList().get(0).getId())
.findOne(); .findOne();
assert bazFromDb != null;
// This does not work and gives the exception // This does not work and gives the exception
List<OmlFoo> foosList1 = bazFromDb.getFoo().getBar().getFooList(); List<OmlFoo> foosList1 = bazFromDb.getFoo().getBar().getFooList();
assertThat(foosList1.size()).isEqualTo(1); assertThat(foosList1.size()).isEqualTo(1);
} }
private static OmlFoo createNewFooWithBar(OmlBar bar) { private static OmlFoo createNewFooWithBar(OmlBar bar) {
OmlFoo foo = new OmlFoo(); OmlFoo foo = new OmlFoo(new OmlBaz());
foo.setBar(bar); foo.setBar(bar);
OmlBaz baz = new OmlBaz();
baz.setFoo(foo);
foo.getBazList().add(baz);
return foo; return foo;
} }
ebean/pom.xml
+4 -4
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</parent> </parent>
<name>ebean composite</name> <name>ebean composite</name>
@@ -22,20 +22,20 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</dependency> </dependency>
<!-- Technically optional but most expected to use query beans --> <!-- Technically optional but most expected to use query beans -->
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId> <artifactId>ebean-querybean</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
kotlin-querybean-generator/pom.xml
+4 -4
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</parent> </parent>
<name>kotlin querybean generator</name> <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId> <artifactId>ebean-querybean</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
@@ -43,7 +43,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
@@ -64,7 +64,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-ddl-generator</artifactId> <artifactId>ebean-ddl-generator</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
pom.xml
+2 -2
View File
@@ -9,7 +9,7 @@
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>ebean parent</name> <name>ebean parent</name>
@@ -46,7 +46,7 @@
<ebean-test-docker.version>4.2</ebean-test-docker.version> <ebean-test-docker.version>4.2</ebean-test-docker.version>
<ebean-datasource.version>7.3</ebean-datasource.version> <ebean-datasource.version>7.3</ebean-datasource.version>
<ebean-agent.version>12.12.0</ebean-agent.version> <ebean-agent.version>12.12.0</ebean-agent.version>
<ebean-maven-plugin.version>12.12.0</ebean-maven-plugin.version> <ebean-maven-plugin.version>12.12.1</ebean-maven-plugin.version>
</properties> </properties>
<dependencies> <dependencies>
querybean-generator/pom.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>12.12.1-SNAPSHOT</version> <version>12.12.2-SNAPSHOT</version>
</parent> </parent>
<name>querybean generator</name> <name>querybean generator</name>
tests/test-kotlin/pom.xml
+2 -2
View File
@@ -18,7 +18,7 @@
<maven.compiler.source>11</maven.compiler.source> <maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target> <maven.compiler.target>11</maven.compiler.target>
<ebean-maven-plugin.version>12.12.0</ebean-maven-plugin.version> <ebean-maven-plugin.version>12.12.1</ebean-maven-plugin.version>
<kotlin.version>1.5.31</kotlin.version> <kotlin.version>1.5.31</kotlin.version>
<jackson.version>2.12.1</jackson.version> <jackson.version>2.12.1</jackson.version>
</properties> </properties>
@@ -95,7 +95,7 @@
<id>test</id> <id>test</id>
<phase>process-test-classes</phase> <phase>process-test-classes</phase>
<configuration> <configuration>
<transformArgs>debug=1</transformArgs> <transformArgs>debug=5</transformArgs>
</configuration> </configuration>
<goals> <goals>
<goal>testEnhance</goal> <goal>testEnhance</goal>
tests/test-kotlin/src/test/kotlin/io/ebean/test/kotlin/OneToManyEnhancementTest.kt
+18
View File
@@ -0,0 +1,18 @@
package io.ebean.test.kotlin
import io.ebean.common.BeanList
import org.assertj.core.api.Assertions.assertThat
import org.example.order.Customer
import org.example.order.Order
import org.junit.jupiter.api.Test
class OneToManyEnhancementTest {
@Test
fun `o2m is BeanCollection`() {
val customer = Customer("foo")
val order = Order(customer)
assertThat(order.items).isInstanceOf(BeanList::class.java)
}
}