Improve sample code

Author: nakamura-to

docs/criteria-api.rst

@@ -30,7 +30,7 @@ We use the following Entity classes to show you some examples:
       private Integer employeeNo;
       private String employeeName;
       private Integer managerId;
-      public LocalDate hiredate;
+      private LocalDate hiredate;
       private Salary salary;
       private Integer departmentId;
       private Integer addressId;
@@ -39,6 +39,7 @@ We use the following Entity classes to show you some examples:
       @Transient private Department department;
       @Transient private Employee manager;
       @Transient private Address address;
+
       // getter and setter
     }
 
@@ -47,13 +48,13 @@ We use the following Entity classes to show you some examples:
     @Entity
     public class Department {
 
-      @Id Integer departmentId;
-      Integer departmentNo;
-      String departmentName;
-      String location;
-      @Version Integer version;
-      @OriginalStates Department originalStates;
-      @Transient List<Employee> employeeList = new ArrayList<>();
+      @Id private Integer departmentId;
+      private Integer departmentNo;
+      private String departmentName;
+      private String location;
+      @Version private Integer version;
+      @OriginalStates private Department originalStates;
+      @Transient private List<Employee> employeeList = new ArrayList<>();
 
       // getter and setter
     }

test-criteria/src/main/java/example/Department.java

@@ -11,13 +11,13 @@
 @Entity
 public class Department {
 
-  @Id Integer departmentId;
-  Integer departmentNo;
-  String departmentName;
-  String location;
-  @Version Integer version;
-  @OriginalStates Department originalStates;
-  @Transient List<Employee> employeeList = new ArrayList<>();
+  @Id private Integer departmentId;
+  private Integer departmentNo;
+  private String departmentName;
+  private String location;
+  @Version private Integer version;
+  @OriginalStates private Department originalStates;
+  @Transient private List<Employee> employeeList = new ArrayList<>();
 
   public Integer getDepartmentId() {
     return departmentId;

test-criteria/src/main/java/example/Employee.java

@@ -14,7 +14,7 @@ public class Employee {
   private Integer employeeNo;
   private String employeeName;
   private Integer managerId;
-  public LocalDate hiredate;
+  private LocalDate hiredate;
   private Salary salary;
   private Integer departmentId;
   private Integer addressId;

test-criteria/src/test/java/example/EntityqlSelectTest.java

@@ -255,7 +255,8 @@ void associate() {
             .fetch();
 
     assertEquals(6, list.size());
-    assertTrue(list.stream().allMatch(it -> it.getDepartment().departmentName.equals("SALES")));
+    assertTrue(
+        list.stream().allMatch(it -> it.getDepartment().getDepartmentName().equals("SALES")));
     assertEquals(list.get(0).getDepartment().getEmployeeList().size(), 6);
   }
 
@@ -323,7 +324,8 @@ void associate_multi() {
             .fetch();
 
     assertEquals(6, list.size());
-    assertTrue(list.stream().allMatch(it -> it.getDepartment().departmentName.equals("SALES")));
+    assertTrue(
+        list.stream().allMatch(it -> it.getDepartment().getDepartmentName().equals("SALES")));
     assertEquals(list.get(0).getDepartment().getEmployeeList().size(), 6);
     assertTrue(list.stream().allMatch(it -> it.getAddress() != null));
   }