diff --git a/.gitignore b/.gitignore
index a1c2a23..549e00a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,33 @@
-# Compiled class file
-*.class
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
 
-# Log file
-*.log
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
 
-# BlueJ files
-*.ctxt
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
 
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
 
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
+### VS Code ###
+.vscode/
diff --git a/.idea/API-REST-com-Spring-Boot.iml b/.idea/API-REST-com-Spring-Boot.iml
deleted file mode 100644
index d6ebd48..0000000
--- a/.idea/API-REST-com-Spring-Boot.iml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 9788d01..1d6be3c 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -9,9 +9,6 @@
         <module name="forum" />
       </profile>
     </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="forum" target="11" />
-    </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 69d9fd9..7499b63 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/forum/src/main/kotlin" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/kotlin" charset="UTF-8" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_10.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_10.xml
deleted file mode 100644
index dbac086..0000000
--- a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: ch.qos.logback:logback-classic:1.2.10">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.2.10/logback-classic-1.2.10.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.2.10/logback-classic-1.2.10-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.2.10/logback-classic-1.2.10-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_10.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_10.xml
deleted file mode 100644
index ae11b75..0000000
--- a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: ch.qos.logback:logback-core:1.2.10">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.2.10/logback-core-1.2.10.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.2.10/logback-core-1.2.10-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.2.10/logback-core-1.2.10-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml
deleted file mode 100644
index bc7d7fd..0000000
--- a/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.fasterxml:classmate:1.5.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.5.1/classmate-1.5.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.5.1/classmate-1.5.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.5.1/classmate-1.5.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_13_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_13_1.xml
deleted file mode 100644
index 49a5bb6..0000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_13_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.13.1/jackson-annotations-2.13.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.13.1/jackson-annotations-2.13.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.13.1/jackson-annotations-2.13.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_13_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_13_1.xml
deleted file mode 100644
index a1987aa..0000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_13_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.13.1/jackson-core-2.13.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.13.1/jackson-core-2.13.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.13.1/jackson-core-2.13.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_13_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_13_1.xml
deleted file mode 100644
index 229a81b..0000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_13_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.fasterxml.jackson.core:jackson-databind:2.13.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.13.1/jackson-databind-2.13.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.13.1/jackson-databind-2.13.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.13.1/jackson-databind-2.13.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_13_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_13_1.xml
deleted file mode 100644
index f95653d..0000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_13_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.13.1/jackson-datatype-jdk8-2.13.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.13.1/jackson-datatype-jdk8-2.13.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.13.1/jackson-datatype-jdk8-2.13.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_13_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_13_1.xml
deleted file mode 100644
index 903e588..0000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_13_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.13.1/jackson-datatype-jsr310-2.13.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.13.1/jackson-datatype-jsr310-2.13.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.13.1/jackson-datatype-jsr310-2.13.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_kotlin_2_13_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_kotlin_2_13_1.xml
deleted file mode 100644
index 21cf719..0000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_kotlin_2_13_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-kotlin/2.13.1/jackson-module-kotlin-2.13.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-kotlin/2.13.1/jackson-module-kotlin-2.13.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-kotlin/2.13.1/jackson-module-kotlin-2.13.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_13_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_13_1.xml
deleted file mode 100644
index d5d9656..0000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_13_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.13.1/jackson-module-parameter-names-2.13.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.13.1/jackson-module-parameter-names-2.13.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-parameter-names/2.13.1/jackson-module-parameter-names-2.13.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_6_0.xml b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_6_0.xml
deleted file mode 100644
index 3056db8..0000000
--- a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_6_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.jayway.jsonpath:json-path:2.6.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/jayway/jsonpath/json-path/2.6.0/json-path-2.6.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/jayway/jsonpath/json-path/2.6.0/json-path-2.6.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/jayway/jsonpath/json-path/2.6.0/json-path-2.6.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml b/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml
deleted file mode 100644
index b8581a6..0000000
--- a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_9_1.xml b/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_9_1.xml
deleted file mode 100644
index f25b99b..0000000
--- a/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_9_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: io.jsonwebtoken:jjwt:0.9.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/jsonwebtoken/jjwt/0.9.1/jjwt-0.9.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/io/jsonwebtoken/jjwt/0.9.1/jjwt-0.9.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/jsonwebtoken/jjwt/0.9.1/jjwt-0.9.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_swagger_core_v3_swagger_annotations_2_1_13.xml b/.idea/libraries/Maven__io_swagger_core_v3_swagger_annotations_2_1_13.xml
deleted file mode 100644
index 185d955..0000000
--- a/.idea/libraries/Maven__io_swagger_core_v3_swagger_annotations_2_1_13.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: io.swagger.core.v3:swagger-annotations:2.1.13">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/core/v3/swagger-annotations/2.1.13/swagger-annotations-2.1.13.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/core/v3/swagger-annotations/2.1.13/swagger-annotations-2.1.13-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/core/v3/swagger-annotations/2.1.13/swagger-annotations-2.1.13-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml b/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml
deleted file mode 100644
index be90656..0000000
--- a/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: jakarta.activation:jakarta.activation-api:1.2.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml b/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml
deleted file mode 100644
index cba9dd2..0000000
--- a/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml b/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml
deleted file mode 100644
index e66afb9..0000000
--- a/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: jakarta.validation:jakarta.validation-api:2.0.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/jakarta/validation/jakarta.validation-api/2.0.2/jakarta.validation-api-2.0.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/jakarta/validation/jakarta.validation-api/2.0.2/jakarta.validation-api-2.0.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/jakarta/validation/jakarta.validation-api/2.0.2/jakarta.validation-api-2.0.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml b/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml
deleted file mode 100644
index 04213f7..0000000
--- a/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_persistence_javax_persistence_api_2_2.xml b/.idea/libraries/Maven__javax_persistence_javax_persistence_api_2_2.xml
deleted file mode 100644
index b7d39c6..0000000
--- a/.idea/libraries/Maven__javax_persistence_javax_persistence_api_2_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: javax.persistence:javax.persistence-api:2.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/persistence/javax.persistence-api/2.2/javax.persistence-api-2.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/persistence/javax.persistence-api/2.2/javax.persistence-api-2.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/javax/persistence/javax.persistence-api/2.2/javax.persistence-api-2.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_11_22.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_11_22.xml
deleted file mode 100644
index c957e32..0000000
--- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_11_22.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: net.bytebuddy:byte-buddy:1.11.22">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.11.22/byte-buddy-1.11.22.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.11.22/byte-buddy-1.11.22-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.11.22/byte-buddy-1.11.22-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_11_22.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_11_22.xml
deleted file mode 100644
index b67ac50..0000000
--- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_11_22.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: net.bytebuddy:byte-buddy-agent:1.11.22">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.11.22/byte-buddy-agent-1.11.22.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.11.22/byte-buddy-agent-1.11.22-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.11.22/byte-buddy-agent-1.11.22-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_minidev_accessors_smart_2_4_7.xml b/.idea/libraries/Maven__net_minidev_accessors_smart_2_4_7.xml
deleted file mode 100644
index 8157bb4..0000000
--- a/.idea/libraries/Maven__net_minidev_accessors_smart_2_4_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: net.minidev:accessors-smart:2.4.7">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/accessors-smart/2.4.7/accessors-smart-2.4.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/accessors-smart/2.4.7/accessors-smart-2.4.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/accessors-smart/2.4.7/accessors-smart-2.4.7-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_minidev_json_smart_2_4_7.xml b/.idea/libraries/Maven__net_minidev_json_smart_2_4_7.xml
deleted file mode 100644
index a17f648..0000000
--- a/.idea/libraries/Maven__net_minidev_json_smart_2_4_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: net.minidev:json-smart:2.4.7">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/json-smart/2.4.7/json-smart-2.4.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/json-smart/2.4.7/json-smart-2.4.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/net/minidev/json-smart/2.4.7/json-smart-2.4.7-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_17_1.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_17_1.xml
deleted file mode 100644
index a54efd2..0000000
--- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_17_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.logging.log4j:log4j-api:2.17.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.17.1/log4j-api-2.17.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.17.1/log4j-api-2.17.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-api/2.17.1/log4j-api-2.17.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_17_1.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_17_1.xml
deleted file mode 100644
index 2634d27..0000000
--- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_17_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.17.1/log4j-to-slf4j-2.17.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.17.1/log4j-to-slf4j-2.17.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/logging/log4j/log4j-to-slf4j/2.17.1/log4j-to-slf4j-2.17.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_56.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_56.xml
deleted file mode 100644
index 75e850b..0000000
--- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_56.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.56">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.56/tomcat-embed-core-9.0.56.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.56/tomcat-embed-core-9.0.56-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-core/9.0.56/tomcat-embed-core-9.0.56-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_56.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_56.xml
deleted file mode 100644
index db5dc73..0000000
--- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_56.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.56">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/9.0.56/tomcat-embed-el-9.0.56.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/9.0.56/tomcat-embed-el-9.0.56-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-el/9.0.56/tomcat-embed-el-9.0.56-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_56.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_56.xml
deleted file mode 100644
index 7feae04..0000000
--- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_56.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.56">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.56/tomcat-embed-websocket-9.0.56.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.56/tomcat-embed-websocket-9.0.56-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/tomcat/embed/tomcat-embed-websocket/9.0.56/tomcat-embed-websocket-9.0.56-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_2.xml b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_2.xml
deleted file mode 100644
index 6ac1c42..0000000
--- a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.apiguardian:apiguardian-api:1.1.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_assertj_assertj_core_3_21_0.xml b/.idea/libraries/Maven__org_assertj_assertj_core_3_21_0.xml
deleted file mode 100644
index 03e3cae..0000000
--- a/.idea/libraries/Maven__org_assertj_assertj_core_3_21_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.assertj:assertj-core:3.21.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/3.21.0/assertj-core-3.21.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/3.21.0/assertj-core-3.21.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/assertj/assertj-core/3.21.0/assertj-core-3.21.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml
deleted file mode 100644
index 6b5496f..0000000
--- a/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.hamcrest:hamcrest:2.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest/2.2/hamcrest-2.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest/2.2/hamcrest-2.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest/2.2/hamcrest-2.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_2_0_Final.xml b/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_2_0_Final.xml
deleted file mode 100644
index e45a76e..0000000
--- a/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_2_0_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.hibernate.validator:hibernate-validator:6.2.0.Final">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.2.0.Final/hibernate-validator-6.2.0.Final.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.2.0.Final/hibernate-validator-6.2.0.Final-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/hibernate/validator/hibernate-validator/6.2.0.Final/hibernate-validator-6.2.0.Final-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_3_Final.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_3_Final.xml
deleted file mode 100644
index 5845c01..0000000
--- a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_3_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.jboss.logging:jboss-logging:3.4.3.Final">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.4.3.Final/jboss-logging-3.4.3.Final.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.4.3.Final/jboss-logging-3.4.3.Final-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jboss/logging/jboss-logging/3.4.3.Final/jboss-logging-3.4.3.Final-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jetbrains_annotations_13_0.xml b/.idea/libraries/Maven__org_jetbrains_annotations_13_0.xml
deleted file mode 100644
index e2c8297..0000000
--- a/.idea/libraries/Maven__org_jetbrains_annotations_13_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.jetbrains:annotations:13.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_reflect_1_6_10.xml b/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_reflect_1_6_10.xml
deleted file mode 100644
index 6309284..0000000
--- a/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_reflect_1_6_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.6.10">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.6.10/kotlin-reflect-1.6.10.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.6.10/kotlin-reflect-1.6.10-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.6.10/kotlin-reflect-1.6.10-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_6_10.xml b/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_6_10.xml
deleted file mode 100644
index f1749be..0000000
--- a/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_6_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.6.10">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.6.10/kotlin-stdlib-1.6.10.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.6.10/kotlin-stdlib-1.6.10-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.6.10/kotlin-stdlib-1.6.10-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_6_10.xml b/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_6_10.xml
deleted file mode 100644
index 188563d..0000000
--- a/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_6_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.6.10">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.6.10/kotlin-stdlib-common-1.6.10.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.6.10/kotlin-stdlib-common-1.6.10-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.6.10/kotlin-stdlib-common-1.6.10-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_6_10.xml b/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_6_10.xml
deleted file mode 100644
index 7665522..0000000
--- a/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_6_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.10/kotlin-stdlib-jdk7-1.6.10.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.10/kotlin-stdlib-jdk7-1.6.10-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.10/kotlin-stdlib-jdk7-1.6.10-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_jdk8_1_6_10.xml b/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_jdk8_1_6_10.xml
deleted file mode 100644
index 5528c7f..0000000
--- a/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_jdk8_1_6_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6.10/kotlin-stdlib-jdk8-1.6.10.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6.10/kotlin-stdlib-jdk8-1.6.10-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6.10/kotlin-stdlib-jdk8-1.6.10-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_8_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_8_2.xml
deleted file mode 100644
index 4f367e7..0000000
--- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_8_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.junit.jupiter:junit-jupiter:5.8.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter/5.8.2/junit-jupiter-5.8.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter/5.8.2/junit-jupiter-5.8.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter/5.8.2/junit-jupiter-5.8.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_2.xml
deleted file mode 100644
index 8e50783..0000000
--- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.junit.jupiter:junit-jupiter-api:5.8.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.8.2/junit-jupiter-api-5.8.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.8.2/junit-jupiter-api-5.8.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.8.2/junit-jupiter-api-5.8.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_2.xml
deleted file mode 100644
index fc8291b..0000000
--- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.junit.jupiter:junit-jupiter-engine:5.8.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.8.2/junit-jupiter-engine-5.8.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.8.2/junit-jupiter-engine-5.8.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.8.2/junit-jupiter-engine-5.8.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_8_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_8_2.xml
deleted file mode 100644
index 4b3ffb1..0000000
--- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_8_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.junit.jupiter:junit-jupiter-params:5.8.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-params/5.8.2/junit-jupiter-params-5.8.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-params/5.8.2/junit-jupiter-params-5.8.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-params/5.8.2/junit-jupiter-params-5.8.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_2.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_2.xml
deleted file mode 100644
index 181d095..0000000
--- a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.junit.platform:junit-platform-commons:1.8.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.8.2/junit-platform-commons-1.8.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.8.2/junit-platform-commons-1.8.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.8.2/junit-platform-commons-1.8.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_2.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_2.xml
deleted file mode 100644
index 5f3aebe..0000000
--- a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.junit.platform:junit-platform-engine:1.8.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.8.2/junit-platform-engine-1.8.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.8.2/junit-platform-engine-1.8.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.8.2/junit-platform-engine-1.8.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_4_0_0.xml b/.idea/libraries/Maven__org_mockito_mockito_core_4_0_0.xml
deleted file mode 100644
index cf13209..0000000
--- a/.idea/libraries/Maven__org_mockito_mockito_core_4_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.mockito:mockito-core:4.0.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/4.0.0/mockito-core-4.0.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/4.0.0/mockito-core-4.0.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-core/4.0.0/mockito-core-4.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_4_0_0.xml b/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_4_0_0.xml
deleted file mode 100644
index 49e3f23..0000000
--- a/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_4_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.mockito:mockito-junit-jupiter:4.0.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-junit-jupiter/4.0.0/mockito-junit-jupiter-4.0.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-junit-jupiter/4.0.0/mockito-junit-jupiter-4.0.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-junit-jupiter/4.0.0/mockito-junit-jupiter-4.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_3_2.xml b/.idea/libraries/Maven__org_objenesis_objenesis_3_2.xml
deleted file mode 100644
index 6613def..0000000
--- a/.idea/libraries/Maven__org_objenesis_objenesis_3_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.objenesis:objenesis:3.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/3.2/objenesis-3.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/3.2/objenesis-3.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/3.2/objenesis-3.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml
deleted file mode 100644
index fbc1b16..0000000
--- a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.opentest4j:opentest4j:1.2.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_9_1.xml b/.idea/libraries/Maven__org_ow2_asm_asm_9_1.xml
deleted file mode 100644
index 67127c2..0000000
--- a/.idea/libraries/Maven__org_ow2_asm_asm_9_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.ow2.asm:asm:9.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/9.1/asm-9.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/9.1/asm-9.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/ow2/asm/asm/9.1/asm-9.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml
deleted file mode 100644
index c4c54d6..0000000
--- a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.skyscreamer:jsonassert:1.5.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_33.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_33.xml
deleted file mode 100644
index 9df4034..0000000
--- a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_33.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.slf4j:jul-to-slf4j:1.7.33">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.33/jul-to-slf4j-1.7.33.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.33/jul-to-slf4j-1.7.33-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/jul-to-slf4j/1.7.33/jul-to-slf4j-1.7.33-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_33.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_33.xml
deleted file mode 100644
index fe3b9f9..0000000
--- a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_33.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.slf4j:slf4j-api:1.7.33">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.33/slf4j-api-1.7.33.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.33/slf4j-api-1.7.33-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.33/slf4j-api-1.7.33-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_6_3.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_6_3.xml
deleted file mode 100644
index 396eca0..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_6_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot:2.6.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.6.3/spring-boot-2.6.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.6.3/spring-boot-2.6.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/2.6.3/spring-boot-2.6.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_6_3.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_6_3.xml
deleted file mode 100644
index bc835a4..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_6_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.6.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.6.3/spring-boot-autoconfigure-2.6.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.6.3/spring-boot-autoconfigure-2.6.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.6.3/spring-boot-autoconfigure-2.6.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_6_3.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_6_3.xml
deleted file mode 100644
index 39305b4..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_6_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot-devtools:2.6.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-devtools/2.6.3/spring-boot-devtools-2.6.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-devtools/2.6.3/spring-boot-devtools-2.6.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-devtools/2.6.3/spring-boot-devtools-2.6.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_6_3.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_6_3.xml
deleted file mode 100644
index 1f24f41..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_6_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot-starter:2.6.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.6.3/spring-boot-starter-2.6.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.6.3/spring-boot-starter-2.6.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter/2.6.3/spring-boot-starter-2.6.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_6_3.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_6_3.xml
deleted file mode 100644
index 7b77cde..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_6_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot-starter-json:2.6.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.6.3/spring-boot-starter-json-2.6.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.6.3/spring-boot-starter-json-2.6.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-json/2.6.3/spring-boot-starter-json-2.6.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_6_3.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_6_3.xml
deleted file mode 100644
index 8ad31db..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_6_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot-starter-logging:2.6.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.6.3/spring-boot-starter-logging-2.6.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.6.3/spring-boot-starter-logging-2.6.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-logging/2.6.3/spring-boot-starter-logging-2.6.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_2_6_3.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_2_6_3.xml
deleted file mode 100644
index 4f1f541..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_2_6_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot-starter-security:2.6.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-security/2.6.3/spring-boot-starter-security-2.6.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-security/2.6.3/spring-boot-starter-security-2.6.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-security/2.6.3/spring-boot-starter-security-2.6.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_6_3.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_6_3.xml
deleted file mode 100644
index 7919017..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_6_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot-starter-test:2.6.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/2.6.3/spring-boot-starter-test-2.6.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/2.6.3/spring-boot-starter-test-2.6.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-test/2.6.3/spring-boot-starter-test-2.6.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_6_3.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_6_3.xml
deleted file mode 100644
index b11b88d..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_6_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.6.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.6.3/spring-boot-starter-tomcat-2.6.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.6.3/spring-boot-starter-tomcat-2.6.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-tomcat/2.6.3/spring-boot-starter-tomcat-2.6.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_6_3.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_6_3.xml
deleted file mode 100644
index 560cdec..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_6_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot-starter-validation:2.6.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-validation/2.6.3/spring-boot-starter-validation-2.6.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-validation/2.6.3/spring-boot-starter-validation-2.6.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-validation/2.6.3/spring-boot-starter-validation-2.6.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_6_3.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_6_3.xml
deleted file mode 100644
index 4a0c88d..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_6_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot-starter-web:2.6.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.6.3/spring-boot-starter-web-2.6.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.6.3/spring-boot-starter-web-2.6.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-web/2.6.3/spring-boot-starter-web-2.6.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_6_3.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_6_3.xml
deleted file mode 100644
index 41eb953..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_6_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot-test:2.6.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.6.3/spring-boot-test-2.6.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.6.3/spring-boot-test-2.6.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test/2.6.3/spring-boot-test-2.6.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_6_3.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_6_3.xml
deleted file mode 100644
index 36981dd..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_6_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.6.3">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/2.6.3/spring-boot-test-autoconfigure-2.6.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/2.6.3/spring-boot-test-autoconfigure-2.6.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-test-autoconfigure/2.6.3/spring-boot-test-autoconfigure-2.6.3-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_6_1.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_6_1.xml
deleted file mode 100644
index 466ed80..0000000
--- a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_6_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.data:spring-data-commons:2.6.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.6.1/spring-data-commons-2.6.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.6.1/spring-data-commons-2.6.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-commons/2.6.1/spring-data-commons-2.6.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_6_1.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_6_1.xml
deleted file mode 100644
index bb3eea7..0000000
--- a/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_6_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.data:spring-data-jpa:2.6.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/2.6.1/spring-data-jpa-2.6.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/2.6.1/spring-data-jpa-2.6.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-jpa/2.6.1/spring-data-jpa-2.6.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_config_5_6_1.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_config_5_6_1.xml
deleted file mode 100644
index effe587..0000000
--- a/.idea/libraries/Maven__org_springframework_security_spring_security_config_5_6_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.security:spring-security-config:5.6.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-config/5.6.1/spring-security-config-5.6.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-config/5.6.1/spring-security-config-5.6.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-config/5.6.1/spring-security-config-5.6.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_core_5_6_1.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_core_5_6_1.xml
deleted file mode 100644
index 3f987bb..0000000
--- a/.idea/libraries/Maven__org_springframework_security_spring_security_core_5_6_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.security:spring-security-core:5.6.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-core/5.6.1/spring-security-core-5.6.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-core/5.6.1/spring-security-core-5.6.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-core/5.6.1/spring-security-core-5.6.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_6_1.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_6_1.xml
deleted file mode 100644
index 9565078..0000000
--- a/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_6_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.security:spring-security-crypto:5.6.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-crypto/5.6.1/spring-security-crypto-5.6.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-crypto/5.6.1/spring-security-crypto-5.6.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-crypto/5.6.1/spring-security-crypto-5.6.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_web_5_6_1.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_web_5_6_1.xml
deleted file mode 100644
index 3cd52fc..0000000
--- a/.idea/libraries/Maven__org_springframework_security_spring_security_web_5_6_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework.security:spring-security-web:5.6.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-web/5.6.1/spring-security-web-5.6.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-web/5.6.1/spring-security-web-5.6.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-web/5.6.1/spring-security-web-5.6.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_5_3_15.xml b/.idea/libraries/Maven__org_springframework_spring_aop_5_3_15.xml
deleted file mode 100644
index 944b33f..0000000
--- a/.idea/libraries/Maven__org_springframework_spring_aop_5_3_15.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-aop:5.3.15">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.3.15/spring-aop-5.3.15.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.3.15/spring-aop-5.3.15-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.3.15/spring-aop-5.3.15-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_5_3_15.xml b/.idea/libraries/Maven__org_springframework_spring_beans_5_3_15.xml
deleted file mode 100644
index ae144f8..0000000
--- a/.idea/libraries/Maven__org_springframework_spring_beans_5_3_15.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-beans:5.3.15">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.3.15/spring-beans-5.3.15.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.3.15/spring-beans-5.3.15-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.3.15/spring-beans-5.3.15-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_context_5_3_15.xml b/.idea/libraries/Maven__org_springframework_spring_context_5_3_15.xml
deleted file mode 100644
index ec20caf..0000000
--- a/.idea/libraries/Maven__org_springframework_spring_context_5_3_15.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-context:5.3.15">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.3.15/spring-context-5.3.15.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.3.15/spring-context-5.3.15-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/5.3.15/spring-context-5.3.15-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_core_5_3_15.xml b/.idea/libraries/Maven__org_springframework_spring_core_5_3_15.xml
deleted file mode 100644
index 1f1333a..0000000
--- a/.idea/libraries/Maven__org_springframework_spring_core_5_3_15.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-core:5.3.15">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.3.15/spring-core-5.3.15.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.3.15/spring-core-5.3.15-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.3.15/spring-core-5.3.15-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_5_3_15.xml b/.idea/libraries/Maven__org_springframework_spring_expression_5_3_15.xml
deleted file mode 100644
index b7591b7..0000000
--- a/.idea/libraries/Maven__org_springframework_spring_expression_5_3_15.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-expression:5.3.15">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.3.15/spring-expression-5.3.15.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.3.15/spring-expression-5.3.15-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-expression/5.3.15/spring-expression-5.3.15-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_15.xml b/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_15.xml
deleted file mode 100644
index 80b47ac..0000000
--- a/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_15.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-jcl:5.3.15">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.3.15/spring-jcl-5.3.15.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.3.15/spring-jcl-5.3.15-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jcl/5.3.15/spring-jcl-5.3.15-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_15.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_15.xml
deleted file mode 100644
index 0ae3ca5..0000000
--- a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_15.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-jdbc:5.3.15">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.3.15/spring-jdbc-5.3.15.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.3.15/spring-jdbc-5.3.15-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-jdbc/5.3.15/spring-jdbc-5.3.15-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_5_3_15.xml b/.idea/libraries/Maven__org_springframework_spring_orm_5_3_15.xml
deleted file mode 100644
index 56a48af..0000000
--- a/.idea/libraries/Maven__org_springframework_spring_orm_5_3_15.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-orm:5.3.15">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/5.3.15/spring-orm-5.3.15.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/5.3.15/spring-orm-5.3.15-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/5.3.15/spring-orm-5.3.15-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_test_5_3_15.xml b/.idea/libraries/Maven__org_springframework_spring_test_5_3_15.xml
deleted file mode 100644
index eb596c8..0000000
--- a/.idea/libraries/Maven__org_springframework_spring_test_5_3_15.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-test:5.3.15">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/5.3.15/spring-test-5.3.15.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/5.3.15/spring-test-5.3.15-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-test/5.3.15/spring-test-5.3.15-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_5_3_15.xml b/.idea/libraries/Maven__org_springframework_spring_tx_5_3_15.xml
deleted file mode 100644
index 622bc02..0000000
--- a/.idea/libraries/Maven__org_springframework_spring_tx_5_3_15.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-tx:5.3.15">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.3.15/spring-tx-5.3.15.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.3.15/spring-tx-5.3.15-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.3.15/spring-tx-5.3.15-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_web_5_3_15.xml b/.idea/libraries/Maven__org_springframework_spring_web_5_3_15.xml
deleted file mode 100644
index fa3f174..0000000
--- a/.idea/libraries/Maven__org_springframework_spring_web_5_3_15.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-web:5.3.15">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.3.15/spring-web-5.3.15.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.3.15/spring-web-5.3.15-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.3.15/spring-web-5.3.15-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_15.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_15.xml
deleted file mode 100644
index 71de89f..0000000
--- a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_15.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.springframework:spring-webmvc:5.3.15">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.3.15/spring-webmvc-5.3.15.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.3.15/spring-webmvc-5.3.15-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/spring-webmvc/5.3.15/spring-webmvc-5.3.15-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_8_4.xml b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_8_4.xml
deleted file mode 100644
index 23e67e6..0000000
--- a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_8_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.xmlunit:xmlunit-core:2.8.4">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/xmlunit/xmlunit-core/2.8.4/xmlunit-core-2.8.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/xmlunit/xmlunit-core/2.8.4/xmlunit-core-2.8.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/xmlunit/xmlunit-core/2.8.4/xmlunit-core-2.8.4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_29.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_29.xml
deleted file mode 100644
index c871529..0000000
--- a/.idea/libraries/Maven__org_yaml_snakeyaml_1_29.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.yaml:snakeyaml:1.29">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.29/snakeyaml-1.29.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.29/snakeyaml-1.29-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.29/snakeyaml-1.29-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1949d83..8adaa0a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
-        <option value="$PROJECT_DIR$/forum/pom.xml" />
+        <option value="$PROJECT_DIR$/pom.xml" />
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="18" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index e52f389..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/API-REST-com-Spring-Boot.iml" filepath="$PROJECT_DIR$/.idea/API-REST-com-Spring-Boot.iml" />
-      <module fileurl="file://$PROJECT_DIR$/forum/forum.iml" filepath="$PROJECT_DIR$/forum/forum.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java
new file mode 100644
index 0000000..e76d1f3
--- /dev/null
+++ b/.mvn/wrapper/MavenWrapperDownloader.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    private static final String WRAPPER_VERSION = "0.5.6";
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+            ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+            ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if(mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if(mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if(!outputFile.getParentFile().exists()) {
+            if(!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+            String username = System.getenv("MVNW_USERNAME");
+            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+            Authenticator.setDefault(new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication(username, password);
+                }
+            });
+        }
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
new file mode 100644
index 0000000..2cc7d4a
Binary files /dev/null and b/.mvn/wrapper/maven-wrapper.jar differ
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 0000000..ffdc10e
--- /dev/null
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..b940e6e
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,4 @@
+FROM adoptopenjdk/openjdk11
+EXPOSE 8080
+ADD /target/forum-0.0.1-SNAPSHOT.jar forum.jar
+ENTRYPOINT ["java", "$JAVA_OPTS -XX:+UseContainerSupport", "-Xmx300m -Xss512k -XX:CICompilerCount=2", "-Dserver.port=$PORT", "-jar", "forum.jar"]
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 1e1751d..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2022 Carlos Henrique
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/README.md b/README.md
deleted file mode 100644
index b7d7b55..0000000
--- a/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# API-REST-com-Spring-Boot
\ No newline at end of file
diff --git a/forum/.gitignore b/forum/.gitignore
deleted file mode 100644
index 549e00a..0000000
--- a/forum/.gitignore
+++ /dev/null
@@ -1,33 +0,0 @@
-HELP.md
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
diff --git a/forum/.mvn/wrapper/maven-wrapper.jar b/forum/.mvn/wrapper/maven-wrapper.jar
deleted file mode 100644
index c1dd12f..0000000
Binary files a/forum/.mvn/wrapper/maven-wrapper.jar and /dev/null differ
diff --git a/forum/.mvn/wrapper/maven-wrapper.properties b/forum/.mvn/wrapper/maven-wrapper.properties
deleted file mode 100644
index b7cb93e..0000000
--- a/forum/.mvn/wrapper/maven-wrapper.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
diff --git a/forum/src/main/kotlin/br/com/alura/forum/config/JwtUtils.kt b/forum/src/main/kotlin/br/com/alura/forum/config/JwtUtils.kt
deleted file mode 100644
index 289682a..0000000
--- a/forum/src/main/kotlin/br/com/alura/forum/config/JwtUtils.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package br.com.alura.forum.config
-
-import io.jsonwebtoken.Jwts
-import io.jsonwebtoken.SignatureAlgorithm
-import org.springframework.beans.factory.annotation.Value
-import java.util.*
-
-@Component
-class JwtUtils {
-
-    private val expiration : Long = 6000
-
-    @Value("\${jwt.secret")
-    private lateinit var secret : String
-
-    fun generateToken(username: String): String? {
-        return Jwts.builder()
-            .setSubject(username)
-            .setExpiration(Date(System.currentTimeMillis() + expiration))
-            .signWith(SignatureAlgorithm.HS512, secret.toByteArray())
-            .compact()
-    }
-}
\ No newline at end of file
diff --git a/forum/src/main/kotlin/br/com/alura/forum/controller/RespostasController.kt b/forum/src/main/kotlin/br/com/alura/forum/controller/RespostasController.kt
deleted file mode 100644
index 8be9920..0000000
--- a/forum/src/main/kotlin/br/com/alura/forum/controller/RespostasController.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package br.com.alura.forum.controller
-
-import br.com.alura.forum.model.Resposta
-import br.com.alura.forum.service.RespostaService
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.PathVariable
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
-
-@RestController
-@RequestMapping("/topicos/{id}/respostas")
-class RespostasController(private val service: RespostaService) {
-
-    @GetMapping
-    fun listar(@PathVariable id: Long): List<Resposta> {
-        return service.listar(id)
-    }
-}
\ No newline at end of file
diff --git a/forum/src/main/kotlin/br/com/alura/forum/dto/ErrorView.kt b/forum/src/main/kotlin/br/com/alura/forum/dto/ErrorView.kt
deleted file mode 100644
index 6aa8af7..0000000
--- a/forum/src/main/kotlin/br/com/alura/forum/dto/ErrorView.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package br.com.alura.forum.dto
-
-import java.time.LocalDateTime
-
-data class ErrorView(
-    val timestamp: LocalDateTime = LocalDateTime.now(),
-    val status: Int,
-    val error: String,
-    val message: String?,
-    val path: String
-)
diff --git a/forum/src/main/kotlin/br/com/alura/forum/dto/NovoTopicoForm.kt b/forum/src/main/kotlin/br/com/alura/forum/dto/NovoTopicoForm.kt
deleted file mode 100644
index 54b4924..0000000
--- a/forum/src/main/kotlin/br/com/alura/forum/dto/NovoTopicoForm.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package br.com.alura.forum.dto
-
-import javax.validation.constraints.NotEmpty
-import javax.validation.constraints.NotNull
-import javax.validation.constraints.Size
-
-data class NovoTopicoForm(
-
-    @field:NotEmpty(message = "Titulo não pode ser em branco")
-    @field:Size(min = 5, max = 100, message = "Titulo deve ter entre 5 e 100 caracteres")
-    val titulo: String,
-
-    @field:NotEmpty(message = "Mensagem não pode ser em branco")
-    val mensagem: String,
-
-    @field:NotNull
-    val idCurso: Long,
-
-    @field:NotNull
-    val idAutor: Long
-)
\ No newline at end of file
diff --git a/forum/src/main/kotlin/br/com/alura/forum/dto/TopicoView.kt b/forum/src/main/kotlin/br/com/alura/forum/dto/TopicoView.kt
deleted file mode 100644
index cee8004..0000000
--- a/forum/src/main/kotlin/br/com/alura/forum/dto/TopicoView.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package br.com.alura.forum.dto
-
-import br.com.alura.forum.model.StatusTopico
-import java.time.LocalDateTime
-
-data class TopicoView(
-    val id: Long?,
-    val titulo: String,
-    val mensagem: String,
-    val status: StatusTopico,
-    val dataCriacao: LocalDateTime
-)
diff --git a/forum/src/main/kotlin/br/com/alura/forum/mapper/TopicoFormMapper.kt b/forum/src/main/kotlin/br/com/alura/forum/mapper/TopicoFormMapper.kt
deleted file mode 100644
index 75f304a..0000000
--- a/forum/src/main/kotlin/br/com/alura/forum/mapper/TopicoFormMapper.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package br.com.alura.forum.mapper
-
-import br.com.alura.forum.dto.NovoTopicoForm
-import br.com.alura.forum.model.Topico
-import br.com.alura.forum.service.CursoService
-import br.com.alura.forum.service.ServiceUsuario
-import org.springframework.stereotype.Component
-
-@Component
-class TopicoFormMapper(
-    private val cursoService: CursoService,
-    private val usuarioService: ServiceUsuario
-) : Mapper<NovoTopicoForm, Topico> {
-
-    override fun map(t: NovoTopicoForm): Topico {
-        return Topico(
-            titulo = t.titulo,
-            mensagem = t.mensagem,
-            curso = cursoService.buscarPorId(t.idCurso),
-            autor = usuarioService.buscarPorId(t.idAutor)
-        )
-    }
-
-}
diff --git a/forum/src/main/kotlin/br/com/alura/forum/mapper/TopicoViewMapper.kt b/forum/src/main/kotlin/br/com/alura/forum/mapper/TopicoViewMapper.kt
deleted file mode 100644
index 9f8267d..0000000
--- a/forum/src/main/kotlin/br/com/alura/forum/mapper/TopicoViewMapper.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package br.com.alura.forum.mapper
-
-import br.com.alura.forum.dto.TopicoView
-import br.com.alura.forum.model.Topico
-import org.springframework.stereotype.Component
-
-@Component
-class TopicoViewMapper : Mapper<Topico, TopicoView> {
-
-    override fun map(t: Topico): TopicoView {
-        return TopicoView(
-            id = t.id,
-            titulo = t.titulo,
-            mensagem = t.mensagem,
-            dataCriacao = t.dataCriacao,
-            status = t.status
-        )
-    }
-}
\ No newline at end of file
diff --git a/forum/src/main/kotlin/br/com/alura/forum/model/Credentials.kt b/forum/src/main/kotlin/br/com/alura/forum/model/Credentials.kt
deleted file mode 100644
index 07ed8c1..0000000
--- a/forum/src/main/kotlin/br/com/alura/forum/model/Credentials.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package br.com.alura.forum.model
-
-data class Credentials(
-    val username: String = "",
-    val password: String = ""
-)
\ No newline at end of file
diff --git a/forum/src/main/kotlin/br/com/alura/forum/model/Curso.kt b/forum/src/main/kotlin/br/com/alura/forum/model/Curso.kt
deleted file mode 100644
index f2bdf76..0000000
--- a/forum/src/main/kotlin/br/com/alura/forum/model/Curso.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package br.com.alura.forum.model
-
-data class Curso(
-    val id: Long? = null,
-    val nome: String,
-    val categoria: String
-)
diff --git a/forum/src/main/kotlin/br/com/alura/forum/model/Resposta.kt b/forum/src/main/kotlin/br/com/alura/forum/model/Resposta.kt
deleted file mode 100644
index a128710..0000000
--- a/forum/src/main/kotlin/br/com/alura/forum/model/Resposta.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package br.com.alura.forum.model
-
-import java.time.LocalDate
-import java.time.LocalDateTime
-
-data class Resposta(
-    val id: Long?,
-    val mensagem: String,
-    val dataCriacao: LocalDateTime = LocalDateTime.now(),
-    val autor: Usuario,
-    val topico: Topico,
-    val solucao: Boolean
-)
diff --git a/forum/src/main/kotlin/br/com/alura/forum/model/Topico.kt b/forum/src/main/kotlin/br/com/alura/forum/model/Topico.kt
deleted file mode 100644
index f1d40d9..0000000
--- a/forum/src/main/kotlin/br/com/alura/forum/model/Topico.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package br.com.alura.forum.model
-
-import java.time.LocalDateTime
-
-data class Topico(
-    var id: Long? = null,
-    val titulo: String,
-    val mensagem: String,
-    val dataCriacao: LocalDateTime = LocalDateTime.now(),
-    val curso: Curso,
-    val autor: Usuario,
-    val status: StatusTopico = StatusTopico.NAO_RESPONDIDO,
-    val respostas: List<Resposta> = ArrayList()
-)
\ No newline at end of file
diff --git a/forum/src/main/kotlin/br/com/alura/forum/model/Usuario.kt b/forum/src/main/kotlin/br/com/alura/forum/model/Usuario.kt
deleted file mode 100644
index 26c24d3..0000000
--- a/forum/src/main/kotlin/br/com/alura/forum/model/Usuario.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package br.com.alura.forum.model
-
-import com.fasterxml.jackson.annotation.JsonIgnore
-import javax.persistence.*
-
-@Entity
-data class Usuario(
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    val id: Long? = null,
-    val nome: String,
-    val email: String,
-    val password: String,
-
-    @JsonIgnore
-    @ManyToMany(fetch = FetchType.EAGER)
-    @JoinColumn(name = "usuario_role")
-    val role: List<Role> = mutableListOf()
-)
\ No newline at end of file
diff --git a/forum/src/main/kotlin/br/com/alura/forum/service/AutorService.kt b/forum/src/main/kotlin/br/com/alura/forum/service/AutorService.kt
deleted file mode 100644
index 4c615b8..0000000
--- a/forum/src/main/kotlin/br/com/alura/forum/service/AutorService.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package br.com.alura.forum.service
-
-import br.com.alura.forum.model.Usuario
-import org.springframework.stereotype.Service
-import java.util.*
-
-@Service
-class UsuarioService(
-    var usuarios: List<Usuario>
-) {
-
-    init {
-        val usuario = Usuario(
-            id = 1,
-            nome = "Ana da Silva",
-            email = "ana@email.com.br",
-            password = ""
-        )
-        usuarios = Arrays.asList(usuario)
-    }
-
-    fun buscarPorId(id: Long): Usuario {
-        return usuarios.stream().filter({ c ->
-            c.id == id
-        }).findFirst().get()
-    }
-}
diff --git a/forum/src/main/kotlin/br/com/alura/forum/service/CursoService.kt b/forum/src/main/kotlin/br/com/alura/forum/service/CursoService.kt
deleted file mode 100644
index 737ce72..0000000
--- a/forum/src/main/kotlin/br/com/alura/forum/service/CursoService.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package br.com.alura.forum.service
-
-import br.com.alura.forum.model.Curso
-import org.springframework.stereotype.Service
-import java.util.*
-
-@Service
-class CursoService(var cursos: List<Curso>) {
-
-    init {
-        val curso = Curso(
-            id = 1,
-            nome = "Kotlin",
-            categoria = "Programação"
-        )
-        cursos = Arrays.asList(curso)
-    }
-
-    fun buscarPorId(id: Long): Curso {
-        return cursos.stream().filter({ c ->
-            c.id == id
-        }).findFirst().get()
-    }
-}
diff --git a/forum/src/main/kotlin/br/com/alura/forum/service/RespostaService.kt b/forum/src/main/kotlin/br/com/alura/forum/service/RespostaService.kt
deleted file mode 100644
index 6faab18..0000000
--- a/forum/src/main/kotlin/br/com/alura/forum/service/RespostaService.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-package br.com.alura.forum.service
-
-import br.com.alura.forum.model.Curso
-import br.com.alura.forum.model.Resposta
-import br.com.alura.forum.model.Topico
-import br.com.alura.forum.model.Usuario
-import org.springframework.stereotype.Service
-import java.util.*
-import java.util.stream.Collectors
-
-@Service
-class RespostaService(
-    private var respostas: List<Resposta>,
-    private val topicoService: TopicoService
-) {
-
-    init {
-        val curso = Curso(
-            id = 1,
-            nome = "Kotlin",
-            categoria = "Programacao"
-        )
-        val autor = Usuario(
-            id = 1,
-            nome = "Ana da Silva",
-            email = "ana@email.com",
-            password = ""
-        )
-        val topico = Topico(
-            id = 1,
-            titulo = "Duvida Kotlin",
-            mensagem = "Variaveis no Kotlin",
-            curso = curso,
-            autor = autor
-        )
-
-        val resposta = Resposta(
-            id = 1,
-            mensagem = "Resposta 1",
-            autor = autor,
-            topico = topico,
-            solucao = false
-        )
-
-        val resposta2 = Resposta(
-            id = 2,
-            mensagem = "Resposta 2",
-            autor = autor,
-            topico = topico,
-            solucao = false
-        )
-
-        respostas = Arrays.asList(resposta, resposta2)
-    }
-
-    fun listar(idTopico: Long): List<Resposta> {
-        return respostas.stream().filter { r ->
-            r.topico.id == idTopico
-        }.collect(Collectors.toList())
-    }
-}
diff --git a/forum/src/main/kotlin/br/com/alura/forum/service/TopicoService.kt b/forum/src/main/kotlin/br/com/alura/forum/service/TopicoService.kt
deleted file mode 100644
index 079ffc3..0000000
--- a/forum/src/main/kotlin/br/com/alura/forum/service/TopicoService.kt
+++ /dev/null
@@ -1,66 +0,0 @@
-package br.com.alura.forum.service
-
-import br.com.alura.forum.dto.AtualizacaoTopicoForm
-import br.com.alura.forum.dto.NovoTopicoForm
-import br.com.alura.forum.dto.TopicoView
-import br.com.alura.forum.exception.NotFoundException
-import br.com.alura.forum.mapper.TopicoFormMapper
-import br.com.alura.forum.mapper.TopicoViewMapper
-import br.com.alura.forum.model.Topico
-import org.springframework.stereotype.Service
-import java.util.*
-import java.util.stream.Collectors
-
-@Service
-class TopicoService(
-    private var topicos: List<Topico> = ArrayList(),
-    private val topicoViewMapper: TopicoViewMapper,
-    private val topicoFormMapper: TopicoFormMapper,
-    private val notFoundMessage: String = "Tópico não encontrado!"
-) {
-
-    fun listar(): List<TopicoView> {
-        return topicos.stream().map { t ->
-            topicoViewMapper.map(t)
-        }.collect(Collectors.toList())
-    }
-
-    fun buscarPorId(id: Long): TopicoView {
-        val topico = topicos.stream().filter { t ->
-            t.id == id
-        }.findFirst().orElseThrow { NotFoundException(notFoundMessage) }
-        return topicoViewMapper.map(topico)
-    }
-
-    fun cadastrar(form: NovoTopicoForm): TopicoView {
-        val topico = topicoFormMapper.map(form)
-        topico.id = topicos.size.toLong() + 1
-        topicos = topicos.plus(topico)
-        return topicoViewMapper.map(topico)
-    }
-
-    fun atualizar(form: AtualizacaoTopicoForm): TopicoView {
-        val topico = topicos.stream().filter { t ->
-            t.id == form.id
-        }.findFirst().orElseThrow { NotFoundException(notFoundMessage) }
-        val topicoAtualizado = Topico(
-            id = form.id,
-            titulo = form.titulo,
-            mensagem = form.mensagem,
-            autor = topico.autor,
-            curso = topico.curso,
-            respostas = topico.respostas,
-            status = topico.status,
-            dataCriacao = topico.dataCriacao
-        )
-        topicos = topicos.minus(topico).plus(topicoAtualizado)
-        return topicoViewMapper.map(topico)
-    }
-
-    fun deletar(id: Long) {
-        val topico = topicos.stream().filter { t ->
-            t.id == id
-        }.findFirst().get()
-        topicos = topicos.minus(topico)
-    }
-}
\ No newline at end of file
diff --git a/forum/src/test/kotlin/br/com/alura/forum/ForumApplicationTests.kt b/forum/src/test/kotlin/br/com/alura/forum/ForumApplicationTests.kt
deleted file mode 100644
index c59b432..0000000
--- a/forum/src/test/kotlin/br/com/alura/forum/ForumApplicationTests.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package br.com.alura.forum
-
-import org.junit.jupiter.api.Test
-import org.springframework.boot.test.context.SpringBootTest
-
-@SpringBootTest
-class ForumApplicationTests {
-
-	@Test
-	fun contextLoads() {
-	}
-
-}
diff --git a/forum/mvnw b/mvnw
similarity index 94%
rename from forum/mvnw
rename to mvnw
index 8a8fb22..a16b543 100644
--- a/forum/mvnw
+++ b/mvnw
@@ -36,10 +36,6 @@
 
 if [ -z "$MAVEN_SKIP_RC" ] ; then
 
-  if [ -f /usr/local/etc/mavenrc ] ; then
-    . /usr/local/etc/mavenrc
-  fi
-
   if [ -f /etc/mavenrc ] ; then
     . /etc/mavenrc
   fi
@@ -149,7 +145,7 @@ if [ -z "$JAVACMD" ] ; then
       JAVACMD="$JAVA_HOME/bin/java"
     fi
   else
-    JAVACMD="`\\unset -f command; \\command -v java`"
+    JAVACMD="`which java`"
   fi
 fi
 
@@ -216,9 +212,9 @@ else
       echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
     fi
     if [ -n "$MVNW_REPOURL" ]; then
-      jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
     else
-      jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
     fi
     while IFS="=" read key value; do
       case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
@@ -237,9 +233,9 @@ else
           echo "Found wget ... using wget"
         fi
         if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+            wget "$jarUrl" -O "$wrapperJarPath"
         else
-            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
         fi
     elif command -v curl > /dev/null; then
         if [ "$MVNW_VERBOSE" = true ]; then
@@ -309,8 +305,6 @@ WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
 exec "$JAVACMD" \
   $MAVEN_OPTS \
-  $MAVEN_DEBUG_OPTS \
   -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
-  "-Dmaven.home=${M2_HOME}" \
-  "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
   ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/forum/mvnw.cmd b/mvnw.cmd
similarity index 84%
rename from forum/mvnw.cmd
rename to mvnw.cmd
index 1d8ab01..c8d4337 100644
--- a/forum/mvnw.cmd
+++ b/mvnw.cmd
@@ -46,8 +46,8 @@ if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
 @REM Execute a user defined script before this one
 if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
 @REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
-if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
 :skipRcPre
 
 @setlocal
@@ -120,9 +120,9 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
 set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
 set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
-set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
 
-FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
     IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
 )
 
@@ -134,7 +134,7 @@ if exist %WRAPPER_JAR% (
     )
 ) else (
     if not "%MVNW_REPOURL%" == "" (
-        SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
     )
     if "%MVNW_VERBOSE%" == "true" (
         echo Couldn't find %WRAPPER_JAR%, downloading it ...
@@ -158,13 +158,7 @@ if exist %WRAPPER_JAR% (
 @REM work with both Windows and non-Windows executions.
 set MAVEN_CMD_LINE_ARGS=%*
 
-%MAVEN_JAVA_EXE% ^
-  %JVM_CONFIG_MAVEN_PROPS% ^
-  %MAVEN_OPTS% ^
-  %MAVEN_DEBUG_OPTS% ^
-  -classpath %WRAPPER_JAR% ^
-  "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
-  %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
 if ERRORLEVEL 1 goto error
 goto end
 
@@ -174,15 +168,15 @@ set ERROR_CODE=1
 :end
 @endlocal & set ERROR_CODE=%ERROR_CODE%
 
-if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
 @REM check for post script, once with legacy .bat ending and once with .cmd ending
-if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
-if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
 :skipRcPost
 
 @REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%"=="on" pause
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
 
-if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
 
-cmd /C exit /B %ERROR_CODE%
+exit /B %ERROR_CODE%
diff --git a/forum/pom.xml b/pom.xml
similarity index 53%
rename from forum/pom.xml
rename to pom.xml
index ff2ff45..2193b61 100644
--- a/forum/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.6.3</version>
+		<version>2.4.4</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>br.com.alura</groupId>
@@ -15,8 +15,22 @@
 	<description>Demo project for Spring Boot</description>
 	<properties>
 		<java.version>11</java.version>
-		<kotlin.version>1.6.10</kotlin.version>
+		<kotlin.version>1.4.31</kotlin.version>
+		<testcontainers.version>1.16.2</testcontainers.version>
 	</properties>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.testcontainers</groupId>
+				<artifactId>testcontainers-bom</artifactId>
+				<version>${testcontainers.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -52,44 +66,84 @@
 		</dependency>
 
 		<dependency>
-			<groupId>io.swagger.core.v3</groupId>
-			<artifactId>swagger-annotations</artifactId>
-			<version>2.1.13</version>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-security</artifactId>
+			<groupId>org.flywaydb</groupId>
+			<artifactId>flyway-core</artifactId>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-devtools</artifactId>
-			<scope>runtime</scope>
-			<optional>true</optional>
+			<artifactId>spring-boot-starter-cache</artifactId>
 		</dependency>
 
+		<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-security -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
+			<artifactId>spring-boot-starter-security</artifactId>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/io.jsonwebtoken/jjwt -->
+		<dependency>
+			<groupId>io.jsonwebtoken</groupId>
+			<artifactId>jjwt</artifactId>
+			<version>0.9.1</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java -->
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<version>8.0.28</version>
+		</dependency>
+
+		<dependency>
+			<groupId>io.mockk</groupId>
+			<artifactId>mockk</artifactId>
+			<version>1.12.2</version>
 			<scope>test</scope>
 		</dependency>
 
+		<!-- https://mvnrepository.com/artifact/org.assertj/assertj-core -->
 		<dependency>
-			<groupId>javax.persistence</groupId>
-			<artifactId>javax.persistence-api</artifactId>
-			<version>2.2</version>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<version>3.21.0</version>
+			<scope>test</scope>
 		</dependency>
 
 		<dependency>
-			<groupId>org.springframework.data</groupId>
-			<artifactId>spring-data-jpa</artifactId>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>testcontainers</artifactId>
+			<scope>test</scope>
 		</dependency>
 
 		<dependency>
-			<groupId>io.jsonwebtoken</groupId>
-			<artifactId>jjwt</artifactId>
-			<version>0.9.1</version>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>mysql</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/org.springdoc/springdoc-openapi-ui -->
+		<dependency>
+			<groupId>org.springdoc</groupId>
+			<artifactId>springdoc-openapi-ui</artifactId>
+			<version>1.6.2</version>
 		</dependency>
 	</dependencies>
 
@@ -110,6 +164,8 @@
 					</args>
 					<compilerPlugins>
 						<plugin>spring</plugin>
+						<plugin>jpa</plugin>
+						<plugin>no-arg</plugin>
 					</compilerPlugins>
 				</configuration>
 				<dependencies>
@@ -118,9 +174,32 @@
 						<artifactId>kotlin-maven-allopen</artifactId>
 						<version>${kotlin.version}</version>
 					</dependency>
+					<dependency>
+						<groupId>org.jetbrains.kotlin</groupId>
+						<artifactId>kotlin-maven-noarg</artifactId>
+						<version>${kotlin.version}</version>
+					</dependency>
 				</dependencies>
+
 			</plugin>
 		</plugins>
 	</build>
 
+	<profiles>
+		<profile>
+			<id>dev</id>
+			<properties>
+				<activatedProperties>dev</activatedProperties>
+			</properties>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+		</profile>
+		<profile>
+			<id>prod</id>
+			<properties>
+				<activatedProperties>prod</activatedProperties>
+			</properties>
+		</profile>
+	</profiles>
 </project>
diff --git a/forum/src/main/kotlin/br/com/alura/forum/ForumApplication.kt b/src/main/kotlin/br/com/alura/forum/ForumApplication.kt
similarity index 78%
rename from forum/src/main/kotlin/br/com/alura/forum/ForumApplication.kt
rename to src/main/kotlin/br/com/alura/forum/ForumApplication.kt
index 848100e..8556268 100644
--- a/forum/src/main/kotlin/br/com/alura/forum/ForumApplication.kt
+++ b/src/main/kotlin/br/com/alura/forum/ForumApplication.kt
@@ -2,8 +2,10 @@ package br.com.alura.forum
 
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.runApplication
+import org.springframework.cache.annotation.EnableCaching
 
 @SpringBootApplication
+@EnableCaching
 class ForumApplication
 
 fun main(args: Array<String>) {
diff --git a/src/main/kotlin/br/com/alura/forum/config/JWTUtil.kt b/src/main/kotlin/br/com/alura/forum/config/JWTUtil.kt
new file mode 100644
index 0000000..eda8599
--- /dev/null
+++ b/src/main/kotlin/br/com/alura/forum/config/JWTUtil.kt
@@ -0,0 +1,47 @@
+package br.com.alura.forum.config
+
+import br.com.alura.forum.service.UsuarioService
+import io.jsonwebtoken.Jwts
+import io.jsonwebtoken.SignatureAlgorithm
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken
+import org.springframework.security.core.Authentication
+import org.springframework.security.core.GrantedAuthority
+import org.springframework.stereotype.Component
+import java.lang.IllegalArgumentException
+import java.util.*
+
+@Component
+class JWTUtil(
+        private val usuarioService: UsuarioService
+) {
+
+    private val expiration : Long = 6000000
+
+    @Value("\${jwt.secret}")
+    private lateinit var secret : String
+
+    fun generateToken(username: String, authorities: MutableCollection<out GrantedAuthority>): String? {
+        return Jwts.builder()
+                .setSubject(username)
+                .claim("role", authorities)
+                .setExpiration(Date(System.currentTimeMillis() + expiration))
+                .signWith(SignatureAlgorithm.HS512, secret.toByteArray())
+                .compact()
+    }
+
+    fun isValid(jwt: String?): Boolean {
+        return try {
+            Jwts.parser().setSigningKey(secret.toByteArray()).parseClaimsJws(jwt)
+            true
+        } catch (e: IllegalArgumentException) {
+            false
+        }
+    }
+
+    fun getAuthentication(jwt: String?) : Authentication {
+        val username = Jwts.parser().setSigningKey(secret.toByteArray()).parseClaimsJws(jwt).body.subject
+        val user = usuarioService.loadUserByUsername(username)
+        return UsernamePasswordAuthenticationToken(username, null, user.authorities)
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/br/com/alura/forum/config/OpenAPI3Config.kt b/src/main/kotlin/br/com/alura/forum/config/OpenAPI3Config.kt
new file mode 100644
index 0000000..e4dc204
--- /dev/null
+++ b/src/main/kotlin/br/com/alura/forum/config/OpenAPI3Config.kt
@@ -0,0 +1,17 @@
+package br.com.alura.forum.config
+
+import io.swagger.v3.oas.annotations.OpenAPIDefinition
+import io.swagger.v3.oas.annotations.enums.SecuritySchemeType
+import io.swagger.v3.oas.annotations.info.Info
+import io.swagger.v3.oas.annotations.security.SecurityScheme
+import org.springframework.context.annotation.Configuration
+
+@Configuration
+@OpenAPIDefinition(info = Info(title = "API's do fórum Alura"))
+@SecurityScheme(
+    name = "bearerAuth",
+    type = SecuritySchemeType.HTTP,
+    bearerFormat = "JWT",
+    scheme = "bearer"
+)
+class OpenAPI3Config
\ No newline at end of file
diff --git a/forum/src/main/kotlin/br/com/alura/forum/config/SecurityConfiguration.kt b/src/main/kotlin/br/com/alura/forum/config/SecurityConfiguration.kt
similarity index 58%
rename from forum/src/main/kotlin/br/com/alura/forum/config/SecurityConfiguration.kt
rename to src/main/kotlin/br/com/alura/forum/config/SecurityConfiguration.kt
index 3d99b8d..ca9b8d1 100644
--- a/forum/src/main/kotlin/br/com/alura/forum/config/SecurityConfiguration.kt
+++ b/src/main/kotlin/br/com/alura/forum/config/SecurityConfiguration.kt
@@ -1,8 +1,10 @@
 package br.com.alura.forum.config
 
+import br.com.alura.forum.security.JWTAuthenticationFilter
 import br.com.alura.forum.security.JWTLoginFilter
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
+import org.springframework.http.HttpMethod
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
@@ -15,20 +17,25 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthentic
 @Configuration
 @EnableWebSecurity
 class SecurityConfiguration(
-    private val userDetailsService: UserDetailsService,
-    private val jwtUtil: JwtUtils
-) : WebSecurityConfigurerAdapter() {
+        private val userDetailsService: UserDetailsService,
+        private val jwtUtil: JWTUtil
+)
+    : WebSecurityConfigurerAdapter() {
 
     override fun configure(http: HttpSecurity?) {
-        http?.authorizeRequests()?.
-            //antMatchers("/topicos")?.hasAuthority("LEITURA_ESCRITA")?.
-        antMatchers("/login")?.permitAll()?.anyRequest()?.authenticated()?.and()
-        http?.addFilterBefore(
-            JWTLoginFilter(authManager = authenticationManager(), jwtUtil = jwtUtil),
-            UsernamePasswordAuthenticationFilter().javaClass
-        )
-        http?.sessionManagement()?.sessionCreationPolicy(SessionCreationPolicy.STATELESS)?.and()?.formLogin()?.disable()
-            ?.httpBasic()
+        http?.
+        csrf()?.disable()?.
+        authorizeRequests()?.
+        antMatchers("/topicos")?.hasAuthority("LEITURA_ESCRITA")?.
+        antMatchers(HttpMethod.POST,"/login")?.permitAll()?.
+        antMatchers(HttpMethod.GET, "/swagger-ui/*")?.permitAll()?.
+        antMatchers(HttpMethod.GET,"/v3/api-docs/**")?.permitAll()?.
+        anyRequest()?.
+        authenticated()?.
+        and()
+        http?.addFilterBefore(JWTLoginFilter(authManager = authenticationManager(), jwtUtil = jwtUtil), UsernamePasswordAuthenticationFilter().javaClass)
+        http?.addFilterBefore(JWTAuthenticationFilter(jwtUtil = jwtUtil), UsernamePasswordAuthenticationFilter().javaClass)
+        http?.sessionManagement()?.sessionCreationPolicy(SessionCreationPolicy.STATELESS)
     }
 
     @Bean
diff --git a/src/main/kotlin/br/com/alura/forum/config/SwaggerConfig.kt b/src/main/kotlin/br/com/alura/forum/config/SwaggerConfig.kt
new file mode 100644
index 0000000..84627a1
--- /dev/null
+++ b/src/main/kotlin/br/com/alura/forum/config/SwaggerConfig.kt
@@ -0,0 +1,15 @@
+package br.com.alura.forum.config
+
+import io.swagger.v3.oas.annotations.enums.SecuritySchemeType
+import io.swagger.v3.oas.annotations.security.SecurityScheme
+import org.springframework.context.annotation.Configuration
+
+@Configuration
+@SecurityScheme(
+        name = "bearerAuth",
+        type = SecuritySchemeType.HTTP,
+        bearerFormat = "JWT",
+        scheme = "bearer"
+)
+class SwaggerConfig {
+}
\ No newline at end of file
diff --git a/forum/src/main/kotlin/br/com/alura/forum/controller/HelloController.kt b/src/main/kotlin/br/com/alura/forum/controller/HelloController.kt
similarity index 89%
rename from forum/src/main/kotlin/br/com/alura/forum/controller/HelloController.kt
rename to src/main/kotlin/br/com/alura/forum/controller/HelloController.kt
index 3c76f18..72e192c 100644
--- a/forum/src/main/kotlin/br/com/alura/forum/controller/HelloController.kt
+++ b/src/main/kotlin/br/com/alura/forum/controller/HelloController.kt
@@ -10,6 +10,7 @@ class HelloController {
 
     @GetMapping
     fun hello(): String {
-        return "Hello World alterado"
+        return "Hello World!"
     }
+
 }
\ No newline at end of file
diff --git a/forum/src/main/kotlin/br/com/alura/forum/controller/TopicoController.kt b/src/main/kotlin/br/com/alura/forum/controller/TopicoController.kt
similarity index 51%
rename from forum/src/main/kotlin/br/com/alura/forum/controller/TopicoController.kt
rename to src/main/kotlin/br/com/alura/forum/controller/TopicoController.kt
index 2a9b8a2..0cfd10c 100644
--- a/forum/src/main/kotlin/br/com/alura/forum/controller/TopicoController.kt
+++ b/src/main/kotlin/br/com/alura/forum/controller/TopicoController.kt
@@ -2,22 +2,35 @@ package br.com.alura.forum.controller
 
 import br.com.alura.forum.dto.AtualizacaoTopicoForm
 import br.com.alura.forum.dto.NovoTopicoForm
+import br.com.alura.forum.dto.TopicoPorCategoriaDto
 import br.com.alura.forum.dto.TopicoView
-import br.com.alura.forum.model.Topico
 import br.com.alura.forum.service.TopicoService
+import io.swagger.v3.oas.annotations.security.SecurityRequirement
+import org.springframework.cache.annotation.CacheEvict
+import org.springframework.cache.annotation.Cacheable
+import org.springframework.data.domain.Page
+import org.springframework.data.domain.Pageable
+import org.springframework.data.domain.Sort
+import org.springframework.data.web.PageableDefault
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
+import org.springframework.transaction.annotation.Transactional
 import org.springframework.web.bind.annotation.*
 import org.springframework.web.util.UriComponentsBuilder
 import javax.validation.Valid
 
 @RestController
 @RequestMapping("/topicos")
+@SecurityRequirement(name = "bearerAuth")
 class TopicoController(private val service: TopicoService) {
 
     @GetMapping
-    fun listar(): List<TopicoView> {
-        return service.listar()
+    @Cacheable("topicos")
+    fun listar(
+            @RequestParam(required = false) nomeCurso: String?,
+            @PageableDefault(size = 5, sort = ["dataCriacao"], direction = Sort.Direction.DESC) paginacao: Pageable
+    ): Page<TopicoView> {
+        return service.listar(nomeCurso, paginacao)
     }
 
     @GetMapping("/{id}")
@@ -26,9 +39,11 @@ class TopicoController(private val service: TopicoService) {
     }
 
     @PostMapping
+    @Transactional
+    @CacheEvict(value = ["topicos"], allEntries = true)
     fun cadastrar(
-        @RequestBody @Valid form: NovoTopicoForm,
-        uriBuilder: UriComponentsBuilder
+            @RequestBody @Valid form: NovoTopicoForm,
+            uriBuilder: UriComponentsBuilder
     ): ResponseEntity<TopicoView> {
         val topicoView = service.cadastrar(form)
         val uri = uriBuilder.path("/topicos/${topicoView.id}").build().toUri()
@@ -36,6 +51,8 @@ class TopicoController(private val service: TopicoService) {
     }
 
     @PutMapping
+    @Transactional
+    @CacheEvict(value = ["topicos"], allEntries = true)
     fun atualizar(@RequestBody @Valid form: AtualizacaoTopicoForm): ResponseEntity<TopicoView> {
         val topicoView = service.atualizar(form)
         return ResponseEntity.ok(topicoView)
@@ -43,7 +60,15 @@ class TopicoController(private val service: TopicoService) {
 
     @DeleteMapping("/{id}")
     @ResponseStatus(HttpStatus.NO_CONTENT)
+    @Transactional
+    @CacheEvict(value = ["topicos"], allEntries = true)
     fun deletar(@PathVariable id: Long) {
         service.deletar(id)
     }
+
+    @GetMapping("/relatorio")
+    fun relatorio(): List<TopicoPorCategoriaDto> {
+        return service.relatorio()
+    }
+
 }
\ No newline at end of file
diff --git a/forum/src/main/kotlin/br/com/alura/forum/dto/AtualizacaoTopicoForm.kt b/src/main/kotlin/br/com/alura/forum/dto/AtualizacaoTopicoForm.kt
similarity index 51%
rename from forum/src/main/kotlin/br/com/alura/forum/dto/AtualizacaoTopicoForm.kt
rename to src/main/kotlin/br/com/alura/forum/dto/AtualizacaoTopicoForm.kt
index 79b5867..6f6fd54 100644
--- a/forum/src/main/kotlin/br/com/alura/forum/dto/AtualizacaoTopicoForm.kt
+++ b/src/main/kotlin/br/com/alura/forum/dto/AtualizacaoTopicoForm.kt
@@ -5,12 +5,11 @@ import javax.validation.constraints.NotNull
 import javax.validation.constraints.Size
 
 data class AtualizacaoTopicoForm(
-
-    @field:NotNull
-    val id: Long,
-    @field:NotEmpty
-    @field:Size(min = 5, max = 100)
-    val titulo: String,
-    @NotEmpty
-    val mensagem: String
+        @field:NotNull
+        val id: Long,
+        @field:NotEmpty
+        @field:Size(min = 5, max = 100)
+        val titulo: String,
+        @field:NotEmpty
+        val mensagem: String
 )
diff --git a/src/main/kotlin/br/com/alura/forum/dto/ErrorView.kt b/src/main/kotlin/br/com/alura/forum/dto/ErrorView.kt
new file mode 100644
index 0000000..532371f
--- /dev/null
+++ b/src/main/kotlin/br/com/alura/forum/dto/ErrorView.kt
@@ -0,0 +1,11 @@
+package br.com.alura.forum.dto
+
+import java.time.LocalDateTime
+
+data class ErrorView(
+        val timestamp: LocalDateTime = LocalDateTime.now(),
+        val status: Int,
+        val error: String,
+        val message: String?,
+        val path: String
+)
diff --git a/src/main/kotlin/br/com/alura/forum/dto/NovoTopicoForm.kt b/src/main/kotlin/br/com/alura/forum/dto/NovoTopicoForm.kt
new file mode 100644
index 0000000..b69472a
--- /dev/null
+++ b/src/main/kotlin/br/com/alura/forum/dto/NovoTopicoForm.kt
@@ -0,0 +1,17 @@
+package br.com.alura.forum.dto
+
+import javax.validation.constraints.NotEmpty
+import javax.validation.constraints.NotNull
+import javax.validation.constraints.Size
+
+data class NovoTopicoForm(
+        @field:NotEmpty(message = "Titulo nao pode ser em branco")
+        @field:Size(min = 5, max = 100, message = "Titulo deve ter entre 5 e 100 caracteres")
+        val titulo: String,
+        @field:NotEmpty(message = "Mensagem nao pode ser em branco")
+        val mensagem: String,
+        @field:NotNull
+        val idCurso: Long,
+        @field:NotNull
+        val idAutor: Long
+)
diff --git a/src/main/kotlin/br/com/alura/forum/dto/TopicoPorCategoriaDto.kt b/src/main/kotlin/br/com/alura/forum/dto/TopicoPorCategoriaDto.kt
new file mode 100644
index 0000000..f751fc3
--- /dev/null
+++ b/src/main/kotlin/br/com/alura/forum/dto/TopicoPorCategoriaDto.kt
@@ -0,0 +1,6 @@
+package br.com.alura.forum.dto
+
+data class TopicoPorCategoriaDto(
+        val categoria: String,
+        val quantidade: Long
+)
diff --git a/src/main/kotlin/br/com/alura/forum/dto/TopicoView.kt b/src/main/kotlin/br/com/alura/forum/dto/TopicoView.kt
new file mode 100644
index 0000000..2ca59fe
--- /dev/null
+++ b/src/main/kotlin/br/com/alura/forum/dto/TopicoView.kt
@@ -0,0 +1,14 @@
+package br.com.alura.forum.dto
+
+import br.com.alura.forum.model.StatusTopico
+import java.time.LocalDate
+import java.time.LocalDateTime
+
+data class TopicoView(
+        val id: Long?,
+        val titulo: String,
+        val mensagem: String,
+        val status: StatusTopico,
+        val dataCriacao: LocalDateTime,
+        val dataAlteracao: LocalDate?
+)
diff --git a/forum/src/main/kotlin/br/com/alura/forum/exception/ExceptionHandler.kt b/src/main/kotlin/br/com/alura/forum/exception/ExceptionHandler.kt
similarity index 52%
rename from forum/src/main/kotlin/br/com/alura/forum/exception/ExceptionHandler.kt
rename to src/main/kotlin/br/com/alura/forum/exception/ExceptionHandler.kt
index 0a50f13..ac1365d 100644
--- a/forum/src/main/kotlin/br/com/alura/forum/exception/ExceptionHandler.kt
+++ b/src/main/kotlin/br/com/alura/forum/exception/ExceptionHandler.kt
@@ -14,46 +14,47 @@ class ExceptionHandler {
     @ExceptionHandler(NotFoundException::class)
     @ResponseStatus(HttpStatus.NOT_FOUND)
     fun handleNotFound(
-        exception: NotFoundException,
-        request: HttpServletRequest
+            exception: NotFoundException,
+            request: HttpServletRequest
     ): ErrorView {
         return ErrorView(
-            status = HttpStatus.NOT_FOUND.value(),
-            error = HttpStatus.NOT_FOUND.name,
-            message = exception.message,
-            path = request.servletPath
-        )
-    }
-
-    @ExceptionHandler(Exception::class)
-    @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
-    fun handleServerError(
-        exception: Exception,
-        request: HttpServletRequest
-    ): ErrorView {
-        return ErrorView(
-            status = HttpStatus.INTERNAL_SERVER_ERROR.value(),
-            error = HttpStatus.INTERNAL_SERVER_ERROR.name,
-            message = exception.message,
-            path = request.servletPath
+                status = HttpStatus.NOT_FOUND.value(),
+                error = HttpStatus.NOT_FOUND.name,
+                message = exception.message,
+                path = request.servletPath
         )
     }
 
     @ExceptionHandler(MethodArgumentNotValidException::class)
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     fun handleValidationError(
-        exception: MethodArgumentNotValidException,
-        request: HttpServletRequest
+            exception: MethodArgumentNotValidException,
+            request: HttpServletRequest
     ): ErrorView {
         val errorMessage = HashMap<String, String?>()
-        exception.bindingResult.fieldErrors.forEach { e ->
-            errorMessage.put(e.field, e.defaultMessage)
+        exception.bindingResult.fieldErrors.forEach{
+            e -> errorMessage.put(e.field, e.defaultMessage)
         }
         return ErrorView(
-            status = HttpStatus.BAD_REQUEST.value(),
-            error = HttpStatus.BAD_REQUEST.name,
-            message = errorMessage.toString(),
-            path = request.servletPath
+                status = HttpStatus.BAD_REQUEST.value(),
+                error = HttpStatus.BAD_REQUEST.name,
+                message = errorMessage.toString(),
+                path = request.servletPath
         )
     }
+
+    @ExceptionHandler(Exception::class)
+    @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+    fun handleServerError(
+            exception: Exception,
+            request: HttpServletRequest
+    ): ErrorView {
+        return ErrorView(
+                status = HttpStatus.INTERNAL_SERVER_ERROR.value(),
+                error = HttpStatus.INTERNAL_SERVER_ERROR.name,
+                message = exception.message,
+                path = request.servletPath
+        )
+    }
+
 }
\ No newline at end of file
diff --git a/forum/src/main/kotlin/br/com/alura/forum/exception/NotFoundException.kt b/src/main/kotlin/br/com/alura/forum/exception/NotFoundException.kt
similarity index 76%
rename from forum/src/main/kotlin/br/com/alura/forum/exception/NotFoundException.kt
rename to src/main/kotlin/br/com/alura/forum/exception/NotFoundException.kt
index 3d5b31b..5ce0a10 100644
--- a/forum/src/main/kotlin/br/com/alura/forum/exception/NotFoundException.kt
+++ b/src/main/kotlin/br/com/alura/forum/exception/NotFoundException.kt
@@ -1,4 +1,6 @@
 package br.com.alura.forum.exception
 
+import java.lang.RuntimeException
+
 class NotFoundException(message: String?) : RuntimeException(message) {
 }
\ No newline at end of file
diff --git a/forum/src/main/kotlin/br/com/alura/forum/mapper/Mapper.kt b/src/main/kotlin/br/com/alura/forum/mapper/Mapper.kt
similarity index 98%
rename from forum/src/main/kotlin/br/com/alura/forum/mapper/Mapper.kt
rename to src/main/kotlin/br/com/alura/forum/mapper/Mapper.kt
index c274cf8..b422ed8 100644
--- a/forum/src/main/kotlin/br/com/alura/forum/mapper/Mapper.kt
+++ b/src/main/kotlin/br/com/alura/forum/mapper/Mapper.kt
@@ -3,4 +3,5 @@ package br.com.alura.forum.mapper
 interface Mapper<T, U> {
 
     fun map(t: T): U
+
 }
diff --git a/src/main/kotlin/br/com/alura/forum/mapper/TopicoFormMapper.kt b/src/main/kotlin/br/com/alura/forum/mapper/TopicoFormMapper.kt
new file mode 100644
index 0000000..3daa1a9
--- /dev/null
+++ b/src/main/kotlin/br/com/alura/forum/mapper/TopicoFormMapper.kt
@@ -0,0 +1,25 @@
+package br.com.alura.forum.mapper
+
+import br.com.alura.forum.dto.NovoTopicoForm
+import br.com.alura.forum.model.Topico
+import br.com.alura.forum.service.CursoService
+import br.com.alura.forum.service.UsuarioService
+import org.springframework.stereotype.Component
+import java.time.LocalDate
+
+@Component
+class TopicoFormMapper(
+        private val cursoService: CursoService,
+        private val usuarioService: UsuarioService
+): Mapper<NovoTopicoForm, Topico> {
+    override fun map(t: NovoTopicoForm): Topico {
+        return Topico(
+                titulo = t.titulo,
+                mensagem = t.mensagem,
+                curso = cursoService.buscarPorId(t.idCurso),
+                autor = usuarioService.buscarPorId(t.idAutor),
+                dataAlteracao = LocalDate.now()
+        )
+    }
+
+}
diff --git a/src/main/kotlin/br/com/alura/forum/mapper/TopicoViewMapper.kt b/src/main/kotlin/br/com/alura/forum/mapper/TopicoViewMapper.kt
new file mode 100644
index 0000000..85943ca
--- /dev/null
+++ b/src/main/kotlin/br/com/alura/forum/mapper/TopicoViewMapper.kt
@@ -0,0 +1,20 @@
+package br.com.alura.forum.mapper
+
+import br.com.alura.forum.dto.TopicoView
+import br.com.alura.forum.model.Topico
+import org.springframework.stereotype.Component
+
+@Component
+class TopicoViewMapper: Mapper<Topico, TopicoView> {
+
+    override fun map(t: Topico): TopicoView {
+        return TopicoView(
+                id = t.id,
+                titulo = t.titulo,
+                mensagem = t.mensagem,
+                dataCriacao = t.dataCriacao,
+                status = t.status,
+                dataAlteracao = t.dataAlteracao
+        )
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/br/com/alura/forum/model/Credentials.kt b/src/main/kotlin/br/com/alura/forum/model/Credentials.kt
new file mode 100644
index 0000000..4ff8083
--- /dev/null
+++ b/src/main/kotlin/br/com/alura/forum/model/Credentials.kt
@@ -0,0 +1,6 @@
+package br.com.alura.forum.model
+
+data class Credentials(
+        val username: String = "",
+        val password: String = ""
+)
diff --git a/src/main/kotlin/br/com/alura/forum/model/Curso.kt b/src/main/kotlin/br/com/alura/forum/model/Curso.kt
new file mode 100644
index 0000000..1c26dff
--- /dev/null
+++ b/src/main/kotlin/br/com/alura/forum/model/Curso.kt
@@ -0,0 +1,14 @@
+package br.com.alura.forum.model
+
+import javax.persistence.Entity
+import javax.persistence.GeneratedValue
+import javax.persistence.GenerationType
+import javax.persistence.Id
+
+@Entity
+data class Curso(
+        @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
+        val id: Long? = null,
+        val nome: String,
+        val categoria: String
+)
\ No newline at end of file
diff --git a/src/main/kotlin/br/com/alura/forum/model/Resposta.kt b/src/main/kotlin/br/com/alura/forum/model/Resposta.kt
new file mode 100644
index 0000000..da85910
--- /dev/null
+++ b/src/main/kotlin/br/com/alura/forum/model/Resposta.kt
@@ -0,0 +1,18 @@
+package br.com.alura.forum.model
+
+import java.time.LocalDate
+import java.time.LocalDateTime
+import javax.persistence.*
+
+@Entity
+data class Resposta(
+        @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
+        val id: Long? = null,
+        val mensagem: String,
+        val dataCriacao: LocalDateTime = LocalDateTime.now(),
+        @ManyToOne
+        val autor: Usuario,
+        @ManyToOne
+        val topico: Topico,
+        val solucao: Boolean
+)
diff --git a/forum/src/main/kotlin/br/com/alura/forum/model/Role.kt b/src/main/kotlin/br/com/alura/forum/model/Role.kt
similarity index 66%
rename from forum/src/main/kotlin/br/com/alura/forum/model/Role.kt
rename to src/main/kotlin/br/com/alura/forum/model/Role.kt
index aaed908..f6989ae 100644
--- a/forum/src/main/kotlin/br/com/alura/forum/model/Role.kt
+++ b/src/main/kotlin/br/com/alura/forum/model/Role.kt
@@ -8,12 +8,10 @@ import javax.persistence.Id
 
 @Entity
 data class Role(
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private val id: Long,
-    private val nome: String
-): GrantedAuthority {
+        @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
+        private val id: Long,
+        private val nome: String
+) : GrantedAuthority {
 
     override fun getAuthority() = nome
 }
\ No newline at end of file
diff --git a/forum/src/main/kotlin/br/com/alura/forum/model/StatusTopico.kt b/src/main/kotlin/br/com/alura/forum/model/StatusTopico.kt
similarity index 98%
rename from forum/src/main/kotlin/br/com/alura/forum/model/StatusTopico.kt
rename to src/main/kotlin/br/com/alura/forum/model/StatusTopico.kt
index da31496..76e11c9 100644
--- a/forum/src/main/kotlin/br/com/alura/forum/model/StatusTopico.kt
+++ b/src/main/kotlin/br/com/alura/forum/model/StatusTopico.kt
@@ -1,8 +1,10 @@
 package br.com.alura.forum.model
 
 enum class StatusTopico {
+
     NAO_RESPONDIDO,
     NAO_SOLUCIONADO,
     SOLUCIONADO,
     FECHADO
+
 }
diff --git a/src/main/kotlin/br/com/alura/forum/model/Topico.kt b/src/main/kotlin/br/com/alura/forum/model/Topico.kt
new file mode 100644
index 0000000..d1d0df9
--- /dev/null
+++ b/src/main/kotlin/br/com/alura/forum/model/Topico.kt
@@ -0,0 +1,23 @@
+package br.com.alura.forum.model
+
+import java.time.LocalDate
+import java.time.LocalDateTime
+import javax.persistence.*
+
+@Entity
+data class Topico(
+        @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
+        var id: Long? = null,
+        var titulo: String,
+        var mensagem: String,
+        val dataCriacao: LocalDateTime = LocalDateTime.now(),
+        @ManyToOne
+        val curso: Curso,
+        @ManyToOne
+        val autor: Usuario,
+        @Enumerated(value = EnumType.STRING)
+        val status: StatusTopico = StatusTopico.NAO_RESPONDIDO,
+        @OneToMany(mappedBy = "topico")
+        val respostas: List<Resposta> = ArrayList(),
+        val dataAlteracao: LocalDate? = null
+)
\ No newline at end of file
diff --git a/src/main/kotlin/br/com/alura/forum/model/Usuario.kt b/src/main/kotlin/br/com/alura/forum/model/Usuario.kt
new file mode 100644
index 0000000..ec37746
--- /dev/null
+++ b/src/main/kotlin/br/com/alura/forum/model/Usuario.kt
@@ -0,0 +1,19 @@
+package br.com.alura.forum.model
+
+import com.fasterxml.jackson.annotation.JsonIgnore
+import javax.persistence.*
+
+@Entity
+data class Usuario(
+
+        @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
+        val id: Long? = null,
+        val nome: String,
+        val email: String,
+        val password: String,
+
+        @JsonIgnore
+        @ManyToMany(fetch = FetchType.EAGER)
+        @JoinColumn(name = "usuario_role")
+        val role: List<Role> = mutableListOf()
+)
diff --git a/src/main/kotlin/br/com/alura/forum/repository/CursoRepository.kt b/src/main/kotlin/br/com/alura/forum/repository/CursoRepository.kt
new file mode 100644
index 0000000..46a6cc5
--- /dev/null
+++ b/src/main/kotlin/br/com/alura/forum/repository/CursoRepository.kt
@@ -0,0 +1,7 @@
+package br.com.alura.forum.repository
+
+import br.com.alura.forum.model.Curso
+import org.springframework.data.jpa.repository.JpaRepository
+
+interface CursoRepository: JpaRepository<Curso, Long> {
+}
\ No newline at end of file
diff --git a/src/main/kotlin/br/com/alura/forum/repository/TopicoRepository.kt b/src/main/kotlin/br/com/alura/forum/repository/TopicoRepository.kt
new file mode 100644
index 0000000..68c6415
--- /dev/null
+++ b/src/main/kotlin/br/com/alura/forum/repository/TopicoRepository.kt
@@ -0,0 +1,17 @@
+package br.com.alura.forum.repository
+
+import br.com.alura.forum.dto.TopicoPorCategoriaDto
+import br.com.alura.forum.model.Topico
+import org.springframework.data.domain.Page
+import org.springframework.data.domain.Pageable
+import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.data.jpa.repository.Query
+
+interface TopicoRepository: JpaRepository<Topico, Long> {
+
+    fun findByCursoNome(nomeCurso: String, paginacao: Pageable): Page<Topico>
+
+    @Query("SELECT new br.com.alura.forum.dto.TopicoPorCategoriaDto(curso.categoria, count(t)) FROM Topico t JOIN t.curso curso GROUP BY curso.categoria")
+    fun relatorio(): List<TopicoPorCategoriaDto>
+
+}
\ No newline at end of file
diff --git a/forum/src/main/kotlin/br/com/alura/forum/repository/UsuarioRepository.kt b/src/main/kotlin/br/com/alura/forum/repository/UsuarioRepository.kt
similarity index 67%
rename from forum/src/main/kotlin/br/com/alura/forum/repository/UsuarioRepository.kt
rename to src/main/kotlin/br/com/alura/forum/repository/UsuarioRepository.kt
index 6684ea6..d1d0569 100644
--- a/forum/src/main/kotlin/br/com/alura/forum/repository/UsuarioRepository.kt
+++ b/src/main/kotlin/br/com/alura/forum/repository/UsuarioRepository.kt
@@ -1,12 +1,9 @@
 package br.com.alura.forum.repository
 
 import br.com.alura.forum.model.Usuario
-import org.springframework.context.annotation.Bean
 import org.springframework.data.jpa.repository.JpaRepository
-import org.springframework.stereotype.Repository
 
-@Repository
 interface UsuarioRepository: JpaRepository<Usuario, Long> {
-    @Bean
+
     fun findByEmail(username: String?): Usuario?
 }
\ No newline at end of file
diff --git a/src/main/kotlin/br/com/alura/forum/security/JWTAuthenticationFilter.kt b/src/main/kotlin/br/com/alura/forum/security/JWTAuthenticationFilter.kt
new file mode 100644
index 0000000..cc2aa0b
--- /dev/null
+++ b/src/main/kotlin/br/com/alura/forum/security/JWTAuthenticationFilter.kt
@@ -0,0 +1,28 @@
+package br.com.alura.forum.security
+
+import br.com.alura.forum.config.JWTUtil
+import org.springframework.security.core.context.SecurityContextHolder
+import org.springframework.web.filter.OncePerRequestFilter
+import javax.servlet.FilterChain
+import javax.servlet.http.HttpServletRequest
+import javax.servlet.http.HttpServletResponse
+
+class JWTAuthenticationFilter(private val jwtUtil: JWTUtil) : OncePerRequestFilter() {
+
+    override fun doFilterInternal(request: HttpServletRequest, response: HttpServletResponse, filterChain: FilterChain) {
+        val token = request.getHeader("Authorization")
+        val jwt = getTokenDetail(token)
+        if(jwtUtil.isValid(jwt)) {
+           val authentication = jwtUtil.getAuthentication(jwt)
+           SecurityContextHolder.getContext().authentication = authentication
+        }
+        filterChain.doFilter(request, response)
+    }
+
+    private fun getTokenDetail(token: String?) : String? {
+        return token?.let { jwt ->
+            jwt.startsWith("Bearer ")
+            jwt.substring(7, jwt.length)
+        }
+    }
+}
diff --git a/forum/src/main/kotlin/br/com/alura/forum/security/JWTLoginFilter.kt b/src/main/kotlin/br/com/alura/forum/security/JWTLoginFilter.kt
similarity index 61%
rename from forum/src/main/kotlin/br/com/alura/forum/security/JWTLoginFilter.kt
rename to src/main/kotlin/br/com/alura/forum/security/JWTLoginFilter.kt
index 1afd3c7..9c2b83c 100644
--- a/forum/src/main/kotlin/br/com/alura/forum/security/JWTLoginFilter.kt
+++ b/src/main/kotlin/br/com/alura/forum/security/JWTLoginFilter.kt
@@ -1,6 +1,6 @@
 package br.com.alura.forum.security
 
-import br.com.alura.forum.config.JwtUtils
+import br.com.alura.forum.config.JWTUtil
 import br.com.alura.forum.model.Credentials
 import com.fasterxml.jackson.databind.ObjectMapper
 import org.springframework.security.authentication.AuthenticationManager
@@ -13,24 +13,20 @@ import javax.servlet.http.HttpServletRequest
 import javax.servlet.http.HttpServletResponse
 
 class JWTLoginFilter(
-    private val authManager: AuthenticationManager,
-    private val jwtUtil: JwtUtils
-) : UsernamePasswordAuthenticationFilter() {
+        private val authManager: AuthenticationManager,
+        private val jwtUtil: JWTUtil)
+    : UsernamePasswordAuthenticationFilter() {
 
     override fun attemptAuthentication(request: HttpServletRequest?, response: HttpServletResponse?): Authentication {
-        val (username, password) = ObjectMapper().readValue(request?.inputStream, Credentials::class.java)
+        val(username, password) = ObjectMapper().readValue(request?.inputStream, Credentials::class.java)
         val token = UsernamePasswordAuthenticationToken(username, password)
         return authManager.authenticate(token)
     }
 
-    override fun successfulAuthentication(
-        request: HttpServletRequest?,
-        response: HttpServletResponse?,
-        chain: FilterChain?,
-        authResult: Authentication?
-    ) {
-        val username = (authResult?.principal as UserDetails).username
-        val token = jwtUtil.generateToken(username)
+    override fun successfulAuthentication(request: HttpServletRequest?, response: HttpServletResponse?, chain: FilterChain?, authResult: Authentication?) {
+        val user = (authResult?.principal as UserDetails)
+        val token = jwtUtil.generateToken(user.username, user.authorities)
         response?.addHeader("Authorization", "Bearer $token")
     }
+
 }
diff --git a/src/main/kotlin/br/com/alura/forum/service/CursoService.kt b/src/main/kotlin/br/com/alura/forum/service/CursoService.kt
new file mode 100644
index 0000000..1d89f48
--- /dev/null
+++ b/src/main/kotlin/br/com/alura/forum/service/CursoService.kt
@@ -0,0 +1,16 @@
+package br.com.alura.forum.service
+
+import br.com.alura.forum.model.Curso
+import br.com.alura.forum.repository.CursoRepository
+import org.springframework.stereotype.Service
+import java.util.*
+
+@Service
+class CursoService(private val repository: CursoRepository) {
+
+    fun buscarPorId(id: Long): Curso {
+        return repository.getOne(id)
+    }
+
+
+}
diff --git a/src/main/kotlin/br/com/alura/forum/service/TopicoService.kt b/src/main/kotlin/br/com/alura/forum/service/TopicoService.kt
new file mode 100644
index 0000000..60ea410
--- /dev/null
+++ b/src/main/kotlin/br/com/alura/forum/service/TopicoService.kt
@@ -0,0 +1,64 @@
+package br.com.alura.forum.service
+
+import br.com.alura.forum.dto.AtualizacaoTopicoForm
+import br.com.alura.forum.dto.NovoTopicoForm
+import br.com.alura.forum.dto.TopicoPorCategoriaDto
+import br.com.alura.forum.dto.TopicoView
+import br.com.alura.forum.exception.NotFoundException
+import br.com.alura.forum.mapper.TopicoFormMapper
+import br.com.alura.forum.mapper.TopicoViewMapper
+import br.com.alura.forum.repository.TopicoRepository
+import org.springframework.data.domain.Page
+import org.springframework.data.domain.Pageable
+import org.springframework.stereotype.Service
+
+@Service
+class TopicoService(
+        private val repository: TopicoRepository,
+        private val topicoViewMapper: TopicoViewMapper,
+        private val topicoFormMapper: TopicoFormMapper,
+        private val notFoundMessage: String = "Topico nao encontrado!"
+) {
+
+    fun listar(
+        nomeCurso: String?,
+        paginacao: Pageable
+    ): Page<TopicoView> {
+        val topicos = nomeCurso?.let {
+            repository.findByCursoNome(nomeCurso, paginacao)
+        } ?: repository.findAll(paginacao)
+
+        return topicos.map { t ->
+            topicoViewMapper.map(t)
+        }
+    }
+
+    fun buscarPorId(id: Long): TopicoView {
+        val topico = repository.findById(id)
+                .orElseThrow{NotFoundException(notFoundMessage)}
+        return topicoViewMapper.map(topico)
+    }
+
+    fun cadastrar(form: NovoTopicoForm): TopicoView {
+        val topico = topicoFormMapper.map(form)
+        repository.save(topico)
+        return topicoViewMapper.map(topico)
+    }
+
+    fun atualizar(form: AtualizacaoTopicoForm): TopicoView {
+        val topico = repository.findById(form.id)
+                .orElseThrow{NotFoundException(notFoundMessage)}
+        topico.titulo = form.titulo
+        topico.mensagem = form.mensagem
+        return topicoViewMapper.map(topico)
+    }
+
+    fun deletar(id: Long) {
+        repository.deleteById(id)
+    }
+
+    fun relatorio(): List<TopicoPorCategoriaDto> {
+        return repository.relatorio()
+    }
+
+}
\ No newline at end of file
diff --git a/forum/src/main/kotlin/br/com/alura/forum/service/UserDetails.kt b/src/main/kotlin/br/com/alura/forum/service/UserDetail.kt
similarity index 93%
rename from forum/src/main/kotlin/br/com/alura/forum/service/UserDetails.kt
rename to src/main/kotlin/br/com/alura/forum/service/UserDetail.kt
index 0ad23f9..aad20a4 100644
--- a/forum/src/main/kotlin/br/com/alura/forum/service/UserDetails.kt
+++ b/src/main/kotlin/br/com/alura/forum/service/UserDetail.kt
@@ -4,7 +4,7 @@ import br.com.alura.forum.model.Usuario
 import org.springframework.security.core.userdetails.UserDetails
 
 class UserDetail(
-    private val usuario: Usuario
+        private val usuario: Usuario
 ) : UserDetails {
 
     override fun getAuthorities() = usuario.role
diff --git a/forum/src/main/kotlin/br/com/alura/forum/service/ServiceUsuario.kt b/src/main/kotlin/br/com/alura/forum/service/UsuarioService.kt
similarity index 80%
rename from forum/src/main/kotlin/br/com/alura/forum/service/ServiceUsuario.kt
rename to src/main/kotlin/br/com/alura/forum/service/UsuarioService.kt
index 3231963..5e8bfdf 100644
--- a/forum/src/main/kotlin/br/com/alura/forum/service/ServiceUsuario.kt
+++ b/src/main/kotlin/br/com/alura/forum/service/UsuarioService.kt
@@ -2,15 +2,15 @@ package br.com.alura.forum.service
 
 import br.com.alura.forum.model.Usuario
 import br.com.alura.forum.repository.UsuarioRepository
-import org.springframework.context.annotation.Bean
 import org.springframework.security.core.userdetails.UserDetails
 import org.springframework.security.core.userdetails.UserDetailsService
 import org.springframework.stereotype.Service
+import java.lang.RuntimeException
 
 @Service
-class ServiceUsuario (
-    private val repository: UsuarioRepository
-) : UserDetailsService {
+class UsuarioService (
+        private val repository: UsuarioRepository
+        ) : UserDetailsService {
 
     fun buscarPorId(id: Long): Usuario {
         return repository.getOne(id)
@@ -20,4 +20,4 @@ class ServiceUsuario (
         val usuario = repository.findByEmail(username) ?: throw RuntimeException()
         return UserDetail(usuario)
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
new file mode 100644
index 0000000..1f91943
--- /dev/null
+++ b/src/main/resources/application-dev.yml
@@ -0,0 +1,16 @@
+spring:
+  datasource:
+    driverClassName: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://localhost:3306/forum
+    username: root
+    password: root
+  jpa:
+    properties:
+      hibernate:
+        show_sql: true
+        format_sql: true
+  h2:
+    console:
+      enabled: true
+jwt:
+  secret: secret
\ No newline at end of file
diff --git a/forum/src/main/resources/application.yml b/src/main/resources/application-prod.yml
similarity index 85%
rename from forum/src/main/resources/application.yml
rename to src/main/resources/application-prod.yml
index 2fc6ea6..4430d5d 100644
--- a/forum/src/main/resources/application.yml
+++ b/src/main/resources/application-prod.yml
@@ -1,7 +1,7 @@
 spring:
   datasource:
     driverClassName: org.h2.Driver
-    url: jdbc:h2:men:forum
+    url: jdbc:h2:mem:forum
     username: sa
     password:
   jpa:
@@ -14,5 +14,4 @@ spring:
     console:
       enabled: true
 jwt:
-  secret: secreto
-
+  secret: secret
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
new file mode 100644
index 0000000..f50d812
--- /dev/null
+++ b/src/main/resources/application.yml
@@ -0,0 +1,3 @@
+spring:
+  profiles:
+    active: @activatedProperties@
\ No newline at end of file
diff --git a/src/main/resources/db/migration/V10__alter_table_topico_add_data_alteracao.sql b/src/main/resources/db/migration/V10__alter_table_topico_add_data_alteracao.sql
new file mode 100644
index 0000000..64c7800
--- /dev/null
+++ b/src/main/resources/db/migration/V10__alter_table_topico_add_data_alteracao.sql
@@ -0,0 +1 @@
+alter table topico add column data_alteracao date
\ No newline at end of file
diff --git a/forum/src/main/resources/db.migration/V1_create_table_curso.sql b/src/main/resources/db/migration/V1__create_table_curso.sql
similarity index 100%
rename from forum/src/main/resources/db.migration/V1_create_table_curso.sql
rename to src/main/resources/db/migration/V1__create_table_curso.sql
diff --git a/forum/src/main/resources/db.migration/V2_create_table_resposta.sql b/src/main/resources/db/migration/V2__create_table_usuario.sql
similarity index 100%
rename from forum/src/main/resources/db.migration/V2_create_table_resposta.sql
rename to src/main/resources/db/migration/V2__create_table_usuario.sql
diff --git a/forum/src/main/resources/db.migration/V3_create_table_topico.sql b/src/main/resources/db/migration/V3__create_table_topico.sql
similarity index 100%
rename from forum/src/main/resources/db.migration/V3_create_table_topico.sql
rename to src/main/resources/db/migration/V3__create_table_topico.sql
diff --git a/forum/src/main/resources/db.migration/V4_create_table_usuario.sql b/src/main/resources/db/migration/V4__create_table_resposta.sql
similarity index 100%
rename from forum/src/main/resources/db.migration/V4_create_table_usuario.sql
rename to src/main/resources/db/migration/V4__create_table_resposta.sql
diff --git a/forum/src/main/resources/db.migration/V5_alter_table_usuario_add_password.sql b/src/main/resources/db/migration/V5__alter_table_usuario_add_password.sql
similarity index 100%
rename from forum/src/main/resources/db.migration/V5_alter_table_usuario_add_password.sql
rename to src/main/resources/db/migration/V5__alter_table_usuario_add_password.sql
diff --git a/forum/src/main/resources/db.migration/V6_insert_password_usuario.sql b/src/main/resources/db/migration/V6__insert_password_usuario.sql
similarity index 100%
rename from forum/src/main/resources/db.migration/V6_insert_password_usuario.sql
rename to src/main/resources/db/migration/V6__insert_password_usuario.sql
diff --git a/forum/src/main/resources/db.migration/V7__create_table_role.sql b/src/main/resources/db/migration/V7__create_table_role.sql
similarity index 100%
rename from forum/src/main/resources/db.migration/V7__create_table_role.sql
rename to src/main/resources/db/migration/V7__create_table_role.sql
diff --git a/forum/src/main/resources/db.migration/V8__create_table_usuario_role.sql b/src/main/resources/db/migration/V8__create_table_usuario_role.sql
similarity index 100%
rename from forum/src/main/resources/db.migration/V8__create_table_usuario_role.sql
rename to src/main/resources/db/migration/V8__create_table_usuario_role.sql
diff --git a/src/main/resources/db/migration/V9__insert_topico.sql b/src/main/resources/db/migration/V9__insert_topico.sql
new file mode 100644
index 0000000..ef319df
--- /dev/null
+++ b/src/main/resources/db/migration/V9__insert_topico.sql
@@ -0,0 +1,3 @@
+insert into topico(id, titulo, mensagem, data_criacao, status, curso_id, autor_id)
+    values(1, 'Duvida sobre kotlin', 'Minha funcao let nao funciona',
+        '2021-12-24 12:00:00', 'NAO_RESPONDIDO', 1, 1)
\ No newline at end of file
diff --git a/src/test/kotlin/br/com/alura/forum/controller/TopicoControllerTest.kt b/src/test/kotlin/br/com/alura/forum/controller/TopicoControllerTest.kt
new file mode 100644
index 0000000..2e9f5d1
--- /dev/null
+++ b/src/test/kotlin/br/com/alura/forum/controller/TopicoControllerTest.kt
@@ -0,0 +1,70 @@
+package br.com.alura.forum.controller
+
+import br.com.alura.forum.config.JWTUtil
+import br.com.alura.forum.model.Role
+import br.com.alura.forum.model.UsuarioTest
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers
+import org.springframework.test.web.servlet.MockMvc
+import org.springframework.test.web.servlet.get
+import org.springframework.test.web.servlet.setup.DefaultMockMvcBuilder
+import org.springframework.test.web.servlet.setup.MockMvcBuilders
+import org.springframework.web.context.WebApplicationContext
+
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+class TopicoControllerTest {
+
+    @Autowired
+    private lateinit var webApplicationContext: WebApplicationContext
+
+    @Autowired
+    private lateinit var jwtUtil: JWTUtil
+
+    private lateinit var mockMvc: MockMvc
+
+    private var token: String? = null
+
+    companion object {
+        private const val RECURSO = "/topicos/"
+        private const val RECURSO_ID = RECURSO.plus("%s")
+    }
+
+    @BeforeEach
+    fun setup() {
+        token = generateToken()
+
+        mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext)
+                .apply<DefaultMockMvcBuilder?>(
+                        SecurityMockMvcConfigurers.springSecurity()
+                ).build()
+    }
+
+    @Test
+    fun `deve retornar codigo 400 quando chamar topicos sem token`() {
+        mockMvc.get(RECURSO).andExpect { status { is4xxClientError() } }
+    }
+
+    @Test
+    fun `deve retornar codigo 200 quando chamar topicos com token`() {
+        mockMvc.get(RECURSO) {
+            headers { token?.let { this.setBearerAuth(it) } }
+        }.andExpect { status { is2xxSuccessful() } }
+    }
+
+    @Test
+    fun `deve retornar codigo 200 quando chamar topico por id com token`() {
+        mockMvc.get(RECURSO_ID.format("1")) {
+            headers { token?.let { this.setBearerAuth(it) } }
+        }.andExpect { status { is2xxSuccessful() } }
+    }
+
+    private fun generateToken(): String? {
+        val authorities = mutableListOf(Role(1, "LEITURA_ESCRITA"))
+        val usuario = UsuarioTest.buildToToken()
+
+        return jwtUtil.generateToken(usuario.email, authorities)
+    }
+}
\ No newline at end of file
diff --git a/src/test/kotlin/br/com/alura/forum/integration/TopicoRepositoryTest.kt b/src/test/kotlin/br/com/alura/forum/integration/TopicoRepositoryTest.kt
new file mode 100644
index 0000000..3344419
--- /dev/null
+++ b/src/test/kotlin/br/com/alura/forum/integration/TopicoRepositoryTest.kt
@@ -0,0 +1,62 @@
+package br.com.alura.forum.integration
+
+import br.com.alura.forum.dto.TopicoPorCategoriaDto
+import br.com.alura.forum.model.TopicoTest
+import br.com.alura.forum.repository.TopicoRepository
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest
+import org.springframework.data.domain.PageRequest
+import org.springframework.test.context.DynamicPropertyRegistry
+import org.springframework.test.context.DynamicPropertySource
+import org.testcontainers.containers.MySQLContainer
+import org.testcontainers.junit.jupiter.Container
+import org.testcontainers.junit.jupiter.Testcontainers
+
+@DataJpaTest
+@Testcontainers
+@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
+class TopicoRepositoryTest{
+
+    @Autowired
+    private lateinit var topicoRepository: TopicoRepository
+
+    private val paginacao = PageRequest.of(0,5)
+    private val topico = TopicoTest.build()
+
+    companion object {
+        @Container
+        private val mysqlContainer = MySQLContainer<Nothing>("mysql:latest").apply {
+            withDatabaseName("testdb")
+            withUsername("joao")
+            withPassword("12345")
+        }
+
+        @JvmStatic
+        @DynamicPropertySource
+        fun properties(registry: DynamicPropertyRegistry) {
+            registry.add("spring.datasource.url", mysqlContainer::getJdbcUrl);
+            registry.add("spring.datasource.password", mysqlContainer::getPassword);
+            registry.add("spring.datasource.username", mysqlContainer::getUsername);
+        }
+    }
+
+    @Test
+    fun `deve gerar um relatorio`() {
+        topicoRepository.save(topico)
+        val relatorio = topicoRepository.relatorio()
+
+        assertThat(relatorio).isNotNull
+        assertThat(relatorio.first()).isExactlyInstanceOf(TopicoPorCategoriaDto::class.java)
+    }
+
+    @Test
+    fun `deve listar topico pelo nome do curso`(){
+        topicoRepository.save(topico)
+        val topico = topicoRepository.findByCursoNome(nomeCurso = "Kotlin", paginacao = paginacao)
+
+        assertThat(topico).isNotNull
+    }
+}
\ No newline at end of file
diff --git a/src/test/kotlin/br/com/alura/forum/model/CursoTest.kt b/src/test/kotlin/br/com/alura/forum/model/CursoTest.kt
new file mode 100644
index 0000000..12d4c6f
--- /dev/null
+++ b/src/test/kotlin/br/com/alura/forum/model/CursoTest.kt
@@ -0,0 +1,9 @@
+package br.com.alura.forum.model
+
+object CursoTest {
+    fun build() = Curso(
+            id = 1,
+            nome = "Kotlin Basico",
+            categoria = "Programacao"
+    )
+}
\ No newline at end of file
diff --git a/src/test/kotlin/br/com/alura/forum/model/TopicoTest.kt b/src/test/kotlin/br/com/alura/forum/model/TopicoTest.kt
new file mode 100644
index 0000000..fd3bec2
--- /dev/null
+++ b/src/test/kotlin/br/com/alura/forum/model/TopicoTest.kt
@@ -0,0 +1,11 @@
+package br.com.alura.forum.model
+
+object TopicoTest {
+    fun build() = Topico(
+            id = 1,
+            titulo = "Kotlin Basico",
+            mensagem = "Aprendendo kotlin basico",
+            curso = CursoTest.build(),
+            autor = UsuarioTest.build()
+    )
+}
\ No newline at end of file
diff --git a/src/test/kotlin/br/com/alura/forum/model/TopicoViewTest.kt b/src/test/kotlin/br/com/alura/forum/model/TopicoViewTest.kt
new file mode 100644
index 0000000..d4ab12c
--- /dev/null
+++ b/src/test/kotlin/br/com/alura/forum/model/TopicoViewTest.kt
@@ -0,0 +1,16 @@
+package br.com.alura.forum.model
+
+import br.com.alura.forum.dto.TopicoView
+import java.time.LocalDate
+import java.time.LocalDateTime
+
+object TopicoViewTest {
+    fun build() = TopicoView(
+            id = 1,
+            titulo = "Kotlin Basico",
+            mensagem = "Aprendendo kotlin basico",
+            status = StatusTopico.NAO_RESPONDIDO,
+            dataCriacao = LocalDateTime.now(),
+            dataAlteracao = LocalDate.now()
+    )
+}
\ No newline at end of file
diff --git a/src/test/kotlin/br/com/alura/forum/model/UsuarioTest.kt b/src/test/kotlin/br/com/alura/forum/model/UsuarioTest.kt
new file mode 100644
index 0000000..0e7165d
--- /dev/null
+++ b/src/test/kotlin/br/com/alura/forum/model/UsuarioTest.kt
@@ -0,0 +1,16 @@
+package br.com.alura.forum.model
+
+object UsuarioTest {
+    fun build() = Usuario(
+            id = 1,
+            nome = "Joao",
+            email = "jvc.martins",
+            password = "123"
+    )
+
+    fun buildToToken() = Usuario(
+            nome = "Ana da Silva",
+            email = "ana@email.com",
+            password = "123456"
+    )
+}
\ No newline at end of file
diff --git a/src/test/kotlin/br/com/alura/forum/model/service/TopicoServiceTest.kt b/src/test/kotlin/br/com/alura/forum/model/service/TopicoServiceTest.kt
new file mode 100644
index 0000000..9eae982
--- /dev/null
+++ b/src/test/kotlin/br/com/alura/forum/model/service/TopicoServiceTest.kt
@@ -0,0 +1,65 @@
+package br.com.alura.forum.model.service
+
+import br.com.alura.forum.exception.NotFoundException
+import br.com.alura.forum.mapper.TopicoFormMapper
+import br.com.alura.forum.mapper.TopicoViewMapper
+import br.com.alura.forum.model.*
+import br.com.alura.forum.repository.TopicoRepository
+import br.com.alura.forum.service.TopicoService
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.verify
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.assertThrows
+import org.springframework.data.domain.PageImpl
+import org.springframework.data.domain.Pageable
+import java.util.*
+
+class TopicoServiceTest {
+    val topicos = PageImpl(listOf(TopicoTest.build()))
+    val paginacao: Pageable = mockk()
+
+    val topicoRepository: TopicoRepository = mockk {
+        every { findByCursoNome(any(), any()) } returns topicos
+        every { findAll(paginacao) } returns topicos
+    }
+
+    val topicoViewMapper: TopicoViewMapper = mockk {
+        every { map(any()) } returns TopicoViewTest.build()
+    }
+    val topicoFormMapper: TopicoFormMapper = mockk()
+
+    val topicoService = TopicoService(
+            topicoRepository, topicoViewMapper, topicoFormMapper
+    )
+
+    @Test
+    fun `deve listar topicos a partir do nome do curso`() {
+        topicoService.listar("Kotlin avançado", paginacao)
+
+        verify(exactly = 1) { topicoRepository.findByCursoNome(any(), any()) }
+        verify(exactly = 1) { topicoViewMapper.map(any()) }
+        verify(exactly = 0) { topicoRepository.findAll(paginacao) }
+    }
+
+    @Test
+    fun `deve listar todos os topicos quando o nome do curso for nulo`() {
+        topicoService.listar(null, paginacao)
+
+        verify(exactly = 0) { topicoRepository.findByCursoNome(any(), any()) }
+        verify(exactly = 1) { topicoViewMapper.map(any()) }
+        verify(exactly = 1) { topicoRepository.findAll(paginacao) }
+    }
+
+    @Test
+    fun `deve lancar excecao se nao achar topico por id`() {
+        every { topicoRepository.findById(any()) } returns Optional.empty()
+
+        val actual = assertThrows<NotFoundException> {
+            topicoService.buscarPorId(2)
+        }
+
+        assertThat(actual.message).isEqualTo("Topico nao encontrado!")
+    }
+}
\ No newline at end of file