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

Merge branch 'master' into wip/EntityBeanIntercept-interface

Browse Source
This commit is contained in:
Rob Bygrave
2022-04-12 21:09:58 +12:00
committed by GitHub
parent bed4721823 2aba1835f1
commit 45003b3d5f
140 changed files with 1072 additions and 1581 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ebean-test/src/test/java/org/tests/model/EGenProps.java
+12 -14
View File
@@ -1,7 +1,5 @@
package org.tests.model;
import io.ebean.annotation.CreatedTimestamp;
import io.ebean.annotation.UpdatedTimestamp;
import io.ebean.annotation.WhenCreated;
import io.ebean.annotation.WhenModified;
@@ -31,40 +29,40 @@ public class EGenProps {
@WhenModified
Timestamp whenModified;
@CreatedTimestamp
@WhenCreated
Timestamp tsCreated;
@UpdatedTimestamp
@WhenModified
Timestamp tsUpdated;
@CreatedTimestamp
@WhenCreated
LocalDateTime ldtCreated;
@UpdatedTimestamp
@WhenModified
LocalDateTime ldtUpdated;
@CreatedTimestamp
@WhenCreated
OffsetDateTime odtCreated;
@UpdatedTimestamp
@WhenModified
OffsetDateTime odtUpdated;
@CreatedTimestamp
@WhenCreated
ZonedDateTime zdtCreated;
@UpdatedTimestamp
@WhenModified
ZonedDateTime zdtUpdated;
@CreatedTimestamp
@WhenCreated
Instant instantCreated;
@UpdatedTimestamp
@WhenModified
Instant instantUpdated;
@CreatedTimestamp
@WhenCreated
long longCreated;
@UpdatedTimestamp
@WhenModified
long longUpdated;
public Long getId() {
ebean-test/src/test/java/org/tests/model/basic/Contact.java
+1 -1
View File
@@ -40,7 +40,7 @@ public class Contact {
@OneToMany(cascade = CascadeType.ALL)
List<ContactNote> notes;
@CreatedTimestamp
@WhenCreated
Timestamp cretime;
@Version
ebean-test/src/test/java/org/tests/model/basic/Product.java
+1 -1
View File
@@ -33,7 +33,7 @@ public class Product implements Serializable {
String name;
@CreatedTimestamp
@WhenCreated
Timestamp cretime;
@Version
ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java
Vendored
+1 -1
View File
@@ -117,9 +117,9 @@ public class TestNatKeyCacheWithForeignKey extends BaseTestCase {
@Test
public void findSimple() {
setupData();
clearAllL2Cache();
appStats();
OCachedApp app0 = findAppByName("app0");
assertThat(app0).isNotNull();
ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java
+1 -1
View File
@@ -192,6 +192,6 @@ public class TestElementCollectionBasicMap extends BaseTestCase {
final EcmPerson fromJson = DB.json().toBean(EcmPerson.class, asJson);
assertThat(fromJson.getName()).isEqualTo("Fiona021");
assertThat(fromJson.getPhoneNumbers()).hasSize(2);
assertThat(fromJson.getPhoneNumbers().toString()).isEqualTo("BeanMap size[2] map{home=021 1234, work=021 4321}");
assertThat(fromJson.getPhoneNumbers().toString()).isEqualTo("{home=021 1234, work=021 4321}");
}
}
ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java
+1 -1
View File
@@ -183,6 +183,6 @@ class TestElementCollectionBasicSet extends BaseTestCase {
final EcsPerson fromJson = DB.json().toBean(EcsPerson.class, asJson);
assertThat(fromJson.getName()).isEqualTo("Fiona021");
assertThat(fromJson.getPhoneNumbers()).hasSize(2);
assertThat(fromJson.getPhoneNumbers().toString()).isEqualTo("BeanSet size[2] set[021 1234, 021 4321]");
assertThat(fromJson.getPhoneNumbers().toString()).isEqualTo("[021 1234, 021 4321]");
}
}
ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java
+1 -1
View File
@@ -190,6 +190,6 @@ public class TestElementCollectionEmbeddedList extends BaseTestCase {
final EcblPerson fromJson = DB.json().toBean(EcblPerson.class, asJson);
assertThat(fromJson.getName()).isEqualTo("Fiona64021");
assertThat(fromJson.getPhoneNumbers()).hasSize(2);
assertThat(fromJson.getPhoneNumbers().toString()).isEqualTo("BeanList size[2] list[64-021-1234, 64-021-4321]");
assertThat(fromJson.getPhoneNumbers().toString()).isEqualTo("[64-021-1234, 64-021-4321]");
}
}
ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java
+1 -1
View File
@@ -181,6 +181,6 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase {
final EcbmPerson fromJson = DB.json().toBean(EcbmPerson.class, asJson);
assertThat(fromJson.getName()).isEqualTo("Fiona64021");
assertThat(fromJson.getPhoneNumbers()).hasSize(2);
assertThat(fromJson.getPhoneNumbers().toString()).isEqualTo("BeanMap size[2] map{home=64-021-1234, work=64-021-4321}");
assertThat(fromJson.getPhoneNumbers().toString()).isEqualTo("{home=64-021-1234, work=64-021-4321}");
}
}
ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java
+1 -1
View File
@@ -45,6 +45,6 @@ public class TestElementCollectionEnumSet extends BaseTestCase {
final EcEnumPerson fromJson = DB.json().toBean(EcEnumPerson.class, asJson);
assertThat(fromJson.getName()).isEqualTo("Enum Person");
assertThat(fromJson.getTags()).hasSize(2);
assertThat(fromJson.getTags().toString()).isEqualTo("BeanSet size[2] set[BLUE, RED]");
assertThat(fromJson.getTags().toString()).isEqualTo("[BLUE, RED]");
}
}
ebean-test/src/test/java/org/tests/query/TestQueryFindStream.java
-21
View File
@@ -37,27 +37,6 @@ public class TestQueryFindStream extends BaseTestCase {
}
}
@Test
public void findLargeStream_basic() {
ResetBasicData.reset();
try (Stream<Customer> stream = DB.find(Customer.class)
.findLargeStream()) {
// bad example, don't use a stream like this when we can
// use findSingleAttributeList() instead
final List<String> namesStream = stream
.map(Customer::getName)
.collect(toList());
final List<String> namesQuery = DB.find(Customer.class)
.select("name")
.findSingleAttributeList();
assertThat(namesStream).hasSize(namesQuery.size());
assertThat(namesStream).containsAll(namesQuery);
}
}
@Test
public void manualTest_findSteam_when_closeWithResources() {
// confirm manually the stream is closed via try with resources block