From 60ee7e3f755ee153ccbec221dbcbab8672ecfb31 Mon Sep 17 00:00:00 2001 From: stvort Date: Wed, 15 Dec 2021 09:00:47 +0400 Subject: [PATCH] 2021-11 spring-07-jdbc updated --- .../src/main/resources/application.yml | 9 --------- .../src/main/resources/application.yml | 9 --------- .../src/main/resources/application.yml | 9 --------- .../src/main/resources/application.yml | 9 --------- .../src/main/resources/application.yml | 9 --------- .../jdbc-demo-exercise/.gitignore | 0 .../jdbc-demo-exercise/pom.xml | 0 .../src/main/java/ru/otus/spring/Main.java | 0 .../main/java/ru/otus/spring/dao/PersonDao.java | 0 .../java/ru/otus/spring/dao/PersonDaoJdbc.java | 1 - .../main/java/ru/otus/spring/domain/Person.java | 0 .../src/main/resources/application.yml | 16 ++++++++++++++++ .../src/main/resources/data.sql | 0 .../src/main/resources/schema.sql | 0 .../jdbc-demo-solution-3/.gitignore | 0 .../jdbc-demo-solution-3/pom.xml | 0 .../src/main/java/ru/otus/spring/Main.java | 0 .../main/java/ru/otus/spring/dao/PersonDao.java | 0 .../java/ru/otus/spring/dao/PersonDaoJdbc.java | 5 ++--- .../main/java/ru/otus/spring/domain/Person.java | 0 .../src/main/resources/application.yml | 16 ++++++++++++++++ .../src/main/resources/data.sql | 0 .../src/main/resources/schema.sql | 0 .../jdbc-demo-solution-4/.gitignore | 0 .../jdbc-demo-solution-4/pom.xml | 0 .../src/main/java/ru/otus/spring/Main.java | 0 .../main/java/ru/otus/spring/dao/PersonDao.java | 0 .../java/ru/otus/spring/dao/PersonDaoJdbc.java | 10 +++------- .../main/java/ru/otus/spring/domain/Person.java | 0 .../src/main/resources/application.yml | 16 ++++++++++++++++ .../src/main/resources/data.sql | 0 .../src/main/resources/schema.sql | 0 .../jdbc-demo-solution-5/.gitignore | 0 .../jdbc-demo-solution-5/pom.xml | 0 .../src/main/java/ru/otus/spring/Main.java | 0 .../main/java/ru/otus/spring/dao/PersonDao.java | 0 .../java/ru/otus/spring/dao/PersonDaoJdbc.java | 13 +++++-------- .../main/java/ru/otus/spring/domain/Person.java | 0 .../src/main/resources/application.yml | 16 ++++++++++++++++ .../src/main/resources/data.sql | 0 .../src/main/resources/schema.sql | 0 .../jdbc-demo-solution-final/.gitignore | 0 .../jdbc-demo-solution-final/pom.xml | 0 .../src/main/java/ru/otus/spring/Main.java | 0 .../main/java/ru/otus/spring/dao/PersonDao.java | 0 .../java/ru/otus/spring/dao/PersonDaoJdbc.java | 10 +++++----- .../main/java/ru/otus/spring/domain/Person.java | 0 .../src/main/resources/application.yml | 17 +++++++++++++++++ .../src/main/resources/data.sql | 0 .../src/main/resources/schema.sql | 0 .../ru/otus/spring/dao/PersonDaoJdbcTest.java | 0 .../src/test/resources/application.yml | 0 .../src/test/resources/data.sql | 0 .../{jdbc-class-work => }/pom.xml | 0 54 files changed, 96 insertions(+), 69 deletions(-) delete mode 100644 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-exercise/src/main/resources/application.yml delete mode 100644 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-3/src/main/resources/application.yml delete mode 100644 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-4/src/main/resources/application.yml delete mode 100644 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-5/src/main/resources/application.yml delete mode 100644 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-final/src/main/resources/application.yml rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-exercise/.gitignore (100%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-exercise/pom.xml (100%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-exercise/src/main/java/ru/otus/spring/Main.java (100%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-exercise/src/main/java/ru/otus/spring/dao/PersonDao.java (100%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-exercise/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java (78%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-exercise/src/main/java/ru/otus/spring/domain/Person.java (100%) create mode 100644 2021-11/spring-07-jdbc/jdbc-demo-exercise/src/main/resources/application.yml rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-exercise/src/main/resources/data.sql (100%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-exercise/src/main/resources/schema.sql (100%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-3/.gitignore (100%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-3/pom.xml (100%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-3/src/main/java/ru/otus/spring/Main.java (100%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-3/src/main/java/ru/otus/spring/dao/PersonDao.java (100%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-3/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java (64%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-3/src/main/java/ru/otus/spring/domain/Person.java (100%) create mode 100644 2021-11/spring-07-jdbc/jdbc-demo-solution-3/src/main/resources/application.yml rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-3/src/main/resources/data.sql (100%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-3/src/main/resources/schema.sql (100%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-4/.gitignore (100%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-4/pom.xml (100%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-4/src/main/java/ru/otus/spring/Main.java (100%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-4/src/main/java/ru/otus/spring/dao/PersonDao.java (100%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-4/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java (54%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-4/src/main/java/ru/otus/spring/domain/Person.java (100%) create mode 100644 2021-11/spring-07-jdbc/jdbc-demo-solution-4/src/main/resources/application.yml rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-4/src/main/resources/data.sql (100%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-4/src/main/resources/schema.sql (100%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-5/.gitignore (100%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-5/pom.xml (100%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-5/src/main/java/ru/otus/spring/Main.java (100%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-5/src/main/java/ru/otus/spring/dao/PersonDao.java (100%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-5/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java (63%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-5/src/main/java/ru/otus/spring/domain/Person.java (100%) create mode 100644 2021-11/spring-07-jdbc/jdbc-demo-solution-5/src/main/resources/application.yml rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-5/src/main/resources/data.sql (100%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-5/src/main/resources/schema.sql (100%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-final/.gitignore (100%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-final/pom.xml (100%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-final/src/main/java/ru/otus/spring/Main.java (100%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-final/src/main/java/ru/otus/spring/dao/PersonDao.java (100%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-final/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java (85%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-final/src/main/java/ru/otus/spring/domain/Person.java (100%) create mode 100644 2021-11/spring-07-jdbc/jdbc-demo-solution-final/src/main/resources/application.yml rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-final/src/main/resources/data.sql (100%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-final/src/main/resources/schema.sql (100%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-final/src/test/java/ru/otus/spring/dao/PersonDaoJdbcTest.java (100%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-final/src/test/resources/application.yml (100%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/jdbc-demo-solution-final/src/test/resources/data.sql (100%) rename 2021-11/spring-07-jdbc/{jdbc-class-work => }/pom.xml (100%) diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-exercise/src/main/resources/application.yml b/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-exercise/src/main/resources/application.yml deleted file mode 100644 index 24f942fb..00000000 --- a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-exercise/src/main/resources/application.yml +++ /dev/null @@ -1,9 +0,0 @@ -spring: - datasource: - url: jdbc:h2:mem:testdb - - h2: - console: - path: /h2-console - settings: - web-allow-others: true \ No newline at end of file diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-3/src/main/resources/application.yml b/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-3/src/main/resources/application.yml deleted file mode 100644 index 24f942fb..00000000 --- a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-3/src/main/resources/application.yml +++ /dev/null @@ -1,9 +0,0 @@ -spring: - datasource: - url: jdbc:h2:mem:testdb - - h2: - console: - path: /h2-console - settings: - web-allow-others: true \ No newline at end of file diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-4/src/main/resources/application.yml b/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-4/src/main/resources/application.yml deleted file mode 100644 index 24f942fb..00000000 --- a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-4/src/main/resources/application.yml +++ /dev/null @@ -1,9 +0,0 @@ -spring: - datasource: - url: jdbc:h2:mem:testdb - - h2: - console: - path: /h2-console - settings: - web-allow-others: true \ No newline at end of file diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-5/src/main/resources/application.yml b/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-5/src/main/resources/application.yml deleted file mode 100644 index 24f942fb..00000000 --- a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-5/src/main/resources/application.yml +++ /dev/null @@ -1,9 +0,0 @@ -spring: - datasource: - url: jdbc:h2:mem:testdb - - h2: - console: - path: /h2-console - settings: - web-allow-others: true \ No newline at end of file diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-final/src/main/resources/application.yml b/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-final/src/main/resources/application.yml deleted file mode 100644 index 24f942fb..00000000 --- a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-final/src/main/resources/application.yml +++ /dev/null @@ -1,9 +0,0 @@ -spring: - datasource: - url: jdbc:h2:mem:testdb - - h2: - console: - path: /h2-console - settings: - web-allow-others: true \ No newline at end of file diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-exercise/.gitignore b/2021-11/spring-07-jdbc/jdbc-demo-exercise/.gitignore similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-exercise/.gitignore rename to 2021-11/spring-07-jdbc/jdbc-demo-exercise/.gitignore diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-exercise/pom.xml b/2021-11/spring-07-jdbc/jdbc-demo-exercise/pom.xml similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-exercise/pom.xml rename to 2021-11/spring-07-jdbc/jdbc-demo-exercise/pom.xml diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-exercise/src/main/java/ru/otus/spring/Main.java b/2021-11/spring-07-jdbc/jdbc-demo-exercise/src/main/java/ru/otus/spring/Main.java similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-exercise/src/main/java/ru/otus/spring/Main.java rename to 2021-11/spring-07-jdbc/jdbc-demo-exercise/src/main/java/ru/otus/spring/Main.java diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-exercise/src/main/java/ru/otus/spring/dao/PersonDao.java b/2021-11/spring-07-jdbc/jdbc-demo-exercise/src/main/java/ru/otus/spring/dao/PersonDao.java similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-exercise/src/main/java/ru/otus/spring/dao/PersonDao.java rename to 2021-11/spring-07-jdbc/jdbc-demo-exercise/src/main/java/ru/otus/spring/dao/PersonDao.java diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-exercise/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java b/2021-11/spring-07-jdbc/jdbc-demo-exercise/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java similarity index 78% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-exercise/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java rename to 2021-11/spring-07-jdbc/jdbc-demo-exercise/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java index a6b41b84..05de001c 100644 --- a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-exercise/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java +++ b/2021-11/spring-07-jdbc/jdbc-demo-exercise/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java @@ -3,7 +3,6 @@ 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; diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-exercise/src/main/java/ru/otus/spring/domain/Person.java b/2021-11/spring-07-jdbc/jdbc-demo-exercise/src/main/java/ru/otus/spring/domain/Person.java similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-exercise/src/main/java/ru/otus/spring/domain/Person.java rename to 2021-11/spring-07-jdbc/jdbc-demo-exercise/src/main/java/ru/otus/spring/domain/Person.java diff --git a/2021-11/spring-07-jdbc/jdbc-demo-exercise/src/main/resources/application.yml b/2021-11/spring-07-jdbc/jdbc-demo-exercise/src/main/resources/application.yml new file mode 100644 index 00000000..8f40ea4e --- /dev/null +++ b/2021-11/spring-07-jdbc/jdbc-demo-exercise/src/main/resources/application.yml @@ -0,0 +1,16 @@ +spring: + datasource: + url: jdbc:h2:mem:testdb + #initialization-mode: always + #schema: schema.sql + #data: data.sql + sql: + init: + mode: always + data-locations: data.sql + schema-locations: schema.sql + h2: + console: + path: /h2-console + settings: + web-allow-others: true \ No newline at end of file diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-exercise/src/main/resources/data.sql b/2021-11/spring-07-jdbc/jdbc-demo-exercise/src/main/resources/data.sql similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-exercise/src/main/resources/data.sql rename to 2021-11/spring-07-jdbc/jdbc-demo-exercise/src/main/resources/data.sql diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-exercise/src/main/resources/schema.sql b/2021-11/spring-07-jdbc/jdbc-demo-exercise/src/main/resources/schema.sql similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-exercise/src/main/resources/schema.sql rename to 2021-11/spring-07-jdbc/jdbc-demo-exercise/src/main/resources/schema.sql diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-3/.gitignore b/2021-11/spring-07-jdbc/jdbc-demo-solution-3/.gitignore similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-3/.gitignore rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-3/.gitignore diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-3/pom.xml b/2021-11/spring-07-jdbc/jdbc-demo-solution-3/pom.xml similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-3/pom.xml rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-3/pom.xml diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-3/src/main/java/ru/otus/spring/Main.java b/2021-11/spring-07-jdbc/jdbc-demo-solution-3/src/main/java/ru/otus/spring/Main.java similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-3/src/main/java/ru/otus/spring/Main.java rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-3/src/main/java/ru/otus/spring/Main.java diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-3/src/main/java/ru/otus/spring/dao/PersonDao.java b/2021-11/spring-07-jdbc/jdbc-demo-solution-3/src/main/java/ru/otus/spring/dao/PersonDao.java similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-3/src/main/java/ru/otus/spring/dao/PersonDao.java rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-3/src/main/java/ru/otus/spring/dao/PersonDao.java diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-3/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java b/2021-11/spring-07-jdbc/jdbc-demo-solution-3/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java similarity index 64% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-3/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-3/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java index f069a7a2..b6abbe44 100644 --- a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-3/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java +++ b/2021-11/spring-07-jdbc/jdbc-demo-solution-3/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java @@ -2,9 +2,7 @@ package ru.otus.spring.dao; import org.springframework.jdbc.core.JdbcOperations; import org.springframework.stereotype.Repository; -import ru.otus.spring.domain.Person; -@SuppressWarnings({"SqlNoDataSourceInspection", "ConstantConditions", "SqlDialectInspection"}) @Repository public class PersonDaoJdbc implements PersonDao { @@ -17,7 +15,8 @@ public class PersonDaoJdbc implements PersonDao { @Override public int count() { - return jdbc.queryForObject("select count(*) from persons", Integer.class); + Integer count = jdbc.queryForObject("select count(*) from persons", Integer.class); + return count == null? 0: count; } } diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-3/src/main/java/ru/otus/spring/domain/Person.java b/2021-11/spring-07-jdbc/jdbc-demo-solution-3/src/main/java/ru/otus/spring/domain/Person.java similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-3/src/main/java/ru/otus/spring/domain/Person.java rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-3/src/main/java/ru/otus/spring/domain/Person.java diff --git a/2021-11/spring-07-jdbc/jdbc-demo-solution-3/src/main/resources/application.yml b/2021-11/spring-07-jdbc/jdbc-demo-solution-3/src/main/resources/application.yml new file mode 100644 index 00000000..8f40ea4e --- /dev/null +++ b/2021-11/spring-07-jdbc/jdbc-demo-solution-3/src/main/resources/application.yml @@ -0,0 +1,16 @@ +spring: + datasource: + url: jdbc:h2:mem:testdb + #initialization-mode: always + #schema: schema.sql + #data: data.sql + sql: + init: + mode: always + data-locations: data.sql + schema-locations: schema.sql + h2: + console: + path: /h2-console + settings: + web-allow-others: true \ No newline at end of file diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-3/src/main/resources/data.sql b/2021-11/spring-07-jdbc/jdbc-demo-solution-3/src/main/resources/data.sql similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-3/src/main/resources/data.sql rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-3/src/main/resources/data.sql diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-3/src/main/resources/schema.sql b/2021-11/spring-07-jdbc/jdbc-demo-solution-3/src/main/resources/schema.sql similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-3/src/main/resources/schema.sql rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-3/src/main/resources/schema.sql diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-4/.gitignore b/2021-11/spring-07-jdbc/jdbc-demo-solution-4/.gitignore similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-4/.gitignore rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-4/.gitignore diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-4/pom.xml b/2021-11/spring-07-jdbc/jdbc-demo-solution-4/pom.xml similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-4/pom.xml rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-4/pom.xml diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-4/src/main/java/ru/otus/spring/Main.java b/2021-11/spring-07-jdbc/jdbc-demo-solution-4/src/main/java/ru/otus/spring/Main.java similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-4/src/main/java/ru/otus/spring/Main.java rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-4/src/main/java/ru/otus/spring/Main.java diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-4/src/main/java/ru/otus/spring/dao/PersonDao.java b/2021-11/spring-07-jdbc/jdbc-demo-solution-4/src/main/java/ru/otus/spring/dao/PersonDao.java similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-4/src/main/java/ru/otus/spring/dao/PersonDao.java rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-4/src/main/java/ru/otus/spring/dao/PersonDao.java diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-4/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java b/2021-11/spring-07-jdbc/jdbc-demo-solution-4/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java similarity index 54% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-4/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-4/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java index 35b648f2..c49b5674 100644 --- a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-4/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java +++ b/2021-11/spring-07-jdbc/jdbc-demo-solution-4/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java @@ -1,15 +1,10 @@ package ru.otus.spring.dao; import org.springframework.jdbc.core.JdbcOperations; -import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Repository; import ru.otus.spring.domain.Person; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.List; -@SuppressWarnings({"SqlNoDataSourceInspection", "ConstantConditions", "SqlDialectInspection"}) @Repository public class PersonDaoJdbc implements PersonDao { @@ -22,12 +17,13 @@ public class PersonDaoJdbc implements PersonDao { @Override public int count() { - return jdbc.queryForObject("select count(*) from persons", Integer.class); + Integer count = jdbc.queryForObject("select count(*) from persons", Integer.class); + return count == null? 0: count; } @Override public void insert(Person person) { - jdbc.update("insert into persons (id, `name`) values (?, ?)", person.getId(), person.getName()); + jdbc.update("insert into persons (id, name) values (?, ?)", person.getId(), person.getName()); } } diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-4/src/main/java/ru/otus/spring/domain/Person.java b/2021-11/spring-07-jdbc/jdbc-demo-solution-4/src/main/java/ru/otus/spring/domain/Person.java similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-4/src/main/java/ru/otus/spring/domain/Person.java rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-4/src/main/java/ru/otus/spring/domain/Person.java diff --git a/2021-11/spring-07-jdbc/jdbc-demo-solution-4/src/main/resources/application.yml b/2021-11/spring-07-jdbc/jdbc-demo-solution-4/src/main/resources/application.yml new file mode 100644 index 00000000..8f40ea4e --- /dev/null +++ b/2021-11/spring-07-jdbc/jdbc-demo-solution-4/src/main/resources/application.yml @@ -0,0 +1,16 @@ +spring: + datasource: + url: jdbc:h2:mem:testdb + #initialization-mode: always + #schema: schema.sql + #data: data.sql + sql: + init: + mode: always + data-locations: data.sql + schema-locations: schema.sql + h2: + console: + path: /h2-console + settings: + web-allow-others: true \ No newline at end of file diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-4/src/main/resources/data.sql b/2021-11/spring-07-jdbc/jdbc-demo-solution-4/src/main/resources/data.sql similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-4/src/main/resources/data.sql rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-4/src/main/resources/data.sql diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-4/src/main/resources/schema.sql b/2021-11/spring-07-jdbc/jdbc-demo-solution-4/src/main/resources/schema.sql similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-4/src/main/resources/schema.sql rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-4/src/main/resources/schema.sql diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-5/.gitignore b/2021-11/spring-07-jdbc/jdbc-demo-solution-5/.gitignore similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-5/.gitignore rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-5/.gitignore diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-5/pom.xml b/2021-11/spring-07-jdbc/jdbc-demo-solution-5/pom.xml similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-5/pom.xml rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-5/pom.xml diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-5/src/main/java/ru/otus/spring/Main.java b/2021-11/spring-07-jdbc/jdbc-demo-solution-5/src/main/java/ru/otus/spring/Main.java similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-5/src/main/java/ru/otus/spring/Main.java rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-5/src/main/java/ru/otus/spring/Main.java diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-5/src/main/java/ru/otus/spring/dao/PersonDao.java b/2021-11/spring-07-jdbc/jdbc-demo-solution-5/src/main/java/ru/otus/spring/dao/PersonDao.java similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-5/src/main/java/ru/otus/spring/dao/PersonDao.java rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-5/src/main/java/ru/otus/spring/dao/PersonDao.java diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-5/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java b/2021-11/spring-07-jdbc/jdbc-demo-solution-5/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java similarity index 63% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-5/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-5/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java index 9685df76..9bf36079 100644 --- a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-5/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java +++ b/2021-11/spring-07-jdbc/jdbc-demo-solution-5/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java @@ -2,17 +2,13 @@ package ru.otus.spring.dao; import org.springframework.jdbc.core.JdbcOperations; import org.springframework.jdbc.core.RowMapper; -import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; import org.springframework.stereotype.Repository; import ru.otus.spring.domain.Person; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.Collections; import java.util.List; -import java.util.Map; -@SuppressWarnings({"SqlNoDataSourceInspection", "ConstantConditions", "SqlDialectInspection"}) @Repository public class PersonDaoJdbc implements PersonDao { @@ -25,22 +21,23 @@ public class PersonDaoJdbc implements PersonDao { @Override public int count() { - return jdbc.queryForObject("select count(*) from persons", Integer.class); + Integer count = jdbc.queryForObject("select count(*) from persons", Integer.class); + return count == null? 0: count; } @Override public void insert(Person person) { - jdbc.update("insert into persons (id, `name`) values (?, ?)", person.getId(), person.getName()); + jdbc.update("insert into persons (id, name) values (?, ?)", person.getId(), person.getName()); } @Override public Person getById(long id) { - return jdbc.queryForObject("select * from persons where id = ?", new Object[] {id}, new PersonMapper()); + return jdbc.queryForObject("select id, name from persons where id = ?", new PersonMapper(), id); } @Override public List getAll() { - return jdbc.query("select * from persons", new PersonMapper()); + return jdbc.query("select id, name from persons", new PersonMapper()); } diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-5/src/main/java/ru/otus/spring/domain/Person.java b/2021-11/spring-07-jdbc/jdbc-demo-solution-5/src/main/java/ru/otus/spring/domain/Person.java similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-5/src/main/java/ru/otus/spring/domain/Person.java rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-5/src/main/java/ru/otus/spring/domain/Person.java diff --git a/2021-11/spring-07-jdbc/jdbc-demo-solution-5/src/main/resources/application.yml b/2021-11/spring-07-jdbc/jdbc-demo-solution-5/src/main/resources/application.yml new file mode 100644 index 00000000..8f40ea4e --- /dev/null +++ b/2021-11/spring-07-jdbc/jdbc-demo-solution-5/src/main/resources/application.yml @@ -0,0 +1,16 @@ +spring: + datasource: + url: jdbc:h2:mem:testdb + #initialization-mode: always + #schema: schema.sql + #data: data.sql + sql: + init: + mode: always + data-locations: data.sql + schema-locations: schema.sql + h2: + console: + path: /h2-console + settings: + web-allow-others: true \ No newline at end of file diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-5/src/main/resources/data.sql b/2021-11/spring-07-jdbc/jdbc-demo-solution-5/src/main/resources/data.sql similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-5/src/main/resources/data.sql rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-5/src/main/resources/data.sql diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-5/src/main/resources/schema.sql b/2021-11/spring-07-jdbc/jdbc-demo-solution-5/src/main/resources/schema.sql similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-5/src/main/resources/schema.sql rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-5/src/main/resources/schema.sql diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-final/.gitignore b/2021-11/spring-07-jdbc/jdbc-demo-solution-final/.gitignore similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-final/.gitignore rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-final/.gitignore diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-final/pom.xml b/2021-11/spring-07-jdbc/jdbc-demo-solution-final/pom.xml similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-final/pom.xml rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-final/pom.xml diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-final/src/main/java/ru/otus/spring/Main.java b/2021-11/spring-07-jdbc/jdbc-demo-solution-final/src/main/java/ru/otus/spring/Main.java similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-final/src/main/java/ru/otus/spring/Main.java rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-final/src/main/java/ru/otus/spring/Main.java diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-final/src/main/java/ru/otus/spring/dao/PersonDao.java b/2021-11/spring-07-jdbc/jdbc-demo-solution-final/src/main/java/ru/otus/spring/dao/PersonDao.java similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-final/src/main/java/ru/otus/spring/dao/PersonDao.java rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-final/src/main/java/ru/otus/spring/dao/PersonDao.java diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-final/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java b/2021-11/spring-07-jdbc/jdbc-demo-solution-final/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java similarity index 85% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-final/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-final/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java index f70dffc7..e703d4f6 100644 --- a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-final/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java +++ b/2021-11/spring-07-jdbc/jdbc-demo-solution-final/src/main/java/ru/otus/spring/dao/PersonDaoJdbc.java @@ -12,7 +12,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; -@SuppressWarnings({"SqlNoDataSourceInspection", "ConstantConditions", "SqlDialectInspection"}) @Repository public class PersonDaoJdbc implements PersonDao { @@ -29,12 +28,13 @@ public class PersonDaoJdbc implements PersonDao { @Override public int count() { - return jdbc.queryForObject("select count(*) from persons", Integer.class); + Integer count = jdbc.queryForObject("select count(*) from persons", Integer.class); + return count == null? 0: count; } @Override public void insert(Person person) { - namedParameterJdbcOperations.update("insert into persons (id, `name`) values (:id, :name)", + namedParameterJdbcOperations.update("insert into persons (id, name) values (:id, :name)", Map.of("id", person.getId(), "name", person.getName())); } @@ -42,13 +42,13 @@ public class PersonDaoJdbc implements PersonDao { public Person getById(long id) { Map params = Collections.singletonMap("id", id); return namedParameterJdbcOperations.queryForObject( - "select * from persons where id = :id", params, new PersonMapper() + "select id, name from persons where id = :id", params, new PersonMapper() ); } @Override public List getAll() { - return jdbc.query("select * from persons", new PersonMapper()); + return jdbc.query("select id, name from persons", new PersonMapper()); } @Override diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-final/src/main/java/ru/otus/spring/domain/Person.java b/2021-11/spring-07-jdbc/jdbc-demo-solution-final/src/main/java/ru/otus/spring/domain/Person.java similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-final/src/main/java/ru/otus/spring/domain/Person.java rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-final/src/main/java/ru/otus/spring/domain/Person.java diff --git a/2021-11/spring-07-jdbc/jdbc-demo-solution-final/src/main/resources/application.yml b/2021-11/spring-07-jdbc/jdbc-demo-solution-final/src/main/resources/application.yml new file mode 100644 index 00000000..50b6c632 --- /dev/null +++ b/2021-11/spring-07-jdbc/jdbc-demo-solution-final/src/main/resources/application.yml @@ -0,0 +1,17 @@ +spring: + datasource: + url: jdbc:h2:mem:testdb + #initialization-mode: always + #schema: schema.sql + #data: data.sql + sql: + init: + mode: always + data-locations: data.sql + schema-locations: schema.sql + h2: + console: + path: /h2-console + settings: + web-allow-others: true + diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-final/src/main/resources/data.sql b/2021-11/spring-07-jdbc/jdbc-demo-solution-final/src/main/resources/data.sql similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-final/src/main/resources/data.sql rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-final/src/main/resources/data.sql diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-final/src/main/resources/schema.sql b/2021-11/spring-07-jdbc/jdbc-demo-solution-final/src/main/resources/schema.sql similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-final/src/main/resources/schema.sql rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-final/src/main/resources/schema.sql diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-final/src/test/java/ru/otus/spring/dao/PersonDaoJdbcTest.java b/2021-11/spring-07-jdbc/jdbc-demo-solution-final/src/test/java/ru/otus/spring/dao/PersonDaoJdbcTest.java similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-final/src/test/java/ru/otus/spring/dao/PersonDaoJdbcTest.java rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-final/src/test/java/ru/otus/spring/dao/PersonDaoJdbcTest.java diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-final/src/test/resources/application.yml b/2021-11/spring-07-jdbc/jdbc-demo-solution-final/src/test/resources/application.yml similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-final/src/test/resources/application.yml rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-final/src/test/resources/application.yml diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-final/src/test/resources/data.sql b/2021-11/spring-07-jdbc/jdbc-demo-solution-final/src/test/resources/data.sql similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/jdbc-demo-solution-final/src/test/resources/data.sql rename to 2021-11/spring-07-jdbc/jdbc-demo-solution-final/src/test/resources/data.sql diff --git a/2021-11/spring-07-jdbc/jdbc-class-work/pom.xml b/2021-11/spring-07-jdbc/pom.xml similarity index 100% rename from 2021-11/spring-07-jdbc/jdbc-class-work/pom.xml rename to 2021-11/spring-07-jdbc/pom.xml