General simplification - new data model; only single Repository class for all scenarios (so we can better compare two different implementations); refaktored JUnit classes -> scenarios extracted to Scenarios class

Author: bwajtr

.gitignore

@@ -1,3 +1,2 @@
-/jooqgenerator/*.jar
 /target
 /.idea

README.md

@@ -5,6 +5,10 @@ We are not comparing performance (that'll be maybe added later), but rather how
 
 We prepared some common scenarios, which you typically need to implement data-centric application, and then we implemented these scenarios using various non-JPA frameworks.
 
+## Model used
+
+
+
 ## Why only non-JPA?
 Well, we were trying to "stick with standard" in our projects in the past, but after many years of JPA usage
 (Hibernate mostly), we realized it's counterproductive. In most of our projects it caused more problems then 

SimpleCompanyModel.png

@@ -0,0 +1 @@
+<mxfile type="device" userAgent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.75 Safari/537.36" version="5.3.3.6" editor="www.draw.io"><diagram>7Vtfk9o2EP80PDaD8Zm7PAZC2ofrzE14aPvU0WFhK5ElVxbHkU+flbXyH8zF5PC4tCdgBuvn1b/9rbS7FkzCZfb8qyJ5+ruMKZ/MpvHzJPw4mc2Cm/AGvgxysMhtBCUDJIrFKFQDa/aNIjhFdMdiWrQEtZRcs7wNbqQQdKNbGFFK7ttiW8nbveYkcT3WwHpDeBf9g8U6tejdbF7jv1GWpK7nYP7e3nkkm6+JkjuB/U1m4bZ82dsZcW2VEw1XoEQlJTRjrrLnJeVGkU5HVhufXrhbDVJRgQP5cQXk4InwHc5zKbOciIPFC31w8y/2LONEQGmR6owDGMDlVgq9RqEplDcp4/E9Ocid6b7QMHdXWqRSsW8gT1xluK00Mg16hNYY50vJpSq7DOnUvFs116ZF7EvRAuo+uLmaFi10TwoDlOORnJO8YI/lCI1IRlTCxEJqLTMUclP71O4eWQoXXaWinp+o0tRZeMUeLAEqM6oVKHGKd+doxWj8sztb3NeWFDiRtGlFlQWj9SZVyzWpcIG8nuY47HCcw61jfmEiJUk1t4VW8it1ChGy5L5JEUJFTjZMJPd0a0Z9UyOfcSIG2qdM0zXgprs9bBGASdDflss9ICmLYyoMg1ITTSxdhptcMqHLyUcL+ICOltN30SSCIS+hDOpxZfgYcaWXUsDQCdSDahRsYU+NPbRs9cRCcUuhn1NHIi79PhKd3CUc4ubZ4FCQjL5BEgfgzTmeMXiLOryROIZdqpjM5tzMJ2ZPcJnYqVnoUR0jZwnBUE7IHaPeYH7eYG7P3K2HMBhsomEwqyzn8kC7i9175Es8cnTbdsnBDOO1Xp98hw71EppvvU8+xye71XCVPhl3hQaHMYXB68wMH7df0LpocTr/Z2di+wVngv7iRvQBRIJ30Ji76/brv0urqHZy29qb3cqHNpYxAwGXxvoIbgDixnTIQTdFLnbKc/da7oIp5jKjkNfNfWlGGIhcEFh71l/BeogMj8J6N1suCCfYiOfuZ7mLRgyqTiRAHxtRlU+BBkyBQheUINHzM3fmwNW7iGifAp33WPKqc6ATSdDGHiDY1MWzeSmbYyYp7hGIT1KGYG7MLOUGA90GSTSG80sswkxTmUhB+KpGQX9wKElNC6U/q9mkz0z/2bj+y4iA5qAk4g/mMBWA1efMnBOWmHFS2MwXqvUB/SfZaWm4q3q/lxLILNt90X8VcqdK5uujK3DJCXXaQq2a6f2QBUU50eypfXx7kY7RPf7PdOwU2lTyv6fjbvj3oOQXc6DvY78hY78qhqtOpPGoqj/4G4JmH/ydFS5Uy+E6D6W7wZ8PF17N3KjH0t0nJDEBJZr9D5zVWyWwQ9YpTq8j3utG6ugn/XHxS/6yh92eZyUhxqJun42wiT6279DVXbRcu4dHuWXbZ9nObfat3XLBXIXbdJbTOpSwi9bTOQydo/pSXOD/tbTwKLnrzRNdtNfME+3GNEJeGGHnwyrZwMdKhoFV+jeF6yHAZWyDElBWhWkRU8sJ4NKuW34wQOO3U/ir8mr3PP6VeZ/8+5Y8XNgR1KZQTeWUdUCx/oW8Fa//cxCuvgM=</diagram></mxfile>

sql-updates/SimpleCompanyModel.xml

@@ -1,77 +1,88 @@
 -- Meant for PostgreSQL --
 
-DROP TABLE product;
-DROP TABLE product_category;
-DROP TABLE employee_department;
-DROP TABLE department;
-DROP TABLE employee;
-DROP TABLE company;
+-- (re)create tables first
 
+DROP TABLE ProjectEmployee;
+DROP TABLE Project;
+DROP TABLE Employee;
+DROP TABLE Department;
+DROP TABLE Company;
 
-CREATE TABLE company (
+CREATE TABLE Company (
   pid SERIAL PRIMARY KEY,
   name VARCHAR(40) NOT NULL,
   address VARCHAR(128)
 );
 
-CREATE TABLE employee (
-  pid SERIAL PRIMARY KEY,
-  company_pid INTEGER NOT NULL REFERENCES company (pid) ON DELETE CASCADE,
-  name varchar(50) NOT NULL,
-  surname varchar(50) NOT NULL,
-  mail varchar(50),
-  salary numeric(10,2) CHECK (salary > 0)
-);
-
-CREATE TABLE department (
+CREATE TABLE Department (
   pid SERIAL PRIMARY KEY,
+  company_pid INTEGER NOT NULL REFERENCES Company (pid) ON DELETE CASCADE,
   name varchar(50) NOT NULL
 );
 
-CREATE TABLE employee_department (
-  employee_pid INTEGER NOT NULL REFERENCES employee (pid) ON DELETE CASCADE,
-  department_pid INTEGER NOT NULL REFERENCES department (pid) ON DELETE CASCADE,
-  UNIQUE (employee_pid, department_pid)
-);
-
-CREATE TABLE product_category (
+CREATE TABLE Employee (
   pid SERIAL PRIMARY KEY,
-  category varchar(50) NOT NULL
+  department_pid INTEGER NOT NULL REFERENCES Department (pid) ON DELETE CASCADE,
+  name varchar(50) NOT NULL,
+  surname varchar(50) NOT NULL,
+  email varchar(50),
+  salary numeric(10,2) CHECK (salary > 0)
 );
 
-CREATE TABLE product (
+CREATE TABLE Project (
   pid SERIAL PRIMARY KEY,
-  product_category_pid INTEGER NOT NULL REFERENCES product_category (pid) ON DELETE CASCADE,
   name varchar(50) NOT NULL,
-  description varchar(50) NOT NULL,
-  row_status char(1) DEFAULT 'A',
-  price numeric(10,2) CHECK (price > 0)
+  dateStarted date
 );
 
-INSERT INTO product_category (pid, category) values (1, 'Hardware');
-INSERT INTO product_category (pid, category) values (2, 'Software');
-INSERT INTO product_category (pid, category) values (3, 'Middleware');
-
-INSERT INTO public.company (name, address) VALUES('CleverGang', 'Chotikov 14, Chotikov 330 17');
-INSERT INTO public.company (name, address) VALUES('Querity', 'Manesova 44, Plzen');
-
-
-INSERT INTO public.employee (company_pid, name, surname, mail, salary)
-VALUES(1, 'Břetislav', 'Wajtr', 'bretislav.wajtr@clevergang.com', 35000);
-INSERT INTO public.employee (company_pid, name, surname, mail, salary)
-VALUES(1, 'Viktor', 'Janukovic', 'viktor.janukovic@clevergang.com', 10000);
-INSERT INTO public.employee (company_pid, name, surname, mail, salary)
-VALUES(1, 'Olga', 'Pravcová', 'olga.wajtrova@clevergang.com', 35000);
-INSERT INTO public.employee (company_pid, name, surname, mail, salary)
-VALUES(2, 'Jiri', 'Kiml', 'jiri.kiml@querity.cz', 49000);
-
-
-INSERT INTO public.department (name) VALUES('Development');
-INSERT INTO public.department (name) VALUES('Sales');
-
-
-INSERT INTO public.employee_department (employee_pid, department_pid) VALUES(1, 1);
-INSERT INTO public.employee_department (employee_pid, department_pid) VALUES(2, 1);
-INSERT INTO public.employee_department (employee_pid, department_pid) VALUES(3, 1);
-INSERT INTO public.employee_department (employee_pid, department_pid) VALUES(3, 2);
+CREATE TABLE ProjectEmployee (
+  project_pid INTEGER REFERENCES Project,
+  employee_pid INTEGER REFERENCES Employee,
+  PRIMARY KEY (project_pid, employee_pid)
+);
 
+-- now insertProject some test data
+
+INSERT INTO Company (name, address) VALUES ('CleverGang', 'Prague, Czech Republic');
+INSERT INTO Company (name, address) VALUES ('Supersoft', 'Berlin, Germany');
+INSERT INTO Company (name, address) VALUES ('Pear', 'Cupertino, USA');
+
+INSERT INTO Department (company_pid, name) VALUES (1, 'Back office');
+INSERT INTO Department (company_pid, name) VALUES (1, 'IT Department');
+INSERT INTO Department (company_pid, name) VALUES (1, 'Software Development');
+INSERT INTO Department (company_pid, name) VALUES (2, 'Help desk');
+INSERT INTO Department (company_pid, name) VALUES (2, 'Sales');
+INSERT INTO Department (company_pid, name) VALUES (3, 'Hardware Development');
+
+-- names generated using listofrandomnames.com ;)
+INSERT INTO Employee (department_pid, name, surname, email, salary)
+  VALUES (1, 'Curt', 'Odegaard', 'curt.odegaard@clevergang.com', 10000);
+INSERT INTO Employee (department_pid, name, surname, email, salary)
+  VALUES (2, 'Rupert', 'Spradling', 'rupert.spradling@clevergang.com', 11000);
+INSERT INTO Employee (department_pid, name, surname, email, salary)
+  VALUES (3, 'Carita', 'Ladouceur', 'carita.ladouceur@clevergang.com', 12000);
+INSERT INTO Employee (department_pid, name, surname, email, salary)
+  VALUES (4, 'Abbie', 'Waring', 'abbie.waring@supersoft.com', 13000);
+INSERT INTO Employee (department_pid, name, surname, email, salary)
+  VALUES (5, 'Cecily', 'Devaughn', 'cecily.devaughn@supersoft.com', 15000);
+INSERT INTO Employee (department_pid, name, surname, email, salary)
+  VALUES (6, 'Yulanda', 'Grado', 'yulanda.grado@pear.com', 17000);
+INSERT INTO Employee (department_pid, name, surname, email, salary)
+  VALUES (1, 'Chia', 'Kuder', 'chia.kuder@clevergang.com', 20000);
+INSERT INTO Employee (department_pid, name, surname, email, salary)
+  VALUES (2, 'Alica', 'Iannotti', 'alica.iannotti@clevergang.com', 30000);
+INSERT INTO Employee (department_pid, name, surname, email, salary)
+  VALUES (3, 'Estrella', 'Heroux', 'estrella.heroux@clevergang.com', 31000);
+INSERT INTO Employee (department_pid, name, surname, email, salary)
+  VALUES (4, 'Myrta', 'Lirette', 'myrta.lirette@supersoft.com', 50000);
+
+
+INSERT INTO Project (name, dateStarted) VALUES ('Awesome app', CURRENT_DATE);
+INSERT INTO Project (name, dateStarted) VALUES ('Desktop app', CURRENT_DATE);
+
+
+INSERT INTO ProjectEmployee (project_pid, employee_pid) VALUES (1, 1);
+INSERT INTO ProjectEmployee (project_pid, employee_pid) VALUES (1, 2);
+INSERT INTO ProjectEmployee (project_pid, employee_pid) VALUES (1, 9);
+INSERT INTO ProjectEmployee (project_pid, employee_pid) VALUES (2, 10);
+INSERT INTO ProjectEmployee (project_pid, employee_pid) VALUES (2, 5);

sql-updates/create-script.sql

@@ -1,17 +1,94 @@
 package com.clevergang.dbtests;
 
-import org.springframework.stereotype.Component;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.clevergang.dbtests.model.Project;
+import com.clevergang.dbtests.service.repository.DataRepository;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.StopWatch;
 
 /**
  * Common scenarios
  *
  * @author Bretislav Wajtr <bretislav.wajtr@clevergang.com>
  */
-@Component
 public class Scenarios {
+    private static final Logger logger = LoggerFactory.getLogger(Scenarios.class);
+
+    private DataRepository repository;
+
+    public Scenarios(DataRepository repository) {
+        this.repository = repository;
+    }
+
+    /**
+     * Load single entity based on primary key
+     */
+    public void scenarioOne() {
+        Integer pid = 1;
+        repository.findCompany(pid);
+    }
+
+    /**
+     * Load list of entities based on condition
+     */
+    public void scenarioTwo() {
+        Integer minSalary = 2000;
+        repository.employeesWithSalaryGreaterThan(minSalary);
+    }
+
+    /**
+     * Save new single entity and return primary key
+     */
+    public void scenarioThree() {
+        Project project = new Project();
+        project.setName("TestProject");
+        project.setDate(LocalDate.now());
+
+        repository.insertProject(project);
+    }
 
+    /**
+     * Batch insertProject multiple entities of same type and return generated keys
+     */
+    public void scenarioFour() {
+        // create a list of thousand products
+        List<Project> projects = new ArrayList<>();
+        StopWatch watch = new StopWatch();
+        watch.start();
+        for (int i = 0; i < 1000; i++) {
+            Project project = new Project();
+            project.setName(RandomStringUtils.randomAlphabetic(10));
+            project.setDate(LocalDate.now());
+            projects.add(project);
+        }
+        repository.insertAllProjects(projects);
+        watch.stop();
+        logger.info("Total time {} ms", watch.getTotalTimeMillis());
+    }
 
+    /**
+     * Update single existing entity - update one field of the entity
+     */
+    public void scenarioFive() {
+    }
 
+    public void scenarioSix() {
+
+    }
+
+    public void scenarioSeven() {
+
+    }
+
+    public void scenarioEight() {
+
+    }
 }
 
 
+

src/main/java/com/clevergang/dbtests/Scenarios.java

@@ -5,6 +5,7 @@
  */
 public class Department {
     private Integer pid;
+    private Integer department_pid;
     private String name;
 
     public Integer getPid() {
@@ -23,6 +24,14 @@ public void setName(String name) {
         this.name = name;
     }
 
+    public Integer getDepartmentPid() {
+        return department_pid;
+    }
+
+    public void setDepartmentPid(Integer department_pid) {
+        this.department_pid = department_pid;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o)
@@ -34,13 +43,16 @@ public boolean equals(Object o) {
 
         if (pid != null ? !pid.equals(that.pid) : that.pid != null)
             return false;
+        if (department_pid != null ? !department_pid.equals(that.department_pid) : that.department_pid != null)
+            return false;
         return name != null ? name.equals(that.name) : that.name == null;
 
     }
 
     @Override
     public int hashCode() {
         int result = pid != null ? pid.hashCode() : 0;
+        result = 31 * result + (department_pid != null ? department_pid.hashCode() : 0);
         result = 31 * result + (name != null ? name.hashCode() : 0);
         return result;
     }
@@ -49,7 +61,9 @@ public int hashCode() {
     public String toString() {
         return "Department{" +
             "pid=" + pid +
+            ", department_pid=" + department_pid +
             ", name='" + name + '\'' +
             '}';
     }
 }
+

src/main/java/com/clevergang/dbtests/model/Department.java

@@ -8,10 +8,10 @@
 public class Employee {
 
     private Integer pid;
-    private Integer company_pid;
+    private Integer department_pid;
     private String name;
     private String surname;
-    private String mail;
+    private String email;
     private BigDecimal salary;
 
     public Integer getPid() {
@@ -22,12 +22,12 @@ public void setPid(Integer pid) {
         this.pid = pid;
     }
 
-    public Integer getCompany_pid() {
-        return company_pid;
+    public Integer getDepartmentPid() {
+        return department_pid;
     }
 
-    public void setCompany_pid(Integer company_pid) {
-        this.company_pid = company_pid;
+    public void setDepartmentPid(Integer department_pid) {
+        this.department_pid = department_pid;
     }
 
     public String getName() {
@@ -46,12 +46,12 @@ public void setSurname(String surname) {
         this.surname = surname;
     }
 
-    public String getMail() {
-        return mail;
+    public String getEmail() {
+        return email;
     }
 
-    public void setMail(String mail) {
-        this.mail = mail;
+    public void setEmail(String email) {
+        this.email = email;
     }
 
     public BigDecimal getSalary() {
@@ -73,13 +73,13 @@ public boolean equals(Object o) {
 
         if (pid != null ? !pid.equals(employee.pid) : employee.pid != null)
             return false;
-        if (company_pid != null ? !company_pid.equals(employee.company_pid) : employee.company_pid != null)
+        if (department_pid != null ? !department_pid.equals(employee.department_pid) : employee.department_pid != null)
             return false;
         if (name != null ? !name.equals(employee.name) : employee.name != null)
             return false;
         if (surname != null ? !surname.equals(employee.surname) : employee.surname != null)
             return false;
-        if (mail != null ? !mail.equals(employee.mail) : employee.mail != null)
+        if (email != null ? !email.equals(employee.email) : employee.email != null)
             return false;
         return salary != null ? salary.equals(employee.salary) : employee.salary == null;
 
@@ -88,10 +88,10 @@ public boolean equals(Object o) {
     @Override
     public int hashCode() {
         int result = pid != null ? pid.hashCode() : 0;
-        result = 31 * result + (company_pid != null ? company_pid.hashCode() : 0);
+        result = 31 * result + (department_pid != null ? department_pid.hashCode() : 0);
         result = 31 * result + (name != null ? name.hashCode() : 0);
         result = 31 * result + (surname != null ? surname.hashCode() : 0);
-        result = 31 * result + (mail != null ? mail.hashCode() : 0);
+        result = 31 * result + (email != null ? email.hashCode() : 0);
         result = 31 * result + (salary != null ? salary.hashCode() : 0);
         return result;
     }
@@ -100,10 +100,10 @@ public int hashCode() {
     public String toString() {
         return "Employee{" +
             "pid=" + pid +
-            ", company_pid=" + company_pid +
+            ", department_pid=" + department_pid +
             ", name='" + name + '\'' +
             ", surname='" + surname + '\'' +
-            ", mail='" + mail + '\'' +
+            ", email='" + email + '\'' +
             ", salary=" + salary +
             '}';
     }