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

#2361 - Tidy tests only, organise imports

Browse Source
This commit is contained in:
Rob Bygrave
2021-09-09 11:29:05 +12:00
parent 1696caadd4
commit 7a327cb644
626 changed files with 854 additions and 2475 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ebean-test/src/test/java/misc/migration/history/v1_0/EHistory7.java
+2 -2
View File
@@ -1,12 +1,12 @@
package misc.migration.history.v1_0;
import io.ebean.annotation.History;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import io.ebean.annotation.History;
/**
* detects a bug where dropHistoryTable is not applied correctly
*
ebean-test/src/test/java/misc/migration/v1_0/DfkCascadeOne.java
+1 -6
View File
@@ -1,11 +1,6 @@
package misc.migration.v1_0;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.*;
import java.util.List;
@Entity
ebean-test/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java
+1 -7
View File
@@ -1,12 +1,6 @@
package misc.migration.v1_0;
import javax.persistence.ConstraintMode;
import javax.persistence.Entity;
import javax.persistence.ForeignKey;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.*;
@Entity
@Table(name = "migtest_fk_none_via_join")
ebean-test/src/test/java/misc/migration/v1_0/EBasic.java
-1
View File
@@ -10,7 +10,6 @@ import javax.persistence.Id;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.validation.constraints.Size;
import java.sql.Timestamp;
@Entity
ebean-test/src/test/java/misc/migration/v1_0/EEnum.java
+5 -5
View File
@@ -1,16 +1,16 @@
package misc.migration.v1_0;
import io.ebean.annotation.EnumValue;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import io.ebean.annotation.EnumValue;
@Entity
@Table(name = "migtest_e_enum")
public class EEnum {
public enum Status {
@EnumValue("N")
NEW,
@@ -21,9 +21,9 @@ public class EEnum {
@EnumValue("I")
INACTIVE,
}
@Id
Integer id;
Status testStatus;
}
ebean-test/src/test/java/misc/migration/v1_0/EHistory2.java
+3 -3
View File
@@ -1,13 +1,13 @@
package misc.migration.v1_0;
import io.ebean.annotation.History;
import io.ebean.annotation.HistoryExclude;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import io.ebean.annotation.History;
import io.ebean.annotation.HistoryExclude;
@Entity
@Table(name = "migtest_e_history2")
@History
ebean-test/src/test/java/misc/migration/v1_0/EHistory3.java
+2 -2
View File
@@ -1,12 +1,12 @@
package misc.migration.v1_0;
import io.ebean.annotation.History;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import io.ebean.annotation.History;
@Entity
@Table(name = "migtest_e_history3")
ebean-test/src/test/java/misc/migration/v1_0/EHistory4.java
+2 -2
View File
@@ -1,12 +1,12 @@
package misc.migration.v1_0;
import io.ebean.annotation.History;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import io.ebean.annotation.History;
@Entity
@Table(name = "migtest_e_history4")
ebean-test/src/test/java/misc/migration/v1_0/EHistory5.java
+2 -2
View File
@@ -1,12 +1,12 @@
package misc.migration.v1_0;
import io.ebean.annotation.History;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import io.ebean.annotation.History;
@Entity
@Table(name = "migtest_e_history5")
ebean-test/src/test/java/misc/migration/v1_0/EHistory6.java
+3 -3
View File
@@ -1,13 +1,13 @@
package misc.migration.v1_0;
import io.ebean.annotation.History;
import io.ebean.annotation.NotNull;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import io.ebean.annotation.History;
import io.ebean.annotation.NotNull;
@Entity
@Table(name = "migtest_e_history6")
ebean-test/src/test/java/misc/migration/v1_0/ERef.java
+5 -6
View File
@@ -1,23 +1,22 @@
package misc.migration.v1_0;
import java.util.List;
import io.ebean.annotation.Index;
import io.ebean.annotation.NotNull;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.validation.constraints.Size;
import io.ebean.annotation.Index;
import io.ebean.annotation.NotNull;
import java.util.List;
@Entity
@Table(name = "migtest_e_ref")
public class ERef {
@Id
Integer id;
@OneToMany
List<EBasic> basics;
ebean-test/src/test/java/misc/migration/v1_1/CKeyParent.java
+1 -7
View File
@@ -1,12 +1,6 @@
package misc.migration.v1_1;
import javax.persistence.CascadeType;
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.Version;
import javax.persistence.*;
import java.util.ArrayList;
import java.util.List;
ebean-test/src/test/java/misc/migration/v1_1/DfkCascadeOne.java
+1 -6
View File
@@ -1,11 +1,6 @@
package misc.migration.v1_1;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.*;
import java.util.List;
@Entity
ebean-test/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java
+1 -7
View File
@@ -1,12 +1,6 @@
package misc.migration.v1_1;
import javax.persistence.ConstraintMode;
import javax.persistence.Entity;
import javax.persistence.ForeignKey;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.*;
@Entity
@Table(name = "migtest_fk_none_via_join")
ebean-test/src/test/java/misc/migration/v1_1/EBasic.java
+2 -10
View File
@@ -1,18 +1,10 @@
package misc.migration.v1_1;
import io.ebean.annotation.DbDefault;
import io.ebean.annotation.DbMigration;
import io.ebean.annotation.EnumValue;
import io.ebean.annotation.Index;
import io.ebean.annotation.NotNull;
import io.ebean.annotation.*;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.*;
import javax.validation.constraints.Size;
import java.sql.Timestamp;
@Entity
ebean-test/src/test/java/misc/migration/v1_1/EHistory.java
+5 -5
View File
@@ -1,15 +1,15 @@
package misc.migration.v1_1;
import io.ebean.annotation.DbComment;
import io.ebean.annotation.DbMigration;
import io.ebean.annotation.History;
import io.ebean.annotation.Platform;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import io.ebean.annotation.Platform;
import io.ebean.annotation.DbComment;
import io.ebean.annotation.DbMigration;
import io.ebean.annotation.History;
@Entity
@Table(name = "migtest_e_history")
@History
ebean-test/src/test/java/misc/migration/v1_1/EHistory2.java
+5 -5
View File
@@ -1,16 +1,16 @@
package misc.migration.v1_1;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.validation.constraints.Size;
import io.ebean.annotation.DbDefault;
import io.ebean.annotation.History;
import io.ebean.annotation.HistoryExclude;
import io.ebean.annotation.NotNull;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.validation.constraints.Size;
@Entity
@Table(name = "migtest_e_history2")
@History
ebean-test/src/test/java/misc/migration/v1_1/EHistory3.java
+3 -3
View File
@@ -1,13 +1,13 @@
package misc.migration.v1_1;
import io.ebean.annotation.History;
import io.ebean.annotation.HistoryExclude;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import io.ebean.annotation.History;
import io.ebean.annotation.HistoryExclude;
@Entity
@Table(name = "migtest_e_history3")
ebean-test/src/test/java/misc/migration/v1_1/EHistory4.java
+2 -2
View File
@@ -1,12 +1,12 @@
package misc.migration.v1_1;
import io.ebean.annotation.History;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import io.ebean.annotation.History;
@Entity
@Table(name = "migtest_e_history4")
ebean-test/src/test/java/misc/migration/v1_1/EHistory5.java
+4 -4
View File
@@ -1,14 +1,14 @@
package misc.migration.v1_1;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import io.ebean.annotation.DbDefault;
import io.ebean.annotation.History;
import io.ebean.annotation.NotNull;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
@Entity
@Table(name = "migtest_e_history5")
ebean-test/src/test/java/misc/migration/v1_1/EHistory6.java
+4 -4
View File
@@ -1,14 +1,14 @@
package misc.migration.v1_1;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import io.ebean.annotation.DbDefault;
import io.ebean.annotation.History;
import io.ebean.annotation.NotNull;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
@Entity
@Table(name = "migtest_e_history6")
ebean-test/src/test/java/misc/migration/v1_1/ESoftdelete.java
+6 -6
View File
@@ -1,22 +1,22 @@
package misc.migration.v1_1;
import io.ebean.annotation.SoftDelete;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import io.ebean.annotation.SoftDelete;
@Entity
@Table(name = "migtest_e_softdelete")
public class ESoftdelete {
@Id
Integer id;
String testString;
@SoftDelete
boolean deleted;
}
ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java
+2 -3
View File
@@ -1,11 +1,10 @@
package misc.migration.v1_1;
import java.util.List;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.ManyToMany;
import javax.persistence.Table;
import java.util.List;
@Entity
@Table(name = "migtest_mtm_c")
@@ -38,7 +37,7 @@ public class MtmChild {
public List<MtmMaster> getMasters() {
return masters;
}
public void setMasters(List<MtmMaster> masters) {
this.masters = masters;
}
ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java
+2 -3
View File
@@ -1,11 +1,10 @@
package misc.migration.v1_1;
import java.util.List;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.ManyToMany;
import javax.persistence.Table;
import java.util.List;
@Entity
@Table(name = "migtest_mtm_m")
@@ -38,7 +37,7 @@ public class MtmMaster {
public List<MtmChild> getChildren() {
return children;
}
public void setChildren(List<MtmChild> children) {
this.children = children;
}
ebean-test/src/test/java/misc/migration/v1_1/OtoMaster.java
+1 -5
View File
@@ -1,10 +1,6 @@
package misc.migration.v1_1;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.OneToOne;
import javax.persistence.Table;
import javax.persistence.*;
@Entity
@Table(name = "migtest_oto_master")
ebean-test/src/test/java/misc/migration/v1_2/DfkCascadeOne.java
+1 -6
View File
@@ -1,11 +1,6 @@
package misc.migration.v1_2;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.*;
import java.util.List;
@Entity
ebean-test/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java
+1 -7
View File
@@ -1,12 +1,6 @@
package misc.migration.v1_2;
import javax.persistence.ConstraintMode;
import javax.persistence.Entity;
import javax.persistence.ForeignKey;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.*;
@Entity
@Table(name = "migtest_fk_none_via_join")
ebean-test/src/test/java/misc/migration/v1_2/EBasic.java
-1
View File
@@ -10,7 +10,6 @@ import javax.persistence.Id;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.validation.constraints.Size;
import java.sql.Timestamp;
@Entity
ebean-test/src/test/java/misc/migration/v1_2/EEnum.java
+5 -5
View File
@@ -1,16 +1,16 @@
package misc.migration.v1_2;
import io.ebean.annotation.EnumValue;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import io.ebean.annotation.EnumValue;
@Entity
@Table(name = "migtest_e_enum")
public class EEnum {
public enum Status {
@EnumValue("N")
NEW,
@@ -21,9 +21,9 @@ public class EEnum {
@EnumValue("I")
INACTIVE,
}
@Id
Integer id;
Status testStatus;
}
ebean-test/src/test/java/misc/migration/v1_2/EHistory2.java
+3 -3
View File
@@ -1,13 +1,13 @@
package misc.migration.v1_2;
import io.ebean.annotation.History;
import io.ebean.annotation.HistoryExclude;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import io.ebean.annotation.History;
import io.ebean.annotation.HistoryExclude;
@Entity
@Table(name = "migtest_e_history2")
@History
ebean-test/src/test/java/misc/migration/v1_2/EHistory3.java
+2 -2
View File
@@ -1,12 +1,12 @@
package misc.migration.v1_2;
import io.ebean.annotation.History;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import io.ebean.annotation.History;
@Entity
@Table(name = "migtest_e_history3")
ebean-test/src/test/java/misc/migration/v1_2/EHistory4.java
+2 -2
View File
@@ -1,12 +1,12 @@
package misc.migration.v1_2;
import io.ebean.annotation.History;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import io.ebean.annotation.History;
@Entity
@Table(name = "migtest_e_history4")
ebean-test/src/test/java/misc/migration/v1_2/EHistory5.java
+2 -2
View File
@@ -1,12 +1,12 @@
package misc.migration.v1_2;
import io.ebean.annotation.History;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import io.ebean.annotation.History;
@Entity
@Table(name = "migtest_e_history5")
ebean-test/src/test/java/misc/migration/v1_2/EHistory6.java
+4 -4
View File
@@ -1,14 +1,14 @@
package misc.migration.v1_2;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import io.ebean.annotation.DbDefault;
import io.ebean.annotation.History;
import io.ebean.annotation.NotNull;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
@Entity
@Table(name = "migtest_e_history6")
ebean-test/src/test/java/misc/migration/v1_2/ERef.java
+5 -6
View File
@@ -1,23 +1,22 @@
package misc.migration.v1_2;
import java.util.List;
import io.ebean.annotation.Index;
import io.ebean.annotation.NotNull;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.validation.constraints.Size;
import io.ebean.annotation.Index;
import io.ebean.annotation.NotNull;
import java.util.List;
@Entity
@Table(name = "migtest_e_ref")
public class ERef {
@Id
Integer id;
@OneToMany
List<EBasic> basics;