From d1ee9a2d668b2dab6e384262e095a7eeebf6be12 Mon Sep 17 00:00:00 2001 From: stvort Date: Thu, 19 Dec 2019 21:11:52 +0400 Subject: [PATCH] Spring 2019-11 07 lesson classwork edited --- .../ru/otus/spring/dao/PersonDaoJdbc.java | 7 +++ .../java/ru/otus/spring/domain/Person.java | 6 +-- .../src/main/resources/schema.sql | 2 +- .../.gitignore | 0 .../pom.xml | 2 +- .../src/main/java/ru/otus/spring/Main.java | 0 .../java/ru/otus/spring/dao/PersonDao.java | 0 .../ru/otus/spring/dao/PersonDaoJdbc.java | 0 .../java/ru/otus/spring/domain/Person.java | 6 +-- .../src/main/resources/data.sql | 0 .../src/main/resources/schema.sql | 2 + .../.gitignore | 0 .../pom.xml | 2 +- .../src/main/java/ru/otus/spring/Main.java | 0 .../java/ru/otus/spring/dao/PersonDao.java | 0 .../ru/otus/spring/dao/PersonDaoJdbc.java | 0 .../java/ru/otus/spring/domain/Person.java | 6 +-- .../src/main/resources/data.sql | 0 .../src/main/resources/schema.sql | 2 + .../.gitignore | 0 .../pom.xml | 2 +- .../src/main/java/ru/otus/spring/Main.java | 0 .../java/ru/otus/spring/dao/PersonDao.java | 2 +- .../ru/otus/spring/dao/PersonDaoJdbc.java | 4 +- .../java/ru/otus/spring/domain/Person.java | 6 +-- .../src/main/resources/data.sql | 0 .../src/main/resources/schema.sql | 2 + .../.gitignore | 0 .../pom.xml | 2 +- .../src/main/java/ru/otus/spring/Main.java | 0 .../java/ru/otus/spring/dao/PersonDao.java | 4 +- .../ru/otus/spring/dao/PersonDaoJdbc.java | 6 +-- .../java/ru/otus/spring/domain/Person.java | 6 +-- .../src/main/resources/data.sql | 0 .../src/main/resources/schema.sql | 2 + .../src/main/java/ru/otus/spring/Main.java | 20 -------- .../java/ru/otus/spring/dao/PersonDao.java | 4 -- .../ru/otus/spring/dao/PersonDaoJdbc.java | 17 ------- .../src/main/resources/schema.sql | 2 - .../src/main/resources/schema.sql | 2 - .../src/main/resources/schema.sql | 2 - .../src/main/resources/schema.sql | 2 - .../jdbc-demo-solution-step-final/.gitignore | 4 -- .../jdbc-demo-solution-step-final/pom.xml | 46 ------------------- .../java/ru/otus/spring/domain/Person.java | 20 -------- .../src/main/resources/data.sql | 1 - .../src/main/resources/schema.sql | 2 - 2019-11/spring-07/jdbc-class-work/pom.xml | 9 ++-- 48 files changed, 47 insertions(+), 155 deletions(-) rename 2019-11/spring-07/jdbc-class-work/{jdbc-demo-solution-step-1 => jdbc-demo-solution-3}/.gitignore (100%) rename 2019-11/spring-07/jdbc-class-work/{jdbc-demo-solution-step-1 => jdbc-demo-solution-3}/pom.xml (96%) rename 2019-11/spring-07/jdbc-class-work/{jdbc-demo-solution-step-2 => jdbc-demo-solution-3}/src/main/java/ru/otus/spring/Main.java (100%) rename 2019-11/spring-07/jdbc-class-work/{jdbc-demo-solution-step-2 => jdbc-demo-solution-3}/src/main/java/ru/otus/spring/dao/PersonDao.java (100%) rename 2019-11/spring-07/jdbc-class-work/{jdbc-demo-solution-step-2 => jdbc-demo-solution-3}/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java (100%) rename 2019-11/spring-07/jdbc-class-work/{jdbc-demo-solution-step-1 => jdbc-demo-solution-3}/src/main/java/ru/otus/spring/domain/Person.java (70%) rename 2019-11/spring-07/jdbc-class-work/{jdbc-demo-solution-step-1 => jdbc-demo-solution-3}/src/main/resources/data.sql (100%) create mode 100644 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-3/src/main/resources/schema.sql rename 2019-11/spring-07/jdbc-class-work/{jdbc-demo-solution-step-2 => jdbc-demo-solution-4}/.gitignore (100%) rename 2019-11/spring-07/jdbc-class-work/{jdbc-demo-solution-step-2 => jdbc-demo-solution-4}/pom.xml (96%) rename 2019-11/spring-07/jdbc-class-work/{jdbc-demo-solution-step-3 => jdbc-demo-solution-4}/src/main/java/ru/otus/spring/Main.java (100%) rename 2019-11/spring-07/jdbc-class-work/{jdbc-demo-solution-step-3 => jdbc-demo-solution-4}/src/main/java/ru/otus/spring/dao/PersonDao.java (100%) rename 2019-11/spring-07/jdbc-class-work/{jdbc-demo-solution-step-3 => jdbc-demo-solution-4}/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java (100%) rename 2019-11/spring-07/jdbc-class-work/{jdbc-demo-solution-step-3 => jdbc-demo-solution-4}/src/main/java/ru/otus/spring/domain/Person.java (70%) rename 2019-11/spring-07/jdbc-class-work/{jdbc-demo-solution-step-2 => jdbc-demo-solution-4}/src/main/resources/data.sql (100%) create mode 100644 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-4/src/main/resources/schema.sql rename 2019-11/spring-07/jdbc-class-work/{jdbc-demo-solution-step-3 => jdbc-demo-solution-5}/.gitignore (100%) rename 2019-11/spring-07/jdbc-class-work/{jdbc-demo-solution-step-3 => jdbc-demo-solution-5}/pom.xml (96%) rename 2019-11/spring-07/jdbc-class-work/{jdbc-demo-solution-step-4 => jdbc-demo-solution-5}/src/main/java/ru/otus/spring/Main.java (100%) rename 2019-11/spring-07/jdbc-class-work/{jdbc-demo-solution-step-4 => jdbc-demo-solution-5}/src/main/java/ru/otus/spring/dao/PersonDao.java (87%) rename 2019-11/spring-07/jdbc-class-work/{jdbc-demo-solution-step-4 => jdbc-demo-solution-5}/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java (94%) rename 2019-11/spring-07/jdbc-class-work/{jdbc-demo-solution-step-2 => jdbc-demo-solution-5}/src/main/java/ru/otus/spring/domain/Person.java (70%) rename 2019-11/spring-07/jdbc-class-work/{jdbc-demo-solution-step-3 => jdbc-demo-solution-5}/src/main/resources/data.sql (100%) create mode 100644 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-5/src/main/resources/schema.sql rename 2019-11/spring-07/jdbc-class-work/{jdbc-demo-solution-step-4 => jdbc-demo-solution-final}/.gitignore (100%) rename 2019-11/spring-07/jdbc-class-work/{jdbc-demo-solution-step-4 => jdbc-demo-solution-final}/pom.xml (96%) rename 2019-11/spring-07/jdbc-class-work/{jdbc-demo-solution-step-final => jdbc-demo-solution-final}/src/main/java/ru/otus/spring/Main.java (100%) rename 2019-11/spring-07/jdbc-class-work/{jdbc-demo-solution-step-final => jdbc-demo-solution-final}/src/main/java/ru/otus/spring/dao/PersonDao.java (77%) rename 2019-11/spring-07/jdbc-class-work/{jdbc-demo-solution-step-final => jdbc-demo-solution-final}/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java (94%) rename 2019-11/spring-07/jdbc-class-work/{jdbc-demo-solution-step-4 => jdbc-demo-solution-final}/src/main/java/ru/otus/spring/domain/Person.java (70%) rename 2019-11/spring-07/jdbc-class-work/{jdbc-demo-solution-step-4 => jdbc-demo-solution-final}/src/main/resources/data.sql (100%) create mode 100644 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-final/src/main/resources/schema.sql delete mode 100644 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-1/src/main/java/ru/otus/spring/Main.java delete mode 100644 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-1/src/main/java/ru/otus/spring/dao/PersonDao.java delete mode 100644 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-1/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java delete mode 100644 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-1/src/main/resources/schema.sql delete mode 100644 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-2/src/main/resources/schema.sql delete mode 100644 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-3/src/main/resources/schema.sql delete mode 100644 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-4/src/main/resources/schema.sql delete mode 100644 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-final/.gitignore delete mode 100644 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-final/pom.xml delete mode 100644 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-final/src/main/java/ru/otus/spring/domain/Person.java delete mode 100644 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-final/src/main/resources/data.sql delete mode 100644 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-final/src/main/resources/schema.sql diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-exercise/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java b/2019-11/spring-07/jdbc-class-work/jdbc-demo-exercise/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java index b38dd2a5..a6b41b84 100644 --- a/2019-11/spring-07/jdbc-class-work/jdbc-demo-exercise/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java +++ b/2019-11/spring-07/jdbc-class-work/jdbc-demo-exercise/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java @@ -1,8 +1,15 @@ package ru.otus.spring.dao; +import org.springframework.jdbc.core.JdbcOperations; import org.springframework.stereotype.Repository; @SuppressWarnings({"SqlNoDataSourceInspection", "ConstantConditions", "SqlDialectInspection"}) @Repository public class PersonDaoJdbc implements PersonDao { + private final JdbcOperations jdbc; + + public PersonDaoJdbc(JdbcOperations jdbcOperations) + { + this.jdbc = jdbcOperations; + } } diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-exercise/src/main/java/ru/otus/spring/domain/Person.java b/2019-11/spring-07/jdbc-class-work/jdbc-demo-exercise/src/main/java/ru/otus/spring/domain/Person.java index e34ae29c..4faa446b 100644 --- a/2019-11/spring-07/jdbc-class-work/jdbc-demo-exercise/src/main/java/ru/otus/spring/domain/Person.java +++ b/2019-11/spring-07/jdbc-class-work/jdbc-demo-exercise/src/main/java/ru/otus/spring/domain/Person.java @@ -2,15 +2,15 @@ package ru.otus.spring.domain; public class Person { - private final int id; + private final long id; private final String name; - public Person(int id, String name) { + public Person(long id, String name) { this.id = id; this.name = name; } - public int getId() { + public long getId() { return id; } diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-exercise/src/main/resources/schema.sql b/2019-11/spring-07/jdbc-class-work/jdbc-demo-exercise/src/main/resources/schema.sql index b38e5bc8..87aadc44 100644 --- a/2019-11/spring-07/jdbc-class-work/jdbc-demo-exercise/src/main/resources/schema.sql +++ b/2019-11/spring-07/jdbc-class-work/jdbc-demo-exercise/src/main/resources/schema.sql @@ -1,2 +1,2 @@ DROP TABLE IF EXISTS PERSONS; -CREATE TABLE PERSONS(ID INT PRIMARY KEY, NAME VARCHAR(255)); +CREATE TABLE PERSONS(ID BIGINT PRIMARY KEY, NAME VARCHAR(255)); diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-1/.gitignore b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-3/.gitignore similarity index 100% rename from 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-1/.gitignore rename to 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-3/.gitignore diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-1/pom.xml b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-3/pom.xml similarity index 96% rename from 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-1/pom.xml rename to 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-3/pom.xml index dad2e34c..ebe0a6bd 100644 --- a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-1/pom.xml +++ b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-3/pom.xml @@ -5,7 +5,7 @@ 4.0.0 ru.otus - jdbc-demo-solution-step-1 + jdbc-demo-solution-3 1.0-SNAPSHOT diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-2/src/main/java/ru/otus/spring/Main.java b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-3/src/main/java/ru/otus/spring/Main.java similarity index 100% rename from 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-2/src/main/java/ru/otus/spring/Main.java rename to 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-3/src/main/java/ru/otus/spring/Main.java diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-2/src/main/java/ru/otus/spring/dao/PersonDao.java b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-3/src/main/java/ru/otus/spring/dao/PersonDao.java similarity index 100% rename from 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-2/src/main/java/ru/otus/spring/dao/PersonDao.java rename to 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-3/src/main/java/ru/otus/spring/dao/PersonDao.java diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-2/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-3/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java similarity index 100% rename from 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-2/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java rename to 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-3/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-1/src/main/java/ru/otus/spring/domain/Person.java b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-3/src/main/java/ru/otus/spring/domain/Person.java similarity index 70% rename from 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-1/src/main/java/ru/otus/spring/domain/Person.java rename to 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-3/src/main/java/ru/otus/spring/domain/Person.java index e34ae29c..4faa446b 100644 --- a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-1/src/main/java/ru/otus/spring/domain/Person.java +++ b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-3/src/main/java/ru/otus/spring/domain/Person.java @@ -2,15 +2,15 @@ package ru.otus.spring.domain; public class Person { - private final int id; + private final long id; private final String name; - public Person(int id, String name) { + public Person(long id, String name) { this.id = id; this.name = name; } - public int getId() { + public long getId() { return id; } diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-1/src/main/resources/data.sql b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-3/src/main/resources/data.sql similarity index 100% rename from 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-1/src/main/resources/data.sql rename to 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-3/src/main/resources/data.sql diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-3/src/main/resources/schema.sql b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-3/src/main/resources/schema.sql new file mode 100644 index 00000000..87aadc44 --- /dev/null +++ b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-3/src/main/resources/schema.sql @@ -0,0 +1,2 @@ +DROP TABLE IF EXISTS PERSONS; +CREATE TABLE PERSONS(ID BIGINT PRIMARY KEY, NAME VARCHAR(255)); diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-2/.gitignore b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-4/.gitignore similarity index 100% rename from 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-2/.gitignore rename to 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-4/.gitignore diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-2/pom.xml b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-4/pom.xml similarity index 96% rename from 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-2/pom.xml rename to 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-4/pom.xml index d5004851..eef3dc15 100644 --- a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-2/pom.xml +++ b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-4/pom.xml @@ -5,7 +5,7 @@ 4.0.0 ru.otus - jdbc-demo-solution-step-2 + jdbc-demo-solution-4 1.0-SNAPSHOT diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-3/src/main/java/ru/otus/spring/Main.java b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-4/src/main/java/ru/otus/spring/Main.java similarity index 100% rename from 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-3/src/main/java/ru/otus/spring/Main.java rename to 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-4/src/main/java/ru/otus/spring/Main.java diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-3/src/main/java/ru/otus/spring/dao/PersonDao.java b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-4/src/main/java/ru/otus/spring/dao/PersonDao.java similarity index 100% rename from 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-3/src/main/java/ru/otus/spring/dao/PersonDao.java rename to 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-4/src/main/java/ru/otus/spring/dao/PersonDao.java diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-3/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-4/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java similarity index 100% rename from 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-3/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java rename to 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-4/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-3/src/main/java/ru/otus/spring/domain/Person.java b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-4/src/main/java/ru/otus/spring/domain/Person.java similarity index 70% rename from 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-3/src/main/java/ru/otus/spring/domain/Person.java rename to 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-4/src/main/java/ru/otus/spring/domain/Person.java index e34ae29c..4faa446b 100644 --- a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-3/src/main/java/ru/otus/spring/domain/Person.java +++ b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-4/src/main/java/ru/otus/spring/domain/Person.java @@ -2,15 +2,15 @@ package ru.otus.spring.domain; public class Person { - private final int id; + private final long id; private final String name; - public Person(int id, String name) { + public Person(long id, String name) { this.id = id; this.name = name; } - public int getId() { + public long getId() { return id; } diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-2/src/main/resources/data.sql b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-4/src/main/resources/data.sql similarity index 100% rename from 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-2/src/main/resources/data.sql rename to 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-4/src/main/resources/data.sql diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-4/src/main/resources/schema.sql b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-4/src/main/resources/schema.sql new file mode 100644 index 00000000..87aadc44 --- /dev/null +++ b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-4/src/main/resources/schema.sql @@ -0,0 +1,2 @@ +DROP TABLE IF EXISTS PERSONS; +CREATE TABLE PERSONS(ID BIGINT PRIMARY KEY, NAME VARCHAR(255)); diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-3/.gitignore b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-5/.gitignore similarity index 100% rename from 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-3/.gitignore rename to 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-5/.gitignore diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-3/pom.xml b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-5/pom.xml similarity index 96% rename from 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-3/pom.xml rename to 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-5/pom.xml index 83d1a443..1f838595 100644 --- a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-3/pom.xml +++ b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-5/pom.xml @@ -5,7 +5,7 @@ 4.0.0 ru.otus - jdbc-demo-solution-step-3 + jdbc-demo-solution-5 1.0-SNAPSHOT diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-4/src/main/java/ru/otus/spring/Main.java b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-5/src/main/java/ru/otus/spring/Main.java similarity index 100% rename from 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-4/src/main/java/ru/otus/spring/Main.java rename to 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-5/src/main/java/ru/otus/spring/Main.java diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-4/src/main/java/ru/otus/spring/dao/PersonDao.java b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-5/src/main/java/ru/otus/spring/dao/PersonDao.java similarity index 87% rename from 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-4/src/main/java/ru/otus/spring/dao/PersonDao.java rename to 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-5/src/main/java/ru/otus/spring/dao/PersonDao.java index a2b1379a..e2995f92 100644 --- a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-4/src/main/java/ru/otus/spring/dao/PersonDao.java +++ b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-5/src/main/java/ru/otus/spring/dao/PersonDao.java @@ -10,7 +10,7 @@ public interface PersonDao { void insert(Person person); - Person getById(int id); + Person getById(long id); List getAll(); } diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-4/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-5/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java similarity index 94% rename from 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-4/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java rename to 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-5/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java index a89d7c0b..9685df76 100644 --- a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-4/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java +++ b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-5/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java @@ -34,7 +34,7 @@ public class PersonDaoJdbc implements PersonDao { } @Override - public Person getById(int id) { + public Person getById(long id) { return jdbc.queryForObject("select * from persons where id = ?", new Object[] {id}, new PersonMapper()); } @@ -48,7 +48,7 @@ public class PersonDaoJdbc implements PersonDao { @Override public Person mapRow(ResultSet resultSet, int i) throws SQLException { - int id = resultSet.getInt("id"); + long id = resultSet.getLong("id"); String name = resultSet.getString("name"); return new Person(id, name); } diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-2/src/main/java/ru/otus/spring/domain/Person.java b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-5/src/main/java/ru/otus/spring/domain/Person.java similarity index 70% rename from 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-2/src/main/java/ru/otus/spring/domain/Person.java rename to 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-5/src/main/java/ru/otus/spring/domain/Person.java index e34ae29c..4faa446b 100644 --- a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-2/src/main/java/ru/otus/spring/domain/Person.java +++ b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-5/src/main/java/ru/otus/spring/domain/Person.java @@ -2,15 +2,15 @@ package ru.otus.spring.domain; public class Person { - private final int id; + private final long id; private final String name; - public Person(int id, String name) { + public Person(long id, String name) { this.id = id; this.name = name; } - public int getId() { + public long getId() { return id; } diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-3/src/main/resources/data.sql b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-5/src/main/resources/data.sql similarity index 100% rename from 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-3/src/main/resources/data.sql rename to 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-5/src/main/resources/data.sql diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-5/src/main/resources/schema.sql b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-5/src/main/resources/schema.sql new file mode 100644 index 00000000..87aadc44 --- /dev/null +++ b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-5/src/main/resources/schema.sql @@ -0,0 +1,2 @@ +DROP TABLE IF EXISTS PERSONS; +CREATE TABLE PERSONS(ID BIGINT PRIMARY KEY, NAME VARCHAR(255)); diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-4/.gitignore b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-final/.gitignore similarity index 100% rename from 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-4/.gitignore rename to 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-final/.gitignore diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-4/pom.xml b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-final/pom.xml similarity index 96% rename from 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-4/pom.xml rename to 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-final/pom.xml index 624d36b1..57a48f5c 100644 --- a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-4/pom.xml +++ b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-final/pom.xml @@ -5,7 +5,7 @@ 4.0.0 ru.otus - jdbc-demo-solution-step-4 + jdbc-demo-solution-final 1.0-SNAPSHOT diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-final/src/main/java/ru/otus/spring/Main.java b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-final/src/main/java/ru/otus/spring/Main.java similarity index 100% rename from 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-final/src/main/java/ru/otus/spring/Main.java rename to 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-final/src/main/java/ru/otus/spring/Main.java diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-final/src/main/java/ru/otus/spring/dao/PersonDao.java b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-final/src/main/java/ru/otus/spring/dao/PersonDao.java similarity index 77% rename from 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-final/src/main/java/ru/otus/spring/dao/PersonDao.java rename to 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-final/src/main/java/ru/otus/spring/dao/PersonDao.java index 9843d440..f2c30f7c 100644 --- a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-final/src/main/java/ru/otus/spring/dao/PersonDao.java +++ b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-final/src/main/java/ru/otus/spring/dao/PersonDao.java @@ -10,9 +10,9 @@ public interface PersonDao { void insert(Person person); - Person getById(int id); + Person getById(long id); List getAll(); - void deleteById(int id); + void deleteById(long id); } diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-final/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-final/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java similarity index 94% rename from 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-final/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java rename to 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-final/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java index 348e4df5..f76b3d3f 100644 --- a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-final/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java +++ b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-final/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java @@ -38,7 +38,7 @@ public class PersonDaoJdbc implements PersonDao { } @Override - public Person getById(int id) { + public Person getById(long id) { Map params = Collections.singletonMap("id", id); return namedParameterJdbcOperations.queryForObject( "select * from persons where id = :id", params, new PersonMapper() @@ -51,7 +51,7 @@ public class PersonDaoJdbc implements PersonDao { } @Override - public void deleteById(int id) { + public void deleteById(long id) { Map params = Collections.singletonMap("id", id); namedParameterJdbcOperations.update( "delete from persons where id = :id", params @@ -62,7 +62,7 @@ public class PersonDaoJdbc implements PersonDao { @Override public Person mapRow(ResultSet resultSet, int i) throws SQLException { - int id = resultSet.getInt("id"); + long id = resultSet.getLong("id"); String name = resultSet.getString("name"); return new Person(id, name); } diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-4/src/main/java/ru/otus/spring/domain/Person.java b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-final/src/main/java/ru/otus/spring/domain/Person.java similarity index 70% rename from 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-4/src/main/java/ru/otus/spring/domain/Person.java rename to 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-final/src/main/java/ru/otus/spring/domain/Person.java index e34ae29c..4faa446b 100644 --- a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-4/src/main/java/ru/otus/spring/domain/Person.java +++ b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-final/src/main/java/ru/otus/spring/domain/Person.java @@ -2,15 +2,15 @@ package ru.otus.spring.domain; public class Person { - private final int id; + private final long id; private final String name; - public Person(int id, String name) { + public Person(long id, String name) { this.id = id; this.name = name; } - public int getId() { + public long getId() { return id; } diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-4/src/main/resources/data.sql b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-final/src/main/resources/data.sql similarity index 100% rename from 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-4/src/main/resources/data.sql rename to 2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-final/src/main/resources/data.sql diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-final/src/main/resources/schema.sql b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-final/src/main/resources/schema.sql new file mode 100644 index 00000000..87aadc44 --- /dev/null +++ b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-final/src/main/resources/schema.sql @@ -0,0 +1,2 @@ +DROP TABLE IF EXISTS PERSONS; +CREATE TABLE PERSONS(ID BIGINT PRIMARY KEY, NAME VARCHAR(255)); diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-1/src/main/java/ru/otus/spring/Main.java b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-1/src/main/java/ru/otus/spring/Main.java deleted file mode 100644 index 8916eb04..00000000 --- a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-1/src/main/java/ru/otus/spring/Main.java +++ /dev/null @@ -1,20 +0,0 @@ -package ru.otus.spring; - -import org.h2.tools.Console; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.ApplicationContext; -import ru.otus.spring.dao.PersonDao; - -@SpringBootApplication -public class Main { - - public static void main(String[] args) throws Exception { - - ApplicationContext context = SpringApplication.run(Main.class); - - PersonDao dao = context.getBean(PersonDao.class); - - Console.main(args); - } -} diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-1/src/main/java/ru/otus/spring/dao/PersonDao.java b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-1/src/main/java/ru/otus/spring/dao/PersonDao.java deleted file mode 100644 index 4ee1a3b3..00000000 --- a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-1/src/main/java/ru/otus/spring/dao/PersonDao.java +++ /dev/null @@ -1,4 +0,0 @@ -package ru.otus.spring.dao; - -public interface PersonDao { -} diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-1/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-1/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java deleted file mode 100644 index dc1933f1..00000000 --- a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-1/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java +++ /dev/null @@ -1,17 +0,0 @@ -package ru.otus.spring.dao; - -import org.springframework.jdbc.core.JdbcOperations; -import org.springframework.stereotype.Repository; - -@SuppressWarnings({"SqlNoDataSourceInspection", "ConstantConditions", "SqlDialectInspection"}) -@Repository -public class PersonDaoJdbc implements PersonDao { - - private final JdbcOperations jdbc; - - public PersonDaoJdbc(JdbcOperations jdbcOperations) - { - this.jdbc = jdbcOperations; - } - -} diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-1/src/main/resources/schema.sql b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-1/src/main/resources/schema.sql deleted file mode 100644 index b38e5bc8..00000000 --- a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-1/src/main/resources/schema.sql +++ /dev/null @@ -1,2 +0,0 @@ -DROP TABLE IF EXISTS PERSONS; -CREATE TABLE PERSONS(ID INT PRIMARY KEY, NAME VARCHAR(255)); diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-2/src/main/resources/schema.sql b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-2/src/main/resources/schema.sql deleted file mode 100644 index b38e5bc8..00000000 --- a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-2/src/main/resources/schema.sql +++ /dev/null @@ -1,2 +0,0 @@ -DROP TABLE IF EXISTS PERSONS; -CREATE TABLE PERSONS(ID INT PRIMARY KEY, NAME VARCHAR(255)); diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-3/src/main/resources/schema.sql b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-3/src/main/resources/schema.sql deleted file mode 100644 index b38e5bc8..00000000 --- a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-3/src/main/resources/schema.sql +++ /dev/null @@ -1,2 +0,0 @@ -DROP TABLE IF EXISTS PERSONS; -CREATE TABLE PERSONS(ID INT PRIMARY KEY, NAME VARCHAR(255)); diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-4/src/main/resources/schema.sql b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-4/src/main/resources/schema.sql deleted file mode 100644 index b38e5bc8..00000000 --- a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-4/src/main/resources/schema.sql +++ /dev/null @@ -1,2 +0,0 @@ -DROP TABLE IF EXISTS PERSONS; -CREATE TABLE PERSONS(ID INT PRIMARY KEY, NAME VARCHAR(255)); diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-final/.gitignore b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-final/.gitignore deleted file mode 100644 index e62c33c2..00000000 --- a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-final/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -.idea/ -*.iml - -target/ diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-final/pom.xml b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-final/pom.xml deleted file mode 100644 index 6987d731..00000000 --- a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-final/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - 4.0.0 - - ru.otus - jdbc-demo-solution-step-final - 1.0-SNAPSHOT - - - org.springframework.boot - spring-boot-starter-parent - 2.2.1.RELEASE - - - - 11 - 11 - - - - - org.springframework.boot - spring-boot-starter - - - org.springframework.boot - spring-boot-starter-jdbc - - - com.h2database - h2 - 1.4.200 - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-final/src/main/java/ru/otus/spring/domain/Person.java b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-final/src/main/java/ru/otus/spring/domain/Person.java deleted file mode 100644 index e34ae29c..00000000 --- a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-final/src/main/java/ru/otus/spring/domain/Person.java +++ /dev/null @@ -1,20 +0,0 @@ -package ru.otus.spring.domain; - -public class Person { - - private final int id; - private final String name; - - public Person(int id, String name) { - this.id = id; - this.name = name; - } - - public int getId() { - return id; - } - - public String getName() { - return name; - } -} diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-final/src/main/resources/data.sql b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-final/src/main/resources/data.sql deleted file mode 100644 index 240a5b4e..00000000 --- a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-final/src/main/resources/data.sql +++ /dev/null @@ -1 +0,0 @@ -insert into persons (id, `name`) values (1, 'masha'); diff --git a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-final/src/main/resources/schema.sql b/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-final/src/main/resources/schema.sql deleted file mode 100644 index b38e5bc8..00000000 --- a/2019-11/spring-07/jdbc-class-work/jdbc-demo-solution-step-final/src/main/resources/schema.sql +++ /dev/null @@ -1,2 +0,0 @@ -DROP TABLE IF EXISTS PERSONS; -CREATE TABLE PERSONS(ID INT PRIMARY KEY, NAME VARCHAR(255)); diff --git a/2019-11/spring-07/jdbc-class-work/pom.xml b/2019-11/spring-07/jdbc-class-work/pom.xml index 4756a248..1c941227 100644 --- a/2019-11/spring-07/jdbc-class-work/pom.xml +++ b/2019-11/spring-07/jdbc-class-work/pom.xml @@ -12,10 +12,9 @@ jdbc-demo-exercise - jdbc-demo-solution-step-1 - jdbc-demo-solution-step-2 - jdbc-demo-solution-step-3 - jdbc-demo-solution-step-4 - jdbc-demo-solution-step-final + jdbc-demo-solution-3 + jdbc-demo-solution-4 + jdbc-demo-solution-5 + jdbc-demo-solution-final