From 8752e37d6ca951b5c57dfecff064cf9e15b3515e Mon Sep 17 00:00:00 2001 From: GSteffun <42888439+GSteffun@users.noreply.github.com> Date: Thu, 21 Oct 2021 16:02:17 +0300 Subject: [PATCH 01/22] Complete. --- .idea/.gitignore | 3 + .idea/compiler.xml | 14 ++ .idea/dataSources.xml | 15 +++ .idea/jarRepositories.xml | 20 +++ .idea/jpa-buddy.xml | 6 + .idea/misc.xml | 12 ++ .idea/runConfigurations.xml | 10 ++ .idea/sqldialects.xml | 6 + .idea/vcs.xml | 6 + pom.xml | 3 +- src/main/java/jm/task/core/jdbc/Main.java | 17 ++- .../task/core/jdbc/dao/UserDaoJDBCImpl.java | 125 +++++++++++++++++- .../java/jm/task/core/jdbc/model/User.java | 5 + .../core/jdbc/service/UserServiceImpl.java | 19 ++- .../java/jm/task/core/jdbc/util/Util.java | 23 ++++ 15 files changed, 274 insertions(+), 10 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/compiler.xml create mode 100644 .idea/dataSources.xml create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/jpa-buddy.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/runConfigurations.xml create mode 100644 .idea/sqldialects.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 00000000..26d33521 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 00000000..19f5be47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml new file mode 100644 index 00000000..d078f5b9 --- /dev/null +++ b/.idea/dataSources.xml @@ -0,0 +1,15 @@ + + + + + mysql.8 + true + com.mysql.cj.jdbc.Driver + jdbc:mysql://localhost:3306/base_for_work + $ProjectFileDir$ + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 00000000..712ab9d9 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/jpa-buddy.xml b/.idea/jpa-buddy.xml new file mode 100644 index 00000000..d08f4008 --- /dev/null +++ b/.idea/jpa-buddy.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..242782f2 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 00000000..797acea5 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml new file mode 100644 index 00000000..56782cab --- /dev/null +++ b/.idea/sqldialects.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..35eb1ddf --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 0605a4c0..23d29f85 100644 --- a/pom.xml +++ b/pom.xml @@ -12,6 +12,7 @@ org.apache.maven.plugins maven-compiler-plugin + 3.8.1 7 7 @@ -33,7 +34,7 @@ mysql mysql-connector-java - 5.1.38 + 8.0.25 diff --git a/src/main/java/jm/task/core/jdbc/Main.java b/src/main/java/jm/task/core/jdbc/Main.java index f6e43b0f..0ec30550 100644 --- a/src/main/java/jm/task/core/jdbc/Main.java +++ b/src/main/java/jm/task/core/jdbc/Main.java @@ -1,7 +1,22 @@ package jm.task.core.jdbc; +import jm.task.core.jdbc.model.User; +import jm.task.core.jdbc.service.UserService; +import jm.task.core.jdbc.service.UserServiceImpl; + +import java.util.List; + public class Main { public static void main(String[] args) { - // реализуйте алгоритм здесь + UserService userService = new UserServiceImpl(); + userService.createUsersTable(); + userService.saveUser("Vladimir", "Nuroev", (byte)53); + userService.saveUser("Vadim", "Rolnin", (byte)37); + userService.saveUser("Stanislav", "Petrov", (byte)44); + userService.saveUser("Oleg", "Igorev", (byte)29); + List listUsers = userService.getAllUsers(); + System.out.println(listUsers); + userService.cleanUsersTable(); + userService.dropUsersTable(); } } diff --git a/src/main/java/jm/task/core/jdbc/dao/UserDaoJDBCImpl.java b/src/main/java/jm/task/core/jdbc/dao/UserDaoJDBCImpl.java index a6c6c359..36432002 100644 --- a/src/main/java/jm/task/core/jdbc/dao/UserDaoJDBCImpl.java +++ b/src/main/java/jm/task/core/jdbc/dao/UserDaoJDBCImpl.java @@ -1,35 +1,158 @@ package jm.task.core.jdbc.dao; import jm.task.core.jdbc.model.User; +import jm.task.core.jdbc.service.UserService; +import jm.task.core.jdbc.util.Util; +import java.sql.*; +import java.util.ArrayList; import java.util.List; public class UserDaoJDBCImpl implements UserDao { + private UserService userService; + + public UserDaoJDBCImpl(UserService userService) { + this.userService = userService; + } + public UserDaoJDBCImpl() { } public void createUsersTable() { + try { + Connection connection = Util.getMySQLConnection(); + if (connection == null) { + System.out.println("No connection"); + System.exit(0); + } + Statement statement = connection.createStatement(); + int result = statement.executeUpdate("CREATE TABLE Users (" + + "id INT NOT NULL AUTO_INCREMENT PRIMARY KEY," + + "name varchar(50) NOT NULL," + + "lastName varchar(50) NOT NULL," + + "age int NOT NULL);"); + if (result == 0) { + System.out.println("Таблица пользователей создана успешно!"); + } + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } catch (SQLException e) { + System.out.println(e.getMessage()); + } + } public void dropUsersTable() { + try { + Connection connection = Util.getMySQLConnection(); + if (connection == null) { + System.out.println("No connection"); + System.exit(0); + } + Statement statement = connection.createStatement(); + int result = statement.executeUpdate("DROP TABLE Users;"); + if (result == 0) { + System.out.println("Таблица пользователей успешно удалена!"); + } + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } catch (SQLException e) { + System.out.println(e.getMessage()); + } + } public void saveUser(String name, String lastName, byte age) { + try { + Connection connection = Util.getMySQLConnection(); + if (connection == null) { + System.out.println("No connection"); + System.exit(0); + } + Statement statement = connection.createStatement(); +// String strResult = String.format("INSERT INTO Users SET name = '%s', lastName = '%s', age = %d;", name, lastName, age); + int result = statement.executeUpdate(String.format("INSERT INTO Users SET name = '%s', lastName = '%s', age = %d;", name, lastName, age)); + if (result == 1) { + System.out.println("Пользователь " + name + " добавлен в базу данных"); + } + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } catch (SQLException e) { + e.printStackTrace(); + } + } public void removeUserById(long id) { + try { + Connection connection = Util.getMySQLConnection(); + if (connection == null) { + System.out.println("No connection"); + System.exit(0); + } + Statement statement = connection.createStatement(); + int result = statement.executeUpdate(String.format("DELETE FROM Users where id = %d;", id)); + if (result == 1) { + System.out.println(String.format("Пользовател с id = %d успешно удален!", id)); + } else { + System.out.println(String.format("Пользователь с указанным id = %d не найден.", id)); + } + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } catch (SQLException e) { + e.printStackTrace(); + } } public List getAllUsers() { - return null; + List listUsers = new ArrayList<>(0); + try { + Connection connection = Util.getMySQLConnection(); + if (connection == null) { + System.out.println("No connection"); + System.exit(0); + } + Statement statement = connection.createStatement(); + ResultSet resultSet = statement.executeQuery("SELECT * FROM Users;"); + while(resultSet.next()) { + User user = new User(resultSet.getString("name"), + resultSet.getString("lastName"), + resultSet.getByte("age")); + user.setId(resultSet.getLong("id")); + listUsers.add(user); + } + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } catch (SQLException e) { + e.printStackTrace(); + } + return listUsers; } public void cleanUsersTable() { + try { + Connection connection = Util.getMySQLConnection(); + if (connection == null) { + System.out.println("No connection"); + System.exit(0); + } + Statement statement = connection.createStatement(); + String sql = "TRUNCATE TABLE Users;"; + int result = statement.executeUpdate(sql); + if (result == 0) { + System.out.println("Таблица Users успешно очищена."); + } + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } catch (SQLException e) { + e.printStackTrace(); + } + } } diff --git a/src/main/java/jm/task/core/jdbc/model/User.java b/src/main/java/jm/task/core/jdbc/model/User.java index 21b054f6..3d9e3acf 100644 --- a/src/main/java/jm/task/core/jdbc/model/User.java +++ b/src/main/java/jm/task/core/jdbc/model/User.java @@ -59,4 +59,9 @@ public Byte getAge() { public void setAge(Byte age) { this.age = age; } + + @Override + public String toString() { + return "Имя: " + name + " | Фамилия: " + lastName + " | Возраст: " + age; + } } diff --git a/src/main/java/jm/task/core/jdbc/service/UserServiceImpl.java b/src/main/java/jm/task/core/jdbc/service/UserServiceImpl.java index b05bd191..b4189778 100644 --- a/src/main/java/jm/task/core/jdbc/service/UserServiceImpl.java +++ b/src/main/java/jm/task/core/jdbc/service/UserServiceImpl.java @@ -1,31 +1,36 @@ package jm.task.core.jdbc.service; +import jm.task.core.jdbc.dao.UserDao; +import jm.task.core.jdbc.dao.UserDaoJDBCImpl; import jm.task.core.jdbc.model.User; import java.util.List; public class UserServiceImpl implements UserService { - public void createUsersTable() { + private UserDaoJDBCImpl userDao = new UserDaoJDBCImpl(); + + public void createUsersTable() { + userDao.createUsersTable(); } public void dropUsersTable() { - + userDao.dropUsersTable(); } public void saveUser(String name, String lastName, byte age) { - + userDao.saveUser(name, lastName, age); } public void removeUserById(long id) { - + userDao.removeUserById(id); } - public List getAllUsers() { - return null; + public List getAllUsers(){ + return userDao.getAllUsers(); } public void cleanUsersTable() { - + userDao.cleanUsersTable(); } } diff --git a/src/main/java/jm/task/core/jdbc/util/Util.java b/src/main/java/jm/task/core/jdbc/util/Util.java index 59e462ba..dddbf8bf 100644 --- a/src/main/java/jm/task/core/jdbc/util/Util.java +++ b/src/main/java/jm/task/core/jdbc/util/Util.java @@ -1,5 +1,28 @@ package jm.task.core.jdbc.util; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; + public class Util { // реализуйте настройку соеденения с БД + + public static Connection getMySQLConnection() throws SQLException, ClassNotFoundException { + + String hostName = "localhost"; + String dbName = "base_for_work"; + String userName = "aadmin"; + String password = "123!789q654"; + + return getMySQLConnection(hostName, dbName, userName, password); + } + + public static Connection getMySQLConnection(String hostName, String dbName, + String userName, String password) throws SQLException, ClassNotFoundException { + String connectionURL = "jdbc:mysql://" + hostName + ":3306/" + dbName; + + Connection conn = DriverManager.getConnection(connectionURL, userName, password); + return conn; + } + } From b3c71791ae00092ef7776e9e9c16f1b3dfd0ba7f Mon Sep 17 00:00:00 2001 From: GSteffun <42888439+GSteffun@users.noreply.github.com> Date: Thu, 21 Oct 2021 16:49:20 +0300 Subject: [PATCH 02/22] Complete. --- .idea/sqldialects.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml index 56782cab..539d872a 100644 --- a/.idea/sqldialects.xml +++ b/.idea/sqldialects.xml @@ -1,6 +1,7 @@ + \ No newline at end of file From 4a2d8bbcca5e30a5440a2c47d68f26fafa439d56 Mon Sep 17 00:00:00 2001 From: GSteffun <42888439+GSteffun@users.noreply.github.com> Date: Thu, 21 Oct 2021 16:58:25 +0300 Subject: [PATCH 03/22] Complete. --- src/main/java/jm/task/core/jdbc/Main.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/jm/task/core/jdbc/Main.java b/src/main/java/jm/task/core/jdbc/Main.java index 0ec30550..3e8b0884 100644 --- a/src/main/java/jm/task/core/jdbc/Main.java +++ b/src/main/java/jm/task/core/jdbc/Main.java @@ -7,6 +7,7 @@ import java.util.List; public class Main { + //Comment public static void main(String[] args) { UserService userService = new UserServiceImpl(); userService.createUsersTable(); From 53555a527029dfdb9fb93e9417c9185ab225f734 Mon Sep 17 00:00:00 2001 From: GSteffun <42888439+GSteffun@users.noreply.github.com> Date: Thu, 21 Oct 2021 16:59:45 +0300 Subject: [PATCH 04/22] Done --- .idea/dataSources.local.xml | 22 + .../20fc9a50-b39e-4a4b-a7d7-ab858fabcae6.xml | 1111 +++++++++++++++++ .../schema/information_schema.FNRwLQ.meta | 2 + .../storage_v2/_src_/schema/mysql.osA4Bg.meta | 2 + .../schema/performance_schema.kIw0nw.meta | 2 + .../storage_v2/_src_/schema/sys.zb4BAA.meta | 2 + target/TaskJDBC-1.0-SNAPSHOT.jar | Bin 0 -> 10375 bytes target/classes/jm/task/core/jdbc/Main.class | Bin 0 -> 1162 bytes .../jm/task/core/jdbc/dao/UserDao.class | Bin 0 -> 411 bytes .../core/jdbc/dao/UserDaoHibernateImpl.class | Bin 0 -> 1051 bytes .../task/core/jdbc/dao/UserDaoJDBCImpl.class | Bin 0 -> 5347 bytes .../jm/task/core/jdbc/model/User.class | Bin 0 -> 1909 bytes .../task/core/jdbc/service/UserService.class | Bin 0 -> 423 bytes .../core/jdbc/service/UserServiceImpl.class | Bin 0 -> 1306 bytes .../classes/jm/task/core/jdbc/util/Util.class | Bin 0 -> 1301 bytes target/maven-archiver/pom.properties | 5 + .../compile/default-compile/createdFiles.lst | 8 + .../compile/default-compile/inputFiles.lst | 8 + .../default-testCompile/createdFiles.lst | 1 + .../default-testCompile/inputFiles.lst | 1 + .../surefire-reports/TEST-UserServiceTest.xml | 68 + target/surefire-reports/UserServiceTest.txt | 4 + target/test-classes/UserServiceTest.class | Bin 0 -> 4206 bytes 23 files changed, 1236 insertions(+) create mode 100644 .idea/dataSources.local.xml create mode 100644 .idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6.xml create mode 100644 .idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6/storage_v2/_src_/schema/information_schema.FNRwLQ.meta create mode 100644 .idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6/storage_v2/_src_/schema/mysql.osA4Bg.meta create mode 100644 .idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6/storage_v2/_src_/schema/performance_schema.kIw0nw.meta create mode 100644 .idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6/storage_v2/_src_/schema/sys.zb4BAA.meta create mode 100644 target/TaskJDBC-1.0-SNAPSHOT.jar create mode 100644 target/classes/jm/task/core/jdbc/Main.class create mode 100644 target/classes/jm/task/core/jdbc/dao/UserDao.class create mode 100644 target/classes/jm/task/core/jdbc/dao/UserDaoHibernateImpl.class create mode 100644 target/classes/jm/task/core/jdbc/dao/UserDaoJDBCImpl.class create mode 100644 target/classes/jm/task/core/jdbc/model/User.class create mode 100644 target/classes/jm/task/core/jdbc/service/UserService.class create mode 100644 target/classes/jm/task/core/jdbc/service/UserServiceImpl.class create mode 100644 target/classes/jm/task/core/jdbc/util/Util.class create mode 100644 target/maven-archiver/pom.properties create mode 100644 target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst create mode 100644 target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst create mode 100644 target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst create mode 100644 target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst create mode 100644 target/surefire-reports/TEST-UserServiceTest.xml create mode 100644 target/surefire-reports/UserServiceTest.txt create mode 100644 target/test-classes/UserServiceTest.class diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml new file mode 100644 index 00000000..8a2e3cbe --- /dev/null +++ b/.idea/dataSources.local.xml @@ -0,0 +1,22 @@ + + + + + + #@ + ` + + + master_key + aadmin + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6.xml b/.idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6.xml new file mode 100644 index 00000000..e72a3eae --- /dev/null +++ b/.idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6.xml @@ -0,0 +1,1111 @@ + + + + + 8.0.27 + |root||aadmin||ALTER|G +|root||root|localhost|ALTER|G +|root||aadmin||ALTER ROUTINE|G +|root||root|localhost|ALTER ROUTINE|G +|root||root|localhost|APPLICATION_PASSWORD_ADMIN|G +|root||root|localhost|AUDIT_ADMIN|G +|root||root|localhost|AUTHENTICATION_POLICY_ADMIN|G +|root||mysql.session|localhost|BACKUP_ADMIN|G +|root||root|localhost|BACKUP_ADMIN|G +|root||root|localhost|BINLOG_ADMIN|G +|root||root|localhost|BINLOG_ENCRYPTION_ADMIN|G +|root||mysql.session|localhost|CLONE_ADMIN|G +|root||root|localhost|CLONE_ADMIN|G +|root||mysql.session|localhost|CONNECTION_ADMIN|G +|root||root|localhost|CONNECTION_ADMIN|G +|root||aadmin||CREATE|G +|root||root|localhost|CREATE|G +|root||root|localhost|CREATE ROLE|G +|root||aadmin||CREATE ROUTINE|G +|root||root|localhost|CREATE ROUTINE|G +|root||aadmin||CREATE TABLESPACE|G +|root||root|localhost|CREATE TABLESPACE|G +|root||aadmin||CREATE TEMPORARY TABLES|G +|root||root|localhost|CREATE TEMPORARY TABLES|G +|root||aadmin||CREATE USER|G +|root||root|localhost|CREATE USER|G +|root||aadmin||CREATE VIEW|G +|root||root|localhost|CREATE VIEW|G +|root||aadmin||DELETE|G +|root||root|localhost|DELETE|G +|root||aadmin||DROP|G +|root||root|localhost|DROP|G +|root||root|localhost|DROP ROLE|G +|root||root|localhost|ENCRYPTION_KEY_ADMIN|G +|root||aadmin||EVENT|G +|root||root|localhost|EVENT|G +|root||aadmin||EXECUTE|G +|root||root|localhost|EXECUTE|G +|root||aadmin||FILE|G +|root||root|localhost|FILE|G +|root||root|localhost|FLUSH_OPTIMIZER_COSTS|G +|root||root|localhost|FLUSH_STATUS|G +|root||root|localhost|FLUSH_TABLES|G +|root||root|localhost|FLUSH_USER_RESOURCES|G +|root||root|localhost|GROUP_REPLICATION_ADMIN|G +|root||root|localhost|GROUP_REPLICATION_STREAM|G +|root||aadmin||INDEX|G +|root||root|localhost|INDEX|G +|root||root|localhost|INNODB_REDO_LOG_ARCHIVE|G +|root||root|localhost|INNODB_REDO_LOG_ENABLE|G +|root||aadmin||INSERT|G +|root||root|localhost|INSERT|G +|root||aadmin||LOCK TABLES|G +|root||root|localhost|LOCK TABLES|G +|root||root|localhost|PASSWORDLESS_USER_ADMIN|G +|root||mysql.session|localhost|PERSIST_RO_VARIABLES_ADMIN|G +|root||root|localhost|PERSIST_RO_VARIABLES_ADMIN|G +|root||aadmin||PROCESS|G +|root||root|localhost|PROCESS|G +|root||aadmin||REFERENCES|G +|root||root|localhost|REFERENCES|G +|root||aadmin||RELOAD|G +|root||root|localhost|RELOAD|G +|root||aadmin||REPLICATION CLIENT|G +|root||root|localhost|REPLICATION CLIENT|G +|root||aadmin||REPLICATION SLAVE|G +|root||root|localhost|REPLICATION SLAVE|G +|root||root|localhost|REPLICATION_APPLIER|G +|root||root|localhost|REPLICATION_SLAVE_ADMIN|G +|root||root|localhost|RESOURCE_GROUP_ADMIN|G +|root||root|localhost|RESOURCE_GROUP_USER|G +|root||root|localhost|ROLE_ADMIN|G +|root||aadmin||SELECT|G +|root||mysql.infoschema|localhost|SELECT|G +|root||root|localhost|SELECT|G +|root||root|localhost|SERVICE_CONNECTION_ADMIN|G +|root||mysql.session|localhost|SESSION_VARIABLES_ADMIN|G +|root||root|localhost|SESSION_VARIABLES_ADMIN|G +|root||root|localhost|SET_USER_ID|G +|root||aadmin||SHOW DATABASES|G +|root||root|localhost|SHOW DATABASES|G +|root||aadmin||SHOW VIEW|G +|root||root|localhost|SHOW VIEW|G +|root||root|localhost|SHOW_ROUTINE|G +|root||aadmin||SHUTDOWN|G +|root||mysql.session|localhost|SHUTDOWN|G +|root||root|localhost|SHUTDOWN|G +|root||aadmin||SUPER|G +|root||mysql.session|localhost|SUPER|G +|root||root|localhost|SUPER|G +|root||mysql.infoschema|localhost|SYSTEM_USER|G +|root||mysql.session|localhost|SYSTEM_USER|G +|root||mysql.sys|localhost|SYSTEM_USER|G +|root||root|localhost|SYSTEM_USER|G +|root||mysql.session|localhost|SYSTEM_VARIABLES_ADMIN|G +|root||root|localhost|SYSTEM_VARIABLES_ADMIN|G +|root||root|localhost|TABLE_ENCRYPTION_ADMIN|G +|root||aadmin||TRIGGER|G +|root||root|localhost|TRIGGER|G +|root||aadmin||UPDATE|G +|root||root|localhost|UPDATE|G +|root||root|localhost|XA_RECOVER_ADMIN|G +|root||aadmin||grant option|G +|root||root|localhost|grant option|G +performance_schema|schema||mysql.session|localhost|SELECT|G +sys|schema||mysql.sys|localhost|TRIGGER|G + InnoDB + InnoDB + lower/lower + + + 1 + utf8mb4_0900_ai_ci + + + utf8_general_ci + + + user|||mysql.session|localhost|SELECT|G + utf8mb4_0900_ai_ci + + + utf8mb4_0900_ai_ci + + + utf8mb4_0900_ai_ci + + + armscii8 + 1 + + + armscii8 + + + ascii + 1 + + + ascii + + + big5 + 1 + + + big5 + + + binary + 1 + + + cp1250 + 1 + + + cp1250 + + + cp1250 + + + cp1250 + + + cp1250 + + + cp1251 + + + cp1251 + + + cp1251 + + + cp1251 + 1 + + + cp1251 + + + cp1256 + 1 + + + cp1256 + + + cp1257 + + + cp1257 + + + cp1257 + 1 + + + cp850 + 1 + + + cp850 + + + cp852 + 1 + + + cp852 + + + cp866 + 1 + + + cp866 + + + cp932 + 1 + + + cp932 + + + dec8 + 1 + + + dec8 + + + eucjpms + 1 + + + eucjpms + + + euckr + 1 + + + euckr + + + gb18030 + 1 + + + gb18030 + + + gb18030 + + + gb2312 + 1 + + + gb2312 + + + gbk + 1 + + + gbk + + + geostd8 + 1 + + + geostd8 + + + greek + 1 + + + greek + + + hebrew + 1 + + + hebrew + + + hp8 + 1 + + + hp8 + + + keybcs2 + 1 + + + keybcs2 + + + koi8r + 1 + + + koi8r + + + koi8u + 1 + + + koi8u + + + latin1 + + + latin1 + 1 + + + latin1 + + + latin1 + + + latin1 + + + latin1 + + + latin1 + + + latin1 + + + latin2 + + + latin2 + 1 + + + latin2 + + + latin2 + + + latin2 + + + latin5 + 1 + + + latin5 + + + latin7 + + + latin7 + 1 + + + latin7 + + + latin7 + + + macce + 1 + + + macce + + + macroman + 1 + + + macroman + + + sjis + 1 + + + sjis + + + swe7 + 1 + + + swe7 + + + tis620 + 1 + + + tis620 + + + ucs2 + 1 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ujis + 1 + + + ujis + + + utf16 + 1 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16le + 1 + + + utf16le + + + utf32 + 1 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf8 + 1 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + 1 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + caching_sha2_password + + + localhost + caching_sha2_password + + + localhost + caching_sha2_password + + + localhost + caching_sha2_password + + + localhost + caching_sha2_password + + +
+ The group configuration version. +
+ + The member actions configuration. +
+ + 1 + int|0s + 1 + null + + + 2 + varchar(50)|0s + 1 + + + 3 + varchar(50)|0s + 1 + + + 4 + int|0s + 1 + + + 1 + id + 1 + + + 1 + The configuration name. + char(255)|0s + 1 + ascii_general_ci + + + 2 + The version of the configuration name. + bigint unsigned|0s + 1 + + + 1 + name + 1 + + + 1 + The action name. + char(255)|0s + 1 + ascii_general_ci + + + 2 + The event that will trigger the action. + char(64)|0s + 1 + ascii_general_ci + + + 3 + Whether the action is enabled. + tinyint(1)|0s + 1 + + + 4 + The action type. + char(64)|0s + 1 + ascii_general_ci + + + 5 + The order on which the action will be run, value between 1 and 100, lower values first. + tinyint unsigned|0s + 1 + + + 6 + On errors during the action will be handled: IGNORE, CRITICAL. + char(64)|0s + 1 + ascii_general_ci + + + event + btree + + + 1 + name +event + 1 + + + \ No newline at end of file diff --git a/.idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6/storage_v2/_src_/schema/information_schema.FNRwLQ.meta b/.idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6/storage_v2/_src_/schema/information_schema.FNRwLQ.meta new file mode 100644 index 00000000..1ff3db2e --- /dev/null +++ b/.idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6/storage_v2/_src_/schema/information_schema.FNRwLQ.meta @@ -0,0 +1,2 @@ +#n:information_schema +! [null, 0, null, null, -2147483648, -2147483648] diff --git a/.idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6/storage_v2/_src_/schema/mysql.osA4Bg.meta b/.idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6/storage_v2/_src_/schema/mysql.osA4Bg.meta new file mode 100644 index 00000000..86a53f19 --- /dev/null +++ b/.idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6/storage_v2/_src_/schema/mysql.osA4Bg.meta @@ -0,0 +1,2 @@ +#n:mysql +! [null, 0, null, null, -2147483648, -2147483648] diff --git a/.idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6/storage_v2/_src_/schema/performance_schema.kIw0nw.meta b/.idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6/storage_v2/_src_/schema/performance_schema.kIw0nw.meta new file mode 100644 index 00000000..9394db14 --- /dev/null +++ b/.idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6/storage_v2/_src_/schema/performance_schema.kIw0nw.meta @@ -0,0 +1,2 @@ +#n:performance_schema +! [null, 0, null, null, -2147483648, -2147483648] diff --git a/.idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6/storage_v2/_src_/schema/sys.zb4BAA.meta b/.idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6/storage_v2/_src_/schema/sys.zb4BAA.meta new file mode 100644 index 00000000..2f4470bb --- /dev/null +++ b/.idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6/storage_v2/_src_/schema/sys.zb4BAA.meta @@ -0,0 +1,2 @@ +#n:sys +! [null, 0, null, null, -2147483648, -2147483648] diff --git a/target/TaskJDBC-1.0-SNAPSHOT.jar b/target/TaskJDBC-1.0-SNAPSHOT.jar new file mode 100644 index 0000000000000000000000000000000000000000..40e9a4174f66d4e6d9e3db0783cb5b2cf7da36f0 GIT binary patch literal 10375 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 literal 0 HcmV?d00001 diff --git a/target/classes/jm/task/core/jdbc/Main.class b/target/classes/jm/task/core/jdbc/Main.class new file mode 100644 index 0000000000000000000000000000000000000000..551a00c43ba821ca72cc2588364e2ed8c994cafb GIT binary patch literal 1162 zcma)5T~8B16g@)=yDf_>iy)#Xs6Y$IB8p$dDj*~z zC=@DZbgFSE{buR1XT4Z6F~-na(}hipQ`t9x@}+O$CPS_ob6-Y^cTC)((7uSnfb2DdIJy68H>Gp_q1V$5Oc!8O5a>3Md+wvoMc^bIMnb zqF8t&c+e*ON76(YxckH)CLV%&r92kl8d$RM0Lu)+3DNU+7>q-mp?oUxuN3KIOM04* z7)CG8V~0!1$!-J(f?=>CeX-m2>LN_WKx8UGgR2@3r5?+vGaG-D5yM!ed$|(T^OCZo zg%6j9P^?j$hfS(5+$BtMw$EM`!)%u>6uPo(w&_A0O(hl1mOw>Fiz_X2C)nqWei~x s4l4BFG|0&m2v+fePA0|5cu6of$$o`3V!cj&O(pegBs#n%Uk^6_0GB5c_5c6? literal 0 HcmV?d00001 diff --git a/target/classes/jm/task/core/jdbc/dao/UserDao.class b/target/classes/jm/task/core/jdbc/dao/UserDao.class new file mode 100644 index 0000000000000000000000000000000000000000..437ac31e904a1766213f9197bb8a75720ec389e7 GIT binary patch literal 411 zcmZXQ&r8EF9K~PeZ1>A;&a?OKVnB}-!6Aa9;Gyb0O+#r-8%fiF|C$H?fc;Tok_ira z`jVITeaYwTf4;r}+~6X_fZ(#KsbTFq=H`+|~&Mwy9GDaE*n3bA+)!PcZd!hBND*TlWA9*R1nd I<=iW)U(sr5KmY&$ literal 0 HcmV?d00001 diff --git a/target/classes/jm/task/core/jdbc/dao/UserDaoHibernateImpl.class b/target/classes/jm/task/core/jdbc/dao/UserDaoHibernateImpl.class new file mode 100644 index 0000000000000000000000000000000000000000..cf21855da5fdd68e96b405f7ea4b41cc76d39a53 GIT binary patch literal 1051 zcmah|O>fgc5Ph4Zbx1=3g%(;qN+|~?R9FIWN>zz~5UHYa2+e)ttilF=RJK!ze+4Hb z4*URq6yojLBB6=egLh|kXWqPdJO2IW=Pv-S@T`Us$_^@ZtYKZ?)>K|dFObp1`#72^ zKNDC#(vi-N1~i6SS% zF)e@^<0L*`JgBDf!bS+VZhx-CAWL*K=`5dgTSKysWN5iAB?wdlnP#WY)cx8U6Tv+(KqXCEoCs`8RQ4taEH#SYw(`oeOb1?Hry1M1G0+ogJWGiAaw*_w zg*G8I4(uCsjtS8810|!y?rVd1miX$uHp=gqo6C>+!gPpzIGh<$-~c(?IX7H4>^PA> z_qFy9i0?E?sB<+V22@d@b(2;-4?+V?dVHFH0MD(@vw5 z7>EaW$d$he9`nvX99o|mif{CCC37(j7J4cb)b?!56Xxt+FG_0xV6Ns<3vuulGuyk| literal 0 HcmV?d00001 diff --git a/target/classes/jm/task/core/jdbc/dao/UserDaoJDBCImpl.class b/target/classes/jm/task/core/jdbc/dao/UserDaoJDBCImpl.class new file mode 100644 index 0000000000000000000000000000000000000000..35bd89e1e3bf0317683d64a3d7b6538e2bbf1b21 GIT binary patch literal 5347 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 TXx+Zb&1q#RmH#S%`rCg1Baxvq literal 0 HcmV?d00001 diff --git a/target/classes/jm/task/core/jdbc/model/User.class b/target/classes/jm/task/core/jdbc/model/User.class new file mode 100644 index 0000000000000000000000000000000000000000..60331454cf16e85def063f2852d4c381979a573c GIT binary patch literal 1909 zcmaKs+fEZv6o&s@N?V{vEd>M->$#M}cs@`>0W~pcH1R;f<^#x44 z@&SAROazP&9>A;Ng^d568DSU(Z)Ts?`q#JDT6=!~`LzS!8Xk5chPEW)X|y9DkXg~+ z=vqxTm$j!$E3#q>B&H41uxA9?3Zn}hNTDN%&NRA^78qWsYqs8etyQds)K;oX6|HVn zWlek8lnsHnsn?}Iw!E+U+-?}=a!KhNOQT1Lq-uK8enLyNc|46QdKpY#re`MLIrq+% zu3ujo{TL948P$UpWsAy53$dZ zSEWhSi9#T-k34#4%NH%Ba8{r<|32@0bJm<~=clvf{8ZX0oc9mDI6Kbf?gwXW_v7v- zFX%-T^in96m-N!nu@vrT8byrp4z}g73FHcgT}lFj&swH!)a8QFG?r>|)-)|!w++i| z3iP}8d8@6;M$>58(yU1Bag|O(5eM^DtyMR97@uc-1$xScDWA0JOS17or?M)tRncn; zdc#m_e=}~sG8k&4{J%b->aB=;A4+#Au;Vtv=z>7|va}zwV%Y-;a65sAP4BQbDDR#r z*Cbt4+i^xaZ`K#I{8xC|cG0%%w<%Y&-(MwoHmkbzAcKp@o}#ULdH`aNzw^1(YE;PH>E=ry1Crbocnu4(;)wh4#9* z=6`@+jb7I{3Xbi?O^ENV%w>MnF9Yaf_yJtuObOEnSLp!G+i{&=B~YVfoMTQ26vx() zERL_EyEw6q%)VYfJ%B-44xs}laSX!*JLPH@J%3-DO8({4OkGKlj)-Dr^RFvxX++&BWn>pQ`m-iydc zCJb^r668K+qcRfcA+I#k1i5 hZZ$vW%`+Rguz^Atc{YHo`MnUs9ED?;-+P%4fWKXNR}ugK literal 0 HcmV?d00001 diff --git a/target/classes/jm/task/core/jdbc/service/UserService.class b/target/classes/jm/task/core/jdbc/service/UserService.class new file mode 100644 index 0000000000000000000000000000000000000000..e1f4323602580d732ac8e9a58523ff331b8abb0f GIT binary patch literal 423 zcmZXQ%}T^D6opU5v7H~C8OLW3IvWGJtO(9RPzGF7-KS|Nsc9=|TJY6e_y9iCV3H0v z(AB*;`R+~5`Q3m20Jz0vh!Me6QBuR256WvTXpyCyHbQrj3;Jf8r0+wF304K`7*(vw z=}TG&Zmh($U`9Byd1a{*1SiqvonVpa`tw+xG_3O+K@{!&Hzh{PDvyWC*00f`toym` z*HcC?j-H)9&xLtV%0ED`jyC;#Yoww(*_fDMn#jCjrq%XOHv`~qH}qZBnNZ$!d~X*l zxe}~8_ApE8R&((vozIoKImC1A`~(Eny^R(KY+9!X;8F_@b%Los&oKA(4Cj_#SbBt| MOV@E$x$w&R51QX@g8%>k literal 0 HcmV?d00001 diff --git a/target/classes/jm/task/core/jdbc/service/UserServiceImpl.class b/target/classes/jm/task/core/jdbc/service/UserServiceImpl.class new file mode 100644 index 0000000000000000000000000000000000000000..2c018412de7d194c7c3bd11d18eb39c2b93d9c56 GIT binary patch literal 1306 zcmZvbZ*S626vm$mxbmkCWRvOUHn*wc&s=rW`GSRHY%v)j^973W<)z$Uv9wEDNc>is zC`&Z)1Nfng=iU-f=!-V@-gD3IIp^u=?>|3&0XW91G-8NrNa(nQC5Bv|kGNrTr)RwB z^o1EPES*}871S8w#Zp^ClHqZGU zLIziL+?B!QuIFC=A6nCK5BC|8J|C$phGMZfbE6e_meZ>)p43ZiiQdrh0GovN#J~*+ z_0N}GhD5Ou-q_ah5IYQ+o(RrtTgfxzi=~h`3@qDdT7IC~*wgVyR+=?!!JS#D8lFV@ zAK@ZNpSxW_jHcy?tKpy{Jmmz5HeHk3ZSGmpnaN=y_-OeIl?byV=<*v?Ny6a+lE^Rm zLRQ+`53W=^&Uc&=cQmv76y5$Z%Q@plp zBCJY_TC?#vlwS@zG<`9UVf4i01k%iFw5Cy~_de}vh|>zlm2bexKcRiNLFzlwU+FA{ zBE97g0;G^2R*6=6cpqg{Xh*G2StqoUtYrBc(qrW28Ox-d{fCj9GH56%Q`R%bSea+! ziLnyNpy{13-czj!Vr66EGKTu5e9qy;zZGEA$(0}O+uocns dvAXku;`FP~JHo%+`Korwzr6?+!%Iaw`3qdi^3(tT literal 0 HcmV?d00001 diff --git a/target/classes/jm/task/core/jdbc/util/Util.class b/target/classes/jm/task/core/jdbc/util/Util.class new file mode 100644 index 0000000000000000000000000000000000000000..8d17b25dec4f95ebc42907d6b73baf790ae4e17a GIT binary patch literal 1301 zcmbVM>r&HD5dKcnHfagBSPB(I@J1<@0Oi^u&WQ5Iw2mUo_=`!~SW?oYBq_>E_$>Md z9G&q2d??2~No^hMIF6Ia$?nNst&4mQ&TO6UXx23j(aLWrWjqXHBDQ> z5W~RAYJO&OYx`_teJzO*jEYcX+(3$9ve8t1-8)sQj%%omTBWMCebZ78X<<<6hF`ik zc&Y6qWh-b_ewEl}5ebI)U~bFiL*lwB4$)Z}Rpe_^dDS9GIcY5usZN2w?m=(wZYp zr7xpzEO!O=iG&E|Y2{`>!~(5y=zv8mk(Qv_rIHs9wh*NUNGalTC7~$;C1tRjn_pP` zjNy;8A7Z5`9Y+x`NVr3UFihHLfSsdwf#hYZkPo-6l0?igKtGTbLXaV0jU)lAl2sA)1MDUiS;JOsvOkh+=^>rZ9n7 rWCBjRAzFtM;dVH2DdfbZkkb_LD-gRVMGGimhid(uC&MGck6`yFwOT6D literal 0 HcmV?d00001 diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties new file mode 100644 index 00000000..99e8c244 --- /dev/null +++ b/target/maven-archiver/pom.properties @@ -0,0 +1,5 @@ +#Generated by Maven +#Thu Oct 21 15:52:13 MSK 2021 +groupId=org.example +artifactId=TaskJDBC +version=1.0-SNAPSHOT diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 00000000..0ca0fbbb --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,8 @@ +jm\task\core\jdbc\dao\UserDaoJDBCImpl.class +jm\task\core\jdbc\Main.class +jm\task\core\jdbc\dao\UserDaoHibernateImpl.class +jm\task\core\jdbc\service\UserServiceImpl.class +jm\task\core\jdbc\service\UserService.class +jm\task\core\jdbc\model\User.class +jm\task\core\jdbc\util\Util.class +jm\task\core\jdbc\dao\UserDao.class diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 00000000..7f3e1865 --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,8 @@ +C:\Users\steff\IdeaProjects\CoreTaskTemplate\src\main\java\jm\task\core\jdbc\dao\UserDaoJDBCImpl.java +C:\Users\steff\IdeaProjects\CoreTaskTemplate\src\main\java\jm\task\core\jdbc\model\User.java +C:\Users\steff\IdeaProjects\CoreTaskTemplate\src\main\java\jm\task\core\jdbc\util\Util.java +C:\Users\steff\IdeaProjects\CoreTaskTemplate\src\main\java\jm\task\core\jdbc\service\UserService.java +C:\Users\steff\IdeaProjects\CoreTaskTemplate\src\main\java\jm\task\core\jdbc\dao\UserDao.java +C:\Users\steff\IdeaProjects\CoreTaskTemplate\src\main\java\jm\task\core\jdbc\dao\UserDaoHibernateImpl.java +C:\Users\steff\IdeaProjects\CoreTaskTemplate\src\main\java\jm\task\core\jdbc\Main.java +C:\Users\steff\IdeaProjects\CoreTaskTemplate\src\main\java\jm\task\core\jdbc\service\UserServiceImpl.java diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst new file mode 100644 index 00000000..aa9143da --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst @@ -0,0 +1 @@ +UserServiceTest.class diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst new file mode 100644 index 00000000..f4e4c231 --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -0,0 +1 @@ +C:\Users\steff\IdeaProjects\CoreTaskTemplate\src\test\java\UserServiceTest.java diff --git a/target/surefire-reports/TEST-UserServiceTest.xml b/target/surefire-reports/TEST-UserServiceTest.xml new file mode 100644 index 00000000..17e73917 --- /dev/null +++ b/target/surefire-reports/TEST-UserServiceTest.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/target/surefire-reports/UserServiceTest.txt b/target/surefire-reports/UserServiceTest.txt new file mode 100644 index 00000000..a95955b3 --- /dev/null +++ b/target/surefire-reports/UserServiceTest.txt @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: UserServiceTest +------------------------------------------------------------------------------- +Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.466 sec diff --git a/target/test-classes/UserServiceTest.class b/target/test-classes/UserServiceTest.class new file mode 100644 index 0000000000000000000000000000000000000000..3e86d3f420e7572fbd857469ead6f6c30ec2d46d GIT binary patch literal 4206 zcmb7HYjacA6LIfp=Ego{Ac~J9+WuP^Yp|OoqOai%okHulF=0fLMtUrIdSu*86cpASveH)Jh(dFF$B-YI zLdSS2S}^jLqKQn-jE;|vB%*mUH(@2r=otdCEwc3c>g?nSnyiN{`WID+!5B zWUav<75p;MJw|UTwjN>Z@MEWrUr4B)Srbf!jib3tRygMe zjgh43$1@6#Eh9VrPQuIg{MJqXK<^p&Y%^D&K7wvD$SMB+5dCD%8 zC;2_k$0hrg{k?tHo|lPh_H8~a+9i2W{zO)OZ_n_>eEGfd&9HsXF_^dK?4|Pie7zLr z%%pwCUMzoHzTukLrGRX?N5@|5W5|qb)=ZBo>}{_PYDe9x3g|9z(J3x|xx&)Tt*+HA z59s(6o)<|oZY&fwx7V9+mlyGp9|v{(8eL4`Ol~YXUS!TjyYmb?6U_IPVI>u|Gy*>) zvL4oP#7X}|&NK?9#wWbjY)Ms-Z3x ztYkE9yvoFOa@Ct=gP;S6a&N6j6{-CgPc(TvCWj2*dVF`KG-X zW)YTHTTA7uEIW><{aq=!+f0QS7UnItQp5HwTJU+Ud`%{$n(vlxmal6_DZFccDmJ$q z7eBZ)-Jtqqf~i=(&UNCT+5zl)jq;DH*V+pt%`!T&c$+cEnW>DMXtB$^>%ScS(+da_a++XpWoE%4go^yyp;~d5!a)|H|vAl8Y|C zuhZfjnmGb?MCPC(i}0VFLrV#PNU*hpU?dnS;qi!8!V@!&`}g=AqB+n)2mu1nx!DFh zK`=M?R(GA@eSE+tCD%lPl8rv(uK?d0xsAXAo>uS%-(g#P5zlhx_F%^>cJH1=bQb&P z@xqMbF32r*5vOdvjSfM^EqoWmtVL7fO*1$`4dAgp`56PDQ|+U!H~9qW4=m+f6H@u0r4jM3;pq6D=`nw;XzD+kG`;j@OW3 z3Z@!xIO%ctvBF_+EgTj=ZR5KaAQya5?wu9NU1>n+AP$j| &eOBm=SrIV!e3Ms`& z=@kEToW?;6aOJBc+|SXVr&xqV|95;!#SYhy9ITN1jQ*qvxT`+rNGeZ5^T9^i@kFhZ z-oGonhu6mYPu2Fp066r&Ci{0+u%B$e{wTAuDyYl;EZGl}{W-FKof&+d|Di5W-UL?~ dly?MYG3p81Q^R? Date: Thu, 21 Oct 2021 17:01:44 +0300 Subject: [PATCH 05/22] Complete. --- src/main/java/jm/task/core/jdbc/util/Util.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/jm/task/core/jdbc/util/Util.java b/src/main/java/jm/task/core/jdbc/util/Util.java index dddbf8bf..5efb8489 100644 --- a/src/main/java/jm/task/core/jdbc/util/Util.java +++ b/src/main/java/jm/task/core/jdbc/util/Util.java @@ -12,7 +12,7 @@ public static Connection getMySQLConnection() throws SQLException, ClassNotFound String hostName = "localhost"; String dbName = "base_for_work"; String userName = "aadmin"; - String password = "123!789q654"; + String password = "PassWord!"; return getMySQLConnection(hostName, dbName, userName, password); } @@ -20,9 +20,7 @@ public static Connection getMySQLConnection() throws SQLException, ClassNotFound public static Connection getMySQLConnection(String hostName, String dbName, String userName, String password) throws SQLException, ClassNotFoundException { String connectionURL = "jdbc:mysql://" + hostName + ":3306/" + dbName; - - Connection conn = DriverManager.getConnection(connectionURL, userName, password); - return conn; + return DriverManager.getConnection(connectionURL, userName, password); } } From 1554cf8141001bfbeb0b7b50f555669c575c9003 Mon Sep 17 00:00:00 2001 From: GSteffun <42888439+GSteffun@users.noreply.github.com> Date: Thu, 21 Oct 2021 18:42:16 +0300 Subject: [PATCH 06/22] =?UTF-8?q?=D0=9D=D0=B5=D0=BC=D0=BD=D0=BE=D0=B3?= =?UTF-8?q?=D0=BE=20=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE=D1=80=D0=B8?= =?UTF-8?q?=D0=BD=D0=B3=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/jdbc/service/UserServiceImpl.java | 2 +- .../java/jm/task/core/jdbc/util/Util.java | 4 ++-- target/classes/jm/task/core/jdbc/Main.class | Bin 1162 -> 1237 bytes .../core/jdbc/service/UserServiceImpl.class | Bin 1306 -> 1306 bytes .../classes/jm/task/core/jdbc/util/Util.class | Bin 1301 -> 1250 bytes 5 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/jm/task/core/jdbc/service/UserServiceImpl.java b/src/main/java/jm/task/core/jdbc/service/UserServiceImpl.java index b4189778..277e2497 100644 --- a/src/main/java/jm/task/core/jdbc/service/UserServiceImpl.java +++ b/src/main/java/jm/task/core/jdbc/service/UserServiceImpl.java @@ -8,7 +8,7 @@ public class UserServiceImpl implements UserService { - private UserDaoJDBCImpl userDao = new UserDaoJDBCImpl(); + private final UserDaoJDBCImpl userDao = new UserDaoJDBCImpl(); public void createUsersTable() { userDao.createUsersTable(); diff --git a/src/main/java/jm/task/core/jdbc/util/Util.java b/src/main/java/jm/task/core/jdbc/util/Util.java index 5efb8489..e68deacb 100644 --- a/src/main/java/jm/task/core/jdbc/util/Util.java +++ b/src/main/java/jm/task/core/jdbc/util/Util.java @@ -12,13 +12,13 @@ public static Connection getMySQLConnection() throws SQLException, ClassNotFound String hostName = "localhost"; String dbName = "base_for_work"; String userName = "aadmin"; - String password = "PassWord!"; + String password = "123!789q654"; return getMySQLConnection(hostName, dbName, userName, password); } public static Connection getMySQLConnection(String hostName, String dbName, - String userName, String password) throws SQLException, ClassNotFoundException { + String userName, String password) throws SQLException { String connectionURL = "jdbc:mysql://" + hostName + ":3306/" + dbName; return DriverManager.getConnection(connectionURL, userName, password); } diff --git a/target/classes/jm/task/core/jdbc/Main.class b/target/classes/jm/task/core/jdbc/Main.class index 551a00c43ba821ca72cc2588364e2ed8c994cafb..016b917dd4419e818faa6959cc4718dac8a25057 100644 GIT binary patch delta 317 zcmYL^xlY4C6h+UoNn$%DVF?seR1_eAL|DVVZ*D*!fkcyly9iM70ra$dNkoC5-~*td z;B!FSafHxl?$g}+-kF()@GFeoe_r2!DoH2$wpx)QGcmK|jq+79t>2ur(^mVm-e{&S zn~zy=S?RiUd-op|s69nqYL|<6q9HYMe?n&(!eEQN{{D1+& zC>t?WV&NwVT>1XuBz7lDyI8s*60)Sl7RXbRHYn1j#Edc_6?Rmk_IljFgsGUcW;5pM W4|QI!)VeF>c854wM<3WIa|r)k%@(Er diff --git a/target/classes/jm/task/core/jdbc/service/UserServiceImpl.class b/target/classes/jm/task/core/jdbc/service/UserServiceImpl.class index 2c018412de7d194c7c3bd11d18eb39c2b93d9c56..97b18ebb1de8caab9001b29d81fc1f30f7ec991c 100644 GIT binary patch delta 14 VcmbQmHH&M*XC_9W&0m<*m;fj<1kwNi delta 14 VcmbQmHH&M*XC_9b&0m<*m;fi!1i}CS diff --git a/target/classes/jm/task/core/jdbc/util/Util.class b/target/classes/jm/task/core/jdbc/util/Util.class index 8d17b25dec4f95ebc42907d6b73baf790ae4e17a..c859285df6001c38055fc8232cfa1e466c17bf11 100644 GIT binary patch delta 137 zcmbQr^@x+})W2Q(7#J9g8EiLlg)mR9W&X@r!@$hI3KUbDT*;!EyaC8!V$cSXTtJ$E zL5x9;L7YJc$TESbVlZGZ1oD9D8H|7|Mlj15$O5TW1FA9vnkUD=!C(bsu`rkdMOlEV N%z)S$$Yx@&0RSX059K7O0=sN=iQj<$E^Yg4H z$1s28>|SHhhvKYZEV<3wO%rXJ8n1T9u7_5LS7NBls25SZz237`BpgbE;l^KHtP?s%` I$HZU<02+21O#lD@ From 5f67155d54dd8a9b8931abf1e2997626e7da5730 Mon Sep 17 00:00:00 2001 From: GSteffun <42888439+GSteffun@users.noreply.github.com> Date: Thu, 21 Oct 2021 18:43:08 +0300 Subject: [PATCH 07/22] =?UTF-8?q?=D0=9D=D0=B5=D0=BC=D0=BD=D0=BE=D0=B3?= =?UTF-8?q?=D0=BE=20=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE=D1=80=D0=B8?= =?UTF-8?q?=D0=BD=D0=B3=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/jm/task/core/jdbc/util/Util.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/jm/task/core/jdbc/util/Util.java b/src/main/java/jm/task/core/jdbc/util/Util.java index e68deacb..9dfc9b15 100644 --- a/src/main/java/jm/task/core/jdbc/util/Util.java +++ b/src/main/java/jm/task/core/jdbc/util/Util.java @@ -12,7 +12,7 @@ public static Connection getMySQLConnection() throws SQLException, ClassNotFound String hostName = "localhost"; String dbName = "base_for_work"; String userName = "aadmin"; - String password = "123!789q654"; + String password = "Password!"; return getMySQLConnection(hostName, dbName, userName, password); } From 67c874c0f43bc51101f94a58208c62c4851d0828 Mon Sep 17 00:00:00 2001 From: GSteffun <42888439+GSteffun@users.noreply.github.com> Date: Thu, 21 Oct 2021 18:56:43 +0300 Subject: [PATCH 08/22] =?UTF-8?q?=D0=98=20=D0=B5=D1=89=D0=B5=20=D0=BD?= =?UTF-8?q?=D0=B5=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=80=D0=B5=D1=84=D0=B0?= =?UTF-8?q?=D0=BA=D1=82=D0=BE=D1=80=D0=B8=D0=BD=D0=B3=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/jm/task/core/jdbc/Main.java | 3 +- .../task/core/jdbc/dao/UserDaoJDBCImpl.java | 42 +++++------------- .../core/jdbc/service/UserServiceImpl.java | 2 +- .../java/jm/task/core/jdbc/util/Util.java | 2 +- .../task/core/jdbc/dao/UserDaoJDBCImpl.class | Bin 5347 -> 4891 bytes .../core/jdbc/service/UserServiceImpl.class | Bin 1306 -> 1345 bytes 6 files changed, 16 insertions(+), 33 deletions(-) diff --git a/src/main/java/jm/task/core/jdbc/Main.java b/src/main/java/jm/task/core/jdbc/Main.java index 3e8b0884..36a949a0 100644 --- a/src/main/java/jm/task/core/jdbc/Main.java +++ b/src/main/java/jm/task/core/jdbc/Main.java @@ -7,7 +7,7 @@ import java.util.List; public class Main { - //Comment + public static void main(String[] args) { UserService userService = new UserServiceImpl(); userService.createUsersTable(); @@ -20,4 +20,5 @@ public static void main(String[] args) { userService.cleanUsersTable(); userService.dropUsersTable(); } + } diff --git a/src/main/java/jm/task/core/jdbc/dao/UserDaoJDBCImpl.java b/src/main/java/jm/task/core/jdbc/dao/UserDaoJDBCImpl.java index 36432002..e6569b6e 100644 --- a/src/main/java/jm/task/core/jdbc/dao/UserDaoJDBCImpl.java +++ b/src/main/java/jm/task/core/jdbc/dao/UserDaoJDBCImpl.java @@ -2,6 +2,7 @@ import jm.task.core.jdbc.model.User; import jm.task.core.jdbc.service.UserService; +import jm.task.core.jdbc.service.UserServiceImpl; import jm.task.core.jdbc.util.Util; import java.sql.*; @@ -9,14 +10,8 @@ import java.util.List; public class UserDaoJDBCImpl implements UserDao { - private UserService userService; - - public UserDaoJDBCImpl(UserService userService) { - this.userService = userService; - } public UserDaoJDBCImpl() { - } public void createUsersTable() { @@ -36,9 +31,7 @@ public void createUsersTable() { if (result == 0) { System.out.println("Таблица пользователей создана успешно!"); } - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } catch (SQLException e) { + } catch (ClassNotFoundException | SQLException e) { System.out.println(e.getMessage()); } @@ -57,9 +50,7 @@ public void dropUsersTable() { if (result == 0) { System.out.println("Таблица пользователей успешно удалена!"); } - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } catch (SQLException e) { + } catch (ClassNotFoundException | SQLException e) { System.out.println(e.getMessage()); } @@ -79,10 +70,8 @@ public void saveUser(String name, String lastName, byte age) { if (result == 1) { System.out.println("Пользователь " + name + " добавлен в базу данных"); } - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } catch (SQLException e) { - e.printStackTrace(); + } catch (ClassNotFoundException | SQLException e) { + System.out.println(e.getMessage()); } } @@ -102,10 +91,8 @@ public void removeUserById(long id) { } else { System.out.println(String.format("Пользователь с указанным id = %d не найден.", id)); } - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } catch (SQLException e) { - e.printStackTrace(); + } catch (ClassNotFoundException | SQLException e) { + System.out.println(e.getMessage()); } } @@ -126,10 +113,8 @@ public List getAllUsers() { user.setId(resultSet.getLong("id")); listUsers.add(user); } - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } catch (SQLException e) { - e.printStackTrace(); + } catch (ClassNotFoundException | SQLException e) { + System.out.println(e.getMessage()); } return listUsers; } @@ -143,15 +128,12 @@ public void cleanUsersTable() { System.exit(0); } Statement statement = connection.createStatement(); - String sql = "TRUNCATE TABLE Users;"; - int result = statement.executeUpdate(sql); + int result = statement.executeUpdate("TRUNCATE TABLE Users;"); if (result == 0) { System.out.println("Таблица Users успешно очищена."); } - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } catch (SQLException e) { - e.printStackTrace(); + } catch (ClassNotFoundException | SQLException e) { + System.out.println(e.getMessage()); } } diff --git a/src/main/java/jm/task/core/jdbc/service/UserServiceImpl.java b/src/main/java/jm/task/core/jdbc/service/UserServiceImpl.java index 277e2497..9c692928 100644 --- a/src/main/java/jm/task/core/jdbc/service/UserServiceImpl.java +++ b/src/main/java/jm/task/core/jdbc/service/UserServiceImpl.java @@ -8,7 +8,7 @@ public class UserServiceImpl implements UserService { - private final UserDaoJDBCImpl userDao = new UserDaoJDBCImpl(); + private final UserDao userDao = new UserDaoJDBCImpl(); public void createUsersTable() { userDao.createUsersTable(); diff --git a/src/main/java/jm/task/core/jdbc/util/Util.java b/src/main/java/jm/task/core/jdbc/util/Util.java index 9dfc9b15..e68deacb 100644 --- a/src/main/java/jm/task/core/jdbc/util/Util.java +++ b/src/main/java/jm/task/core/jdbc/util/Util.java @@ -12,7 +12,7 @@ public static Connection getMySQLConnection() throws SQLException, ClassNotFound String hostName = "localhost"; String dbName = "base_for_work"; String userName = "aadmin"; - String password = "Password!"; + String password = "123!789q654"; return getMySQLConnection(hostName, dbName, userName, password); } diff --git a/target/classes/jm/task/core/jdbc/dao/UserDaoJDBCImpl.class b/target/classes/jm/task/core/jdbc/dao/UserDaoJDBCImpl.class index 35bd89e1e3bf0317683d64a3d7b6538e2bbf1b21..af7cf06caaf11c9b924d6373d23513d477455d79 100644 GIT binary patch literal 4891 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 TXx+Zb&1q#RmH#S%`rCg1Baxvq diff --git a/target/classes/jm/task/core/jdbc/service/UserServiceImpl.class b/target/classes/jm/task/core/jdbc/service/UserServiceImpl.class index 97b18ebb1de8caab9001b29d81fc1f30f7ec991c..721062a37b467ca8d34fde22e7344e001a9bc3c4 100644 GIT binary patch literal 1345 zcmaKsZBNrs6vzK}os@MQ;J~3EA|Sd4q>4|N5fTR>fh_o9O2W&#?q+s&EonOvzm+B$ zf+l_dKa}y@+qofae6i*}o!|eQ|2=oVet-W7;2B;U$UxJPHE{zI3^P4`&MlXFUF&VT zC+vt}V#o2EXqQ1NS59Z@PmhA_^>UG+-)#1MNJ`}+|_mB1)dx!lq*MJT! zhdfLj1rt-4W~d}1Dd^m>g^F&)V;Rk$4`Lp}ax)orMX;X7O%!#^nwXO{EdBR1)o2HT zM?$6>zT<6I$oP_pc^N#_3H-Bvx9*r&z#_wB$j?<2L%G}>8`X*e$LrRUD~-yDL@$}R zhh;(sqVLCq#;3y$L$-VrpI9-miZzCOS43}ISIILJ%axcph#c2yI$@+LT{rPiW;$)V zf_vjsb(B-DCdFWq-t#+x7){3$$Af-b1j-2#ZTdEMPk7)+XNHT}=z|k7)Kcytg)XnJ zP7)sPlSDD;3t8#%FgjNI8t>96)?mmuUfU1&4{W~vup)gRDL zFOd5N;|r~2P^GVYJ3tOuV%2D5#^*C@A=lp;}PQz_KJL&_=TnA0UDW79nLV0ow3nAM%a^#TB}5j;!9^ufQkeWmBu{@$&k4ljyP!Q;eLNp| uc%R`jt;RPY9Rj_w@h$xI?}a+^lJ@D*&^N`$2T31S$;Y)68pA8a+x`RCdi*&6 literal 1306 zcmZvbZ%@-u6vm&sO}amIn*)b}fPl*WAXQL&F|vd~NLUtpF`e<{U3W7(yOy-w62Fxu z3W+9u06&!R+}p`?>x(w`-gD3IIp^u=uixK)0yw~{G-8NrNa(nQ1%~{9kGWxUr*FLO z4ulynEF4*m71SBxrE*6@lHu`SXawB}t)->w$-l1I`aasZS$~9Q!2ekLsNPR>43!TMK zqPP4(fD{tMD$`02@1ue$?Iiav>yUPmm8^V4`U?43MwYa5|1gp_3>r$xl=aLo7H1g+ zVk|~7XnH4%cT{VFSQ%MIb$9Iw#aT>|+FDkaN_cfr3MF9|PgNTk?9oa#pMimA$|xG~ ziO4bS;}lCtk&P>?%u1{viB%<0oH!UdCcS))eZnyLKTu5e9qwPF^5g&j From 799b6224f6a16fe2bf87a6dded771449c5db0eb6 Mon Sep 17 00:00:00 2001 From: GSteffun <42888439+GSteffun@users.noreply.github.com> Date: Thu, 21 Oct 2021 18:57:42 +0300 Subject: [PATCH 09/22] 1 --- src/main/java/jm/task/core/jdbc/util/Util.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/jm/task/core/jdbc/util/Util.java b/src/main/java/jm/task/core/jdbc/util/Util.java index e68deacb..9dfc9b15 100644 --- a/src/main/java/jm/task/core/jdbc/util/Util.java +++ b/src/main/java/jm/task/core/jdbc/util/Util.java @@ -12,7 +12,7 @@ public static Connection getMySQLConnection() throws SQLException, ClassNotFound String hostName = "localhost"; String dbName = "base_for_work"; String userName = "aadmin"; - String password = "123!789q654"; + String password = "Password!"; return getMySQLConnection(hostName, dbName, userName, password); } From 02607e6677fd3bf4042cff81e51b337bc0ebfbf4 Mon Sep 17 00:00:00 2001 From: GSteffun <42888439+GSteffun@users.noreply.github.com> Date: Thu, 21 Oct 2021 19:09:30 +0300 Subject: [PATCH 10/22] 2 --- .../task/core/jdbc/dao/UserDaoJDBCImpl.java | 12 ++++++------ .../java/jm/task/core/jdbc/util/Util.java | 2 +- .../task/core/jdbc/dao/UserDaoJDBCImpl.class | Bin 4891 -> 4782 bytes .../classes/jm/task/core/jdbc/util/Util.class | Bin 1250 -> 1210 bytes 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/jm/task/core/jdbc/dao/UserDaoJDBCImpl.java b/src/main/java/jm/task/core/jdbc/dao/UserDaoJDBCImpl.java index e6569b6e..b11ecb61 100644 --- a/src/main/java/jm/task/core/jdbc/dao/UserDaoJDBCImpl.java +++ b/src/main/java/jm/task/core/jdbc/dao/UserDaoJDBCImpl.java @@ -31,7 +31,7 @@ public void createUsersTable() { if (result == 0) { System.out.println("Таблица пользователей создана успешно!"); } - } catch (ClassNotFoundException | SQLException e) { + } catch (SQLException e) { System.out.println(e.getMessage()); } @@ -50,7 +50,7 @@ public void dropUsersTable() { if (result == 0) { System.out.println("Таблица пользователей успешно удалена!"); } - } catch (ClassNotFoundException | SQLException e) { + } catch (SQLException e) { System.out.println(e.getMessage()); } @@ -70,7 +70,7 @@ public void saveUser(String name, String lastName, byte age) { if (result == 1) { System.out.println("Пользователь " + name + " добавлен в базу данных"); } - } catch (ClassNotFoundException | SQLException e) { + } catch (SQLException e) { System.out.println(e.getMessage()); } @@ -91,7 +91,7 @@ public void removeUserById(long id) { } else { System.out.println(String.format("Пользователь с указанным id = %d не найден.", id)); } - } catch (ClassNotFoundException | SQLException e) { + } catch (SQLException e) { System.out.println(e.getMessage()); } } @@ -113,7 +113,7 @@ public List getAllUsers() { user.setId(resultSet.getLong("id")); listUsers.add(user); } - } catch (ClassNotFoundException | SQLException e) { + } catch (SQLException e) { System.out.println(e.getMessage()); } return listUsers; @@ -132,7 +132,7 @@ public void cleanUsersTable() { if (result == 0) { System.out.println("Таблица Users успешно очищена."); } - } catch (ClassNotFoundException | SQLException e) { + } catch (SQLException e) { System.out.println(e.getMessage()); } diff --git a/src/main/java/jm/task/core/jdbc/util/Util.java b/src/main/java/jm/task/core/jdbc/util/Util.java index 9dfc9b15..cc9588f8 100644 --- a/src/main/java/jm/task/core/jdbc/util/Util.java +++ b/src/main/java/jm/task/core/jdbc/util/Util.java @@ -7,7 +7,7 @@ public class Util { // реализуйте настройку соеденения с БД - public static Connection getMySQLConnection() throws SQLException, ClassNotFoundException { + public static Connection getMySQLConnection() throws SQLException { String hostName = "localhost"; String dbName = "base_for_work"; diff --git a/target/classes/jm/task/core/jdbc/dao/UserDaoJDBCImpl.class b/target/classes/jm/task/core/jdbc/dao/UserDaoJDBCImpl.class index af7cf06caaf11c9b924d6373d23513d477455d79..bf7ec6e81c9675890880220412735fb76a6fb708 100644 GIT binary patch delta 1786 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 N|L=cpzLG${{u2ozitYda diff --git a/target/classes/jm/task/core/jdbc/util/Util.class b/target/classes/jm/task/core/jdbc/util/Util.class index c859285df6001c38055fc8232cfa1e466c17bf11..c08fe0f87f6aeb07c76e13deafa8575a980d5f90 100644 GIT binary patch delta 59 zcmaFFxr>wQ)W2Q(7#J9g8LT&Q$uLj$VgAUgS#9+o?F Date: Sun, 24 Oct 2021 14:30:27 +0300 Subject: [PATCH 11/22] =?UTF-8?q?=D0=97=D0=B0=D0=BA=D0=BE=D0=BD=D1=87?= =?UTF-8?q?=D0=B8=D0=BB=201.1.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.gitignore | 3 - .idea/compiler.xml | 1 - .idea/dataSources.local.xml | 7 +- .idea/dataSources.xml | 5 +- .../20fc9a50-b39e-4a4b-a7d7-ab858fabcae6.xml | 1111 ----------------- .../schema/information_schema.FNRwLQ.meta | 2 - .../storage_v2/_src_/schema/mysql.osA4Bg.meta | 2 - .../schema/performance_schema.kIw0nw.meta | 2 - .../storage_v2/_src_/schema/sys.zb4BAA.meta | 2 - .idea/jpa-buddy-datasource.xml | 8 + .idea/sqldialects.xml | 1 - .jpb/persistence-units.xml | 12 + pom.xml | 6 +- src/main/java/jm/task/core/jdbc/Main.java | 32 +- .../core/jdbc/dao/UserDaoHibernateImpl.java | 64 +- .../task/core/jdbc/dao/UserDaoJDBCImpl.java | 5 +- .../java/jm/task/core/jdbc/model/User.java | 14 +- .../java/jm/task/core/jdbc/util/Util.java | 55 +- target/TaskJDBC-1.0-SNAPSHOT.jar | Bin 10375 -> 10000 bytes target/classes/jm/task/core/jdbc/Main.class | Bin 1237 -> 1185 bytes .../jm/task/core/jdbc/dao/UserDao.class | Bin 411 -> 411 bytes .../core/jdbc/dao/UserDaoHibernateImpl.class | Bin 1051 -> 3628 bytes .../task/core/jdbc/dao/UserDaoJDBCImpl.class | Bin 4782 -> 4784 bytes .../jm/task/core/jdbc/model/User.class | Bin 1909 -> 2077 bytes .../task/core/jdbc/service/UserService.class | Bin 423 -> 423 bytes .../core/jdbc/service/UserServiceImpl.class | Bin 1345 -> 1345 bytes .../classes/jm/task/core/jdbc/util/Util.class | Bin 1210 -> 3491 bytes target/maven-archiver/pom.properties | 2 +- .../surefire-reports/TEST-UserServiceTest.xml | 22 +- target/surefire-reports/UserServiceTest.txt | 2 +- target/test-classes/UserServiceTest.class | Bin 4206 -> 4206 bytes 31 files changed, 178 insertions(+), 1180 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6.xml delete mode 100644 .idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6/storage_v2/_src_/schema/information_schema.FNRwLQ.meta delete mode 100644 .idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6/storage_v2/_src_/schema/mysql.osA4Bg.meta delete mode 100644 .idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6/storage_v2/_src_/schema/performance_schema.kIw0nw.meta delete mode 100644 .idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6/storage_v2/_src_/schema/sys.zb4BAA.meta create mode 100644 .idea/jpa-buddy-datasource.xml create mode 100644 .jpb/persistence-units.xml diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 26d33521..00000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 19f5be47..e7a827b9 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -7,7 +7,6 @@ - diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml index 8a2e3cbe..04d18767 100644 --- a/.idea/dataSources.local.xml +++ b/.idea/dataSources.local.xml @@ -1,7 +1,7 @@ - + #@ ` @@ -11,10 +11,7 @@ aadmin - - - - + diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index d078f5b9..779d862b 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -1,15 +1,12 @@ - + mysql.8 true com.mysql.cj.jdbc.Driver jdbc:mysql://localhost:3306/base_for_work $ProjectFileDir$ - - - \ No newline at end of file diff --git a/.idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6.xml b/.idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6.xml deleted file mode 100644 index e72a3eae..00000000 --- a/.idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6.xml +++ /dev/null @@ -1,1111 +0,0 @@ - - - - - 8.0.27 - |root||aadmin||ALTER|G -|root||root|localhost|ALTER|G -|root||aadmin||ALTER ROUTINE|G -|root||root|localhost|ALTER ROUTINE|G -|root||root|localhost|APPLICATION_PASSWORD_ADMIN|G -|root||root|localhost|AUDIT_ADMIN|G -|root||root|localhost|AUTHENTICATION_POLICY_ADMIN|G -|root||mysql.session|localhost|BACKUP_ADMIN|G -|root||root|localhost|BACKUP_ADMIN|G -|root||root|localhost|BINLOG_ADMIN|G -|root||root|localhost|BINLOG_ENCRYPTION_ADMIN|G -|root||mysql.session|localhost|CLONE_ADMIN|G -|root||root|localhost|CLONE_ADMIN|G -|root||mysql.session|localhost|CONNECTION_ADMIN|G -|root||root|localhost|CONNECTION_ADMIN|G -|root||aadmin||CREATE|G -|root||root|localhost|CREATE|G -|root||root|localhost|CREATE ROLE|G -|root||aadmin||CREATE ROUTINE|G -|root||root|localhost|CREATE ROUTINE|G -|root||aadmin||CREATE TABLESPACE|G -|root||root|localhost|CREATE TABLESPACE|G -|root||aadmin||CREATE TEMPORARY TABLES|G -|root||root|localhost|CREATE TEMPORARY TABLES|G -|root||aadmin||CREATE USER|G -|root||root|localhost|CREATE USER|G -|root||aadmin||CREATE VIEW|G -|root||root|localhost|CREATE VIEW|G -|root||aadmin||DELETE|G -|root||root|localhost|DELETE|G -|root||aadmin||DROP|G -|root||root|localhost|DROP|G -|root||root|localhost|DROP ROLE|G -|root||root|localhost|ENCRYPTION_KEY_ADMIN|G -|root||aadmin||EVENT|G -|root||root|localhost|EVENT|G -|root||aadmin||EXECUTE|G -|root||root|localhost|EXECUTE|G -|root||aadmin||FILE|G -|root||root|localhost|FILE|G -|root||root|localhost|FLUSH_OPTIMIZER_COSTS|G -|root||root|localhost|FLUSH_STATUS|G -|root||root|localhost|FLUSH_TABLES|G -|root||root|localhost|FLUSH_USER_RESOURCES|G -|root||root|localhost|GROUP_REPLICATION_ADMIN|G -|root||root|localhost|GROUP_REPLICATION_STREAM|G -|root||aadmin||INDEX|G -|root||root|localhost|INDEX|G -|root||root|localhost|INNODB_REDO_LOG_ARCHIVE|G -|root||root|localhost|INNODB_REDO_LOG_ENABLE|G -|root||aadmin||INSERT|G -|root||root|localhost|INSERT|G -|root||aadmin||LOCK TABLES|G -|root||root|localhost|LOCK TABLES|G -|root||root|localhost|PASSWORDLESS_USER_ADMIN|G -|root||mysql.session|localhost|PERSIST_RO_VARIABLES_ADMIN|G -|root||root|localhost|PERSIST_RO_VARIABLES_ADMIN|G -|root||aadmin||PROCESS|G -|root||root|localhost|PROCESS|G -|root||aadmin||REFERENCES|G -|root||root|localhost|REFERENCES|G -|root||aadmin||RELOAD|G -|root||root|localhost|RELOAD|G -|root||aadmin||REPLICATION CLIENT|G -|root||root|localhost|REPLICATION CLIENT|G -|root||aadmin||REPLICATION SLAVE|G -|root||root|localhost|REPLICATION SLAVE|G -|root||root|localhost|REPLICATION_APPLIER|G -|root||root|localhost|REPLICATION_SLAVE_ADMIN|G -|root||root|localhost|RESOURCE_GROUP_ADMIN|G -|root||root|localhost|RESOURCE_GROUP_USER|G -|root||root|localhost|ROLE_ADMIN|G -|root||aadmin||SELECT|G -|root||mysql.infoschema|localhost|SELECT|G -|root||root|localhost|SELECT|G -|root||root|localhost|SERVICE_CONNECTION_ADMIN|G -|root||mysql.session|localhost|SESSION_VARIABLES_ADMIN|G -|root||root|localhost|SESSION_VARIABLES_ADMIN|G -|root||root|localhost|SET_USER_ID|G -|root||aadmin||SHOW DATABASES|G -|root||root|localhost|SHOW DATABASES|G -|root||aadmin||SHOW VIEW|G -|root||root|localhost|SHOW VIEW|G -|root||root|localhost|SHOW_ROUTINE|G -|root||aadmin||SHUTDOWN|G -|root||mysql.session|localhost|SHUTDOWN|G -|root||root|localhost|SHUTDOWN|G -|root||aadmin||SUPER|G -|root||mysql.session|localhost|SUPER|G -|root||root|localhost|SUPER|G -|root||mysql.infoschema|localhost|SYSTEM_USER|G -|root||mysql.session|localhost|SYSTEM_USER|G -|root||mysql.sys|localhost|SYSTEM_USER|G -|root||root|localhost|SYSTEM_USER|G -|root||mysql.session|localhost|SYSTEM_VARIABLES_ADMIN|G -|root||root|localhost|SYSTEM_VARIABLES_ADMIN|G -|root||root|localhost|TABLE_ENCRYPTION_ADMIN|G -|root||aadmin||TRIGGER|G -|root||root|localhost|TRIGGER|G -|root||aadmin||UPDATE|G -|root||root|localhost|UPDATE|G -|root||root|localhost|XA_RECOVER_ADMIN|G -|root||aadmin||grant option|G -|root||root|localhost|grant option|G -performance_schema|schema||mysql.session|localhost|SELECT|G -sys|schema||mysql.sys|localhost|TRIGGER|G - InnoDB - InnoDB - lower/lower - - - 1 - utf8mb4_0900_ai_ci - - - utf8_general_ci - - - user|||mysql.session|localhost|SELECT|G - utf8mb4_0900_ai_ci - - - utf8mb4_0900_ai_ci - - - utf8mb4_0900_ai_ci - - - armscii8 - 1 - - - armscii8 - - - ascii - 1 - - - ascii - - - big5 - 1 - - - big5 - - - binary - 1 - - - cp1250 - 1 - - - cp1250 - - - cp1250 - - - cp1250 - - - cp1250 - - - cp1251 - - - cp1251 - - - cp1251 - - - cp1251 - 1 - - - cp1251 - - - cp1256 - 1 - - - cp1256 - - - cp1257 - - - cp1257 - - - cp1257 - 1 - - - cp850 - 1 - - - cp850 - - - cp852 - 1 - - - cp852 - - - cp866 - 1 - - - cp866 - - - cp932 - 1 - - - cp932 - - - dec8 - 1 - - - dec8 - - - eucjpms - 1 - - - eucjpms - - - euckr - 1 - - - euckr - - - gb18030 - 1 - - - gb18030 - - - gb18030 - - - gb2312 - 1 - - - gb2312 - - - gbk - 1 - - - gbk - - - geostd8 - 1 - - - geostd8 - - - greek - 1 - - - greek - - - hebrew - 1 - - - hebrew - - - hp8 - 1 - - - hp8 - - - keybcs2 - 1 - - - keybcs2 - - - koi8r - 1 - - - koi8r - - - koi8u - 1 - - - koi8u - - - latin1 - - - latin1 - 1 - - - latin1 - - - latin1 - - - latin1 - - - latin1 - - - latin1 - - - latin1 - - - latin2 - - - latin2 - 1 - - - latin2 - - - latin2 - - - latin2 - - - latin5 - 1 - - - latin5 - - - latin7 - - - latin7 - 1 - - - latin7 - - - latin7 - - - macce - 1 - - - macce - - - macroman - 1 - - - macroman - - - sjis - 1 - - - sjis - - - swe7 - 1 - - - swe7 - - - tis620 - 1 - - - tis620 - - - ucs2 - 1 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ucs2 - - - ujis - 1 - - - ujis - - - utf16 - 1 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16 - - - utf16le - 1 - - - utf16le - - - utf32 - 1 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf32 - - - utf8 - 1 - - - utf8 - - - utf8 - - - utf8 - - - utf8 - - - utf8 - - - utf8 - - - utf8 - - - utf8 - - - utf8 - - - utf8 - - - utf8 - - - utf8 - - - utf8 - - - utf8 - - - utf8 - - - utf8 - - - utf8 - - - utf8 - - - utf8 - - - utf8 - - - utf8 - - - utf8 - - - utf8 - - - utf8 - - - utf8 - - - utf8 - - - utf8 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - 1 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - utf8mb4 - - - caching_sha2_password - - - localhost - caching_sha2_password - - - localhost - caching_sha2_password - - - localhost - caching_sha2_password - - - localhost - caching_sha2_password - - -
- The group configuration version. -
- - The member actions configuration. -
- - 1 - int|0s - 1 - null - - - 2 - varchar(50)|0s - 1 - - - 3 - varchar(50)|0s - 1 - - - 4 - int|0s - 1 - - - 1 - id - 1 - - - 1 - The configuration name. - char(255)|0s - 1 - ascii_general_ci - - - 2 - The version of the configuration name. - bigint unsigned|0s - 1 - - - 1 - name - 1 - - - 1 - The action name. - char(255)|0s - 1 - ascii_general_ci - - - 2 - The event that will trigger the action. - char(64)|0s - 1 - ascii_general_ci - - - 3 - Whether the action is enabled. - tinyint(1)|0s - 1 - - - 4 - The action type. - char(64)|0s - 1 - ascii_general_ci - - - 5 - The order on which the action will be run, value between 1 and 100, lower values first. - tinyint unsigned|0s - 1 - - - 6 - On errors during the action will be handled: IGNORE, CRITICAL. - char(64)|0s - 1 - ascii_general_ci - - - event - btree - - - 1 - name -event - 1 - - - \ No newline at end of file diff --git a/.idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6/storage_v2/_src_/schema/information_schema.FNRwLQ.meta b/.idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6/storage_v2/_src_/schema/information_schema.FNRwLQ.meta deleted file mode 100644 index 1ff3db2e..00000000 --- a/.idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6/storage_v2/_src_/schema/information_schema.FNRwLQ.meta +++ /dev/null @@ -1,2 +0,0 @@ -#n:information_schema -! [null, 0, null, null, -2147483648, -2147483648] diff --git a/.idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6/storage_v2/_src_/schema/mysql.osA4Bg.meta b/.idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6/storage_v2/_src_/schema/mysql.osA4Bg.meta deleted file mode 100644 index 86a53f19..00000000 --- a/.idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6/storage_v2/_src_/schema/mysql.osA4Bg.meta +++ /dev/null @@ -1,2 +0,0 @@ -#n:mysql -! [null, 0, null, null, -2147483648, -2147483648] diff --git a/.idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6/storage_v2/_src_/schema/performance_schema.kIw0nw.meta b/.idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6/storage_v2/_src_/schema/performance_schema.kIw0nw.meta deleted file mode 100644 index 9394db14..00000000 --- a/.idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6/storage_v2/_src_/schema/performance_schema.kIw0nw.meta +++ /dev/null @@ -1,2 +0,0 @@ -#n:performance_schema -! [null, 0, null, null, -2147483648, -2147483648] diff --git a/.idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6/storage_v2/_src_/schema/sys.zb4BAA.meta b/.idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6/storage_v2/_src_/schema/sys.zb4BAA.meta deleted file mode 100644 index 2f4470bb..00000000 --- a/.idea/dataSources/20fc9a50-b39e-4a4b-a7d7-ab858fabcae6/storage_v2/_src_/schema/sys.zb4BAA.meta +++ /dev/null @@ -1,2 +0,0 @@ -#n:sys -! [null, 0, null, null, -2147483648, -2147483648] diff --git a/.idea/jpa-buddy-datasource.xml b/.idea/jpa-buddy-datasource.xml new file mode 100644 index 00000000..f5ae5062 --- /dev/null +++ b/.idea/jpa-buddy-datasource.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml index 539d872a..56782cab 100644 --- a/.idea/sqldialects.xml +++ b/.idea/sqldialects.xml @@ -1,7 +1,6 @@ - \ No newline at end of file diff --git a/.jpb/persistence-units.xml b/.jpb/persistence-units.xml new file mode 100644 index 00000000..a462c23d --- /dev/null +++ b/.jpb/persistence-units.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 23d29f85..58f3772f 100644 --- a/pom.xml +++ b/pom.xml @@ -14,8 +14,8 @@ maven-compiler-plugin 3.8.1 - 7 - 7 + 8 + 8 @@ -46,7 +46,7 @@ org.hibernate hibernate-core - 4.3.10.Final + 5.6.0.Final diff --git a/src/main/java/jm/task/core/jdbc/Main.java b/src/main/java/jm/task/core/jdbc/Main.java index 36a949a0..ef5d1f61 100644 --- a/src/main/java/jm/task/core/jdbc/Main.java +++ b/src/main/java/jm/task/core/jdbc/Main.java @@ -1,24 +1,34 @@ package jm.task.core.jdbc; +import jm.task.core.jdbc.dao.UserDaoHibernateImpl; import jm.task.core.jdbc.model.User; -import jm.task.core.jdbc.service.UserService; -import jm.task.core.jdbc.service.UserServiceImpl; import java.util.List; public class Main { public static void main(String[] args) { - UserService userService = new UserServiceImpl(); - userService.createUsersTable(); - userService.saveUser("Vladimir", "Nuroev", (byte)53); - userService.saveUser("Vadim", "Rolnin", (byte)37); - userService.saveUser("Stanislav", "Petrov", (byte)44); - userService.saveUser("Oleg", "Igorev", (byte)29); - List listUsers = userService.getAllUsers(); +// UserService userService = new UserServiceImpl(); +// userService.createUsersTable(); +// userService.saveUser("Vladimir", "Nuroev", (byte)53); +// userService.saveUser("Vadim", "Rolnin", (byte)37); +// userService.saveUser("Stanislav", "Petrov", (byte)44); +// userService.saveUser("Oleg", "Igorev", (byte)29); +// List listUsers = userService.getAllUsers(); +// System.out.println(listUsers); +// userService.cleanUsersTable(); +// userService.dropUsersTable(); + + UserDaoHibernateImpl userDaoHibernate = new UserDaoHibernateImpl(); + userDaoHibernate.createUsersTable(); + userDaoHibernate.saveUser("Vasily", "Petrov", (byte)48); + userDaoHibernate.saveUser("Ivan", "Kuncevich", (byte)59); + userDaoHibernate.saveUser("Alena", "Tibrec", (byte)22); + userDaoHibernate.saveUser("Gleb", "Kuchma", (byte)36); + List listUsers = userDaoHibernate.getAllUsers(); System.out.println(listUsers); - userService.cleanUsersTable(); - userService.dropUsersTable(); + userDaoHibernate.cleanUsersTable(); + userDaoHibernate.dropUsersTable(); } } diff --git a/src/main/java/jm/task/core/jdbc/dao/UserDaoHibernateImpl.java b/src/main/java/jm/task/core/jdbc/dao/UserDaoHibernateImpl.java index dc2d0636..46763320 100644 --- a/src/main/java/jm/task/core/jdbc/dao/UserDaoHibernateImpl.java +++ b/src/main/java/jm/task/core/jdbc/dao/UserDaoHibernateImpl.java @@ -1,42 +1,88 @@ package jm.task.core.jdbc.dao; import jm.task.core.jdbc.model.User; - +import jm.task.core.jdbc.util.Util; +import org.hibernate.*; import java.util.List; public class UserDaoHibernateImpl implements UserDao { - public UserDaoHibernateImpl() { - } + private SessionFactory sessionFactory; + public UserDaoHibernateImpl() { + sessionFactory = Util.getSessionFactory(); + } @Override public void createUsersTable() { - + Session session = sessionFactory.openSession(); + session.beginTransaction(); + try { + session.createSQLQuery("CREATE TABLE USERS (" + + "id INT NOT NULL AUTO_INCREMENT PRIMARY KEY," + + "name varchar(255) NOT NULL," + + "lastName varchar(255) NOT NULL," + + "age int NOT NULL);") + .executeUpdate(); + } catch (Exception e) { + System.out.println(e.getCause().getCause().getMessage()); + } + session.getTransaction().commit(); + session.close(); } @Override public void dropUsersTable() { - + Session session = sessionFactory.openSession(); + session.beginTransaction(); + try { + session.createSQLQuery("DROP TABLE USERS") + .executeUpdate(); + } catch (Exception e) { + System.out.println(e.getCause().getCause().getMessage()); + } + session.getTransaction().commit(); + session.close(); } @Override public void saveUser(String name, String lastName, byte age) { - + Session session = sessionFactory.openSession(); + session.beginTransaction(); + User user = new User(name, lastName, age); + session.save(user); + session.getTransaction().commit(); + session.close(); } @Override public void removeUserById(long id) { - + Session session = sessionFactory.openSession(); + session.beginTransaction(); + session.createQuery("DELETE FROM User WHERE id = :id") + .setParameter("id", id) + .executeUpdate(); + session.getTransaction().commit(); + session.close(); } @Override public List getAllUsers() { - return null; + Session session = sessionFactory.openSession(); + session.beginTransaction(); + List listUsers = session.createQuery("from User").list(); + session.getTransaction().commit(); + session.close(); + return listUsers; } @Override public void cleanUsersTable() { - + Session session = sessionFactory.openSession(); + session.beginTransaction(); + session.createQuery("DELETE FROM User") + .executeUpdate(); + session.getTransaction().commit(); + session.close(); } } diff --git a/src/main/java/jm/task/core/jdbc/dao/UserDaoJDBCImpl.java b/src/main/java/jm/task/core/jdbc/dao/UserDaoJDBCImpl.java index b11ecb61..8f198068 100644 --- a/src/main/java/jm/task/core/jdbc/dao/UserDaoJDBCImpl.java +++ b/src/main/java/jm/task/core/jdbc/dao/UserDaoJDBCImpl.java @@ -25,8 +25,8 @@ public void createUsersTable() { Statement statement = connection.createStatement(); int result = statement.executeUpdate("CREATE TABLE Users (" + "id INT NOT NULL AUTO_INCREMENT PRIMARY KEY," + - "name varchar(50) NOT NULL," + - "lastName varchar(50) NOT NULL," + + "name varchar(255) NOT NULL," + + "lastName varchar(255) NOT NULL," + "age int NOT NULL);"); if (result == 0) { System.out.println("Таблица пользователей создана успешно!"); @@ -65,7 +65,6 @@ public void saveUser(String name, String lastName, byte age) { System.exit(0); } Statement statement = connection.createStatement(); -// String strResult = String.format("INSERT INTO Users SET name = '%s', lastName = '%s', age = %d;", name, lastName, age); int result = statement.executeUpdate(String.format("INSERT INTO Users SET name = '%s', lastName = '%s', age = %d;", name, lastName, age)); if (result == 1) { System.out.println("Пользователь " + name + " добавлен в базу данных"); diff --git a/src/main/java/jm/task/core/jdbc/model/User.java b/src/main/java/jm/task/core/jdbc/model/User.java index 3d9e3acf..812903b0 100644 --- a/src/main/java/jm/task/core/jdbc/model/User.java +++ b/src/main/java/jm/task/core/jdbc/model/User.java @@ -1,21 +1,21 @@ package jm.task.core.jdbc.model; -import javax.persistence.Column; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; -@Table +@Entity +@Table(name = "USERS") public class User { @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @Column + @Column(name = "name") private String name; - @Column + @Column(name = "lastName") private String lastName; - @Column + @Column(name = "age") private Byte age; public User() { diff --git a/src/main/java/jm/task/core/jdbc/util/Util.java b/src/main/java/jm/task/core/jdbc/util/Util.java index cc9588f8..4c90a003 100644 --- a/src/main/java/jm/task/core/jdbc/util/Util.java +++ b/src/main/java/jm/task/core/jdbc/util/Util.java @@ -1,11 +1,23 @@ package jm.task.core.jdbc.util; +import jm.task.core.jdbc.model.User; +import org.hibernate.SessionFactory; +import org.hibernate.boot.Metadata; +import org.hibernate.boot.MetadataSources; +import org.hibernate.boot.registry.StandardServiceRegistry; +import org.hibernate.boot.registry.StandardServiceRegistryBuilder; +import org.hibernate.cfg.Environment; + import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; +import java.util.HashMap; +import java.util.Map; public class Util { - // реализуйте настройку соеденения с БД + + private static StandardServiceRegistry registry; + private static SessionFactory sessionFactory; public static Connection getMySQLConnection() throws SQLException { @@ -23,4 +35,45 @@ public static Connection getMySQLConnection(String hostName, String dbName, return DriverManager.getConnection(connectionURL, userName, password); } + + + public static SessionFactory getSessionFactory() { + + if (sessionFactory == null) { + try { + StandardServiceRegistryBuilder registryBuilder = new StandardServiceRegistryBuilder(); + + Map settings = new HashMap<>(); + settings.put(Environment.DRIVER, "com.mysql.jdbc.Driver"); + settings.put(Environment.URL, "jdbc:mysql://localhost:3306/base_for_work"); + settings.put(Environment.USER, "aadmin"); + settings.put(Environment.PASS, "Password!"); + settings.put(Environment.DIALECT, "org.hibernate.dialect.MySQLDialect"); + + registryBuilder.applySettings(settings); + + registry = registryBuilder.build(); + + MetadataSources sources = new MetadataSources(registry); + sources.addAnnotatedClass(User.class); + Metadata metadata = sources.getMetadataBuilder().build(); + + sessionFactory = metadata.getSessionFactoryBuilder().build(); + + } catch (Exception e) { + e.printStackTrace(); + if (registry != null) { + StandardServiceRegistryBuilder.destroy(registry); + } + } + } + return sessionFactory; + } + + public static void close() { + if (registry != null) { + StandardServiceRegistryBuilder.destroy(registry); + } + } + } diff --git a/target/TaskJDBC-1.0-SNAPSHOT.jar b/target/TaskJDBC-1.0-SNAPSHOT.jar index 40e9a4174f66d4e6d9e3db0783cb5b2cf7da36f0..5d675b5c86377a57b81ff4a29a581f9ffee45ee2 100644 GIT binary patch delta 5810 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 delta 6202 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 I@n^+<0ffd^LI3~& diff --git a/target/classes/jm/task/core/jdbc/Main.class b/target/classes/jm/task/core/jdbc/Main.class index 016b917dd4419e818faa6959cc4718dac8a25057..8087ce5dfbebb96ae9dac643ecfb311ad0a8abcc 100644 GIT binary patch delta 685 zcma)4J#W)c6g@9#V>>aeF_3iC5PvDUf!~)+rjARv%%Fz6AGa_R3eDl~!iy}!SfkH971IpbLCphz4IZYc3a0CsZF#3|Kwa!uoYDkANP#jKkH#A zH~)W;Q7-v@a2E;s3LvB@ks{ot$fA?cIbJ*k`xMJNgi;1n>=No{1-OU%6lr*XJ<7=D z?-)ap&c;_LZ%&~#OCzL9<^^-o*cjnr$-H7t8M`r?8JKfMHl_>aqOmI32usgDW34Xb{M@fX<1ftUaQ delta 707 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 diff --git a/target/classes/jm/task/core/jdbc/dao/UserDaoJDBCImpl.class b/target/classes/jm/task/core/jdbc/dao/UserDaoJDBCImpl.class index bf7ec6e81c9675890880220412735fb76a6fb708..c7e25f5d14a77dc35b45b21c53292872992e1ffc 100644 GIT binary patch delta 281 zcmWNN-771?q+E)R$H8RB{Nv1_x%(BA_yQHXK`cG|P6`!YxG#VK?$P#9eZk8}u zW}Fq7tg^=jCDtgj&Iz0TPkX0I=4c^LkZnTJ8KFRr82i{~h$3SWNJ${gfrJl5N1WnN zsalv!h+bxv@CpROJynWvosVc|t65))=Wdkj!wM8e||PH{k*iYy&UcR9u5 zj2d;h-Qb9Oj(sEYJA5tz7a~v>frbcN(#w^Qu1Ro%P7{M$#<*jW2fq@|w0+7SLVW!L Dct1Pf diff --git a/target/classes/jm/task/core/jdbc/model/User.class b/target/classes/jm/task/core/jdbc/model/User.class index 60331454cf16e85def063f2852d4c381979a573c..5a4f021214025b4a9c64673a1bc7e51514088430 100644 GIT binary patch delta 939 zcmaKq&rTXq6vn?h4u1kop-LeU7fr3H0qJ1D))xF%MT<5r6ivEmLh8g|3=$ZdvSMqx zowW?2Sdfd1)O{5e)oL8bI-YYcp45|UjMoPki|wjFrs~W z`r)AbrTo>Xne|4cVVTv>rm<#L&3f4~_jb#N$7W8z->~FmGP{lwqM=c|_k_w2byQs@nLSEcSY}&KVzfYF%7G#A8Tr?<;cG0 KzDN{~_WD1u8){_$ delta 831 zcmZ{iT~5M46otfuu z)9D17$@nrib9?5VFQ@mp{Igm3{{8#{(8t}pP;q1~AG|#|4?;HbJ27^#28UnsJgcZd zpu?NT+GTZ6#CoQ8sCp$!ZwnPeSLEGQlOn$A^Cno`@B?D5#`J&|3d((({xux2ow!kj zW4?fzFyI-^s4bHf}YiQVmIC}jR!OyW{k7G=~f6#acL$HhYOU=2u4;tN*J@dAmivDT`~fokIFSGV diff --git a/target/classes/jm/task/core/jdbc/service/UserService.class b/target/classes/jm/task/core/jdbc/service/UserService.class index e1f4323602580d732ac8e9a58523ff331b8abb0f..4e60943a3c41d89449d474ab608ee8c3bfabf244 100644 GIT binary patch delta 17 ZcmZ3^yquZi)W2Q(7#J8#Hge2o1OPoI1}Xpm delta 17 ZcmZ3^yquZi)W2Q(7#J9gH*(Bp1OPoD1}Ojl diff --git a/target/classes/jm/task/core/jdbc/service/UserServiceImpl.class b/target/classes/jm/task/core/jdbc/service/UserServiceImpl.class index 721062a37b467ca8d34fde22e7344e001a9bc3c4..fba7f6e45afc239450cc111edd0d802b5cc5566b 100644 GIT binary patch delta 17 ZcmX@eb&!kW)W2Q(7#J8#HgZ_90sug81_}TG delta 17 ZcmX@eb&!kW)W2Q(7#J9gH*#3A0sug31_=NF diff --git a/target/classes/jm/task/core/jdbc/util/Util.class b/target/classes/jm/task/core/jdbc/util/Util.class index c08fe0f87f6aeb07c76e13deafa8575a980d5f90..f16123dddc5e8b14daa8e029bd9cb6fdd3b9382f 100644 GIT binary patch literal 3491 zcmbVOTX)n{6#h;-bkb>BAeIUuU=^{QmI;V}b`a#M(wQm@S8p|wgf?X+8I!bF?{`q~ ze!oBZskFYiFu@Xar|<)AMb8#wwfo zZ0J<<<9rBcQ+8OKFC8iD_gt4i9M2V)94a&cmO|fgr}F=AW;os!JXO(~2J&eP2;8{X z#J*XlV%dHMtI(-n4Lz1%$Ex$(J*Mk&eyxg|u}(T(tJ$t4u(=J=#AX!T7<{5RuV4fB zj&0kvWk;lLP{pmdO+X2~SWuvUXzBKR2Df8V8h5A|!mz+Vgk1V`z<1_szi7C|l0aDKuQm@U4>V&pD=jG?{NCB`5iNr@+d{`G`Re7{PSWsAaHK zu5A}s*J{8#Go>GN=N#X2tF}uP?-UqpK+Ks9#^tOij+17E99D3Tz$(+L=Az8!BnfhH zpnH(Vt~Bmdu^W3NKV%g}PzZySQ=4TW-MujAadj;uZ!)tm%gL02y#lM-;+yp=3ib;O zw=l9%pE08r)#pLRqrI{~=BR2bxc{F-YDq0Cc#siqYOx%n!Xi~LE^sS@om;Y$i;DR` zESEtJMHLfxh{0mXROU-|7_yp!CO7Nh%MUMN(0`!^D

_DvqKgu&gW#Szsqisg)4d zr7|yheq6-~oMdIz`6;mde<@4jbR4P$wGqK6+M!_?p;7W?ebWvyIE6=LcYaJDJG96Y z6DDhdMb%Op`Qa03JRxxN(hghoESoKs8>QkWRTwBUlZIvObzLuHg*gl7bc3)IR)mJ@ua0gK0Qv%*f=O{r6BcRB!lq)%hM&;iloK zsNpG|Ky6r1hrx+qL3Yol1#W1b zR|lUq?V3C)GdPE5R6Hxs^yM|4lOfxvdG?rZn6@m5=T*EQ8I`tdHd&8-I<=q7pm4!) z?TOhc+x0P{T;YsXkf;3#!*}F&GMNge9dcw{VJX9+x;@S_JkO()4m8fB<^jYNMP45! z*leVMrUUV5$Mr6&9Iq;~?%&d3;0c2w6ha5?sZb^ik zOb!OwJv(^m>_A4gP>wS4%E0$Bus5TN&lmZn^DX3T_6o$09CY9%KIJm75-;idMC0Yqnm%m@*g-K>l&arU^P0ihI((JhPBkW zF4CRl{!ZF?9dA&k3w=1x5j{Zc9h5r+N*!*g7b`Zry}s?%3+ zqqh1oZp!kft>u?-nSmNMM&<7wIoQWFF_(lF%mh7k*p`C zcZey~g6Un%5gp?qOk$F8`T8ehf5#`+kR!4!qMRQ^KQU)HJIXxdFhFt)Vhg{v zVkhpzK5Rn~+fm}zBe;iW&KMbxr`PvV&jD)M!${qSi`a_~Dg8MPH6q(bsrT?c^$)I2&w)XE_C4AzX2ta#tK!w1U9h`q4^dNCn6THZJ8K*98d1OIVzw&9Vz4ydvmyI6p`g9C9 zh2~bl;d_V|#PsNGLM7<&`QezH03I?b8#x^gcZJEgGa2uG`KdD`C!I9HgW+Z-GrDqt Z=*rcqjl;x9%TRk diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties index 99e8c244..77596229 100644 --- a/target/maven-archiver/pom.properties +++ b/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Oct 21 15:52:13 MSK 2021 +#Sat Oct 23 19:09:24 MSK 2021 groupId=org.example artifactId=TaskJDBC version=1.0-SNAPSHOT diff --git a/target/surefire-reports/TEST-UserServiceTest.xml b/target/surefire-reports/TEST-UserServiceTest.xml index 17e73917..6f7d2168 100644 --- a/target/surefire-reports/TEST-UserServiceTest.xml +++ b/target/surefire-reports/TEST-UserServiceTest.xml @@ -1,5 +1,5 @@ - + @@ -27,10 +27,10 @@ - + - + @@ -41,7 +41,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -59,10 +59,10 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/target/surefire-reports/UserServiceTest.txt b/target/surefire-reports/UserServiceTest.txt index a95955b3..afba1a64 100644 --- a/target/surefire-reports/UserServiceTest.txt +++ b/target/surefire-reports/UserServiceTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: UserServiceTest ------------------------------------------------------------------------------- -Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.466 sec +Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.456 sec diff --git a/target/test-classes/UserServiceTest.class b/target/test-classes/UserServiceTest.class index 3e86d3f420e7572fbd857469ead6f6c30ec2d46d..712635bff8a401f3f9b295ae5b01176df544f5a6 100644 GIT binary patch delta 17 ZcmaE-@J@l_)W2Q(7#J8#Hgcp1002n|2FL&a delta 17 ZcmaE-@J@l_)W2Q(7#J9gH*%y2002n@2FCyZ From 22fe588baef814b427aa08797f08a7f9b023e621 Mon Sep 17 00:00:00 2001 From: GSteffun <42888439+GSteffun@users.noreply.github.com> Date: Sun, 24 Oct 2021 14:48:05 +0300 Subject: [PATCH 12/22] Test --- src/main/java/jm/task/core/jdbc/Main.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/main/java/jm/task/core/jdbc/Main.java b/src/main/java/jm/task/core/jdbc/Main.java index ef5d1f61..90655eb9 100644 --- a/src/main/java/jm/task/core/jdbc/Main.java +++ b/src/main/java/jm/task/core/jdbc/Main.java @@ -8,17 +8,7 @@ public class Main { public static void main(String[] args) { -// UserService userService = new UserServiceImpl(); -// userService.createUsersTable(); -// userService.saveUser("Vladimir", "Nuroev", (byte)53); -// userService.saveUser("Vadim", "Rolnin", (byte)37); -// userService.saveUser("Stanislav", "Petrov", (byte)44); -// userService.saveUser("Oleg", "Igorev", (byte)29); -// List listUsers = userService.getAllUsers(); -// System.out.println(listUsers); -// userService.cleanUsersTable(); -// userService.dropUsersTable(); - + //This is a branch 114 UserDaoHibernateImpl userDaoHibernate = new UserDaoHibernateImpl(); userDaoHibernate.createUsersTable(); userDaoHibernate.saveUser("Vasily", "Petrov", (byte)48); @@ -30,5 +20,4 @@ public static void main(String[] args) { userDaoHibernate.cleanUsersTable(); userDaoHibernate.dropUsersTable(); } - } From 47b8079ce85066d8a0875f681f82585ab03f6a1a Mon Sep 17 00:00:00 2001 From: GSteffun <42888439+GSteffun@users.noreply.github.com> Date: Sun, 24 Oct 2021 15:00:22 +0300 Subject: [PATCH 13/22] =?UTF-8?q?=D0=97=D0=B0=D0=BA=D0=BE=D0=BD=D1=87?= =?UTF-8?q?=D0=B8=D0=BB=201.1.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../02c1dcc5-74a7-4c46-9f0f-a3d7decf9909.xml | 1036 +++++++++++++++++ .../schema/information_schema.FNRwLQ.meta | 2 + .../storage_v2/_src_/schema/mysql.osA4Bg.meta | 2 + .../schema/performance_schema.kIw0nw.meta | 2 + .../storage_v2/_src_/schema/sys.zb4BAA.meta | 2 + .idea/workspace.xml | 207 ++++ TaskJDBC.iml | 11 + 7 files changed, 1262 insertions(+) create mode 100644 .idea/dataSources/02c1dcc5-74a7-4c46-9f0f-a3d7decf9909.xml create mode 100644 .idea/dataSources/02c1dcc5-74a7-4c46-9f0f-a3d7decf9909/storage_v2/_src_/schema/information_schema.FNRwLQ.meta create mode 100644 .idea/dataSources/02c1dcc5-74a7-4c46-9f0f-a3d7decf9909/storage_v2/_src_/schema/mysql.osA4Bg.meta create mode 100644 .idea/dataSources/02c1dcc5-74a7-4c46-9f0f-a3d7decf9909/storage_v2/_src_/schema/performance_schema.kIw0nw.meta create mode 100644 .idea/dataSources/02c1dcc5-74a7-4c46-9f0f-a3d7decf9909/storage_v2/_src_/schema/sys.zb4BAA.meta create mode 100644 .idea/workspace.xml create mode 100644 TaskJDBC.iml diff --git a/.idea/dataSources/02c1dcc5-74a7-4c46-9f0f-a3d7decf9909.xml b/.idea/dataSources/02c1dcc5-74a7-4c46-9f0f-a3d7decf9909.xml new file mode 100644 index 00000000..aeeb40d0 --- /dev/null +++ b/.idea/dataSources/02c1dcc5-74a7-4c46-9f0f-a3d7decf9909.xml @@ -0,0 +1,1036 @@ + + + + + 8.0.27 + |root||aadmin||ALTER|G +|root||root|localhost|ALTER|G +|root||aadmin||ALTER ROUTINE|G +|root||root|localhost|ALTER ROUTINE|G +|root||root|localhost|APPLICATION_PASSWORD_ADMIN|G +|root||root|localhost|AUDIT_ADMIN|G +|root||root|localhost|AUTHENTICATION_POLICY_ADMIN|G +|root||mysql.session|localhost|BACKUP_ADMIN|G +|root||root|localhost|BACKUP_ADMIN|G +|root||root|localhost|BINLOG_ADMIN|G +|root||root|localhost|BINLOG_ENCRYPTION_ADMIN|G +|root||mysql.session|localhost|CLONE_ADMIN|G +|root||root|localhost|CLONE_ADMIN|G +|root||mysql.session|localhost|CONNECTION_ADMIN|G +|root||root|localhost|CONNECTION_ADMIN|G +|root||aadmin||CREATE|G +|root||root|localhost|CREATE|G +|root||root|localhost|CREATE ROLE|G +|root||aadmin||CREATE ROUTINE|G +|root||root|localhost|CREATE ROUTINE|G +|root||aadmin||CREATE TABLESPACE|G +|root||root|localhost|CREATE TABLESPACE|G +|root||aadmin||CREATE TEMPORARY TABLES|G +|root||root|localhost|CREATE TEMPORARY TABLES|G +|root||aadmin||CREATE USER|G +|root||root|localhost|CREATE USER|G +|root||aadmin||CREATE VIEW|G +|root||root|localhost|CREATE VIEW|G +|root||aadmin||DELETE|G +|root||root|localhost|DELETE|G +|root||aadmin||DROP|G +|root||root|localhost|DROP|G +|root||root|localhost|DROP ROLE|G +|root||root|localhost|ENCRYPTION_KEY_ADMIN|G +|root||aadmin||EVENT|G +|root||root|localhost|EVENT|G +|root||aadmin||EXECUTE|G +|root||root|localhost|EXECUTE|G +|root||aadmin||FILE|G +|root||root|localhost|FILE|G +|root||root|localhost|FLUSH_OPTIMIZER_COSTS|G +|root||root|localhost|FLUSH_STATUS|G +|root||root|localhost|FLUSH_TABLES|G +|root||root|localhost|FLUSH_USER_RESOURCES|G +|root||root|localhost|GROUP_REPLICATION_ADMIN|G +|root||root|localhost|GROUP_REPLICATION_STREAM|G +|root||aadmin||INDEX|G +|root||root|localhost|INDEX|G +|root||root|localhost|INNODB_REDO_LOG_ARCHIVE|G +|root||root|localhost|INNODB_REDO_LOG_ENABLE|G +|root||aadmin||INSERT|G +|root||root|localhost|INSERT|G +|root||aadmin||LOCK TABLES|G +|root||root|localhost|LOCK TABLES|G +|root||root|localhost|PASSWORDLESS_USER_ADMIN|G +|root||mysql.session|localhost|PERSIST_RO_VARIABLES_ADMIN|G +|root||root|localhost|PERSIST_RO_VARIABLES_ADMIN|G +|root||aadmin||PROCESS|G +|root||root|localhost|PROCESS|G +|root||aadmin||REFERENCES|G +|root||root|localhost|REFERENCES|G +|root||aadmin||RELOAD|G +|root||root|localhost|RELOAD|G +|root||aadmin||REPLICATION CLIENT|G +|root||root|localhost|REPLICATION CLIENT|G +|root||aadmin||REPLICATION SLAVE|G +|root||root|localhost|REPLICATION SLAVE|G +|root||root|localhost|REPLICATION_APPLIER|G +|root||root|localhost|REPLICATION_SLAVE_ADMIN|G +|root||root|localhost|RESOURCE_GROUP_ADMIN|G +|root||root|localhost|RESOURCE_GROUP_USER|G +|root||root|localhost|ROLE_ADMIN|G +|root||aadmin||SELECT|G +|root||mysql.infoschema|localhost|SELECT|G +|root||root|localhost|SELECT|G +|root||root|localhost|SERVICE_CONNECTION_ADMIN|G +|root||mysql.session|localhost|SESSION_VARIABLES_ADMIN|G +|root||root|localhost|SESSION_VARIABLES_ADMIN|G +|root||root|localhost|SET_USER_ID|G +|root||aadmin||SHOW DATABASES|G +|root||root|localhost|SHOW DATABASES|G +|root||aadmin||SHOW VIEW|G +|root||root|localhost|SHOW VIEW|G +|root||root|localhost|SHOW_ROUTINE|G +|root||aadmin||SHUTDOWN|G +|root||mysql.session|localhost|SHUTDOWN|G +|root||root|localhost|SHUTDOWN|G +|root||aadmin||SUPER|G +|root||mysql.session|localhost|SUPER|G +|root||root|localhost|SUPER|G +|root||mysql.infoschema|localhost|SYSTEM_USER|G +|root||mysql.session|localhost|SYSTEM_USER|G +|root||mysql.sys|localhost|SYSTEM_USER|G +|root||root|localhost|SYSTEM_USER|G +|root||mysql.session|localhost|SYSTEM_VARIABLES_ADMIN|G +|root||root|localhost|SYSTEM_VARIABLES_ADMIN|G +|root||root|localhost|TABLE_ENCRYPTION_ADMIN|G +|root||aadmin||TRIGGER|G +|root||root|localhost|TRIGGER|G +|root||aadmin||UPDATE|G +|root||root|localhost|UPDATE|G +|root||root|localhost|XA_RECOVER_ADMIN|G +|root||aadmin||grant option|G +|root||root|localhost|grant option|G +performance_schema|schema||mysql.session|localhost|SELECT|G +sys|schema||mysql.sys|localhost|TRIGGER|G + InnoDB + InnoDB + lower/lower + + + 1 + utf8mb4_0900_ai_ci + + + utf8_general_ci + + + utf8mb4_0900_ai_ci + + + utf8mb4_0900_ai_ci + + + utf8mb4_0900_ai_ci + + + armscii8 + + + armscii8 + 1 + + + ascii + + + ascii + 1 + + + big5 + + + big5 + 1 + + + binary + 1 + + + cp1250 + + + cp1250 + + + cp1250 + + + cp1250 + 1 + + + cp1250 + + + cp1251 + + + cp1251 + + + cp1251 + 1 + + + cp1251 + + + cp1251 + + + cp1256 + + + cp1256 + 1 + + + cp1257 + + + cp1257 + 1 + + + cp1257 + + + cp850 + + + cp850 + 1 + + + cp852 + + + cp852 + 1 + + + cp866 + + + cp866 + 1 + + + cp932 + + + cp932 + 1 + + + dec8 + + + dec8 + 1 + + + eucjpms + + + eucjpms + 1 + + + euckr + + + euckr + 1 + + + gb18030 + + + gb18030 + 1 + + + gb18030 + + + gb2312 + + + gb2312 + 1 + + + gbk + + + gbk + 1 + + + geostd8 + + + geostd8 + 1 + + + greek + + + greek + 1 + + + hebrew + + + hebrew + 1 + + + hp8 + + + hp8 + 1 + + + keybcs2 + + + keybcs2 + 1 + + + koi8r + + + koi8r + 1 + + + koi8u + + + koi8u + 1 + + + latin1 + + + latin1 + + + latin1 + + + latin1 + + + latin1 + + + latin1 + + + latin1 + + + latin1 + 1 + + + latin2 + + + latin2 + + + latin2 + + + latin2 + 1 + + + latin2 + + + latin5 + + + latin5 + 1 + + + latin7 + + + latin7 + + + latin7 + 1 + + + latin7 + + + macce + + + macce + 1 + + + macroman + + + macroman + 1 + + + sjis + + + sjis + 1 + + + swe7 + + + swe7 + 1 + + + tis620 + + + tis620 + 1 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + 1 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ucs2 + + + ujis + + + ujis + 1 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + 1 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16 + + + utf16le + + + utf16le + 1 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + 1 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf32 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + 1 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8 + + + utf8mb4 + 1 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + utf8mb4 + + + caching_sha2_password + + + localhost + caching_sha2_password + + + localhost + caching_sha2_password + + + localhost + caching_sha2_password + + + localhost + caching_sha2_password + + + + 1 + int|0s + 1 + null + + + 2 + varchar(50)|0s + 1 + + + 3 + varchar(50)|0s + 1 + + + 4 + int|0s + 1 + + + 1 + id + 1 + + + \ No newline at end of file diff --git a/.idea/dataSources/02c1dcc5-74a7-4c46-9f0f-a3d7decf9909/storage_v2/_src_/schema/information_schema.FNRwLQ.meta b/.idea/dataSources/02c1dcc5-74a7-4c46-9f0f-a3d7decf9909/storage_v2/_src_/schema/information_schema.FNRwLQ.meta new file mode 100644 index 00000000..1ff3db2e --- /dev/null +++ b/.idea/dataSources/02c1dcc5-74a7-4c46-9f0f-a3d7decf9909/storage_v2/_src_/schema/information_schema.FNRwLQ.meta @@ -0,0 +1,2 @@ +#n:information_schema +! [null, 0, null, null, -2147483648, -2147483648] diff --git a/.idea/dataSources/02c1dcc5-74a7-4c46-9f0f-a3d7decf9909/storage_v2/_src_/schema/mysql.osA4Bg.meta b/.idea/dataSources/02c1dcc5-74a7-4c46-9f0f-a3d7decf9909/storage_v2/_src_/schema/mysql.osA4Bg.meta new file mode 100644 index 00000000..86a53f19 --- /dev/null +++ b/.idea/dataSources/02c1dcc5-74a7-4c46-9f0f-a3d7decf9909/storage_v2/_src_/schema/mysql.osA4Bg.meta @@ -0,0 +1,2 @@ +#n:mysql +! [null, 0, null, null, -2147483648, -2147483648] diff --git a/.idea/dataSources/02c1dcc5-74a7-4c46-9f0f-a3d7decf9909/storage_v2/_src_/schema/performance_schema.kIw0nw.meta b/.idea/dataSources/02c1dcc5-74a7-4c46-9f0f-a3d7decf9909/storage_v2/_src_/schema/performance_schema.kIw0nw.meta new file mode 100644 index 00000000..9394db14 --- /dev/null +++ b/.idea/dataSources/02c1dcc5-74a7-4c46-9f0f-a3d7decf9909/storage_v2/_src_/schema/performance_schema.kIw0nw.meta @@ -0,0 +1,2 @@ +#n:performance_schema +! [null, 0, null, null, -2147483648, -2147483648] diff --git a/.idea/dataSources/02c1dcc5-74a7-4c46-9f0f-a3d7decf9909/storage_v2/_src_/schema/sys.zb4BAA.meta b/.idea/dataSources/02c1dcc5-74a7-4c46-9f0f-a3d7decf9909/storage_v2/_src_/schema/sys.zb4BAA.meta new file mode 100644 index 00000000..2f4470bb --- /dev/null +++ b/.idea/dataSources/02c1dcc5-74a7-4c46-9f0f-a3d7decf9909/storage_v2/_src_/schema/sys.zb4BAA.meta @@ -0,0 +1,2 @@ +#n:sys +! [null, 0, null, null, -2147483648, -2147483648] diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 00000000..f3376e33 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,207 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1634900493205 + + + 1635075027223 + + + 1635076085627 + + + 1635076256366 + + + 1635076495822 + + + + + + + + + + + + + + file://$PROJECT_DIR$/src/main/java/jm/task/core/jdbc/model/User.java + 64 + + + + + + + + + + + + ++ ++ +\ No newline at end of file diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_24_10_2021_16_03__Changes_.xml b/.idea/shelf/Uncommitted_changes_before_Checkout_at_24_10_2021_16_03__Changes_.xml new file mode 100644 index 00000000..6c8dfe11 --- /dev/null +++ b/.idea/shelf/Uncommitted_changes_before_Checkout_at_24_10_2021_16_03__Changes_.xml @@ -0,0 +1,4 @@ + + \ No newline at end of file diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_24_10_2021_16_05_[Changes]/shelved.patch b/.idea/shelf/Uncommitted_changes_before_Checkout_at_24_10_2021_16_05_[Changes]/shelved.patch new file mode 100644 index 00000000..4cbe73e6 --- /dev/null +++ b/.idea/shelf/Uncommitted_changes_before_Checkout_at_24_10_2021_16_05_[Changes]/shelved.patch @@ -0,0 +1,206 @@ +Index: .idea/workspace.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/.idea/workspace.xml b/.idea/workspace.xml +new file mode 100644 +--- /dev/null (date 1635080698318) ++++ b/.idea/workspace.xml (date 1635080698318) +@@ -0,0 +1,195 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ 1634900493205 ++ ++ ++ 1635075027223 ++ ++ ++ 1635076085627 ++ ++ ++ 1635076256366 ++ ++ ++ 1635076495822 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++