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 remote-tracking branch 'upstream/master'

Browse Source 
# Conflicts:
#	ebean-core/src/main/java/io/ebeaninternal/server/deploy/TablespaceMeta.java
#	ebean-core/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java
#	ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
#	ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
#	ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerApplyTest.java
#	ebean-test/src/test/java/misc/migration/v1_0/EBasic.java
#	ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java
#	ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java
#	ebean-test/src/test/java/org/tests/json/TestDbJson_List.java
#	ebean-test/src/test/resources/extra-ddl.xml
#	ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations
#	ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_db2.migrations
#	ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/I__create_tablespaces.sql
#	ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/idx_db2.migrations
#	ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations
#	ebean-test/src/test/resources/migrationtest/dbmigration/model/1.0__initial.model.xml
#	ebean-test/src/test/resources/migrationtest/dbmigration/model/1.1.model.xml
This commit is contained in:
Roland Praml
2022-03-24 09:20:28 +01:00
parent 4492fd6de5 84a64f9640
commit 0c6c1abb55
943 changed files with 2654 additions and 1723 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ebean-api/src/main/java/io/ebean/Database.java
+1 -1
View File
@@ -300,7 +300,7 @@ public interface Database {
* Create a new instance of T that is an EntityBean.
* <p>
* Useful if you use BeanPostConstructListeners or &#64;PostConstruct Annotations.
* In this case you should not use "new Bean...()". Making all bean construtors protected
* In this case you should not use "new Bean...()". Making all bean constructors protected
* could be a good idea here.
* </p>
*/