Remove unused Metamodel annotations and update relationships

Author: nakamura-to

dao-style-basic/src/main/java/example/dao_style_basic/entity/Department.java

@@ -2,10 +2,9 @@
 
 import org.seasar.doma.Entity;
 import org.seasar.doma.Id;
-import org.seasar.doma.Metamodel;
 import org.seasar.doma.Version;
 
-@Entity(metamodel = @Metamodel)
+@Entity
 public class Department {
   @Id Integer id;
 

dao-style-basic/src/main/java/example/dao_style_basic/entity/Employee.java

@@ -4,18 +4,17 @@
 import example.dao_style_basic.domain.Salary;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import org.seasar.doma.Association;
 import org.seasar.doma.Column;
 import org.seasar.doma.Entity;
 import org.seasar.doma.GeneratedValue;
 import org.seasar.doma.GenerationType;
 import org.seasar.doma.Id;
-import org.seasar.doma.Metamodel;
 import org.seasar.doma.OriginalStates;
 import org.seasar.doma.SequenceGenerator;
-import org.seasar.doma.Transient;
 import org.seasar.doma.Version;
 
-@Entity(listener = EmployeeListener.class, metamodel = @Metamodel)
+@Entity(listener = EmployeeListener.class)
 public class Employee {
 
   @Id
@@ -45,7 +44,7 @@ public class Employee {
 
   LocalDateTime updateTimestamp;
 
-  @Transient Department department;
+  @Association Department department;
 
   @OriginalStates Employee originalStates;
 

dao-style-basic/src/main/java/example/dao_style_basic/entity/EmployeeDepartment.java

@@ -2,10 +2,9 @@
 
 import org.seasar.doma.Entity;
 import org.seasar.doma.Id;
-import org.seasar.doma.Metamodel;
 import org.seasar.doma.Version;
 
-@Entity(metamodel = @Metamodel)
+@Entity
 public class Department {
   @Id Integer id;
 

dao-style-file/src/main/java/example/dao_style_file/entity/Department.java

@@ -10,12 +10,11 @@
 import org.seasar.doma.GeneratedValue;
 import org.seasar.doma.GenerationType;
 import org.seasar.doma.Id;
-import org.seasar.doma.Metamodel;
 import org.seasar.doma.OriginalStates;
 import org.seasar.doma.SequenceGenerator;
 import org.seasar.doma.Version;
 
-@Entity(listener = EmployeeListener.class, metamodel = @Metamodel)
+@Entity(listener = EmployeeListener.class)
 public class Employee {
 
   @Id

dao-style-file/src/main/java/example/dao_style_file/entity/Employee.java

@@ -2,10 +2,9 @@
 
 import org.seasar.doma.Entity;
 import org.seasar.doma.Id;
-import org.seasar.doma.Metamodel;
 import org.seasar.doma.Version;
 
-@Entity(metamodel = @Metamodel)
+@Entity
 public class Department {
   @Id Integer id;
 

dao-style-text/src/main/java/example/dao_style_text/entity/Department.java

@@ -10,12 +10,11 @@
 import org.seasar.doma.GeneratedValue;
 import org.seasar.doma.GenerationType;
 import org.seasar.doma.Id;
-import org.seasar.doma.Metamodel;
 import org.seasar.doma.OriginalStates;
 import org.seasar.doma.SequenceGenerator;
 import org.seasar.doma.Version;
 
-@Entity(listener = EmployeeListener.class, metamodel = @Metamodel)
+@Entity(listener = EmployeeListener.class)
 public class Employee {
 
   @Id

dao-style-text/src/main/java/example/dao_style_text/entity/Employee.java

@@ -2,10 +2,10 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import org.seasar.doma.Association;
 import org.seasar.doma.Entity;
 import org.seasar.doma.Id;
 import org.seasar.doma.Metamodel;
-import org.seasar.doma.Transient;
 import org.seasar.doma.Version;
 
 @Entity(metamodel = @Metamodel)
@@ -16,7 +16,7 @@ public class Department {
 
   @Version Integer version;
 
-  @Transient List<Employee> employees = new ArrayList<>();
+  @Association List<Employee> employees = new ArrayList<>();
 
   public Integer getId() {
     return id;

dsl-style-java/src/main/java/example/dsl_style_java/entity/Department.java

@@ -4,6 +4,7 @@
 import example.dsl_style_java.domain.Salary;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import org.seasar.doma.Association;
 import org.seasar.doma.Column;
 import org.seasar.doma.Entity;
 import org.seasar.doma.GeneratedValue;
@@ -12,7 +13,6 @@
 import org.seasar.doma.Metamodel;
 import org.seasar.doma.OriginalStates;
 import org.seasar.doma.SequenceGenerator;
-import org.seasar.doma.Transient;
 import org.seasar.doma.Version;
 
 @Entity(listener = EmployeeListener.class, metamodel = @Metamodel)
@@ -45,7 +45,7 @@ public class Employee {
 
   LocalDateTime updateTimestamp;
 
-  @Transient Department department;
+  @Association Department department;
 
   @OriginalStates Employee originalStates;