Clean up

martinellich · Nov 5, 2024 · 96beb93 · 96beb93
1 parent 8177556
commit 96beb93
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/src/main/java/ch/martinelli/demo/vaadinjooq/employee/data/DateGenerator.java b/src/main/java/ch/martinelli/demo/vaadinjooq/employee/data/DateGenerator.java
@@ -3,7 +3,6 @@
 import ch.martinelli.demo.vaadinjooq.employee.model.Sequences;
 import ch.martinelli.demo.vaadinjooq.employee.model.tables.Department;
 import ch.martinelli.demo.vaadinjooq.employee.model.tables.Employee;
-import ch.martinelli.demo.vaadinjooq.employee.model.tables.records.EmployeeRecord;
 import net.datafaker.Faker;
 import org.jooq.DSLContext;
 import org.springframework.boot.ApplicationArguments;
@@ -35,16 +34,16 @@ public void run(ApplicationArguments args) {
 
         var faker = new Faker();
         for (int i = 0; i < 100; i++) {
-            EmployeeRecord employeeRecord = dslContext.newRecord(Employee.EMPLOYEE);
-            employeeRecord.setId(dslContext.nextval(Sequences.EMPLOYEE_SEQ).intValue());
-            employeeRecord.setFirstName(faker.name().firstName());
-            employeeRecord.setLastName(faker.name().lastName());
+            var employee = dslContext.newRecord(Employee.EMPLOYEE);
+            employee.setId(dslContext.nextval(Sequences.EMPLOYEE_SEQ).intValue());
+            employee.setFirstName(faker.name().firstName());
+            employee.setLastName(faker.name().lastName());
             if (i % 7 == 0) {
-                employeeRecord.setDepartmentId(hrDepartment.getId());
+                employee.setDepartmentId(hrDepartment.getId());
             } else {
-                employeeRecord.setDepartmentId(itDepartment.getId());
+                employee.setDepartmentId(itDepartment.getId());
             }
-            employeeRecord.store();
+            employee.store();
         }
     }
 }
diff --git a/src/main/java/ch/martinelli/demo/vaadinjooq/employee/ui/EmployeeForm.java b/src/main/java/ch/martinelli/demo/vaadinjooq/employee/ui/EmployeeForm.java
@@ -40,8 +40,6 @@ public class EmployeeForm extends FormLayout {
     private final ComboBox<DepartmentRecord> departmentId = new ComboBox<>("Department");
 
     private final Binder<EmployeeRecord> binder = new Binder<>(EmployeeRecord.class);
-    private final Button save;
-    private final Button delete;
 
     private EmployeeRecord employee;
 
@@ -106,11 +104,11 @@ public DepartmentRecord convertToPresentation(Integer integer, ValueContext valu
                 })
                 .bind(EmployeeRecord::getDepartmentId, EmployeeRecord::setDepartmentId);
 
-        save = new Button("Save");
+        var save = new Button("Save");
         save.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
         save.addClickListener(this::save);
 
-        delete = new Button("Delete");
+        var delete = new Button("Delete");
         delete.addClickListener(this::delete);
 
         add(id, firstName, lastName, departmentId, new HorizontalLayout(save, delete));