2 Ревизии

Автор SHA1 Съобщение Дата
  BlackJack 861169a82f dev преди 6 години
  BlackJack 78698935b2 trying to figure out how to join tables преди 6 години
променени са 90 файла, в които са добавени 1648 реда и са изтрити 346 реда
  1. 4
    4
      .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_6.xml
  2. 4
    4
      .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_6.xml
  3. 4
    4
      .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_6.xml
  4. 4
    4
      .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_6.xml
  5. 4
    4
      .idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_6.xml
  6. 4
    4
      .idea/libraries/Maven__com_zaxxer_HikariCP_2_7_9.xml
  7. 13
    0
      .idea/libraries/Maven__mysql_mysql_connector_java_5_1_46.xml
  8. 4
    4
      .idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_11.xml
  9. 4
    4
      .idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_11.xml
  10. 4
    4
      .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_31.xml
  11. 4
    4
      .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_31.xml
  12. 4
    4
      .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_31.xml
  13. 0
    13
      .idea/libraries/Maven__org_atteo_evo_inflector_1_2_2.xml
  14. 4
    4
      .idea/libraries/Maven__org_hibernate_hibernate_core_5_2_17_Final.xml
  15. 4
    4
      .idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_2_Final.xml
  16. 4
    4
      .idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_10_Final.xml
  17. 4
    4
      .idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_3_RELEASE.xml
  18. 4
    4
      .idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_3_RELEASE.xml
  19. 4
    4
      .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_3_RELEASE.xml
  20. 4
    4
      .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_3_RELEASE.xml
  21. 0
    13
      .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_0_0_RELEASE.xml
  22. 4
    4
      .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_0_3_RELEASE.xml
  23. 0
    13
      .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_rest_2_0_0_RELEASE.xml
  24. 4
    4
      .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_3_RELEASE.xml
  25. 4
    4
      .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_3_RELEASE.xml
  26. 0
    13
      .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_0_0_RELEASE.xml
  27. 13
    0
      .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_0_3_RELEASE.xml
  28. 0
    13
      .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_0_RELEASE.xml
  29. 13
    0
      .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_3_RELEASE.xml
  30. 0
    13
      .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_0_RELEASE.xml
  31. 13
    0
      .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_3_RELEASE.xml
  32. 4
    4
      .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_3_RELEASE.xml
  33. 4
    4
      .idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_3_RELEASE.xml
  34. 13
    0
      .idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_3_RELEASE.xml
  35. 4
    4
      .idea/libraries/Maven__org_springframework_data_spring_data_commons_2_0_8_RELEASE.xml
  36. 4
    4
      .idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_0_8_RELEASE.xml
  37. 0
    13
      .idea/libraries/Maven__org_springframework_data_spring_data_rest_core_3_0_5_RELEASE.xml
  38. 0
    13
      .idea/libraries/Maven__org_springframework_data_spring_data_rest_webmvc_3_0_5_RELEASE.xml
  39. 0
    13
      .idea/libraries/Maven__org_springframework_hateoas_spring_hateoas_0_24_0_RELEASE.xml
  40. 0
    13
      .idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml
  41. 4
    4
      .idea/libraries/Maven__org_springframework_spring_aop_5_0_7_RELEASE.xml
  42. 4
    4
      .idea/libraries/Maven__org_springframework_spring_aspects_5_0_7_RELEASE.xml
  43. 4
    4
      .idea/libraries/Maven__org_springframework_spring_beans_5_0_7_RELEASE.xml
  44. 4
    4
      .idea/libraries/Maven__org_springframework_spring_context_5_0_7_RELEASE.xml
  45. 4
    4
      .idea/libraries/Maven__org_springframework_spring_core_5_0_7_RELEASE.xml
  46. 4
    4
      .idea/libraries/Maven__org_springframework_spring_expression_5_0_7_RELEASE.xml
  47. 4
    4
      .idea/libraries/Maven__org_springframework_spring_jcl_5_0_7_RELEASE.xml
  48. 4
    4
      .idea/libraries/Maven__org_springframework_spring_jdbc_5_0_7_RELEASE.xml
  49. 4
    4
      .idea/libraries/Maven__org_springframework_spring_orm_5_0_7_RELEASE.xml
  50. 4
    4
      .idea/libraries/Maven__org_springframework_spring_test_5_0_7_RELEASE.xml
  51. 4
    4
      .idea/libraries/Maven__org_springframework_spring_tx_5_0_7_RELEASE.xml
  52. 4
    4
      .idea/libraries/Maven__org_springframework_spring_web_5_0_7_RELEASE.xml
  53. 4
    4
      .idea/libraries/Maven__org_springframework_spring_webmvc_5_0_7_RELEASE.xml
  54. 124
    0
      .idea/uiDesigner.xml
  55. 668
    0
      .idea/workspace.xml
  56. 62
    5
      passProj.iml
  57. 80
    59
      pom.xml
  58. 44
    0
      src/main/java/passionproject/controller/EasyQuestionAnswersController.java
  59. 44
    0
      src/main/java/passionproject/controller/EasyQuestionsController.java
  60. 44
    0
      src/main/java/passionproject/controller/HardQuestionsController.java
  61. 44
    0
      src/main/java/passionproject/controller/IntermediateQuestionsController.java
  62. 44
    0
      src/main/java/passionproject/controller/MysteryQuestionsController.java
  63. 64
    0
      src/main/java/passionproject/model/EasyQuestionAnswers.java
  64. 43
    0
      src/main/java/passionproject/model/EasyQuestions.java
  65. 35
    0
      src/main/java/passionproject/model/HardQuestions.java
  66. 34
    0
      src/main/java/passionproject/model/IntermediateQuestions.java
  67. 15
    0
      src/main/java/passionproject/model/Login.java
  68. 34
    0
      src/main/java/passionproject/model/MysteryQuestions.java
  69. 9
    0
      src/main/java/passionproject/repositories/EasyAnswersRepository.java
  70. 12
    0
      src/main/java/passionproject/repositories/EasyRepository.java
  71. 10
    0
      src/main/java/passionproject/repositories/HardRepository.java
  72. 11
    0
      src/main/java/passionproject/repositories/IntermediateRepository.java
  73. 10
    0
      src/main/java/passionproject/repositories/MysteryRepository.java
  74. BIN
      target/classes/passionproject/controller/EasyQuestionAnswersController.class
  75. BIN
      target/classes/passionproject/controller/EasyQuestionsController.class
  76. BIN
      target/classes/passionproject/controller/HardQuestionsController.class
  77. BIN
      target/classes/passionproject/controller/IntermediateQuestionsController.class
  78. BIN
      target/classes/passionproject/controller/MysteryQuestionsController.class
  79. BIN
      target/classes/passionproject/model/EasyQuestionAnswers.class
  80. BIN
      target/classes/passionproject/model/EasyQuestions.class
  81. BIN
      target/classes/passionproject/model/HardQuestions.class
  82. BIN
      target/classes/passionproject/model/IntermediateQuestions.class
  83. BIN
      target/classes/passionproject/model/Login$Questions.class
  84. BIN
      target/classes/passionproject/model/Login.class
  85. BIN
      target/classes/passionproject/model/MysteryQuestions.class
  86. BIN
      target/classes/passionproject/repositories/EasyAnswersRepository.class
  87. BIN
      target/classes/passionproject/repositories/EasyRepository.class
  88. BIN
      target/classes/passionproject/repositories/HardRepository.class
  89. BIN
      target/classes/passionproject/repositories/IntermediateRepository.class
  90. BIN
      target/classes/passionproject/repositories/MysteryRepository.class

.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_4.xml → .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_6.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.4">
2
+  <library name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.6">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.9.4/jackson-core-2.9.4.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.9.6/jackson-core-2.9.6.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.9.4/jackson-core-2.9.4-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.9.6/jackson-core-2.9.6-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.9.4/jackson-core-2.9.4-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.9.6/jackson-core-2.9.6-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_4.xml → .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_6.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.4">
2
+  <library name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.6">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.9.4/jackson-databind-2.9.4.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.9.6/jackson-databind-2.9.6.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.9.4/jackson-databind-2.9.4-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.9.6/jackson-databind-2.9.6-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.9.4/jackson-databind-2.9.4-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.9.6/jackson-databind-2.9.6-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_4.xml → .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_6.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.4">
2
+  <library name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.6">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.9.4/jackson-datatype-jdk8-2.9.4.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.9.6/jackson-datatype-jdk8-2.9.6.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.9.4/jackson-datatype-jdk8-2.9.4-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.9.6/jackson-datatype-jdk8-2.9.6-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.9.4/jackson-datatype-jdk8-2.9.4-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.9.6/jackson-datatype-jdk8-2.9.6-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_4.xml → .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_6.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.4">
2
+  <library name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.6">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.4/jackson-datatype-jsr310-2.9.4.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.6/jackson-datatype-jsr310-2.9.6.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.4/jackson-datatype-jsr310-2.9.4-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.6/jackson-datatype-jsr310-2.9.6-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.4/jackson-datatype-jsr310-2.9.4-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.6/jackson-datatype-jsr310-2.9.6-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_4.xml → .idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_6.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.4">
2
+  <library name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.6">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.9.4/jackson-module-parameter-names-2.9.4.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.9.6/jackson-module-parameter-names-2.9.6.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.9.4/jackson-module-parameter-names-2.9.4-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.9.6/jackson-module-parameter-names-2.9.6-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.9.4/jackson-module-parameter-names-2.9.4-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.9.6/jackson-module-parameter-names-2.9.6-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

.idea/libraries/Maven__com_zaxxer_HikariCP_2_7_8.xml → .idea/libraries/Maven__com_zaxxer_HikariCP_2_7_9.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: com.zaxxer:HikariCP:2.7.8">
2
+  <library name="Maven: com.zaxxer:HikariCP:2.7.9">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/2.7.8/HikariCP-2.7.8.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/2.7.9/HikariCP-2.7.9.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/2.7.8/HikariCP-2.7.8-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/2.7.9/HikariCP-2.7.9-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/2.7.8/HikariCP-2.7.8-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/2.7.9/HikariCP-2.7.9-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

+ 13
- 0
.idea/libraries/Maven__mysql_mysql_connector_java_5_1_46.xml Целия файл

@@ -0,0 +1,13 @@
1
+<component name="libraryTable">
2
+  <library name="Maven: mysql:mysql-connector-java:5.1.46">
3
+    <CLASSES>
4
+      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.46/mysql-connector-java-5.1.46.jar!/" />
5
+    </CLASSES>
6
+    <JAVADOC>
7
+      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.46/mysql-connector-java-5.1.46-javadoc.jar!/" />
8
+    </JAVADOC>
9
+    <SOURCES>
10
+      <root url="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.46/mysql-connector-java-5.1.46-sources.jar!/" />
11
+    </SOURCES>
12
+  </library>
13
+</component>

.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_10.xml → .idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_11.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: net.bytebuddy:byte-buddy:1.7.10">
2
+  <library name="Maven: net.bytebuddy:byte-buddy:1.7.11">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.7.10/byte-buddy-1.7.10.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.7.11/byte-buddy-1.7.11.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.7.10/byte-buddy-1.7.10-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.7.11/byte-buddy-1.7.11-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.7.10/byte-buddy-1.7.10-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.7.11/byte-buddy-1.7.11-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_10.xml → .idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_11.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: net.bytebuddy:byte-buddy-agent:1.7.10">
2
+  <library name="Maven: net.bytebuddy:byte-buddy-agent:1.7.11">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.7.10/byte-buddy-agent-1.7.10.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.7.11/byte-buddy-agent-1.7.11.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.7.10/byte-buddy-agent-1.7.10-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.7.11/byte-buddy-agent-1.7.11-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.7.10/byte-buddy-agent-1.7.10-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.7.11/byte-buddy-agent-1.7.11-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_28.xml → .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_31.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.28">
2
+  <library name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.31">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/8.5.28/tomcat-embed-core-8.5.28.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/8.5.31/tomcat-embed-core-8.5.31.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/8.5.28/tomcat-embed-core-8.5.28-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/8.5.31/tomcat-embed-core-8.5.31-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/8.5.28/tomcat-embed-core-8.5.28-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/8.5.31/tomcat-embed-core-8.5.31-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_28.xml → .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_31.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.28">
2
+  <library name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.31">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/8.5.28/tomcat-embed-el-8.5.28.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/8.5.31/tomcat-embed-el-8.5.31.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/8.5.28/tomcat-embed-el-8.5.28-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/8.5.31/tomcat-embed-el-8.5.31-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/8.5.28/tomcat-embed-el-8.5.28-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/8.5.31/tomcat-embed-el-8.5.31-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_28.xml → .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_31.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.28">
2
+  <library name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.31">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/8.5.28/tomcat-embed-websocket-8.5.28.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/8.5.31/tomcat-embed-websocket-8.5.31.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/8.5.28/tomcat-embed-websocket-8.5.28-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/8.5.31/tomcat-embed-websocket-8.5.31-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/8.5.28/tomcat-embed-websocket-8.5.28-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/8.5.31/tomcat-embed-websocket-8.5.31-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

+ 0
- 13
.idea/libraries/Maven__org_atteo_evo_inflector_1_2_2.xml Целия файл

@@ -1,13 +0,0 @@
1
-<component name="libraryTable">
2
-  <library name="Maven: org.atteo:evo-inflector:1.2.2">
3
-    <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/atteo/evo-inflector/1.2.2/evo-inflector-1.2.2.jar!/" />
5
-    </CLASSES>
6
-    <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/atteo/evo-inflector/1.2.2/evo-inflector-1.2.2-javadoc.jar!/" />
8
-    </JAVADOC>
9
-    <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/atteo/evo-inflector/1.2.2/evo-inflector-1.2.2-sources.jar!/" />
11
-    </SOURCES>
12
-  </library>
13
-</component>

.idea/libraries/Maven__org_hibernate_hibernate_core_5_2_14_Final.xml → .idea/libraries/Maven__org_hibernate_hibernate_core_5_2_17_Final.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: org.hibernate:hibernate-core:5.2.14.Final">
2
+  <library name="Maven: org.hibernate:hibernate-core:5.2.17.Final">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/5.2.14.Final/hibernate-core-5.2.14.Final.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/5.2.17.Final/hibernate-core-5.2.17.Final.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/5.2.14.Final/hibernate-core-5.2.14.Final-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/5.2.17.Final/hibernate-core-5.2.17.Final-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/5.2.14.Final/hibernate-core-5.2.14.Final-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/5.2.17.Final/hibernate-core-5.2.17.Final-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml → .idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_2_Final.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final">
2
+  <library name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.2.Final">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/javax/persistence/hibernate-jpa-2.1-api/1.0.0.Final/hibernate-jpa-2.1-api-1.0.0.Final.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/javax/persistence/hibernate-jpa-2.1-api/1.0.2.Final/hibernate-jpa-2.1-api-1.0.2.Final.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/javax/persistence/hibernate-jpa-2.1-api/1.0.0.Final/hibernate-jpa-2.1-api-1.0.0.Final-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/javax/persistence/hibernate-jpa-2.1-api/1.0.2.Final/hibernate-jpa-2.1-api-1.0.2.Final-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/javax/persistence/hibernate-jpa-2.1-api/1.0.0.Final/hibernate-jpa-2.1-api-1.0.0.Final-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/javax/persistence/hibernate-jpa-2.1-api/1.0.2.Final/hibernate-jpa-2.1-api-1.0.2.Final-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_7_Final.xml → .idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_10_Final.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: org.hibernate.validator:hibernate-validator:6.0.7.Final">
2
+  <library name="Maven: org.hibernate.validator:hibernate-validator:6.0.10.Final">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.0.7.Final/hibernate-validator-6.0.7.Final.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.0.10.Final/hibernate-validator-6.0.10.Final.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.0.7.Final/hibernate-validator-6.0.7.Final-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.0.10.Final/hibernate-validator-6.0.10.Final-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.0.7.Final/hibernate-validator-6.0.7.Final-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.0.10.Final/hibernate-validator-6.0.10.Final-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

.idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_0_RELEASE.xml → .idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_3_RELEASE.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: org.springframework.boot:spring-boot:2.0.0.RELEASE">
2
+  <library name="Maven: org.springframework.boot:spring-boot:2.0.3.RELEASE">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.0.0.RELEASE/spring-boot-2.0.0.RELEASE.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.0.3.RELEASE/spring-boot-2.0.3.RELEASE.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.0.0.RELEASE/spring-boot-2.0.0.RELEASE-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.0.3.RELEASE/spring-boot-2.0.3.RELEASE-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.0.0.RELEASE/spring-boot-2.0.0.RELEASE-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.0.3.RELEASE/spring-boot-2.0.3.RELEASE-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_0_RELEASE.xml → .idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_3_RELEASE.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.0.0.RELEASE">
2
+  <library name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.0.3.RELEASE">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.0.0.RELEASE/spring-boot-autoconfigure-2.0.0.RELEASE.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.0.3.RELEASE/spring-boot-autoconfigure-2.0.3.RELEASE.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.0.0.RELEASE/spring-boot-autoconfigure-2.0.0.RELEASE-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.0.3.RELEASE/spring-boot-autoconfigure-2.0.3.RELEASE-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.0.0.RELEASE/spring-boot-autoconfigure-2.0.0.RELEASE-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.0.3.RELEASE/spring-boot-autoconfigure-2.0.3.RELEASE-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_0_RELEASE.xml → .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_3_RELEASE.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: org.springframework.boot:spring-boot-starter:2.0.0.RELEASE">
2
+  <library name="Maven: org.springframework.boot:spring-boot-starter:2.0.3.RELEASE">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.0.0.RELEASE/spring-boot-starter-2.0.0.RELEASE.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.0.3.RELEASE/spring-boot-starter-2.0.3.RELEASE.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.0.0.RELEASE/spring-boot-starter-2.0.0.RELEASE-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.0.3.RELEASE/spring-boot-starter-2.0.3.RELEASE-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.0.0.RELEASE/spring-boot-starter-2.0.0.RELEASE-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.0.3.RELEASE/spring-boot-starter-2.0.3.RELEASE-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_0_RELEASE.xml → .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_3_RELEASE.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: org.springframework.boot:spring-boot-starter-web:2.0.0.RELEASE">
2
+  <library name="Maven: org.springframework.boot:spring-boot-starter-aop:2.0.3.RELEASE">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.0.0.RELEASE/spring-boot-starter-web-2.0.0.RELEASE.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-aop/2.0.3.RELEASE/spring-boot-starter-aop-2.0.3.RELEASE.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.0.0.RELEASE/spring-boot-starter-web-2.0.0.RELEASE-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-aop/2.0.3.RELEASE/spring-boot-starter-aop-2.0.3.RELEASE-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.0.0.RELEASE/spring-boot-starter-web-2.0.0.RELEASE-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-aop/2.0.3.RELEASE/spring-boot-starter-aop-2.0.3.RELEASE-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

+ 0
- 13
.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_0_0_RELEASE.xml Целия файл

@@ -1,13 +0,0 @@
1
-<component name="libraryTable">
2
-  <library name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:2.0.0.RELEASE">
3
-    <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-jpa/2.0.0.RELEASE/spring-boot-starter-data-jpa-2.0.0.RELEASE.jar!/" />
5
-    </CLASSES>
6
-    <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-jpa/2.0.0.RELEASE/spring-boot-starter-data-jpa-2.0.0.RELEASE-javadoc.jar!/" />
8
-    </JAVADOC>
9
-    <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-jpa/2.0.0.RELEASE/spring-boot-starter-data-jpa-2.0.0.RELEASE-sources.jar!/" />
11
-    </SOURCES>
12
-  </library>
13
-</component>

.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_0_RELEASE.xml → .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_0_3_RELEASE.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.0.0.RELEASE">
2
+  <library name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:2.0.3.RELEASE">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/2.0.0.RELEASE/spring-boot-test-autoconfigure-2.0.0.RELEASE.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-jpa/2.0.3.RELEASE/spring-boot-starter-data-jpa-2.0.3.RELEASE.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/2.0.0.RELEASE/spring-boot-test-autoconfigure-2.0.0.RELEASE-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-jpa/2.0.3.RELEASE/spring-boot-starter-data-jpa-2.0.3.RELEASE-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/2.0.0.RELEASE/spring-boot-test-autoconfigure-2.0.0.RELEASE-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-jpa/2.0.3.RELEASE/spring-boot-starter-data-jpa-2.0.3.RELEASE-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

+ 0
- 13
.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_rest_2_0_0_RELEASE.xml Целия файл

@@ -1,13 +0,0 @@
1
-<component name="libraryTable">
2
-  <library name="Maven: org.springframework.boot:spring-boot-starter-data-rest:2.0.0.RELEASE">
3
-    <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-rest/2.0.0.RELEASE/spring-boot-starter-data-rest-2.0.0.RELEASE.jar!/" />
5
-    </CLASSES>
6
-    <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-rest/2.0.0.RELEASE/spring-boot-starter-data-rest-2.0.0.RELEASE-javadoc.jar!/" />
8
-    </JAVADOC>
9
-    <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-data-rest/2.0.0.RELEASE/spring-boot-starter-data-rest-2.0.0.RELEASE-sources.jar!/" />
11
-    </SOURCES>
12
-  </library>
13
-</component>

.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_0_RELEASE.xml → .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_3_RELEASE.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.0.0.RELEASE">
2
+  <library name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.0.3.RELEASE">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/2.0.0.RELEASE/spring-boot-starter-jdbc-2.0.0.RELEASE.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/2.0.3.RELEASE/spring-boot-starter-jdbc-2.0.3.RELEASE.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/2.0.0.RELEASE/spring-boot-starter-jdbc-2.0.0.RELEASE-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/2.0.3.RELEASE/spring-boot-starter-jdbc-2.0.3.RELEASE-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/2.0.0.RELEASE/spring-boot-starter-jdbc-2.0.0.RELEASE-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-jdbc/2.0.3.RELEASE/spring-boot-starter-jdbc-2.0.3.RELEASE-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_0_RELEASE.xml → .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_3_RELEASE.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: org.springframework.boot:spring-boot-starter-json:2.0.0.RELEASE">
2
+  <library name="Maven: org.springframework.boot:spring-boot-starter-json:2.0.3.RELEASE">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.0.0.RELEASE/spring-boot-starter-json-2.0.0.RELEASE.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.0.3.RELEASE/spring-boot-starter-json-2.0.3.RELEASE.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.0.0.RELEASE/spring-boot-starter-json-2.0.0.RELEASE-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.0.3.RELEASE/spring-boot-starter-json-2.0.3.RELEASE-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.0.0.RELEASE/spring-boot-starter-json-2.0.0.RELEASE-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.0.3.RELEASE/spring-boot-starter-json-2.0.3.RELEASE-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

+ 0
- 13
.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_0_0_RELEASE.xml Целия файл

@@ -1,13 +0,0 @@
1
-<component name="libraryTable">
2
-  <library name="Maven: org.springframework.boot:spring-boot-starter-logging:2.0.0.RELEASE">
3
-    <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.0.0.RELEASE/spring-boot-starter-logging-2.0.0.RELEASE.jar!/" />
5
-    </CLASSES>
6
-    <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.0.0.RELEASE/spring-boot-starter-logging-2.0.0.RELEASE-javadoc.jar!/" />
8
-    </JAVADOC>
9
-    <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.0.0.RELEASE/spring-boot-starter-logging-2.0.0.RELEASE-sources.jar!/" />
11
-    </SOURCES>
12
-  </library>
13
-</component>

+ 13
- 0
.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_0_3_RELEASE.xml Целия файл

@@ -0,0 +1,13 @@
1
+<component name="libraryTable">
2
+  <library name="Maven: org.springframework.boot:spring-boot-starter-logging:2.0.3.RELEASE">
3
+    <CLASSES>
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.0.3.RELEASE/spring-boot-starter-logging-2.0.3.RELEASE.jar!/" />
5
+    </CLASSES>
6
+    <JAVADOC>
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.0.3.RELEASE/spring-boot-starter-logging-2.0.3.RELEASE-javadoc.jar!/" />
8
+    </JAVADOC>
9
+    <SOURCES>
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.0.3.RELEASE/spring-boot-starter-logging-2.0.3.RELEASE-sources.jar!/" />
11
+    </SOURCES>
12
+  </library>
13
+</component>

+ 0
- 13
.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_0_RELEASE.xml Целия файл

@@ -1,13 +0,0 @@
1
-<component name="libraryTable">
2
-  <library name="Maven: org.springframework.boot:spring-boot-starter-test:2.0.0.RELEASE">
3
-    <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/2.0.0.RELEASE/spring-boot-starter-test-2.0.0.RELEASE.jar!/" />
5
-    </CLASSES>
6
-    <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/2.0.0.RELEASE/spring-boot-starter-test-2.0.0.RELEASE-javadoc.jar!/" />
8
-    </JAVADOC>
9
-    <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/2.0.0.RELEASE/spring-boot-starter-test-2.0.0.RELEASE-sources.jar!/" />
11
-    </SOURCES>
12
-  </library>
13
-</component>

+ 13
- 0
.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_3_RELEASE.xml Целия файл

@@ -0,0 +1,13 @@
1
+<component name="libraryTable">
2
+  <library name="Maven: org.springframework.boot:spring-boot-starter-test:2.0.3.RELEASE">
3
+    <CLASSES>
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/2.0.3.RELEASE/spring-boot-starter-test-2.0.3.RELEASE.jar!/" />
5
+    </CLASSES>
6
+    <JAVADOC>
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/2.0.3.RELEASE/spring-boot-starter-test-2.0.3.RELEASE-javadoc.jar!/" />
8
+    </JAVADOC>
9
+    <SOURCES>
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/2.0.3.RELEASE/spring-boot-starter-test-2.0.3.RELEASE-sources.jar!/" />
11
+    </SOURCES>
12
+  </library>
13
+</component>

+ 0
- 13
.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_0_RELEASE.xml Целия файл

@@ -1,13 +0,0 @@
1
-<component name="libraryTable">
2
-  <library name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.0.0.RELEASE">
3
-    <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.0.0.RELEASE/spring-boot-starter-tomcat-2.0.0.RELEASE.jar!/" />
5
-    </CLASSES>
6
-    <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.0.0.RELEASE/spring-boot-starter-tomcat-2.0.0.RELEASE-javadoc.jar!/" />
8
-    </JAVADOC>
9
-    <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.0.0.RELEASE/spring-boot-starter-tomcat-2.0.0.RELEASE-sources.jar!/" />
11
-    </SOURCES>
12
-  </library>
13
-</component>

+ 13
- 0
.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_3_RELEASE.xml Целия файл

@@ -0,0 +1,13 @@
1
+<component name="libraryTable">
2
+  <library name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.0.3.RELEASE">
3
+    <CLASSES>
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.0.3.RELEASE/spring-boot-starter-tomcat-2.0.3.RELEASE.jar!/" />
5
+    </CLASSES>
6
+    <JAVADOC>
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.0.3.RELEASE/spring-boot-starter-tomcat-2.0.3.RELEASE-javadoc.jar!/" />
8
+    </JAVADOC>
9
+    <SOURCES>
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.0.3.RELEASE/spring-boot-starter-tomcat-2.0.3.RELEASE-sources.jar!/" />
11
+    </SOURCES>
12
+  </library>
13
+</component>

.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_0_RELEASE.xml → .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_3_RELEASE.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: org.springframework.boot:spring-boot-starter-aop:2.0.0.RELEASE">
2
+  <library name="Maven: org.springframework.boot:spring-boot-starter-web:2.0.3.RELEASE">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-aop/2.0.0.RELEASE/spring-boot-starter-aop-2.0.0.RELEASE.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.0.3.RELEASE/spring-boot-starter-web-2.0.3.RELEASE.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-aop/2.0.0.RELEASE/spring-boot-starter-aop-2.0.0.RELEASE-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.0.3.RELEASE/spring-boot-starter-web-2.0.3.RELEASE-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-aop/2.0.0.RELEASE/spring-boot-starter-aop-2.0.0.RELEASE-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.0.3.RELEASE/spring-boot-starter-web-2.0.3.RELEASE-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_0_RELEASE.xml → .idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_3_RELEASE.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: org.springframework.boot:spring-boot-test:2.0.0.RELEASE">
2
+  <library name="Maven: org.springframework.boot:spring-boot-test:2.0.3.RELEASE">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.0.0.RELEASE/spring-boot-test-2.0.0.RELEASE.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.0.3.RELEASE/spring-boot-test-2.0.3.RELEASE.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.0.0.RELEASE/spring-boot-test-2.0.0.RELEASE-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.0.3.RELEASE/spring-boot-test-2.0.3.RELEASE-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.0.0.RELEASE/spring-boot-test-2.0.0.RELEASE-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.0.3.RELEASE/spring-boot-test-2.0.3.RELEASE-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

+ 13
- 0
.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_3_RELEASE.xml Целия файл

@@ -0,0 +1,13 @@
1
+<component name="libraryTable">
2
+  <library name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.0.3.RELEASE">
3
+    <CLASSES>
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/2.0.3.RELEASE/spring-boot-test-autoconfigure-2.0.3.RELEASE.jar!/" />
5
+    </CLASSES>
6
+    <JAVADOC>
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/2.0.3.RELEASE/spring-boot-test-autoconfigure-2.0.3.RELEASE-javadoc.jar!/" />
8
+    </JAVADOC>
9
+    <SOURCES>
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/2.0.3.RELEASE/spring-boot-test-autoconfigure-2.0.3.RELEASE-sources.jar!/" />
11
+    </SOURCES>
12
+  </library>
13
+</component>

.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_0_5_RELEASE.xml → .idea/libraries/Maven__org_springframework_data_spring_data_commons_2_0_8_RELEASE.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: org.springframework.data:spring-data-commons:2.0.5.RELEASE">
2
+  <library name="Maven: org.springframework.data:spring-data-commons:2.0.8.RELEASE">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.0.5.RELEASE/spring-data-commons-2.0.5.RELEASE.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.0.8.RELEASE/spring-data-commons-2.0.8.RELEASE.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.0.5.RELEASE/spring-data-commons-2.0.5.RELEASE-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.0.8.RELEASE/spring-data-commons-2.0.8.RELEASE-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.0.5.RELEASE/spring-data-commons-2.0.5.RELEASE-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.0.8.RELEASE/spring-data-commons-2.0.8.RELEASE-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_0_5_RELEASE.xml → .idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_0_8_RELEASE.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: org.springframework.data:spring-data-jpa:2.0.5.RELEASE">
2
+  <library name="Maven: org.springframework.data:spring-data-jpa:2.0.8.RELEASE">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/2.0.5.RELEASE/spring-data-jpa-2.0.5.RELEASE.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/2.0.8.RELEASE/spring-data-jpa-2.0.8.RELEASE.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/2.0.5.RELEASE/spring-data-jpa-2.0.5.RELEASE-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/2.0.8.RELEASE/spring-data-jpa-2.0.8.RELEASE-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/2.0.5.RELEASE/spring-data-jpa-2.0.5.RELEASE-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/2.0.8.RELEASE/spring-data-jpa-2.0.8.RELEASE-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

+ 0
- 13
.idea/libraries/Maven__org_springframework_data_spring_data_rest_core_3_0_5_RELEASE.xml Целия файл

@@ -1,13 +0,0 @@
1
-<component name="libraryTable">
2
-  <library name="Maven: org.springframework.data:spring-data-rest-core:3.0.5.RELEASE">
3
-    <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-rest-core/3.0.5.RELEASE/spring-data-rest-core-3.0.5.RELEASE.jar!/" />
5
-    </CLASSES>
6
-    <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-rest-core/3.0.5.RELEASE/spring-data-rest-core-3.0.5.RELEASE-javadoc.jar!/" />
8
-    </JAVADOC>
9
-    <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-rest-core/3.0.5.RELEASE/spring-data-rest-core-3.0.5.RELEASE-sources.jar!/" />
11
-    </SOURCES>
12
-  </library>
13
-</component>

+ 0
- 13
.idea/libraries/Maven__org_springframework_data_spring_data_rest_webmvc_3_0_5_RELEASE.xml Целия файл

@@ -1,13 +0,0 @@
1
-<component name="libraryTable">
2
-  <library name="Maven: org.springframework.data:spring-data-rest-webmvc:3.0.5.RELEASE">
3
-    <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-rest-webmvc/3.0.5.RELEASE/spring-data-rest-webmvc-3.0.5.RELEASE.jar!/" />
5
-    </CLASSES>
6
-    <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-rest-webmvc/3.0.5.RELEASE/spring-data-rest-webmvc-3.0.5.RELEASE-javadoc.jar!/" />
8
-    </JAVADOC>
9
-    <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-rest-webmvc/3.0.5.RELEASE/spring-data-rest-webmvc-3.0.5.RELEASE-sources.jar!/" />
11
-    </SOURCES>
12
-  </library>
13
-</component>

+ 0
- 13
.idea/libraries/Maven__org_springframework_hateoas_spring_hateoas_0_24_0_RELEASE.xml Целия файл

@@ -1,13 +0,0 @@
1
-<component name="libraryTable">
2
-  <library name="Maven: org.springframework.hateoas:spring-hateoas:0.24.0.RELEASE">
3
-    <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/hateoas/spring-hateoas/0.24.0.RELEASE/spring-hateoas-0.24.0.RELEASE.jar!/" />
5
-    </CLASSES>
6
-    <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/hateoas/spring-hateoas/0.24.0.RELEASE/spring-hateoas-0.24.0.RELEASE-javadoc.jar!/" />
8
-    </JAVADOC>
9
-    <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/hateoas/spring-hateoas/0.24.0.RELEASE/spring-hateoas-0.24.0.RELEASE-sources.jar!/" />
11
-    </SOURCES>
12
-  </library>
13
-</component>

+ 0
- 13
.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml Целия файл

@@ -1,13 +0,0 @@
1
-<component name="libraryTable">
2
-  <library name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE">
3
-    <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-core/1.2.0.RELEASE/spring-plugin-core-1.2.0.RELEASE.jar!/" />
5
-    </CLASSES>
6
-    <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-core/1.2.0.RELEASE/spring-plugin-core-1.2.0.RELEASE-javadoc.jar!/" />
8
-    </JAVADOC>
9
-    <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-core/1.2.0.RELEASE/spring-plugin-core-1.2.0.RELEASE-sources.jar!/" />
11
-    </SOURCES>
12
-  </library>
13
-</component>

.idea/libraries/Maven__org_springframework_spring_orm_5_0_4_RELEASE.xml → .idea/libraries/Maven__org_springframework_spring_aop_5_0_7_RELEASE.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: org.springframework:spring-orm:5.0.4.RELEASE">
2
+  <library name="Maven: org.springframework:spring-aop:5.0.7.RELEASE">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/5.0.4.RELEASE/spring-orm-5.0.4.RELEASE.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.0.7.RELEASE/spring-aop-5.0.7.RELEASE.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/5.0.4.RELEASE/spring-orm-5.0.4.RELEASE-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.0.7.RELEASE/spring-aop-5.0.7.RELEASE-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/5.0.4.RELEASE/spring-orm-5.0.4.RELEASE-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.0.7.RELEASE/spring-aop-5.0.7.RELEASE-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

.idea/libraries/Maven__org_springframework_spring_context_5_0_4_RELEASE.xml → .idea/libraries/Maven__org_springframework_spring_aspects_5_0_7_RELEASE.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: org.springframework:spring-context:5.0.4.RELEASE">
2
+  <library name="Maven: org.springframework:spring-aspects:5.0.7.RELEASE">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.0.4.RELEASE/spring-context-5.0.4.RELEASE.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aspects/5.0.7.RELEASE/spring-aspects-5.0.7.RELEASE.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.0.4.RELEASE/spring-context-5.0.4.RELEASE-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aspects/5.0.7.RELEASE/spring-aspects-5.0.7.RELEASE-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.0.4.RELEASE/spring-context-5.0.4.RELEASE-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aspects/5.0.7.RELEASE/spring-aspects-5.0.7.RELEASE-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

.idea/libraries/Maven__org_springframework_spring_beans_5_0_4_RELEASE.xml → .idea/libraries/Maven__org_springframework_spring_beans_5_0_7_RELEASE.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: org.springframework:spring-beans:5.0.4.RELEASE">
2
+  <library name="Maven: org.springframework:spring-beans:5.0.7.RELEASE">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.0.4.RELEASE/spring-beans-5.0.4.RELEASE.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.0.7.RELEASE/spring-beans-5.0.7.RELEASE.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.0.4.RELEASE/spring-beans-5.0.4.RELEASE-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.0.7.RELEASE/spring-beans-5.0.7.RELEASE-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.0.4.RELEASE/spring-beans-5.0.4.RELEASE-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.0.7.RELEASE/spring-beans-5.0.7.RELEASE-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

.idea/libraries/Maven__org_springframework_spring_aspects_5_0_4_RELEASE.xml → .idea/libraries/Maven__org_springframework_spring_context_5_0_7_RELEASE.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: org.springframework:spring-aspects:5.0.4.RELEASE">
2
+  <library name="Maven: org.springframework:spring-context:5.0.7.RELEASE">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aspects/5.0.4.RELEASE/spring-aspects-5.0.4.RELEASE.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.0.7.RELEASE/spring-context-5.0.7.RELEASE.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aspects/5.0.4.RELEASE/spring-aspects-5.0.4.RELEASE-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.0.7.RELEASE/spring-context-5.0.7.RELEASE-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aspects/5.0.4.RELEASE/spring-aspects-5.0.4.RELEASE-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.0.7.RELEASE/spring-context-5.0.7.RELEASE-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

.idea/libraries/Maven__org_springframework_spring_test_5_0_4_RELEASE.xml → .idea/libraries/Maven__org_springframework_spring_core_5_0_7_RELEASE.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: org.springframework:spring-test:5.0.4.RELEASE">
2
+  <library name="Maven: org.springframework:spring-core:5.0.7.RELEASE">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/5.0.4.RELEASE/spring-test-5.0.4.RELEASE.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.0.7.RELEASE/spring-core-5.0.7.RELEASE.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/5.0.4.RELEASE/spring-test-5.0.4.RELEASE-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.0.7.RELEASE/spring-core-5.0.7.RELEASE-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/5.0.4.RELEASE/spring-test-5.0.4.RELEASE-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.0.7.RELEASE/spring-core-5.0.7.RELEASE-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

.idea/libraries/Maven__org_springframework_spring_expression_5_0_4_RELEASE.xml → .idea/libraries/Maven__org_springframework_spring_expression_5_0_7_RELEASE.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: org.springframework:spring-expression:5.0.4.RELEASE">
2
+  <library name="Maven: org.springframework:spring-expression:5.0.7.RELEASE">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.0.4.RELEASE/spring-expression-5.0.4.RELEASE.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.0.7.RELEASE/spring-expression-5.0.7.RELEASE.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.0.4.RELEASE/spring-expression-5.0.4.RELEASE-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.0.7.RELEASE/spring-expression-5.0.7.RELEASE-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.0.4.RELEASE/spring-expression-5.0.4.RELEASE-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.0.7.RELEASE/spring-expression-5.0.7.RELEASE-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

.idea/libraries/Maven__org_springframework_spring_web_5_0_4_RELEASE.xml → .idea/libraries/Maven__org_springframework_spring_jcl_5_0_7_RELEASE.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: org.springframework:spring-web:5.0.4.RELEASE">
2
+  <library name="Maven: org.springframework:spring-jcl:5.0.7.RELEASE">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.0.4.RELEASE/spring-web-5.0.4.RELEASE.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.0.7.RELEASE/spring-jcl-5.0.7.RELEASE.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.0.4.RELEASE/spring-web-5.0.4.RELEASE-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.0.7.RELEASE/spring-jcl-5.0.7.RELEASE-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.0.4.RELEASE/spring-web-5.0.4.RELEASE-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.0.7.RELEASE/spring-jcl-5.0.7.RELEASE-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

.idea/libraries/Maven__org_springframework_spring_core_5_0_4_RELEASE.xml → .idea/libraries/Maven__org_springframework_spring_jdbc_5_0_7_RELEASE.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: org.springframework:spring-core:5.0.4.RELEASE">
2
+  <library name="Maven: org.springframework:spring-jdbc:5.0.7.RELEASE">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.0.4.RELEASE/spring-core-5.0.4.RELEASE.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.0.7.RELEASE/spring-jdbc-5.0.7.RELEASE.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.0.4.RELEASE/spring-core-5.0.4.RELEASE-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.0.7.RELEASE/spring-jdbc-5.0.7.RELEASE-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.0.4.RELEASE/spring-core-5.0.4.RELEASE-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.0.7.RELEASE/spring-jdbc-5.0.7.RELEASE-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

.idea/libraries/Maven__org_springframework_spring_aop_5_0_4_RELEASE.xml → .idea/libraries/Maven__org_springframework_spring_orm_5_0_7_RELEASE.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: org.springframework:spring-aop:5.0.4.RELEASE">
2
+  <library name="Maven: org.springframework:spring-orm:5.0.7.RELEASE">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.0.4.RELEASE/spring-aop-5.0.4.RELEASE.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/5.0.7.RELEASE/spring-orm-5.0.7.RELEASE.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.0.4.RELEASE/spring-aop-5.0.4.RELEASE-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/5.0.7.RELEASE/spring-orm-5.0.7.RELEASE-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.0.4.RELEASE/spring-aop-5.0.4.RELEASE-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/5.0.7.RELEASE/spring-orm-5.0.7.RELEASE-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

.idea/libraries/Maven__org_springframework_spring_jdbc_5_0_4_RELEASE.xml → .idea/libraries/Maven__org_springframework_spring_test_5_0_7_RELEASE.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: org.springframework:spring-jdbc:5.0.4.RELEASE">
2
+  <library name="Maven: org.springframework:spring-test:5.0.7.RELEASE">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.0.4.RELEASE/spring-jdbc-5.0.4.RELEASE.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/5.0.7.RELEASE/spring-test-5.0.7.RELEASE.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.0.4.RELEASE/spring-jdbc-5.0.4.RELEASE-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/5.0.7.RELEASE/spring-test-5.0.7.RELEASE-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.0.4.RELEASE/spring-jdbc-5.0.4.RELEASE-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/5.0.7.RELEASE/spring-test-5.0.7.RELEASE-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

.idea/libraries/Maven__org_springframework_spring_tx_5_0_4_RELEASE.xml → .idea/libraries/Maven__org_springframework_spring_tx_5_0_7_RELEASE.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: org.springframework:spring-tx:5.0.4.RELEASE">
2
+  <library name="Maven: org.springframework:spring-tx:5.0.7.RELEASE">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.0.4.RELEASE/spring-tx-5.0.4.RELEASE.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.0.7.RELEASE/spring-tx-5.0.7.RELEASE.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.0.4.RELEASE/spring-tx-5.0.4.RELEASE-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.0.7.RELEASE/spring-tx-5.0.7.RELEASE-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.0.4.RELEASE/spring-tx-5.0.4.RELEASE-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.0.7.RELEASE/spring-tx-5.0.7.RELEASE-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

.idea/libraries/Maven__org_springframework_spring_jcl_5_0_4_RELEASE.xml → .idea/libraries/Maven__org_springframework_spring_web_5_0_7_RELEASE.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: org.springframework:spring-jcl:5.0.4.RELEASE">
2
+  <library name="Maven: org.springframework:spring-web:5.0.7.RELEASE">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.0.4.RELEASE/spring-jcl-5.0.4.RELEASE.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.0.7.RELEASE/spring-web-5.0.7.RELEASE.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.0.4.RELEASE/spring-jcl-5.0.4.RELEASE-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.0.7.RELEASE/spring-web-5.0.7.RELEASE-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.0.4.RELEASE/spring-jcl-5.0.4.RELEASE-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.0.7.RELEASE/spring-web-5.0.7.RELEASE-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

.idea/libraries/Maven__org_springframework_spring_webmvc_5_0_4_RELEASE.xml → .idea/libraries/Maven__org_springframework_spring_webmvc_5_0_7_RELEASE.xml Целия файл

@@ -1,13 +1,13 @@
1 1
 <component name="libraryTable">
2
-  <library name="Maven: org.springframework:spring-webmvc:5.0.4.RELEASE">
2
+  <library name="Maven: org.springframework:spring-webmvc:5.0.7.RELEASE">
3 3
     <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.0.4.RELEASE/spring-webmvc-5.0.4.RELEASE.jar!/" />
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.0.7.RELEASE/spring-webmvc-5.0.7.RELEASE.jar!/" />
5 5
     </CLASSES>
6 6
     <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.0.4.RELEASE/spring-webmvc-5.0.4.RELEASE-javadoc.jar!/" />
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.0.7.RELEASE/spring-webmvc-5.0.7.RELEASE-javadoc.jar!/" />
8 8
     </JAVADOC>
9 9
     <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.0.4.RELEASE/spring-webmvc-5.0.4.RELEASE-sources.jar!/" />
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.0.7.RELEASE/spring-webmvc-5.0.7.RELEASE-sources.jar!/" />
11 11
     </SOURCES>
12 12
   </library>
13 13
 </component>

+ 124
- 0
.idea/uiDesigner.xml Целия файл

@@ -0,0 +1,124 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="Palette2">
4
+    <group name="Swing">
5
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
6
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
7
+      </item>
8
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
9
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
10
+      </item>
11
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
12
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
13
+      </item>
14
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
15
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
16
+      </item>
17
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
18
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
19
+        <initial-values>
20
+          <property name="text" value="Button" />
21
+        </initial-values>
22
+      </item>
23
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
24
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
25
+        <initial-values>
26
+          <property name="text" value="RadioButton" />
27
+        </initial-values>
28
+      </item>
29
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
30
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
31
+        <initial-values>
32
+          <property name="text" value="CheckBox" />
33
+        </initial-values>
34
+      </item>
35
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
36
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
37
+        <initial-values>
38
+          <property name="text" value="Label" />
39
+        </initial-values>
40
+      </item>
41
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
42
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
43
+          <preferred-size width="150" height="-1" />
44
+        </default-constraints>
45
+      </item>
46
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
47
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
48
+          <preferred-size width="150" height="-1" />
49
+        </default-constraints>
50
+      </item>
51
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
52
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
53
+          <preferred-size width="150" height="-1" />
54
+        </default-constraints>
55
+      </item>
56
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
57
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
58
+          <preferred-size width="150" height="50" />
59
+        </default-constraints>
60
+      </item>
61
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
62
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
63
+          <preferred-size width="150" height="50" />
64
+        </default-constraints>
65
+      </item>
66
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
67
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
68
+          <preferred-size width="150" height="50" />
69
+        </default-constraints>
70
+      </item>
71
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
72
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
73
+      </item>
74
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
75
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
76
+          <preferred-size width="150" height="50" />
77
+        </default-constraints>
78
+      </item>
79
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
80
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
81
+          <preferred-size width="150" height="50" />
82
+        </default-constraints>
83
+      </item>
84
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
85
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
86
+          <preferred-size width="150" height="50" />
87
+        </default-constraints>
88
+      </item>
89
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
90
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
91
+          <preferred-size width="200" height="200" />
92
+        </default-constraints>
93
+      </item>
94
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
95
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
96
+          <preferred-size width="200" height="200" />
97
+        </default-constraints>
98
+      </item>
99
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
100
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
101
+      </item>
102
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
103
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
104
+      </item>
105
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
106
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
107
+      </item>
108
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
109
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
110
+      </item>
111
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
112
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
113
+          <preferred-size width="-1" height="20" />
114
+        </default-constraints>
115
+      </item>
116
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
117
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
118
+      </item>
119
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
120
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
121
+      </item>
122
+    </group>
123
+  </component>
124
+</project>

+ 668
- 0
.idea/workspace.xml Целия файл

@@ -2,6 +2,7 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="a1659534-018e-4427-a691-d840db4a80bb" name="Default" comment="">
5
+<<<<<<< HEAD
5 6
       <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_h2database_h2_1_4_196.xml" afterDir="false" />
6 7
       <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_45.xml" afterDir="false" />
7 8
       <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_0_0_RELEASE.xml" afterDir="false" />
@@ -44,6 +45,89 @@
44 45
       <change beforePath="$PROJECT_DIR$/target/classes/users/new.html" beforeDir="false" />
45 46
       <change beforePath="$PROJECT_DIR$/target/classes/users/show.html" beforeDir="false" />
46 47
       <change beforePath="$PROJECT_DIR$/target/test-classes/Questions.class" beforeDir="false" />
48
+=======
49
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_46.xml" afterDir="false" />
50
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_3_RELEASE.xml" afterDir="false" />
51
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_3_RELEASE.xml" afterDir="false" />
52
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_3_RELEASE.xml" afterDir="false" />
53
+      <change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
54
+      <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/controller/EasyQuestionAnswersController.java" afterDir="false" />
55
+      <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/controller/IntermediateQuestionsController.java" afterDir="false" />
56
+      <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/controller/MysteryQuestionsController.java" afterDir="false" />
57
+      <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/model/EasyQuestionAnswers.java" afterDir="false" />
58
+      <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/model/HardQuestions.java" afterDir="false" />
59
+      <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/model/IntermediateQuestions.java" afterDir="false" />
60
+      <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/model/Login.java" afterDir="false" />
61
+      <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/model/MysteryQuestions.java" afterDir="false" />
62
+      <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/repositories/EasyAnswersRepository.java" afterDir="false" />
63
+      <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/repositories/HardRepository.java" afterDir="false" />
64
+      <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/repositories/IntermediateRepository.java" afterDir="false" />
65
+      <change afterPath="$PROJECT_DIR$/src/main/java/passionproject/repositories/MysteryRepository.java" afterDir="false" />
66
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_6.xml" afterDir="false" />
67
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_6.xml" afterDir="false" />
68
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_6.xml" afterDir="false" />
69
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_6.xml" afterDir="false" />
70
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_6.xml" afterDir="false" />
71
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_HikariCP_2_7_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_HikariCP_2_7_9.xml" afterDir="false" />
72
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_11.xml" afterDir="false" />
73
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_11.xml" afterDir="false" />
74
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_28.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_31.xml" afterDir="false" />
75
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_28.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_31.xml" afterDir="false" />
76
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_28.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_31.xml" afterDir="false" />
77
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_atteo_evo_inflector_1_2_2.xml" beforeDir="false" />
78
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_core_5_2_14_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_core_5_2_17_Final.xml" afterDir="false" />
79
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_2_Final.xml" afterDir="false" />
80
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_7_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_10_Final.xml" afterDir="false" />
81
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_postgresql_postgresql_42_2_1.xml" beforeDir="false" />
82
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_3_RELEASE.xml" afterDir="false" />
83
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_3_RELEASE.xml" afterDir="false" />
84
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_3_RELEASE.xml" afterDir="false" />
85
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_3_RELEASE.xml" afterDir="false" />
86
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_0_0_RELEASE.xml" beforeDir="false" />
87
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_rest_2_0_0_RELEASE.xml" beforeDir="false" />
88
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_hateoas_2_0_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_0_3_RELEASE.xml" afterDir="false" />
89
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_3_RELEASE.xml" afterDir="false" />
90
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_3_RELEASE.xml" afterDir="false" />
91
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_0_0_RELEASE.xml" beforeDir="false" />
92
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_0_RELEASE.xml" beforeDir="false" />
93
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_0_RELEASE.xml" beforeDir="false" />
94
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_3_RELEASE.xml" afterDir="false" />
95
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_3_RELEASE.xml" afterDir="false" />
96
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_0_3_RELEASE.xml" afterDir="false" />
97
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_0_5_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_0_8_RELEASE.xml" afterDir="false" />
98
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_0_5_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_0_8_RELEASE.xml" afterDir="false" />
99
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_rest_core_3_0_5_RELEASE.xml" beforeDir="false" />
100
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_rest_hal_browser_3_0_5_RELEASE.xml" beforeDir="false" />
101
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_rest_webmvc_3_0_5_RELEASE.xml" beforeDir="false" />
102
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_hateoas_spring_hateoas_0_24_0_RELEASE.xml" beforeDir="false" />
103
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml" beforeDir="false" />
104
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_5_0_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_0_7_RELEASE.xml" afterDir="false" />
105
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aspects_5_0_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aspects_5_0_7_RELEASE.xml" afterDir="false" />
106
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_0_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_0_7_RELEASE.xml" afterDir="false" />
107
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_0_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_0_7_RELEASE.xml" afterDir="false" />
108
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_0_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_0_7_RELEASE.xml" afterDir="false" />
109
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_0_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_0_7_RELEASE.xml" afterDir="false" />
110
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_0_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_0_7_RELEASE.xml" afterDir="false" />
111
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_5_0_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_5_0_7_RELEASE.xml" afterDir="false" />
112
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_orm_5_0_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_5_0_7_RELEASE.xml" afterDir="false" />
113
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_5_0_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_5_0_7_RELEASE.xml" afterDir="false" />
114
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_5_0_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_5_0_7_RELEASE.xml" afterDir="false" />
115
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_0_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_orm_5_0_7_RELEASE.xml" afterDir="false" />
116
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_0_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_0_7_RELEASE.xml" afterDir="false" />
117
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
118
+      <change beforePath="$PROJECT_DIR$/passionProject.iml" beforeDir="false" afterPath="$PROJECT_DIR$/passionProject.iml" afterDir="false" />
119
+      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
120
+      <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/controller/MainMenuController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/passionproject/controller/HardQuestionsController.java" afterDir="false" />
121
+      <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/controller/QuestionsController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/passionproject/controller/EasyQuestionsController.java" afterDir="false" />
122
+      <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/model/MainMenu.java" beforeDir="false" />
123
+      <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/model/Questions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/passionproject/model/EasyQuestions.java" afterDir="false" />
124
+      <change beforePath="$PROJECT_DIR$/src/main/java/passionproject/repositories/QuestionRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/passionproject/repositories/EasyRepository.java" afterDir="false" />
125
+      <change beforePath="$PROJECT_DIR$/target/classes/passionproject/controller/MainMenuController.class" beforeDir="false" />
126
+      <change beforePath="$PROJECT_DIR$/target/classes/passionproject/controller/QuestionsController.class" beforeDir="false" />
127
+      <change beforePath="$PROJECT_DIR$/target/classes/passionproject/model/MainMenu.class" beforeDir="false" />
128
+      <change beforePath="$PROJECT_DIR$/target/classes/passionproject/model/Questions.class" beforeDir="false" />
129
+      <change beforePath="$PROJECT_DIR$/target/classes/passionproject/repositories/QuestionRepository.class" beforeDir="false" />
130
+>>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
47 131
     </list>
48 132
     <ignored path="$PROJECT_DIR$/target/" />
49 133
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -53,6 +137,7 @@
53 137
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
54 138
     <option name="LAST_RESOLUTION" value="IGNORE" />
55 139
   </component>
140
+<<<<<<< HEAD
56 141
   <component name="DatabaseView">
57 142
     <option name="SHOW_INTERMEDIATE" value="true" />
58 143
     <option name="GROUP_DATA_SOURCES" value="true" />
@@ -69,6 +154,35 @@
69 154
   </component>
70 155
   <component name="FileEditorManager">
71 156
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
157
+=======
158
+  <component name="FileEditorManager">
159
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
160
+      <file leaf-file-name="EasyQuestions.java" pinned="false" current-in-tab="false">
161
+        <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/EasyQuestions.java">
162
+          <provider selected="true" editor-type-id="text-editor">
163
+            <state relative-caret-position="180">
164
+              <caret line="13" column="41" selection-start-line="13" selection-start-column="41" selection-end-line="13" selection-end-column="41" />
165
+              <folding>
166
+                <element signature="imports" expanded="true" />
167
+                <element signature="e#672#673#0" expanded="true" />
168
+                <element signature="e#701#702#0" expanded="true" />
169
+                <element signature="e#738#739#0" expanded="true" />
170
+                <element signature="e#774#775#0" expanded="true" />
171
+              </folding>
172
+            </state>
173
+          </provider>
174
+        </entry>
175
+      </file>
176
+      <file leaf-file-name="EasyQuestionAnswers.java" pinned="false" current-in-tab="false">
177
+        <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/EasyQuestionAnswers.java">
178
+          <provider selected="true" editor-type-id="text-editor">
179
+            <state relative-caret-position="90">
180
+              <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
181
+            </state>
182
+          </provider>
183
+        </entry>
184
+      </file>
185
+>>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
72 186
       <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
73 187
         <entry file="file://$PROJECT_DIR$/README.md">
74 188
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
@@ -79,15 +193,44 @@
79 193
           </provider>
80 194
         </entry>
81 195
       </file>
196
+<<<<<<< HEAD
82 197
       <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
83 198
         <entry file="file://$PROJECT_DIR$/pom.xml">
84 199
           <provider selected="true" editor-type-id="text-editor">
85 200
             <state relative-caret-position="225">
86 201
               <caret line="16" column="1" selection-start-line="16" selection-start-column="1" selection-end-line="16" selection-end-column="1" />
202
+=======
203
+      <file leaf-file-name="EasyRepository.java" pinned="false" current-in-tab="false">
204
+        <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/repositories/EasyRepository.java">
205
+          <provider selected="true" editor-type-id="text-editor">
206
+            <state relative-caret-position="165">
207
+              <caret line="11" selection-start-line="11" selection-end-line="11" />
208
+              <folding>
209
+                <element signature="imports" expanded="true" />
210
+              </folding>
211
+            </state>
212
+          </provider>
213
+        </entry>
214
+      </file>
215
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
216
+        <entry file="file://$PROJECT_DIR$/pom.xml">
217
+          <provider selected="true" editor-type-id="text-editor" />
218
+        </entry>
219
+      </file>
220
+      <file leaf-file-name="HardRepository.java" pinned="false" current-in-tab="false">
221
+        <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/repositories/HardRepository.java">
222
+          <provider selected="true" editor-type-id="text-editor">
223
+            <state relative-caret-position="105">
224
+              <caret line="7" column="11" selection-start-line="7" selection-start-column="11" selection-end-line="7" selection-end-column="11" />
225
+              <folding>
226
+                <element signature="imports" expanded="true" />
227
+              </folding>
228
+>>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
87 229
             </state>
88 230
           </provider>
89 231
         </entry>
90 232
       </file>
233
+<<<<<<< HEAD
91 234
       <file leaf-file-name="application.properties" pinned="false" current-in-tab="false">
92 235
         <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
93 236
           <provider selected="true" editor-type-id="text-editor" />
@@ -98,19 +241,88 @@
98 241
           <provider selected="true" editor-type-id="text-editor">
99 242
             <state relative-caret-position="75">
100 243
               <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
244
+=======
245
+      <file leaf-file-name="EasyQuestionsController.java" pinned="false" current-in-tab="false">
246
+        <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/controller/EasyQuestionsController.java">
247
+          <provider selected="true" editor-type-id="text-editor">
248
+            <state relative-caret-position="105">
249
+              <caret line="13" column="36" selection-start-line="13" selection-start-column="36" selection-end-line="13" selection-end-column="36" />
250
+              <folding>
251
+                <element signature="imports" expanded="true" />
252
+              </folding>
253
+            </state>
254
+          </provider>
255
+        </entry>
256
+      </file>
257
+      <file leaf-file-name="EasyQuestionAnswersController.java" pinned="false" current-in-tab="true">
258
+        <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/controller/EasyQuestionAnswersController.java">
259
+          <provider selected="true" editor-type-id="text-editor">
260
+            <state relative-caret-position="243">
261
+              <caret line="20" column="18" selection-start-line="20" selection-start-column="18" selection-end-line="20" selection-end-column="18" />
262
+              <folding>
263
+                <element signature="imports" expanded="true" />
264
+              </folding>
265
+>>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
101 266
             </state>
102 267
           </provider>
103 268
         </entry>
104 269
       </file>
105 270
     </leaf>
106 271
   </component>
272
+<<<<<<< HEAD
273
+=======
274
+  <component name="FileTemplateManagerImpl">
275
+    <option name="RECENT_TEMPLATES">
276
+      <list>
277
+        <option value="Interface" />
278
+        <option value="Class" />
279
+      </list>
280
+    </option>
281
+  </component>
282
+>>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
107 283
   <component name="Git.Settings">
108 284
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
109 285
   </component>
110 286
   <component name="IdeDocumentHistory">
111 287
     <option name="CHANGED_PATHS">
112 288
       <list>
289
+<<<<<<< HEAD
290
+        <option value="$PROJECT_DIR$/pom.xml" />
291
+=======
292
+        <option value="$PROJECT_DIR$/src/main/java/passionproject/model/Login.java" />
293
+        <option value="$PROJECT_DIR$/src/main/java/passionproject/model/MainMenu.java" />
294
+        <option value="$PROJECT_DIR$/src/main/java/passionproject/controller/MainMenuController.java" />
295
+        <option value="$PROJECT_DIR$/src/main/java/passionproject/controller/QuestionsController.java" />
296
+        <option value="$PROJECT_DIR$/src/main/java/passionproject/model/Questions.java" />
297
+        <option value="$PROJECT_DIR$/src/main/java/passionproject/repositories/QuestionRepository.java" />
298
+        <option value="$PROJECT_DIR$/src/main/java/passionproject/repositories/MysteryQuestions.java" />
299
+        <option value="$PROJECT_DIR$/src/main/java/passionproject/controller/IntermediateController.java" />
300
+        <option value="$PROJECT_DIR$/src/main/java/passionproject/controller/HardRepository.java" />
301
+        <option value="$PROJECT_DIR$/src/main/java/passionproject/model/IntermediateQuestions.java" />
302
+        <option value="$PROJECT_DIR$/src/main/java/passionproject/model/MysteryQuestions.java" />
303
+        <option value="$PROJECT_DIR$/src/main/java/passionproject/model/HardQuestions.java" />
304
+        <option value="$PROJECT_DIR$/src/main/java/passionproject/controller/HardQuestionsController.java" />
305
+        <option value="$PROJECT_DIR$/src/main/java/passionproject/controller/IntermediateQuestionsController.java" />
306
+        <option value="$PROJECT_DIR$/src/main/java/passionproject/controller/MysteryQuestions.java" />
307
+        <option value="$PROJECT_DIR$/src/main/java/passionproject/controller/MysteryQuestionsController.java" />
308
+        <option value="$PROJECT_DIR$/src/main/java/passionproject/repositories/AnswerRepository.java" />
309
+        <option value="$PROJECT_DIR$/src/main/java/passionproject/model/Answer.java" />
310
+        <option value="$PROJECT_DIR$/src/main/java/passionproject/controller/AnswerController.java" />
311
+        <option value="$PROJECT_DIR$/src/main/java/passionproject/controller/EasyAnswer.java" />
312
+        <option value="$PROJECT_DIR$/src/main/java/passionproject/controller/EasyAnswerController.java" />
313
+        <option value="$PROJECT_DIR$/src/main/java/passionproject/controller/EasyQuestionAnswers.java" />
314
+        <option value="$PROJECT_DIR$/src/main/java/passionproject/controller/EasyQuestionsController.java" />
315
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
316
+        <option value="$PROJECT_DIR$/src/main/java/passionproject/repositories/EasyAnswersRepository.java" />
317
+        <option value="$PROJECT_DIR$/src/main/java/passionproject/repositories/HardRepository.java" />
318
+        <option value="$PROJECT_DIR$/src/main/java/passionproject/repositories/IntermediateRepository.java" />
319
+        <option value="$PROJECT_DIR$/src/main/java/passionproject/repositories/MysteryRepository.java" />
320
+        <option value="$PROJECT_DIR$/src/main/java/passionproject/repositories/EasyRepository.java" />
321
+        <option value="$PROJECT_DIR$/src/main/java/passionproject/model/EasyQuestionAnswers.java" />
113 322
         <option value="$PROJECT_DIR$/pom.xml" />
323
+        <option value="$PROJECT_DIR$/src/main/java/passionproject/model/EasyQuestions.java" />
324
+        <option value="$PROJECT_DIR$/src/main/java/passionproject/controller/EasyQuestionAnswersController.java" />
325
+>>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
114 326
       </list>
115 327
     </option>
116 328
   </component>
@@ -130,11 +342,18 @@
130 342
   <component name="NodePackageJsonFileManager">
131 343
     <packageJsonPaths />
132 344
   </component>
345
+<<<<<<< HEAD
133 346
   <component name="ProjectFrameBounds" extendedState="6" fullScreen="true">
134 347
     <option name="x" value="436" />
135 348
     <option name="y" value="23" />
136 349
     <option name="width" value="844" />
137 350
     <option name="height" value="722" />
351
+=======
352
+  <component name="ProjectFrameBounds" extendedState="1">
353
+    <option name="y" value="23" />
354
+    <option name="width" value="1280" />
355
+    <option name="height" value="730" />
356
+>>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
138 357
   </component>
139 358
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
140 359
     <ConfirmationsSetting value="2" id="Add" />
@@ -144,6 +363,10 @@
144 363
       <foldersAlwaysOnTop value="true" />
145 364
     </navigator>
146 365
     <panes>
366
+<<<<<<< HEAD
367
+=======
368
+      <pane id="Scope" />
369
+>>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
147 370
       <pane id="ProjectPane">
148 371
         <subPane>
149 372
           <expand>
@@ -183,6 +406,17 @@
183 406
               <item name="src" type="462c0819:PsiDirectoryNode" />
184 407
               <item name="main" type="462c0819:PsiDirectoryNode" />
185 408
               <item name="java" type="462c0819:PsiDirectoryNode" />
409
+<<<<<<< HEAD
410
+=======
411
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
412
+            </path>
413
+            <path>
414
+              <item name="passionProject" type="b2602c69:ProjectViewProjectNode" />
415
+              <item name="Passion_Project" type="462c0819:PsiDirectoryNode" />
416
+              <item name="src" type="462c0819:PsiDirectoryNode" />
417
+              <item name="main" type="462c0819:PsiDirectoryNode" />
418
+              <item name="java" type="462c0819:PsiDirectoryNode" />
419
+>>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
186 420
               <item name="model" type="462c0819:PsiDirectoryNode" />
187 421
             </path>
188 422
             <path>
@@ -200,20 +434,41 @@
200 434
               <item name="main" type="462c0819:PsiDirectoryNode" />
201 435
               <item name="resources" type="462c0819:PsiDirectoryNode" />
202 436
             </path>
437
+<<<<<<< HEAD
438
+=======
439
+            <path>
440
+              <item name="passionProject" type="b2602c69:ProjectViewProjectNode" />
441
+              <item name="Passion_Project" type="462c0819:PsiDirectoryNode" />
442
+              <item name="src" type="462c0819:PsiDirectoryNode" />
443
+              <item name="test" type="462c0819:PsiDirectoryNode" />
444
+            </path>
445
+>>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
203 446
           </expand>
204 447
           <select />
205 448
         </subPane>
206 449
       </pane>
450
+<<<<<<< HEAD
207 451
       <pane id="PackagesPane" />
208 452
       <pane id="AndroidView" />
209 453
       <pane id="Scope" />
454
+=======
455
+      <pane id="AndroidView" />
456
+      <pane id="PackagesPane" />
457
+>>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
210 458
     </panes>
211 459
   </component>
212 460
   <component name="PropertiesComponent">
213 461
     <property name="RequestMappingsPanelOrder0" value="0" />
214 462
     <property name="RequestMappingsPanelOrder1" value="1" />
463
+<<<<<<< HEAD
464
+    <property name="RequestMappingsPanelWidth0" value="75" />
465
+    <property name="RequestMappingsPanelWidth1" value="75" />
466
+=======
467
+    <property name="RequestMappingsPanelOrder2" value="2" />
215 468
     <property name="RequestMappingsPanelWidth0" value="75" />
216 469
     <property name="RequestMappingsPanelWidth1" value="75" />
470
+    <property name="RequestMappingsPanelWidth2" value="75" />
471
+>>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
217 472
     <property name="WebServerToolWindowFactoryState" value="false" />
218 473
     <property name="aspect.path.notification.shown" value="true" />
219 474
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
@@ -260,6 +515,7 @@
260 515
       </option>
261 516
       <patterns />
262 517
     </configuration>
518
+<<<<<<< HEAD
263 519
     <configuration name="GameEngine (1)" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
264 520
       <module name="passProj" />
265 521
       <extension name="coverage">
@@ -270,6 +526,8 @@
270 526
       </extension>
271 527
       <option name="SPRING_BOOT_MAIN_CLASS" value="passionproject.GameEngine" />
272 528
     </configuration>
529
+=======
530
+>>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
273 531
     <configuration name="GameEngine" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
274 532
       <module name="passionProject" />
275 533
       <extension name="coverage">
@@ -302,6 +560,7 @@
302 560
       <properties />
303 561
       <listeners />
304 562
     </configuration>
563
+<<<<<<< HEAD
305 564
     <list>
306 565
       <item itemvalue="Spring Boot.GameEngine" />
307 566
       <item itemvalue="Spring Boot.GameEngine (1)" />
@@ -309,6 +568,10 @@
309 568
     <recent_temporary>
310 569
       <list>
311 570
         <item itemvalue="Spring Boot.GameEngine (1)" />
571
+=======
572
+    <recent_temporary>
573
+      <list>
574
+>>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
312 575
         <item itemvalue="Spring Boot.GameEngine" />
313 576
       </list>
314 577
     </recent_temporary>
@@ -324,17 +587,29 @@
324 587
       <option name="presentableId" value="Default" />
325 588
       <updated>1531487848837</updated>
326 589
       <workItem from="1531487851169" duration="335000" />
590
+<<<<<<< HEAD
327 591
       <workItem from="1531488336520" duration="3134000" />
328 592
       <workItem from="1531754362604" duration="257000" />
593
+=======
594
+      <workItem from="1531918988277" duration="12317000" />
595
+      <workItem from="1531942331738" duration="11707000" />
596
+>>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
329 597
     </task>
330 598
     <servers />
331 599
   </component>
332 600
   <component name="TimeTrackingManager">
601
+<<<<<<< HEAD
333 602
     <option name="totallyTimeSpent" value="3726000" />
334 603
   </component>
335 604
   <component name="ToolWindowManager">
336 605
     <frame x="508" y="0" width="772" height="800" extended-state="6" />
337 606
     <editor active="true" />
607
+=======
608
+    <option name="totallyTimeSpent" value="24359000" />
609
+  </component>
610
+  <component name="ToolWindowManager">
611
+    <frame x="0" y="0" width="772" height="800" extended-state="6" />
612
+>>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
338 613
     <layout>
339 614
       <window_info anchor="right" id="Palette" order="3" />
340 615
       <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
@@ -342,22 +617,39 @@
342 617
       <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
343 618
       <window_info id="Capture Tool" order="2" />
344 619
       <window_info id="Designer" order="2" />
620
+<<<<<<< HEAD
345 621
       <window_info anchor="right" id="Database" order="3" weight="0.32956383" />
622
+=======
623
+      <window_info anchor="right" id="Database" order="3" />
624
+>>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
346 625
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
347 626
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
348 627
       <window_info id="UI Designer" order="2" />
349 628
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
350 629
       <window_info anchor="bottom" id="TODO" order="6" />
630
+<<<<<<< HEAD
351 631
       <window_info anchor="bottom" id="Messages" order="8" />
632
+=======
633
+      <window_info anchor="bottom" id="Messages" order="8" weight="0.32965517" />
634
+>>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
352 635
       <window_info anchor="right" id="Palette&#9;" order="3" />
353 636
       <window_info id="Image Layers" order="2" />
354 637
       <window_info anchor="bottom" id="Java Enterprise" order="7" weight="0.3296" />
355 638
       <window_info anchor="right" id="Capture Analysis" order="3" />
639
+<<<<<<< HEAD
356 640
       <window_info anchor="bottom" id="Run" order="2" weight="0.56" />
357 641
       <window_info anchor="bottom" id="Version Control" order="7" />
358 642
       <window_info anchor="bottom" id="Spring" order="7" />
359 643
       <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.41379312" />
360 644
       <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.16027397" />
645
+=======
646
+      <window_info anchor="bottom" id="Run" order="2" weight="0.3627586" />
647
+      <window_info anchor="bottom" id="Version Control" order="7" />
648
+      <window_info anchor="bottom" id="Spring" order="7" weight="0.32965517" />
649
+      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.38482758" />
650
+      <window_info id="Persistence" side_tool="true" />
651
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2041096" />
652
+>>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
361 653
       <window_info anchor="right" id="Bean Validation" order="3" />
362 654
       <window_info id="Web" order="2" side_tool="true" />
363 655
       <window_info anchor="right" id="Theme Preview" order="3" />
@@ -369,6 +661,43 @@
369 661
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
370 662
       <window_info anchor="bottom" id="Find" order="1" />
371 663
     </layout>
664
+<<<<<<< HEAD
665
+=======
666
+    <layout-to-restore>
667
+      <window_info id="Designer" order="2" />
668
+      <window_info anchor="right" id="Palette" order="3" />
669
+      <window_info anchor="bottom" id="Run" order="2" weight="0.3627586" />
670
+      <window_info anchor="bottom" id="Spring" order="7" weight="0.32965517" />
671
+      <window_info id="Image Layers" order="3" />
672
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
673
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
674
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
675
+      <window_info id="UI Designer" order="4" />
676
+      <window_info id="Favorites" order="5" side_tool="true" />
677
+      <window_info anchor="bottom" id="Terminal" order="8" weight="0.24965517" />
678
+      <window_info id="Capture Tool" order="6" />
679
+      <window_info anchor="right" id="Capture Analysis" order="4" />
680
+      <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
681
+      <window_info anchor="bottom" id="Messages" order="13" weight="0.32965517" />
682
+      <window_info anchor="bottom" id="TODO" order="6" />
683
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
684
+      <window_info anchor="bottom" id="Java Enterprise" order="10" weight="0.3296" />
685
+      <window_info anchor="bottom" id="Database Changes" order="11" show_stripe_button="false" />
686
+      <window_info anchor="bottom" id="Version Control" order="12" />
687
+      <window_info anchor="right" id="Maven Projects" order="5" />
688
+      <window_info anchor="bottom" id="Find" order="1" />
689
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2819063" />
690
+      <window_info anchor="right" id="Database" order="6" />
691
+      <window_info anchor="bottom" id="Message" order="0" />
692
+      <window_info id="Web" order="7" side_tool="true" />
693
+      <window_info anchor="right" id="Palette&#9;" order="7" />
694
+      <window_info anchor="right" id="Theme Preview" order="8" />
695
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
696
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
697
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
698
+      <window_info anchor="right" id="Bean Validation" order="9" />
699
+    </layout-to-restore>
700
+>>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
372 701
   </component>
373 702
   <component name="TypeScriptGeneratedFilesManager">
374 703
     <option name="version" value="1" />
@@ -377,6 +706,7 @@
377 706
     <option name="myLimit" value="2678400000" />
378 707
   </component>
379 708
   <component name="editorHistoryManager">
709
+<<<<<<< HEAD
380 710
     <entry file="file://$PROJECT_DIR$/README.md">
381 711
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
382 712
         <state split_layout="SPLIT">
@@ -392,6 +722,298 @@
392 722
       <provider selected="true" editor-type-id="text-editor">
393 723
         <state relative-caret-position="225">
394 724
           <caret line="15" column="1" selection-start-line="15" selection-start-column="1" selection-end-line="15" selection-end-column="1" />
725
+=======
726
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/EasyQuestions.java">
727
+      <provider selected="true" editor-type-id="text-editor">
728
+        <state relative-caret-position="150">
729
+          <caret line="10" selection-start-line="10" selection-end-line="10" />
730
+          <folding>
731
+            <element signature="imports" expanded="true" />
732
+            <element signature="e#672#673#0" expanded="true" />
733
+            <element signature="e#701#702#0" expanded="true" />
734
+            <element signature="e#738#739#0" expanded="true" />
735
+            <element signature="e#774#775#0" expanded="true" />
736
+          </folding>
737
+        </state>
738
+      </provider>
739
+    </entry>
740
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/controller/EasyQuestionsController.java">
741
+      <provider selected="true" editor-type-id="text-editor">
742
+        <state relative-caret-position="555">
743
+          <caret line="37" column="34" selection-start-line="37" selection-start-column="34" selection-end-line="37" selection-end-column="34" />
744
+          <folding>
745
+            <element signature="imports" expanded="true" />
746
+          </folding>
747
+        </state>
748
+      </provider>
749
+    </entry>
750
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/repositories/EasyRepository.java">
751
+      <provider selected="true" editor-type-id="text-editor">
752
+        <state relative-caret-position="90">
753
+          <caret line="6" column="17" selection-start-line="6" selection-start-column="17" selection-end-line="6" selection-end-column="17" />
754
+          <folding>
755
+            <element signature="imports" expanded="true" />
756
+          </folding>
757
+        </state>
758
+      </provider>
759
+    </entry>
760
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/controller/IntermediateQuestionsController.java">
761
+      <provider selected="true" editor-type-id="text-editor">
762
+        <state relative-caret-position="420">
763
+          <caret line="28" lean-forward="true" selection-start-line="28" selection-end-line="28" />
764
+          <folding>
765
+            <element signature="imports" expanded="true" />
766
+          </folding>
767
+        </state>
768
+      </provider>
769
+    </entry>
770
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/controller/MysteryQuestionsController.java">
771
+      <provider selected="true" editor-type-id="text-editor">
772
+        <state relative-caret-position="480">
773
+          <caret line="32" column="73" selection-start-line="32" selection-start-column="73" selection-end-line="32" selection-end-column="73" />
774
+          <folding>
775
+            <element signature="imports" expanded="true" />
776
+          </folding>
777
+        </state>
778
+      </provider>
779
+    </entry>
780
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/controller/HardQuestionsController.java">
781
+      <provider selected="true" editor-type-id="text-editor">
782
+        <state relative-caret-position="495">
783
+          <caret line="33" column="62" lean-forward="true" selection-start-line="33" selection-start-column="62" selection-end-line="33" selection-end-column="62" />
784
+          <folding>
785
+            <element signature="imports" expanded="true" />
786
+          </folding>
787
+        </state>
788
+      </provider>
789
+    </entry>
790
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
791
+      <provider selected="true" editor-type-id="text-editor">
792
+        <state relative-caret-position="60">
793
+          <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
794
+        </state>
795
+      </provider>
796
+    </entry>
797
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/StartGame.java">
798
+      <provider selected="true" editor-type-id="text-editor">
799
+        <state relative-caret-position="195">
800
+          <caret line="13" column="2" selection-start-line="13" selection-start-column="2" selection-end-line="13" selection-end-column="2" />
801
+        </state>
802
+      </provider>
803
+    </entry>
804
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/HardQuestions.java">
805
+      <provider selected="true" editor-type-id="text-editor">
806
+        <state relative-caret-position="150">
807
+          <caret line="10" selection-start-line="10" selection-end-line="10" />
808
+          <folding>
809
+            <element signature="imports" expanded="true" />
810
+          </folding>
811
+        </state>
812
+      </provider>
813
+    </entry>
814
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/IntermediateQuestions.java">
815
+      <provider selected="true" editor-type-id="text-editor">
816
+        <state relative-caret-position="300">
817
+          <caret line="24" column="42" selection-start-line="24" selection-start-column="42" selection-end-line="24" selection-end-column="42" />
818
+          <folding>
819
+            <element signature="imports" expanded="true" />
820
+          </folding>
821
+        </state>
822
+      </provider>
823
+    </entry>
824
+    <entry file="file://$PROJECT_DIR$/passionProject.iml">
825
+      <provider selected="true" editor-type-id="text-editor" />
826
+    </entry>
827
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/HumanPlayer.java">
828
+      <provider selected="true" editor-type-id="text-editor">
829
+        <state relative-caret-position="30">
830
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
831
+        </state>
832
+      </provider>
833
+    </entry>
834
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/GamePlay.java">
835
+      <provider selected="true" editor-type-id="text-editor">
836
+        <state relative-caret-position="30">
837
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
838
+        </state>
839
+      </provider>
840
+    </entry>
841
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/MainMenu.java" />
842
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/controller/MainMenuController.java" />
843
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/repositories/IntermediateRepository.java">
844
+      <provider selected="true" editor-type-id="text-editor">
845
+        <state relative-caret-position="30">
846
+          <caret line="2" column="35" selection-start-line="2" selection-start-column="35" selection-end-line="2" selection-end-column="35" />
847
+        </state>
848
+      </provider>
849
+    </entry>
850
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/repositories/MysteryRepository.java">
851
+      <provider selected="true" editor-type-id="text-editor">
852
+        <state relative-caret-position="30">
853
+          <caret line="2" column="30" selection-start-line="2" selection-start-column="30" selection-end-line="2" selection-end-column="30" />
854
+        </state>
855
+      </provider>
856
+    </entry>
857
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/MysteryQuestions.java">
858
+      <provider selected="true" editor-type-id="text-editor">
859
+        <state relative-caret-position="229">
860
+          <caret line="18" column="5" lean-forward="true" selection-start-line="18" selection-start-column="5" selection-end-line="18" selection-end-column="5" />
861
+          <folding>
862
+            <element signature="imports" expanded="true" />
863
+          </folding>
864
+        </state>
865
+      </provider>
866
+    </entry>
867
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/StartGame.java">
868
+      <provider selected="true" editor-type-id="text-editor">
869
+        <state relative-caret-position="195">
870
+          <caret line="13" column="2" selection-start-line="13" selection-start-column="2" selection-end-line="13" selection-end-column="2" />
871
+        </state>
872
+      </provider>
873
+    </entry>
874
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/IntermediateQuestions.java">
875
+      <provider selected="true" editor-type-id="text-editor">
876
+        <state relative-caret-position="300">
877
+          <caret line="24" column="42" selection-start-line="24" selection-start-column="42" selection-end-line="24" selection-end-column="42" />
878
+          <folding>
879
+            <element signature="imports" expanded="true" />
880
+          </folding>
881
+        </state>
882
+      </provider>
883
+    </entry>
884
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/controller/HardQuestionsController.java">
885
+      <provider selected="true" editor-type-id="text-editor">
886
+        <state relative-caret-position="495">
887
+          <caret line="33" column="62" selection-start-line="33" selection-start-column="62" selection-end-line="33" selection-end-column="62" />
888
+          <folding>
889
+            <element signature="imports" expanded="true" />
890
+          </folding>
891
+        </state>
892
+      </provider>
893
+    </entry>
894
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/controller/IntermediateQuestionsController.java">
895
+      <provider selected="true" editor-type-id="text-editor">
896
+        <state relative-caret-position="420">
897
+          <caret line="28" selection-start-line="28" selection-end-line="28" />
898
+          <folding>
899
+            <element signature="imports" expanded="true" />
900
+          </folding>
901
+        </state>
902
+      </provider>
903
+    </entry>
904
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/HardQuestions.java">
905
+      <provider selected="true" editor-type-id="text-editor">
906
+        <state relative-caret-position="150">
907
+          <caret line="10" selection-start-line="10" selection-end-line="10" />
908
+          <folding>
909
+            <element signature="imports" expanded="true" />
910
+          </folding>
911
+        </state>
912
+      </provider>
913
+    </entry>
914
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/GameEngine.java">
915
+      <provider selected="true" editor-type-id="text-editor">
916
+        <state relative-caret-position="150">
917
+          <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
918
+        </state>
919
+      </provider>
920
+    </entry>
921
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/controller/MysteryQuestionsController.java">
922
+      <provider selected="true" editor-type-id="text-editor">
923
+        <state relative-caret-position="480">
924
+          <caret line="32" column="73" selection-start-line="32" selection-start-column="73" selection-end-line="32" selection-end-column="73" />
925
+          <folding>
926
+            <element signature="imports" expanded="true" />
927
+          </folding>
928
+        </state>
929
+      </provider>
930
+    </entry>
931
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/repositories/EasyAnswerRepository.java">
932
+      <provider selected="true" editor-type-id="text-editor">
933
+        <state relative-caret-position="90">
934
+          <caret line="6" column="1" lean-forward="true" selection-end-line="6" selection-end-column="1" />
935
+          <folding>
936
+            <element signature="imports" expanded="true" />
937
+          </folding>
938
+        </state>
939
+      </provider>
940
+    </entry>
941
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/Account.java">
942
+      <provider selected="true" editor-type-id="text-editor">
943
+        <state relative-caret-position="195">
944
+          <caret line="19" column="23" lean-forward="true" selection-start-line="19" selection-start-column="23" selection-end-line="19" selection-end-column="23" />
945
+        </state>
946
+      </provider>
947
+    </entry>
948
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/Enemy.java">
949
+      <provider selected="true" editor-type-id="text-editor">
950
+        <state relative-caret-position="30">
951
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
952
+        </state>
953
+      </provider>
954
+    </entry>
955
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
956
+      <provider selected="true" editor-type-id="text-editor">
957
+        <state relative-caret-position="60">
958
+          <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
959
+        </state>
960
+      </provider>
961
+    </entry>
962
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/Login.java">
963
+      <provider selected="true" editor-type-id="text-editor">
964
+        <state relative-caret-position="210">
965
+          <caret line="14" column="1" selection-start-line="14" selection-start-column="1" selection-end-line="14" selection-end-column="1" />
966
+        </state>
967
+      </provider>
968
+    </entry>
969
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/repositories/IntermediateRepository.java">
970
+      <provider selected="true" editor-type-id="text-editor">
971
+        <state relative-caret-position="120">
972
+          <caret line="8" column="11" selection-start-line="8" selection-start-column="11" selection-end-line="8" selection-end-column="11" />
973
+          <folding>
974
+            <element signature="imports" expanded="true" />
975
+          </folding>
976
+        </state>
977
+      </provider>
978
+    </entry>
979
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/repositories/EasyAnswersRepository.java">
980
+      <provider selected="true" editor-type-id="text-editor">
981
+        <state relative-caret-position="90">
982
+          <caret line="6" column="11" selection-start-line="6" selection-start-column="11" selection-end-line="6" selection-end-column="11" />
983
+          <folding>
984
+            <element signature="imports" expanded="true" />
985
+          </folding>
986
+        </state>
987
+      </provider>
988
+    </entry>
989
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/repositories/MysteryRepository.java">
990
+      <provider selected="true" editor-type-id="text-editor">
991
+        <state relative-caret-position="105">
992
+          <caret line="7" column="11" selection-start-line="7" selection-start-column="11" selection-end-line="7" selection-end-column="11" />
993
+          <folding>
994
+            <element signature="imports" expanded="true" />
995
+          </folding>
996
+        </state>
997
+      </provider>
998
+    </entry>
999
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/repositories/HardRepository.java">
1000
+      <provider selected="true" editor-type-id="text-editor">
1001
+        <state relative-caret-position="105">
1002
+          <caret line="7" column="11" selection-start-line="7" selection-start-column="11" selection-end-line="7" selection-end-column="11" />
1003
+          <folding>
1004
+            <element signature="imports" expanded="true" />
1005
+          </folding>
1006
+        </state>
1007
+      </provider>
1008
+    </entry>
1009
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/repositories/EasyRepository.java">
1010
+      <provider selected="true" editor-type-id="text-editor">
1011
+        <state relative-caret-position="165">
1012
+          <caret line="11" selection-start-line="11" selection-end-line="11" />
1013
+          <folding>
1014
+            <element signature="imports" expanded="true" />
1015
+          </folding>
1016
+>>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
395 1017
         </state>
396 1018
       </provider>
397 1019
     </entry>
@@ -403,6 +1025,7 @@
403 1025
         </state>
404 1026
       </provider>
405 1027
     </entry>
1028
+<<<<<<< HEAD
406 1029
     <entry file="file://$USER_HOME$/Labs/passProj/src/main/java/passionproject/GameEngine.java" />
407 1030
     <entry file="file://$PROJECT_DIR$/src/main/resources/static/style.css">
408 1031
       <provider selected="true" editor-type-id="text-editor" />
@@ -421,10 +1044,55 @@
421 1044
     <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/GameEngine.java">
422 1045
       <provider selected="true" editor-type-id="text-editor">
423 1046
         <state relative-caret-position="75">
1047
+=======
1048
+    <entry file="file://$PROJECT_DIR$/pom.xml">
1049
+      <provider selected="true" editor-type-id="text-editor" />
1050
+    </entry>
1051
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/EasyQuestions.java">
1052
+      <provider selected="true" editor-type-id="text-editor">
1053
+        <state relative-caret-position="180">
1054
+          <caret line="13" column="41" selection-start-line="13" selection-start-column="41" selection-end-line="13" selection-end-column="41" />
1055
+          <folding>
1056
+            <element signature="imports" expanded="true" />
1057
+            <element signature="e#672#673#0" expanded="true" />
1058
+            <element signature="e#701#702#0" expanded="true" />
1059
+            <element signature="e#738#739#0" expanded="true" />
1060
+            <element signature="e#774#775#0" expanded="true" />
1061
+          </folding>
1062
+        </state>
1063
+      </provider>
1064
+    </entry>
1065
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/model/EasyQuestionAnswers.java">
1066
+      <provider selected="true" editor-type-id="text-editor">
1067
+        <state relative-caret-position="90">
1068
+>>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
424 1069
           <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
425 1070
         </state>
426 1071
       </provider>
427 1072
     </entry>
1073
+<<<<<<< HEAD
1074
+=======
1075
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/controller/EasyQuestionsController.java">
1076
+      <provider selected="true" editor-type-id="text-editor">
1077
+        <state relative-caret-position="105">
1078
+          <caret line="13" column="36" selection-start-line="13" selection-start-column="36" selection-end-line="13" selection-end-column="36" />
1079
+          <folding>
1080
+            <element signature="imports" expanded="true" />
1081
+          </folding>
1082
+        </state>
1083
+      </provider>
1084
+    </entry>
1085
+    <entry file="file://$PROJECT_DIR$/src/main/java/passionproject/controller/EasyQuestionAnswersController.java">
1086
+      <provider selected="true" editor-type-id="text-editor">
1087
+        <state relative-caret-position="243">
1088
+          <caret line="20" column="18" selection-start-line="20" selection-start-column="18" selection-end-line="20" selection-end-column="18" />
1089
+          <folding>
1090
+            <element signature="imports" expanded="true" />
1091
+          </folding>
1092
+        </state>
1093
+      </provider>
1094
+    </entry>
1095
+>>>>>>> 78698935b23337450e2d77f72bab0c515efb4b3d
428 1096
   </component>
429 1097
   <component name="masterDetails">
430 1098
     <states>

+ 62
- 5
passProj.iml Целия файл

@@ -13,6 +13,13 @@
13 13
         </sourceRoots>
14 14
       </configuration>
15 15
     </facet>
16
+    <facet type="hibernate" name="Hibernate">
17
+      <configuration>
18
+        <datasource-map />
19
+        <naming-strategy-map />
20
+        <deploymentDescriptor name="hibernate.cfg.xml" url="file://$MODULE_DIR$/pom.xml" />
21
+      </configuration>
22
+    </facet>
16 23
   </component>
17 24
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
18 25
     <output url="file://$MODULE_DIR$/target/classes" />
@@ -28,6 +35,11 @@
28 35
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:2.0.0.RELEASE" level="project" />
29 36
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.0.0.RELEASE" level="project" />
30 37
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.0.0.RELEASE" level="project" />
38
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.0.3.RELEASE" level="project" />
39
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.0.3.RELEASE" level="project" />
40
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.0.3.RELEASE" level="project" />
41
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.0.3.RELEASE" level="project" />
42
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.0.3.RELEASE" level="project" />
31 43
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
32 44
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
33 45
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.10.0" level="project" />
@@ -90,23 +102,68 @@
90 102
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.0.0.RELEASE" level="project" />
91 103
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.0.0.RELEASE" level="project" />
92 104
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.0.0.RELEASE" level="project" />
105
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.0.3.RELEASE" level="project" />
106
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.6" level="project" />
107
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
108
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.6" level="project" />
109
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.6" level="project" />
110
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.6" level="project" />
111
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.6" level="project" />
112
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.0.3.RELEASE" level="project" />
113
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.31" level="project" />
114
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.31" level="project" />
115
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.31" level="project" />
116
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.10.Final" level="project" />
117
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
118
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
119
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
120
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.0.7.RELEASE" level="project" />
121
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.0.7.RELEASE" level="project" />
122
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.0.7.RELEASE" level="project" />
123
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.0.7.RELEASE" level="project" />
124
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.0.7.RELEASE" level="project" />
125
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.0.7.RELEASE" level="project" />
126
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.0.3.RELEASE" level="project" />
127
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.0.3.RELEASE" level="project" />
128
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.0.3.RELEASE" level="project" />
93 129
     <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
94 130
     <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
95 131
     <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
96 132
     <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
133
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
97 134
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
98 135
     <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.9.1" level="project" />
99 136
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.15.0" level="project" />
100
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.7.10" level="project" />
101
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.7.10" level="project" />
137
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.7.11" level="project" />
138
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.7.11" level="project" />
102 139
     <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
103 140
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
104 141
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
105 142
     <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
106 143
     <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
107
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.0.4.RELEASE" level="project" />
108
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.0.4.RELEASE" level="project" />
109
-    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.0.4.RELEASE" level="project" />
144
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.0.7.RELEASE" level="project" />
145
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.0.7.RELEASE" level="project" />
146
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.0.7.RELEASE" level="project" />
110 147
     <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.5.1" level="project" />
148
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:2.0.3.RELEASE" level="project" />
149
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.0.3.RELEASE" level="project" />
150
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.13" level="project" />
151
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.0.3.RELEASE" level="project" />
152
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:2.7.9" level="project" />
153
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.7.RELEASE" level="project" />
154
+    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.2.17.Final" level="project" />
155
+    <orderEntry type="library" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.2.Final" level="project" />
156
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.22.0-GA" level="project" />
157
+    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
158
+    <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.3.Final" level="project" />
159
+    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
160
+    <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.1.Final" level="project" />
161
+    <orderEntry type="library" name="Maven: javax.transaction:javax.transaction-api:1.2" level="project" />
162
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:2.0.8.RELEASE" level="project" />
163
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.0.8.RELEASE" level="project" />
164
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:5.0.7.RELEASE" level="project" />
165
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.0.7.RELEASE" level="project" />
166
+    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:5.0.7.RELEASE" level="project" />
167
+    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:5.1.46" level="project" />
111 168
   </component>
112 169
 </module>

+ 80
- 59
pom.xml Целия файл

@@ -1,4 +1,5 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2
+
2 3
 <project xmlns="http://maven.apache.org/POM/4.0.0"
3 4
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 5
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -12,67 +13,87 @@
12 13
     <name>passion-project</name>
13 14
     <description>Passion Project</description>
14 15
 
15
-    <parent>
16
-        <groupId>org.springframework.boot</groupId>
17
-        <artifactId>spring-boot-starter-parent</artifactId>
18
-        <version>2.0.0.RELEASE</version>
19
-        <relativePath/> <!-- lookup parent from repository -->
20
-    </parent>
16
+<!DOCTYPE hibernate-configuration PUBLIC
17
+        "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
18
+        "http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
19
+<hibernate-configuration>
20
+    <session-factory>
21
+        <!-- Database connection settings -->
22
+        <property name="connection.driver_class">com.mysql.jdbc.Driver</property>
23
+        <property name="connection.url">jdbc:mysql://localhost:3306/newsdb</property>
24
+        <property name="connection.username">root</property>
25
+        <property name="connection.password">secret</property>
26
+        <property name="dialect">org.hibernate.dialect.MySQLDialect</property>
27
+        <property name="show_sql">true</property>
21 28
 
22
-    <properties>
23
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
24
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
25
-        <java.version>1.8</java.version>
26
-    </properties>
29
+        <mapping class="passionproject.model.EasyQuestions"/>
30
+        <mapping class="passionproject.model.EasyQuestionAnswers"/>
27 31
 
28
-    <dependencies>
29
-        <dependency>
30
-            <groupId>org.springframework.boot</groupId>
31
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
32
-        </dependency>
33
-        <dependency>
34
-            <groupId>org.springframework.boot</groupId>
35
-            <artifactId>spring-boot-starter-data-rest</artifactId>
36
-        </dependency>
37
-        <dependency>
38
-            <groupId>org.springframework.boot</groupId>
39
-            <artifactId>spring-boot-starter-web</artifactId>
40
-        </dependency>
41
-        <dependency>
42
-            <groupId>org.springframework.boot</groupId>
43
-            <artifactId>spring-boot-starter-jdbc</artifactId>
44
-        </dependency>
32
+    </session-factory>
33
+</hibernate-configuration>
45 34
 
46
-        <dependency>
47
-            <groupId>org.springframework.boot</groupId>
48
-            <artifactId>spring-boot-devtools</artifactId>
49
-            <scope>runtime</scope>
50
-        </dependency>
51
-        <dependency>
52
-            <groupId>com.h2database</groupId>
53
-            <artifactId>h2</artifactId>
54
-            <scope>runtime</scope>
55
-        </dependency>
56
-        <!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java -->
57
-        <dependency>
58
-            <groupId>mysql</groupId>
59
-            <artifactId>mysql-connector-java</artifactId>
60
-        </dependency>
61
-        <dependency>
62
-            <groupId>org.springframework.boot</groupId>
63
-            <artifactId>spring-boot-starter-test</artifactId>
64
-            <scope>test</scope>
65
-        </dependency>
66
-    </dependencies>
35
+<!--<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"-->
36
+         <!--xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">-->
37
+    <!--<modelVersion>4.0.0</modelVersion>-->
38
+    <!--<groupId>com.passionproject</groupId>-->
39
+    <!--<artifactId>project_spitball2.0</artifactId>-->
40
+    <!--<version>0.0.1-SNAPSHOT</version>-->
41
+    <!--<packaging>jar</packaging>-->
42
+    <!--<name>project_spitball2.0</name>-->
43
+    <!--<description>Demo project for Spring Boot</description>-->
67 44
 
68
-    <build>
69
-        <plugins>
70
-            <plugin>
71
-                <groupId>org.springframework.boot</groupId>
72
-                <artifactId>spring-boot-maven-plugin</artifactId>
73
-            </plugin>
74
-        </plugins>
75
-    </build>
45
+    <!--<parent>-->
46
+        <!--<groupId>org.springframework.boot</groupId>-->
47
+        <!--<artifactId>spring-boot-starter-parent</artifactId>-->
48
+        <!--<version>2.0.3.RELEASE</version>-->
49
+        <!--<relativePath/> &lt;!&ndash; lookup parent from repository &ndash;&gt;-->
50
+    <!--</parent>-->
51
+    <!--<properties>-->
52
+        <!--<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>-->
53
+        <!--<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>-->
54
+        <!--<java.version>1.8</java.version>-->
55
+    <!--</properties>-->
56
+    <!--<dependencies>-->
57
+        <!--<dependency>-->
58
+            <!--<groupId>org.springframework.boot</groupId>-->
59
+            <!--<artifactId>spring-boot-starter-web</artifactId>-->
60
+        <!--</dependency>-->
61
+        <!--<dependency>-->
62
+            <!--<groupId>org.springframework.boot</groupId>-->
63
+            <!--<artifactId>spring-boot-starter-test</artifactId>-->
64
+            <!--<scope>test</scope>-->
65
+        <!--</dependency>-->
66
+        <!--<dependency>-->
67
+            <!--<groupId>org.springframework.boot</groupId>-->
68
+            <!--<artifactId>spring-boot-starter-data-jpa</artifactId>-->
69
+        <!--</dependency>-->
70
+        <!--<dependency>-->
71
+            <!--<groupId>mysql</groupId>-->
72
+            <!--<artifactId>mysql-connector-java</artifactId>-->
73
+            <!--<scope>runtime</scope>-->
74
+        <!--</dependency>-->
75
+        <!--&lt;!&ndash;<dependency>&ndash;&gt;-->
76
+        <!--&lt;!&ndash;<groupId>com.h2database</groupId>&ndash;&gt;-->
77
+        <!--&lt;!&ndash;<artifactId>h2</artifactId>&ndash;&gt;-->
78
+        <!--&lt;!&ndash;</dependency>&ndash;&gt;-->
79
+        <!--&lt;!&ndash;<dependency>&ndash;&gt;-->
80
+        <!--&lt;!&ndash;<groupId>org.hibernate</groupId>&ndash;&gt;-->
81
+        <!--&lt;!&ndash;<artifactId>hibernate-core</artifactId>&ndash;&gt;-->
82
+        <!--&lt;!&ndash;<version>4.1.4.Final</version>&ndash;&gt;-->
83
+        <!--&lt;!&ndash;</dependency>&ndash;&gt;-->
84
+        <!--&lt;!&ndash;<dependency>&ndash;&gt;-->
85
+        <!--&lt;!&ndash;<groupId>org.hibernate</groupId>&ndash;&gt;-->
86
+        <!--&lt;!&ndash;<artifactId>hibernate-entitymanager</artifactId>&ndash;&gt;-->
87
+        <!--&lt;!&ndash;<version>5.2.3.Final</version>&ndash;&gt;-->
88
+        <!--&lt;!&ndash;</dependency>&ndash;&gt;-->
89
+    <!--</dependencies>-->
90
+    <!--<build>-->
91
+        <!--<plugins>-->
92
+            <!--<plugin>-->
93
+                <!--<groupId>org.springframework.boot</groupId>-->
94
+                <!--<artifactId>spring-boot-maven-plugin</artifactId>-->
95
+            <!--</plugin>-->
96
+        <!--</plugins>-->
97
+    <!--</build>-->
98
+<!--</project>-->
76 99
 
77
-    
78
-</project>

+ 44
- 0
src/main/java/passionproject/controller/EasyQuestionAnswersController.java Целия файл

@@ -0,0 +1,44 @@
1
+package passionproject.controller;
2
+
3
+import org.springframework.beans.factory.annotation.Autowired;
4
+import org.springframework.http.HttpStatus;
5
+import org.springframework.http.ResponseEntity;
6
+import org.springframework.web.bind.annotation.*;
7
+import passionproject.model.EasyQuestionAnswers;
8
+import passionproject.repositories.EasyAnswersRepository;
9
+
10
+import java.util.Optional;
11
+
12
+@CrossOrigin
13
+@RestController
14
+public class EasyQuestionAnswersController  {
15
+
16
+    @Autowired
17
+    EasyAnswersRepository answersRepository;
18
+
19
+    @RequestMapping(value = "/easyanswer", method = RequestMethod.POST)
20
+    public ResponseEntity<?> createQuestion(@RequestBody EasyQuestionAnswers easyAnswer) {
21
+        easyAnswer = answersRepository.save(easyAnswer);
22
+        return new ResponseEntity<>(easyAnswer, HttpStatus.CREATED);
23
+    }
24
+
25
+    @RequestMapping(value = "/easyanswer/{answerId}", method = RequestMethod.GET)
26
+    public ResponseEntity<?> getQuestion(@PathVariable Long answerId) {
27
+        Optional<EasyQuestionAnswers> q = answersRepository.findById(answerId);
28
+        return new ResponseEntity<>(q,HttpStatus.OK);
29
+
30
+    }
31
+
32
+    @RequestMapping(value = "/easyanswer/{answerId}", method = RequestMethod.PUT)
33
+    public ResponseEntity<?> updateQuestion(@RequestBody EasyQuestionAnswers easyAnswer) {
34
+        EasyQuestionAnswers q = answersRepository.save(easyAnswer);
35
+        return new ResponseEntity<>(q,HttpStatus.OK);
36
+    }
37
+
38
+    @RequestMapping(value = "/easyanswer/{answerId}", method = RequestMethod.DELETE)
39
+    public ResponseEntity<?> deleteQuestion(@PathVariable EasyQuestionAnswers answerId) {
40
+        answersRepository.delete(answerId);
41
+        return  new ResponseEntity<>(HttpStatus.OK);
42
+    }
43
+
44
+}

+ 44
- 0
src/main/java/passionproject/controller/EasyQuestionsController.java Целия файл

@@ -0,0 +1,44 @@
1
+package passionproject.controller;
2
+
3
+import org.springframework.beans.factory.annotation.Autowired;
4
+import org.springframework.http.HttpStatus;
5
+import org.springframework.http.ResponseEntity;
6
+import org.springframework.web.bind.annotation.*;
7
+import passionproject.model.EasyQuestions;
8
+import passionproject.repositories.EasyRepository;
9
+
10
+import java.util.Optional;
11
+
12
+@CrossOrigin
13
+@RestController
14
+public class EasyQuestionsController{
15
+
16
+    @Autowired
17
+    EasyRepository questionsRepository;
18
+
19
+    @RequestMapping(value = "/easy", method = RequestMethod.POST)
20
+    public ResponseEntity<?> createQuestion(@RequestBody EasyQuestions questions) {
21
+        questions = questionsRepository.save(questions);
22
+        return new ResponseEntity<>(questions, HttpStatus.CREATED);
23
+    }
24
+
25
+    @RequestMapping(value = "/easy/{questionId}", method = RequestMethod.GET)
26
+    public ResponseEntity<?> getQuestion(@PathVariable Long questionId) {
27
+        Optional<EasyQuestions> q = questionsRepository.findById(questionId);
28
+        return new ResponseEntity<>(q,HttpStatus.OK);
29
+
30
+    }
31
+
32
+    @RequestMapping(value = "/easy/{questionId}", method = RequestMethod.PUT)
33
+    public ResponseEntity<?> updateQuestion(@RequestBody EasyQuestions questions) {
34
+        EasyQuestions q = questionsRepository.save(questions);
35
+        return new ResponseEntity<>(q,HttpStatus.OK);
36
+    }
37
+
38
+    @RequestMapping(value = "/easy/{questionId}", method = RequestMethod.DELETE)
39
+    public ResponseEntity<?> deleteQuestion(@PathVariable EasyQuestions questionId) {
40
+        questionsRepository.delete(questionId);
41
+        return  new ResponseEntity<>(HttpStatus.OK);
42
+    }
43
+
44
+}

+ 44
- 0
src/main/java/passionproject/controller/HardQuestionsController.java Целия файл

@@ -0,0 +1,44 @@
1
+package passionproject.controller;
2
+
3
+import org.springframework.beans.factory.annotation.Autowired;
4
+import org.springframework.http.HttpStatus;
5
+import org.springframework.http.ResponseEntity;
6
+import org.springframework.web.bind.annotation.*;
7
+import passionproject.model.HardQuestions;
8
+import passionproject.repositories.HardRepository;
9
+
10
+import java.util.Optional;
11
+
12
+@CrossOrigin
13
+@RestController
14
+public class HardQuestionsController extends HardQuestions{
15
+
16
+    @Autowired
17
+    HardRepository questionsRepository;
18
+
19
+    @RequestMapping(value = "/hard", method = RequestMethod.POST)
20
+    public ResponseEntity<?> createQuestion(@RequestBody HardQuestions questions) {
21
+        questions = questionsRepository.save(questions);
22
+        return new ResponseEntity<>(questions, HttpStatus.CREATED);
23
+    }
24
+
25
+    @RequestMapping(value = "/hard/{questionId}", method = RequestMethod.GET)
26
+    public ResponseEntity<?> getQuestion(@PathVariable Long questionId) {
27
+        Optional<HardQuestions> q = questionsRepository.findById(questionId);
28
+        return new ResponseEntity<>(q,HttpStatus.OK);
29
+
30
+    }
31
+
32
+    @RequestMapping(value = "/hard/{questionId}", method = RequestMethod.PUT)
33
+    public ResponseEntity<?> updateQuestion(@RequestBody HardQuestions questions) {
34
+        HardQuestions q = questionsRepository.save(questions);
35
+        return new ResponseEntity<>(q,HttpStatus.OK);
36
+    }
37
+
38
+    @RequestMapping(value = "/hard/{questionId}", method = RequestMethod.DELETE)
39
+    public ResponseEntity<?> deleteQuestion(@PathVariable HardQuestions questionId) {
40
+        questionsRepository.delete(questionId);
41
+        return  new ResponseEntity<>(HttpStatus.OK);
42
+    }
43
+
44
+}

+ 44
- 0
src/main/java/passionproject/controller/IntermediateQuestionsController.java Целия файл

@@ -0,0 +1,44 @@
1
+package passionproject.controller;
2
+
3
+import org.springframework.beans.factory.annotation.Autowired;
4
+import org.springframework.http.HttpStatus;
5
+import org.springframework.http.ResponseEntity;
6
+import org.springframework.web.bind.annotation.*;
7
+import passionproject.model.IntermediateQuestions;
8
+import passionproject.repositories.IntermediateRepository;
9
+
10
+import java.util.Optional;
11
+
12
+@CrossOrigin
13
+@RestController
14
+public class IntermediateQuestionsController extends IntermediateQuestions{
15
+
16
+    @Autowired
17
+    IntermediateRepository questionsRepository;
18
+
19
+    @RequestMapping(value = "/intermediate", method = RequestMethod.POST)
20
+    public ResponseEntity<?> createQuestion(@RequestBody IntermediateQuestions questions) {
21
+        questions = questionsRepository.save(questions);
22
+        return new ResponseEntity<>(questions, HttpStatus.CREATED);
23
+    }
24
+
25
+    @RequestMapping(value = "/intermediate/{questionId}", method = RequestMethod.GET)
26
+    public ResponseEntity<?> getQuestion(@PathVariable Long questionId) {
27
+        Optional<IntermediateQuestions> q = questionsRepository.findById(questionId);
28
+        return new ResponseEntity<>(q,HttpStatus.OK);
29
+
30
+    }
31
+
32
+    @RequestMapping(value = "/intermediate/{questionId}", method = RequestMethod.PUT)
33
+    public ResponseEntity<?> updateQuestion(@RequestBody IntermediateQuestions questions) {
34
+        IntermediateQuestions q = questionsRepository.save(questions);
35
+        return new ResponseEntity<>(q,HttpStatus.OK);
36
+    }
37
+
38
+    @RequestMapping(value = "/intermediate/{questionId}", method = RequestMethod.DELETE)
39
+    public ResponseEntity<?> deleteQuestion(@PathVariable IntermediateQuestions questionId) {
40
+        questionsRepository.delete(questionId);
41
+        return  new ResponseEntity<>(HttpStatus.OK);
42
+    }
43
+
44
+}

+ 44
- 0
src/main/java/passionproject/controller/MysteryQuestionsController.java Целия файл

@@ -0,0 +1,44 @@
1
+package passionproject.controller;
2
+
3
+import org.springframework.beans.factory.annotation.Autowired;
4
+import org.springframework.http.HttpStatus;
5
+import org.springframework.http.ResponseEntity;
6
+import org.springframework.web.bind.annotation.*;
7
+import passionproject.model.MysteryQuestions;
8
+import passionproject.repositories.MysteryRepository;
9
+
10
+import java.util.Optional;
11
+
12
+@CrossOrigin
13
+@RestController
14
+public class MysteryQuestionsController extends MysteryQuestions {
15
+
16
+    @Autowired
17
+    MysteryRepository questionsRepository;
18
+
19
+    @RequestMapping(value = "/mystery", method = RequestMethod.POST)
20
+    public ResponseEntity<?> createQuestion(@RequestBody MysteryQuestions questions) {
21
+        questions = questionsRepository.save(questions);
22
+        return new ResponseEntity<>(questions, HttpStatus.CREATED);
23
+    }
24
+
25
+    @RequestMapping(value = "/mystery/{questionId}", method = RequestMethod.GET)
26
+    public ResponseEntity<?> getQuestion(@PathVariable Long questionId) {
27
+        Optional<MysteryQuestions> q = questionsRepository.findById(questionId);
28
+        return new ResponseEntity<>(q,HttpStatus.OK);
29
+
30
+    }
31
+
32
+    @RequestMapping(value = "/mystery/{questionId}", method = RequestMethod.PUT)
33
+    public ResponseEntity<?> updateQuestion(@RequestBody MysteryQuestions questions) {
34
+        MysteryQuestions q = questionsRepository.save(questions);
35
+        return new ResponseEntity<>(q,HttpStatus.OK);
36
+    }
37
+
38
+    @RequestMapping(value = "/mystery/{questionId}", method = RequestMethod.DELETE)
39
+    public ResponseEntity<?> deleteQuestion(@PathVariable MysteryQuestions questionId) {
40
+        questionsRepository.delete(questionId);
41
+        return  new ResponseEntity<>(HttpStatus.OK);
42
+    }
43
+
44
+}

+ 64
- 0
src/main/java/passionproject/model/EasyQuestionAnswers.java Целия файл

@@ -0,0 +1,64 @@
1
+package passionproject.model;
2
+
3
+import javax.persistence.*;
4
+
5
+@Entity
6
+@Table
7
+public class EasyQuestionAnswers {
8
+
9
+    @Id
10
+    @GeneratedValue()
11
+    private Long id;
12
+
13
+    private String a;
14
+
15
+    private String b;
16
+
17
+    private String c;
18
+
19
+    private String d;
20
+
21
+    public Long getId() {
22
+        return id;
23
+    }
24
+
25
+    public void setId(Long id) {
26
+        this.id = id;
27
+    }
28
+
29
+    public String getA() {
30
+        return a;
31
+    }
32
+
33
+    public void setA(String a) {
34
+        this.a = a;
35
+    }
36
+
37
+    public String getB() {
38
+        return b;
39
+    }
40
+
41
+    public void setB(String b) {
42
+        this.b = b;
43
+    }
44
+
45
+    public String getC() {
46
+        return c;
47
+    }
48
+
49
+    public void setC(String c) {
50
+        this.c = c;
51
+    }
52
+
53
+    public String getD() {
54
+        return d;
55
+    }
56
+
57
+    public void setD(String d) {
58
+        this.d = d;
59
+    }
60
+
61
+
62
+
63
+
64
+}

+ 43
- 0
src/main/java/passionproject/model/EasyQuestions.java Целия файл

@@ -0,0 +1,43 @@
1
+package passionproject.model;
2
+
3
+import javax.persistence.*;
4
+import javax.sql.rowset.JoinRowSet;
5
+import java.util.List;
6
+
7
+@Entity
8
+@Table
9
+public class EasyQuestions {
10
+    @Id
11
+    @GeneratedValue
12
+    private Long id;
13
+
14
+    @OneToMany(cascade = CascadeType.ALL)
15
+    private List<EasyQuestionAnswers> easyQuestionAnswers;
16
+
17
+    private String easyQuestions;
18
+
19
+    public Long getId() {
20
+        return id;
21
+    }
22
+
23
+    public void setId(Long id) {
24
+        this.id = id;
25
+    }
26
+
27
+    public String getEasyQuestions() {
28
+        return easyQuestions;
29
+    }
30
+
31
+    public void setEasyQuestions(String easyQuestions) {
32
+        this.easyQuestions = easyQuestions;
33
+    }
34
+
35
+    public List<EasyQuestionAnswers> getAnswer() {
36
+        return easyQuestionAnswers;
37
+    }
38
+
39
+    public void setAnswer(List<EasyQuestionAnswers> answers) {
40
+        this.easyQuestionAnswers = answers;
41
+    }
42
+
43
+}

+ 35
- 0
src/main/java/passionproject/model/HardQuestions.java Целия файл

@@ -0,0 +1,35 @@
1
+package passionproject.model;
2
+
3
+import javax.persistence.Entity;
4
+import javax.persistence.GeneratedValue;
5
+import javax.persistence.Id;
6
+import javax.persistence.Table;
7
+
8
+@Entity
9
+@Table
10
+public class HardQuestions {
11
+
12
+    @Id
13
+    @GeneratedValue
14
+    private Long id;
15
+
16
+    private String hardQuestions;
17
+
18
+    public Long getId() {
19
+        return id;
20
+    }
21
+
22
+    public void setId(Long id) {
23
+        this.id = id;
24
+    }
25
+
26
+    public String getHardQuestions() {
27
+        return hardQuestions;
28
+    }
29
+
30
+    public void setHardQuestions(String easyQuestions) {
31
+        this.hardQuestions = easyQuestions;
32
+    }
33
+
34
+}
35
+

+ 34
- 0
src/main/java/passionproject/model/IntermediateQuestions.java Целия файл

@@ -0,0 +1,34 @@
1
+package passionproject.model;
2
+
3
+import javax.persistence.Entity;
4
+import javax.persistence.GeneratedValue;
5
+import javax.persistence.Id;
6
+import javax.persistence.Table;
7
+
8
+@Entity
9
+@Table
10
+public class IntermediateQuestions {
11
+    @Id
12
+    @GeneratedValue
13
+    private Long id;
14
+
15
+    private String intermediateQuestions;
16
+
17
+    public Long getId() {
18
+        return id;
19
+    }
20
+
21
+    public void setId(Long id) {
22
+        this.id = id;
23
+    }
24
+
25
+    public String getIntermediateQuestions() {
26
+        return intermediateQuestions;
27
+    }
28
+
29
+    public void setIntermediateQuestions(String easyQuestions) {
30
+        this.intermediateQuestions = easyQuestions;
31
+    }
32
+
33
+}
34
+

+ 15
- 0
src/main/java/passionproject/model/Login.java Целия файл

@@ -0,0 +1,15 @@
1
+package passionproject.model;
2
+
3
+import javax.persistence.*;
4
+
5
+public class Login {
6
+    @Entity
7
+    @Table(name = "LOGIN")
8
+    public class Questions {
9
+        @Id
10
+        @GeneratedValue
11
+        @Column(name = "LOGIN_ID")
12
+        private Long id;
13
+
14
+    }
15
+}

+ 34
- 0
src/main/java/passionproject/model/MysteryQuestions.java Целия файл

@@ -0,0 +1,34 @@
1
+package passionproject.model;
2
+
3
+import javax.persistence.Entity;
4
+import javax.persistence.GeneratedValue;
5
+import javax.persistence.Id;
6
+import javax.persistence.Table;
7
+
8
+@Entity
9
+@Table
10
+public class MysteryQuestions {
11
+    @Id
12
+    @GeneratedValue
13
+    private Long id;
14
+
15
+    private String mysteryQuestions;
16
+
17
+    public Long getId() {
18
+        return id;
19
+    }
20
+
21
+    public void setId(Long id) {
22
+        this.id = id;
23
+    }
24
+
25
+    public String getMysteryQuestions() {
26
+        return mysteryQuestions;
27
+    }
28
+
29
+    public void setMysteryQuestions(String easyQuestions) {
30
+        this.mysteryQuestions = easyQuestions;
31
+    }
32
+
33
+}
34
+

+ 9
- 0
src/main/java/passionproject/repositories/EasyAnswersRepository.java Целия файл

@@ -0,0 +1,9 @@
1
+package passionproject.repositories;
2
+
3
+import org.springframework.data.repository.CrudRepository;
4
+import org.springframework.stereotype.Repository;
5
+import passionproject.model.EasyQuestionAnswers;
6
+
7
+@Repository
8
+public interface EasyAnswersRepository extends CrudRepository<EasyQuestionAnswers, Long> {
9
+}

+ 12
- 0
src/main/java/passionproject/repositories/EasyRepository.java Целия файл

@@ -0,0 +1,12 @@
1
+package passionproject.repositories;
2
+
3
+
4
+import org.springframework.data.repository.CrudRepository;
5
+import org.springframework.stereotype.Repository;
6
+import passionproject.model.EasyQuestions;
7
+
8
+import java.util.List;
9
+
10
+@Repository
11
+public interface EasyRepository extends CrudRepository<EasyQuestions, Long> {
12
+}

+ 10
- 0
src/main/java/passionproject/repositories/HardRepository.java Целия файл

@@ -0,0 +1,10 @@
1
+package passionproject.repositories;
2
+
3
+
4
+import org.springframework.data.repository.CrudRepository;
5
+import org.springframework.stereotype.Repository;
6
+import passionproject.model.HardQuestions;
7
+
8
+@Repository
9
+public interface HardRepository extends CrudRepository<HardQuestions, Long> {
10
+}

+ 11
- 0
src/main/java/passionproject/repositories/IntermediateRepository.java Целия файл

@@ -0,0 +1,11 @@
1
+package passionproject.repositories;
2
+
3
+
4
+import org.springframework.data.repository.CrudRepository;
5
+import org.springframework.stereotype.Repository;
6
+import passionproject.model.IntermediateQuestions;
7
+
8
+
9
+@Repository
10
+public interface IntermediateRepository extends CrudRepository<IntermediateQuestions, Long> {
11
+}

+ 10
- 0
src/main/java/passionproject/repositories/MysteryRepository.java Целия файл

@@ -0,0 +1,10 @@
1
+package passionproject.repositories;
2
+
3
+
4
+import org.springframework.data.repository.CrudRepository;
5
+import org.springframework.stereotype.Repository;
6
+import passionproject.model.MysteryQuestions;
7
+
8
+@Repository
9
+public interface MysteryRepository extends CrudRepository<MysteryQuestions, Long> {
10
+}

BIN
target/classes/passionproject/controller/EasyQuestionAnswersController.class Целия файл


BIN
target/classes/passionproject/controller/EasyQuestionsController.class Целия файл


BIN
target/classes/passionproject/controller/HardQuestionsController.class Целия файл


BIN
target/classes/passionproject/controller/IntermediateQuestionsController.class Целия файл


BIN
target/classes/passionproject/controller/MysteryQuestionsController.class Целия файл


BIN
target/classes/passionproject/model/EasyQuestionAnswers.class Целия файл


BIN
target/classes/passionproject/model/EasyQuestions.class Целия файл


BIN
target/classes/passionproject/model/HardQuestions.class Целия файл


BIN
target/classes/passionproject/model/IntermediateQuestions.class Целия файл


BIN
target/classes/passionproject/model/Login$Questions.class Целия файл


BIN
target/classes/passionproject/model/Login.class Целия файл


BIN
target/classes/passionproject/model/MysteryQuestions.class Целия файл


BIN
target/classes/passionproject/repositories/EasyAnswersRepository.class Целия файл


BIN
target/classes/passionproject/repositories/EasyRepository.class Целия файл


BIN
target/classes/passionproject/repositories/HardRepository.class Целия файл


BIN
target/classes/passionproject/repositories/IntermediateRepository.class Целия файл


BIN
target/classes/passionproject/repositories/MysteryRepository.class Целия файл