diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 00000000..e7a827b9 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml new file mode 100644 index 00000000..317d84de --- /dev/null +++ b/.idea/dataSources.local.xml @@ -0,0 +1,32 @@ + + + + + + #@ + ` + + + master_key + aadmin + + + + + + + + + #@ + ` + + + aadmin + + + + + + + + \ No newline at end of file diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml new file mode 100644 index 00000000..a898d961 --- /dev/null +++ b/.idea/dataSources.xml @@ -0,0 +1,23 @@ + + + + + mysql.8 + true + com.mysql.cj.jdbc.Driver + jdbc:mysql://localhost:3306/base_for_work + $ProjectFileDir$ + + + mysql + true + true + Hibernate + +C:/Users/steff/IdeaProjects/CoreTaskTemplate/src/main/resources/hibernate.cfg.xml + com.mysql.jdbc.Driver + jdbc:mysql://localhost:3306/base_for_work + $ProjectFileDir$ + + + \ No newline at end of file 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/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-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/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/shelf/Uncommitted_changes_before_Checkout_at_24_10_2021_16_03_[Changes]/shelved.patch b/.idea/shelf/Uncommitted_changes_before_Checkout_at_24_10_2021_16_03_[Changes]/shelved.patch new file mode 100644 index 00000000..c8a5ab62 --- /dev/null +++ b/.idea/shelf/Uncommitted_changes_before_Checkout_at_24_10_2021_16_03_[Changes]/shelved.patch @@ -0,0 +1,253 @@ +Index: src/main/java/jm/task/core/jdbc/Main.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>package jm.task.core.jdbc;\r\n\r\nimport jm.task.core.jdbc.dao.UserDaoHibernateImpl;\r\nimport jm.task.core.jdbc.model.User;\r\n\r\nimport java.util.List;\r\n\r\npublic class Main {\r\n\r\n public static void main(String[] args) {\r\n// UserService userService = new UserServiceImpl();\r\n// userService.createUsersTable();\r\n// userService.saveUser(\"Vladimir\", \"Nuroev\", (byte)53);\r\n// userService.saveUser(\"Vadim\", \"Rolnin\", (byte)37);\r\n// userService.saveUser(\"Stanislav\", \"Petrov\", (byte)44);\r\n// userService.saveUser(\"Oleg\", \"Igorev\", (byte)29);\r\n// List listUsers = userService.getAllUsers();\r\n// System.out.println(listUsers);\r\n// userService.cleanUsersTable();\r\n// userService.dropUsersTable();\r\n\r\n UserDaoHibernateImpl userDaoHibernate = new UserDaoHibernateImpl();\r\n userDaoHibernate.createUsersTable();\r\n userDaoHibernate.saveUser(\"Vasily\", \"Petrov\", (byte)48);\r\n userDaoHibernate.saveUser(\"Ivan\", \"Kuncevich\", (byte)59);\r\n userDaoHibernate.saveUser(\"Alena\", \"Tibrec\", (byte)22);\r\n userDaoHibernate.saveUser(\"Gleb\", \"Kuchma\", (byte)36);\r\n List listUsers = userDaoHibernate.getAllUsers();\r\n System.out.println(listUsers);\r\n userDaoHibernate.cleanUsersTable();\r\n userDaoHibernate.dropUsersTable();\r\n }\r\n\r\n}\r\n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/src/main/java/jm/task/core/jdbc/Main.java b/src/main/java/jm/task/core/jdbc/Main.java +--- a/src/main/java/jm/task/core/jdbc/Main.java (revision 3a73571a16ebf2c3683353a54a71f2c2dd75d07c) ++++ b/src/main/java/jm/task/core/jdbc/Main.java (date 1635080587301) +@@ -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 @@ + userDaoHibernate.cleanUsersTable(); + userDaoHibernate.dropUsersTable(); + } +- + } +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 1635080590750) ++++ b/.idea/workspace.xml (date 1635080590750) +@@ -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_05__Changes_.xml b/.idea/shelf/Uncommitted_changes_before_Checkout_at_24_10_2021_16_05__Changes_.xml new file mode 100644 index 00000000..9a10015b --- /dev/null +++ b/.idea/shelf/Uncommitted_changes_before_Checkout_at_24_10_2021_16_05__Changes_.xml @@ -0,0 +1,4 @@ + + \ 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/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 00000000..c3450524 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,239 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1634900493205 + + + 1635075027223 + + + 1635076085627 + + + 1635076256366 + + + 1635076495822 + + + 1635268230546 + + + 1635331002040 + + + 1635502440349 + + + + + + + + + + + + + + + + + + +