From 41c594c7ab09dbb9d2657ba7a8db0338230a85f9 Mon Sep 17 00:00:00 2001 From: Wellison Pereira Date: Fri, 26 Jul 2019 18:03:51 -0300 Subject: [PATCH 1/9] Adicionando git ignore --- .gitignore | 2 + .idea/TestBackJava.iml | 9 + .idea/compiler.xml | 21 ++ .idea/encodings.xml | 6 + ...__ch_qos_logback_logback_classic_1_2_3.xml | 13 + ...ven__ch_qos_logback_logback_core_1_2_3.xml | 13 + .../Maven__com_fasterxml_classmate_1_4_0.xml | 13 + ...jackson_core_jackson_annotations_2_9_0.xml | 13 + ...terxml_jackson_core_jackson_core_2_9_9.xml | 13 + ...ml_jackson_core_jackson_databind_2_9_9.xml | 13 + ...n_datatype_jackson_datatype_jdk8_2_9_9.xml | 13 + ...datatype_jackson_datatype_jsr310_2_9_9.xml | 13 + ...e_jackson_module_parameter_names_2_9_9.xml | 13 + ...n__com_jayway_jsonpath_json_path_2_4_0.xml | 13 + ...ogle_android_json_0_0_20131108_vaadin1.xml | 13 + ..._io_lettuce_lettuce_core_5_1_7_RELEASE.xml | 13 + ...en__io_netty_netty_buffer_4_1_36_Final.xml | 13 + ...ven__io_netty_netty_codec_4_1_36_Final.xml | 13 + ...en__io_netty_netty_common_4_1_36_Final.xml | 13 + ...n__io_netty_netty_handler_4_1_36_Final.xml | 13 + ...__io_netty_netty_resolver_4_1_36_Final.xml | 13 + ..._io_netty_netty_transport_4_1_36_Final.xml | 13 + ...ectreactor_reactor_core_3_2_10_RELEASE.xml | 13 + ..._annotation_javax_annotation_api_1_3_2.xml | 13 + ..._validation_validation_api_2_0_1_Final.xml | 13 + .idea/libraries/Maven__junit_junit_4_12.xml | 13 + ...Maven__net_bytebuddy_byte_buddy_1_9_13.xml | 13 + ..._net_bytebuddy_byte_buddy_agent_1_9_13.xml | 13 + ...Maven__net_minidev_accessors_smart_1_2.xml | 13 + .../Maven__net_minidev_json_smart_2_3.xml | 13 + ...org_apache_commons_commons_pool2_2_6_2.xml | 13 + ..._apache_logging_log4j_log4j_api_2_11_2.xml | 13 + ...he_logging_log4j_log4j_to_slf4j_2_11_2.xml | 13 + ..._tomcat_embed_tomcat_embed_core_9_0_21.xml | 13 + ...he_tomcat_embed_tomcat_embed_el_9_0_21.xml | 13 + ...at_embed_tomcat_embed_websocket_9_0_21.xml | 13 + ...Maven__org_assertj_assertj_core_3_11_1.xml | 13 + .../Maven__org_hamcrest_hamcrest_core_1_3.xml | 13 + ...ven__org_hamcrest_hamcrest_library_1_3.xml | 13 + ...dator_hibernate_validator_6_0_17_Final.xml | 13 + ...boss_logging_jboss_logging_3_3_2_Final.xml | 13 + ...Maven__org_mockito_mockito_core_2_23_4.xml | 13 + .../Maven__org_objenesis_objenesis_2_6.xml | 13 + .../Maven__org_ow2_asm_asm_5_0_4.xml | 13 + ...Maven__org_projectlombok_lombok_1_18_8.xml | 13 + ...reactivestreams_reactive_streams_1_0_2.xml | 13 + ...aven__org_skyscreamer_jsonassert_1_5_0.xml | 13 + .../Maven__org_slf4j_jul_to_slf4j_1_7_26.xml | 13 + .../Maven__org_slf4j_slf4j_api_1_7_26.xml | 13 + ...amework_boot_spring_boot_2_1_6_RELEASE.xml | 13 + ...pring_boot_autoconfigure_2_1_6_RELEASE.xml | 13 + ...boot_spring_boot_starter_2_1_6_RELEASE.xml | 13 + ..._boot_starter_data_redis_2_1_6_RELEASE.xml | 13 + ...spring_boot_starter_json_2_1_6_RELEASE.xml | 13 + ...ing_boot_starter_logging_2_1_6_RELEASE.xml | 13 + ...spring_boot_starter_test_2_1_6_RELEASE.xml | 13 + ...ring_boot_starter_tomcat_2_1_6_RELEASE.xml | 13 + ..._spring_boot_starter_web_2_1_6_RELEASE.xml | 13 + ...rk_boot_spring_boot_test_2_1_6_RELEASE.xml | 13 + ..._boot_test_autoconfigure_2_1_6_RELEASE.xml | 13 + ...data_spring_data_commons_2_1_9_RELEASE.xml | 13 + ...ata_spring_data_keyvalue_2_1_9_RELEASE.xml | 13 + ...k_data_spring_data_redis_2_1_9_RELEASE.xml | 13 + ...ringframework_spring_aop_5_1_8_RELEASE.xml | 13 + ...ngframework_spring_beans_5_1_8_RELEASE.xml | 13 + ...framework_spring_context_5_1_8_RELEASE.xml | 13 + ...k_spring_context_support_5_1_8_RELEASE.xml | 13 + ...ingframework_spring_core_5_1_8_RELEASE.xml | 13 + ...mework_spring_expression_5_1_8_RELEASE.xml | 13 + ...ringframework_spring_jcl_5_1_8_RELEASE.xml | 13 + ...ringframework_spring_oxm_5_1_8_RELEASE.xml | 13 + ...ingframework_spring_test_5_1_8_RELEASE.xml | 13 + ...pringframework_spring_tx_5_1_8_RELEASE.xml | 13 + ...ringframework_spring_web_5_1_8_RELEASE.xml | 13 + ...gframework_spring_webmvc_5_1_8_RELEASE.xml | 13 + .../Maven__org_xmlunit_xmlunit_core_2_6_2.xml | 13 + .../Maven__org_yaml_snakeyaml_1_23.xml | 13 + .../Maven__redis_clients_jedis_2_9_3.xml | 13 + .idea/misc.xml | 7 + .idea/modules.xml | 8 + .idea/vcs.xml | 6 + .mvn/wrapper/maven-wrapper.jar | Bin 0 -> 49502 bytes .mvn/wrapper/maven-wrapper.properties | 1 + Dockerfile | 7 + REST-Project-1-soapui-project.xml | 33 +++ docker-compose.yml | 21 ++ mvnw | 233 ++++++++++++++++++ mvnw.cmd | 145 +++++++++++ pom.xml | 85 +++++++ src/main/java/santander/api/Application.java | 35 +++ .../api/controller/CategoryController.java | 36 +++ .../api/controller/ExpenseController.java | 97 ++++++++ .../java/santander/api/domain/Category.java | 19 ++ .../java/santander/api/domain/Expense.java | 26 ++ .../java/santander/api/domain/Greetings.java | 20 ++ .../domain/repository/CategoryRepository.java | 10 + .../domain/repository/ExpenseRepository.java | 12 + src/main/resources/application.properties | 4 + 98 files changed, 1805 insertions(+) create mode 100644 .gitignore create mode 100644 .idea/TestBackJava.iml create mode 100644 .idea/compiler.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml create mode 100644 .idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_classmate_1_4_0.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_9.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_9.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_9.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_9.xml create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_9.xml create mode 100644 .idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml create mode 100644 .idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml create mode 100644 .idea/libraries/Maven__io_lettuce_lettuce_core_5_1_7_RELEASE.xml create mode 100644 .idea/libraries/Maven__io_netty_netty_buffer_4_1_36_Final.xml create mode 100644 .idea/libraries/Maven__io_netty_netty_codec_4_1_36_Final.xml create mode 100644 .idea/libraries/Maven__io_netty_netty_common_4_1_36_Final.xml create mode 100644 .idea/libraries/Maven__io_netty_netty_handler_4_1_36_Final.xml create mode 100644 .idea/libraries/Maven__io_netty_netty_resolver_4_1_36_Final.xml create mode 100644 .idea/libraries/Maven__io_netty_netty_transport_4_1_36_Final.xml create mode 100644 .idea/libraries/Maven__io_projectreactor_reactor_core_3_2_10_RELEASE.xml create mode 100644 .idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml create mode 100644 .idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml create mode 100644 .idea/libraries/Maven__junit_junit_4_12.xml create mode 100644 .idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_13.xml create mode 100644 .idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_13.xml create mode 100644 .idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml create mode 100644 .idea/libraries/Maven__net_minidev_json_smart_2_3.xml create mode 100644 .idea/libraries/Maven__org_apache_commons_commons_pool2_2_6_2.xml create mode 100644 .idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_2.xml create mode 100644 .idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_11_2.xml create mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_21.xml create mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_21.xml create mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_21.xml create mode 100644 .idea/libraries/Maven__org_assertj_assertj_core_3_11_1.xml create mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml create mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml create mode 100644 .idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_17_Final.xml create mode 100644 .idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml create mode 100644 .idea/libraries/Maven__org_mockito_mockito_core_2_23_4.xml create mode 100644 .idea/libraries/Maven__org_objenesis_objenesis_2_6.xml create mode 100644 .idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml create mode 100644 .idea/libraries/Maven__org_projectlombok_lombok_1_18_8.xml create mode 100644 .idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_2.xml create mode 100644 .idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml create mode 100644 .idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_26.xml create mode 100644 .idea/libraries/Maven__org_slf4j_slf4j_api_1_7_26.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_6_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_6_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_6_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_1_6_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_6_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_1_6_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_6_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_1_6_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_6_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_6_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_6_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_data_spring_data_commons_2_1_9_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_1_9_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_data_spring_data_redis_2_1_9_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_aop_5_1_8_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_beans_5_1_8_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_context_5_1_8_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_context_support_5_1_8_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_core_5_1_8_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_expression_5_1_8_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_jcl_5_1_8_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_oxm_5_1_8_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_test_5_1_8_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_tx_5_1_8_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_web_5_1_8_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_webmvc_5_1_8_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_2.xml create mode 100644 .idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml create mode 100644 .idea/libraries/Maven__redis_clients_jedis_2_9_3.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 .mvn/wrapper/maven-wrapper.jar create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100644 Dockerfile create mode 100644 REST-Project-1-soapui-project.xml create mode 100644 docker-compose.yml create mode 100755 mvnw create mode 100755 mvnw.cmd create mode 100644 pom.xml create mode 100644 src/main/java/santander/api/Application.java create mode 100644 src/main/java/santander/api/controller/CategoryController.java create mode 100644 src/main/java/santander/api/controller/ExpenseController.java create mode 100644 src/main/java/santander/api/domain/Category.java create mode 100644 src/main/java/santander/api/domain/Expense.java create mode 100644 src/main/java/santander/api/domain/Greetings.java create mode 100644 src/main/java/santander/api/domain/repository/CategoryRepository.java create mode 100644 src/main/java/santander/api/domain/repository/ExpenseRepository.java create mode 100644 src/main/resources/application.properties diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..e673575a --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.idea/ +target/ \ No newline at end of file diff --git a/.idea/TestBackJava.iml b/.idea/TestBackJava.iml new file mode 100644 index 00000000..d6ebd480 --- /dev/null +++ b/.idea/TestBackJava.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 00000000..276b4fe7 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 00000000..b26911bd --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml new file mode 100644 index 00000000..6fec8f43 --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml new file mode 100644 index 00000000..9eb8596a --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_4_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_4_0.xml new file mode 100644 index 00000000..bbd3a886 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml new file mode 100644 index 00000000..06441f49 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_9.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_9.xml new file mode 100644 index 00000000..55b3f7bf --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_9.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_9.xml new file mode 100644 index 00000000..b007cab3 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_9.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_9.xml new file mode 100644 index 00000000..7fc80365 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_9.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_9.xml new file mode 100644 index 00000000..23c806cf --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_9.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_9.xml new file mode 100644 index 00000000..fe2eb1bd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml new file mode 100644 index 00000000..f19f6eb3 --- /dev/null +++ b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 00000000..b8581a6f --- /dev/null +++ b/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_lettuce_lettuce_core_5_1_7_RELEASE.xml b/.idea/libraries/Maven__io_lettuce_lettuce_core_5_1_7_RELEASE.xml new file mode 100644 index 00000000..2a4e7f57 --- /dev/null +++ b/.idea/libraries/Maven__io_lettuce_lettuce_core_5_1_7_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_buffer_4_1_36_Final.xml b/.idea/libraries/Maven__io_netty_netty_buffer_4_1_36_Final.xml new file mode 100644 index 00000000..d6050757 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_buffer_4_1_36_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_codec_4_1_36_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_4_1_36_Final.xml new file mode 100644 index 00000000..444f2a9a --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_codec_4_1_36_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_common_4_1_36_Final.xml b/.idea/libraries/Maven__io_netty_netty_common_4_1_36_Final.xml new file mode 100644 index 00000000..a1563300 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_common_4_1_36_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_handler_4_1_36_Final.xml b/.idea/libraries/Maven__io_netty_netty_handler_4_1_36_Final.xml new file mode 100644 index 00000000..12fdd313 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_handler_4_1_36_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_resolver_4_1_36_Final.xml b/.idea/libraries/Maven__io_netty_netty_resolver_4_1_36_Final.xml new file mode 100644 index 00000000..8bdbb730 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_resolver_4_1_36_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_transport_4_1_36_Final.xml b/.idea/libraries/Maven__io_netty_netty_transport_4_1_36_Final.xml new file mode 100644 index 00000000..b46e0c3a --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_transport_4_1_36_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_projectreactor_reactor_core_3_2_10_RELEASE.xml b/.idea/libraries/Maven__io_projectreactor_reactor_core_3_2_10_RELEASE.xml new file mode 100644 index 00000000..b23f44ae --- /dev/null +++ b/.idea/libraries/Maven__io_projectreactor_reactor_core_3_2_10_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml b/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml new file mode 100644 index 00000000..e74f3ab2 --- /dev/null +++ b/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml new file mode 100644 index 00000000..6978c0b2 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_12.xml b/.idea/libraries/Maven__junit_junit_4_12.xml new file mode 100644 index 00000000..d4110417 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_13.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_13.xml new file mode 100644 index 00000000..84cc30a1 --- /dev/null +++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_13.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_13.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_13.xml new file mode 100644 index 00000000..3aa3d625 --- /dev/null +++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_13.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml b/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml new file mode 100644 index 00000000..b3d38583 --- /dev/null +++ b/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml b/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml new file mode 100644 index 00000000..10830235 --- /dev/null +++ b/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_6_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_6_2.xml new file mode 100644 index 00000000..34993494 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_6_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_2.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_2.xml new file mode 100644 index 00000000..fe93f544 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_11_2.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_11_2.xml new file mode 100644 index 00000000..889bf4fb --- /dev/null +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_11_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_21.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_21.xml new file mode 100644 index 00000000..6d34a482 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_21.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_21.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_21.xml new file mode 100644 index 00000000..4c5cd6a7 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_21.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_21.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_21.xml new file mode 100644 index 00000000..56e82d3a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_21.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_assertj_assertj_core_3_11_1.xml b/.idea/libraries/Maven__org_assertj_assertj_core_3_11_1.xml new file mode 100644 index 00000000..4d16d46c --- /dev/null +++ b/.idea/libraries/Maven__org_assertj_assertj_core_3_11_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml new file mode 100644 index 00000000..f58bbc11 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml new file mode 100644 index 00000000..78dbe458 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_17_Final.xml b/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_17_Final.xml new file mode 100644 index 00000000..4025781f --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_17_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml new file mode 100644 index 00000000..5f7dd01e --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_2_23_4.xml b/.idea/libraries/Maven__org_mockito_mockito_core_2_23_4.xml new file mode 100644 index 00000000..159204fc --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_2_23_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml b/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml new file mode 100644 index 00000000..af41e3b6 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml b/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml new file mode 100644 index 00000000..0bf8cf2b --- /dev/null +++ b/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_8.xml b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_8.xml new file mode 100644 index 00000000..9843fa42 --- /dev/null +++ b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_2.xml b/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_2.xml new file mode 100644 index 00000000..457c7b78 --- /dev/null +++ b/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 00000000..c4c54d6d --- /dev/null +++ b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_26.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_26.xml new file mode 100644 index 00000000..087b2a4d --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_26.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_26.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_26.xml new file mode 100644 index 00000000..6545f77e --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_26.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_6_RELEASE.xml new file mode 100644 index 00000000..eee62a16 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_6_RELEASE.xml new file mode 100644 index 00000000..1b9e6227 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_6_RELEASE.xml new file mode 100644 index 00000000..b51ea535 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_1_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_1_6_RELEASE.xml new file mode 100644 index 00000000..db25ebe0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_1_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_6_RELEASE.xml new file mode 100644 index 00000000..6a6e8906 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_1_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_1_6_RELEASE.xml new file mode 100644 index 00000000..cda4eaee --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_1_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_6_RELEASE.xml new file mode 100644 index 00000000..4f8a3767 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_1_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_1_6_RELEASE.xml new file mode 100644 index 00000000..07998141 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_1_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_6_RELEASE.xml new file mode 100644 index 00000000..1407ba5c --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_6_RELEASE.xml new file mode 100644 index 00000000..283b404c --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_6_RELEASE.xml new file mode 100644 index 00000000..9c971882 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_1_9_RELEASE.xml new file mode 100644 index 00000000..d4981b5c --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_1_9_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_1_9_RELEASE.xml new file mode 100644 index 00000000..ff613454 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_1_9_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_1_9_RELEASE.xml new file mode 100644 index 00000000..f2f72366 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_1_9_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_5_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_5_1_8_RELEASE.xml new file mode 100644 index 00000000..c1a6cbf4 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_5_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_5_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_5_1_8_RELEASE.xml new file mode 100644 index 00000000..d17293b9 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_5_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_5_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_5_1_8_RELEASE.xml new file mode 100644 index 00000000..c68626e8 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_5_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_5_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_5_1_8_RELEASE.xml new file mode 100644 index 00000000..beb56376 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_5_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_5_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_5_1_8_RELEASE.xml new file mode 100644 index 00000000..8580e90f --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_5_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_5_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_5_1_8_RELEASE.xml new file mode 100644 index 00000000..aae055d0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_5_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jcl_5_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jcl_5_1_8_RELEASE.xml new file mode 100644 index 00000000..1a99c900 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jcl_5_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_oxm_5_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_oxm_5_1_8_RELEASE.xml new file mode 100644 index 00000000..ad396e51 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_oxm_5_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_5_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_5_1_8_RELEASE.xml new file mode 100644 index 00000000..684e11b1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_5_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_5_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_5_1_8_RELEASE.xml new file mode 100644 index 00000000..a1addd77 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_5_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_5_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_5_1_8_RELEASE.xml new file mode 100644 index 00000000..1cbea8ac --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_5_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_1_8_RELEASE.xml new file mode 100644 index 00000000..8baea9bf --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_1_8_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_2.xml b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_2.xml new file mode 100644 index 00000000..9f44657d --- /dev/null +++ b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml new file mode 100644 index 00000000..7e63769b --- /dev/null +++ b/.idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__redis_clients_jedis_2_9_3.xml b/.idea/libraries/Maven__redis_clients_jedis_2_9_3.xml new file mode 100644 index 00000000..d8dcebb4 --- /dev/null +++ b/.idea/libraries/Maven__redis_clients_jedis_2_9_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..f091b54e --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..194e3903 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..35eb1ddf --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..5fd4d5023f1463b5ba3970e33c460c1eb26d748d GIT binary patch literal 49502 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%0A$pwhjXzyA0ZzErH{1@M z22-6b1SQ!SMNyqj_7MXE2cwcEm)W)YwB)ji`3Y^5ABx--A11WB3mBQB<7K!~``j&@ z8PKJ^KSa>#M(rar$h}aBFuNI9sB5uAquDlzKW+hYB&WKf9i&+q$j5P;sz2u$f`uHS zaX8$!@N2b81<<0w<{CpXzQGqSZRpfVb3R%bjsw-Kl}2UH>}1M?MLA#ojYaagiYL!P z$_@7yOl~PbidzJ8yx{Jz9&4NS99(R5R&lf~X_{xjXj|tuvPgvzbyC}#ABy^+H+FN0 z8p5U!{kxOvdv3fr35|Kb`J(eXzo*GvF6`_5GI)&6EW}&OGp=!8n`W0mr_o~Xq-t?% z_pDDfIW#L^DmX?q#mA%Jz-f86KG`^7V|1zdA#4#<=}91g$#@J`gOqMu+7H&yMdNIt zp02(*8z*i{Zu;#S#uP#q!6oNjQzC|?>fgzorE(d+S#iv4$if+$-4$8&eo zuSZJ1>R2HJ^3T9dr{tn+#JMGv#x@&C$EZapW9)uhp0`rDsISKrv`~3j)08JZlP&}HwA!z^~-?Ma(x0_AS{@r z8!(Z}5d8+5f7`r3pw_a=Z`!0r6r4%OAGYBoq3T7^xI@9xG3prNo>`}k>@VAQk>(=DIy(szD&6@u?YVdC|pJLT@lx{=IZ; zIkO4)YWp*Dpp$`H$Ok#yf;yBmHvTb@)4j)jVNF-O?$nD25z7)I!cWQ|Yt zeS<_C{i|BS4HICD=}T(|)@vd(v!?P4t4>APo7`K5RJvcTpr_KgWeB~zMLknrKMgpx zyN-EI%es5e)FNho=}qGu$`98v(QDPUMUGrY4tq>?x$md>qgNO0@aAQLMLr8XD8z%; z2Osn1D>N^22w4Xb8{~fi^i~SthAo7%ZjNb)ikgj0_AsXqF_0+W6E_doOUi0uV6Lvg z98Xk#>IK|-YHx!XV64==b(nYKMEyqPF?D)yxE=~;LS?LI_0)|1!T3ZtLa?(qd|YlXdI-e$W z(3J*FbOe3cSXvDaTHU^Hqpf2i8aH+ZzqY$cFFIH;fxMtW^(AmiMkBtb9esujw?rte zoo&0%Afb~VBn6A1@R1!OFJ0)6)Fn72x{}7n z+b#5gMommvlyz7c@XE`{ zXj(%~zhQne`$UZ5#&JH0g={XdiEKUyUZwIMH1rZTl%r@(dsvBg5PwEk^<+f_Yd~a@ z%+u%0@?lPzTD>!bR(}RQoc>?JwI|dTEmoL`T?7B zYl^`d{9)rW)|4&_Uc3J=RW25@?ygT$C4l-nsr+B0>HjK~{|+nFYWkm77qP!iX}31a z^$Mj&DlEuh+s(y*%1DHpDT`(sv4|FUgw5IwR_k{lz0o=zIzuCNz|(LMNJwongUHy#|&`T5_TnHLo4d+5bE zo*yU%b=5~wR@CN3YB0To^mV?3SuD~%_?Q{LQ+U){I8r*?&}iWNtji=w&GuF9t~=Q2 z$1cFAw1BTAh23~s$Ht$w!S2!8I;ONwQnAJ;-P4$qOx-7&)dWgIoy-8{>qC8LE?LhJ zR-L4qCha@z*X+j|V<+C(v)-UZmK0CYB?5`xkI)g2KgKl-q&7(tjcrhp5ZaBma4wAd zn`{j>KNPG>Q$xr7zxX}iRo=M#@?>}?F`Sv+j6>G9tN!g@14LUf(YfA4e=z+4f zNpL4g?eJK`S${tcfA{wbn({8i+$wMaLhSJo`-Yp@G2i0Yq~@wdyFxoVH$w9{5Ql2t zFdKG?0$ zV7nmYC@PSsDhnELrvd8}+T=C6ZcR?`uapdWLc2eaww5vKtjQQgbvEr^)ga?IF;@1(?PAE8Xx5`Ej&qg|)5L}yQA1<^}Y zp7WZpk%}L9gMMyB^(mFrl&2Ng$@#Ox3@Z6r%eJ`sGDQbT0a9ruO`T|71C;oCFwTVT zaTnu)eVKURM`1QuvrBhj;1e>1TEZW54sKUfx0Z=N*;Jpdh~Aj-3WB zR|EYVGDxSvnjeA?xxGF41Wj?~loVahklw|zJ=v3pOEVZFJG^TvR z-tJN5m;wZp!E7=z;5J*Oaq%2bc|Jw!{|O+*sja+B(0D2_X`c2)nVkzP1S~LOj~xs!@>aN z3$K2^pW}@R-70K!X&s4DHHoV&BmGWTG4vi9P1H$JxmD|t_V{GlHZv(`yJ234IVuSr z~!;~#ublS8qdL8SJG@XRCwWhkZyg_EKH(sB2}QQSv4W}|CT0ntD_4Eyp519d1%yKvc33|`yW9QzeJ4*XLP7@l=td+bwxSL~jCf-ny)IDC^~u5s)E-y^FdtU?)hkN{82Y{Lo)bCWcBOx;Jbw;)Pg9bWQQTY-3RWehpok!>D>Sa2EcEOS@ua)#G3I+GxL_ra^92Y!}tMX zwAp*Fv-aAarn`ME7N#Uyim%ynre6u?KS15L#$#rKZSgLnXx;g8TP9suMpO055p278 z%o-6eT(3gdIVFN}Gb3k$zbTyrHYel1x6OxETsk&h0E?&}KUA4>2mi0len7~*;{Io~ znf+tX?|;&u^`Bk-KYtx6Rb6!y7F)kP<5OGX(;)+Re0Y;asCLP;3yO#p>BRy*>lC$}LiEEUGJHB!a=&3CddUu?Qw>{{zm)83wYRy%i}UV2s| z9e>ZXHzuMV#R1yJZato0-F|Jl_w2sUjAw@FzM=DxH}vM>dlB&bQ!>51aGc}&WAH`b z6M6iG$AyJIAJ7-c0+(;pf=2=!B=%yoM1i9r==Q+}CK3uW%##U1rP~mwjUb8PLsi8Q zq!aTLLYK4HQ$vN1sU;d3XW{oFA{u@1$tduWmdOqc(~AqWq+`V)G&?YOOwAK20x>{q zOgII2&A_FXPzVtgrD80Y5J+_SEmyUcdM2N%q);|ZF_m z)6PBcOcAAy3kN*`8ac%zPH3^61_zn6_2FT#NCOWYx>ezqZzCC;tzM%pJC^gFAFcTs ze6C3WE-a*=nt8tErPG9zfPRn$QHqB7aHe8x3w&rWT(0F54<2uBJDYtbB}y|@9V6T( zmM!t}T5SuwxyTCma14&l|yiQRw5Pn|OiDBkx z?4tUGrIVsC9zs=F{W>zl9XeknEc+~Mz7zCnefUPUF8iF?A)QJK8=84#-TLLxq?BTM z=VYjYW%TOhrBp>3D@K{vStlEUt%e{HRc=766AQ+s7V_F|1A!)P3?y*=gUgbZO;O39 zX*BC((-XbnoaRGxxhRQRVKCDG9|qC6?7TwCz{A{OZp$Wu(~0DFo(w^P3f>4gr8@P^ zl8`!vA=_fvwTZc%-Z42}m>Q;KQ~&v;ipZzbA2;}Peg*v}TlKRmU%4WNN<%qb!cLo= zoSx;XBrv4}ErykT!)z)Qar4o?(q6!mpWLNFe~Nz0S@yI{1)Lxt<0K=Q$~>*HH+Wbp zQ~fx0aup_lZb|e6*@IJOJjw~Ypiwdq69&Y2vthfGq6u1!Joy%;v;~4`B@B*S(}}i- zmZc^*aHOK(dd(geOKg)P+J4+*eThk;P@wRjvm}e)h|#EpsV9YoqqRW{)ABhRlvGA* zL$&k5w*_-X1ITCwXiH=)=5lzjxY5tQJTBrv<{dM7$98pdK%i;RGZtiJKaSGCji7w)aNrHu_9_IPGHS-mMN5AheTn_ia^YdunCzcp2ap8eI-RQEm zj(q7_CT)o|w_noPm@MVqIjv%H4Bdo6*9*!Zj)bLx!p9POp(`$dj1QW`V=;=|`Gx8QST=OnK5jlJX3!KBz>v7j$&5b5YrhIArRVL)1C^o{@DJ}*mk*s=< zDK{e2f%fG)mK_Mz*x@#ahOO)cQQ#VH+8Wef>NKWcu4J>PIc3iz8y6PwCmY|UQ(O3!B;HtsE&jvyv^XjL7Env5#i zH4-k5GzPr-%36#%+Hvw1*UiOIk3b7F^|1dPi!-i7C^ZWp~_KI%D!sGYb@@zXa?*{XfjZ~%Y^mT!kaK_>K8 z_jL78^ zS0eRdqZ0v~WWow1CE;vDBh#{w9R4JgB!})W9N{{D=p-RMnehZ#pH*ABzDP46ryZkt z4ek|LHS{CDhTTMQa3a5fO9OLg?y$+#Gi2}Fv>QD-+ZEQKX2Fv{jr~miXz1ZpPcXvJ zNvQT@kQbBz_Y4Kg)*`E2t;tPh5_7tSGvL-|-A`lgHX3uVG4jLev9>YCZUeNNzioL? z;OBD{z+=Gs3+*ph)#bO#7IHl|rOFfvpK%cF>W??Q!Nh&B@hByD&}g|>a?GJ4uhX3g zPJXKKAh&zWv&wITO66G{PuGLsxpWSqaadFsv>_vQt?LVslVob7wylsa+O`IYWySoO z$tw#v7=&7ZGZqS}N!c##5-bC%>ze*s0H9J%d|!JgE#uZ|k1_bAn*x(Y%r{c=(HLwNkPZOUT#@j4{YfG#@=49YJ{?7? zddbK}G-@Dod&^Vf`GOo)G|`n@kq?Z=o84x{889+?F*dQz(kr@9lQ-TXhGN`)^-Li1 zb}xO2W(FvB2)EA;%qAkHbDd&#h`iW06N1LYz%)9;A&A25joc!4x+4%D@w1R+doLs= z#@(A@oWJq?1*oT>$+4=V=UnuMvEk;IcEnp4kcC<_>x=Hw9~h+03Og7#DK(3y3ohIp z-gQ$-RQIJTx%0o@PDST|NW41VgAR?CH`Sj-OTS0)?Y*M_wo|92;Oz)aya`^I0@?S{ z<%^epAw!Tw(bvSmU_k~Im^%#|0`Xkcmxj;31jX2Gg?PbzdXp9Dg~P)PW+Xi%iWiCr zV-Vv9IR5guDS2lGV!lfTWxkD8w%yz=UB`2j2Zb0eg~arRA*Q6>`q=8#4&OC|L6O}8 z)!w(idG0yk-BF#~k@Avk>an9z_ibOP*Rb;db_PsakNWYdNoygT?yRG=+5>ud<6Vxhk?P9rk!+8?xMg!x5kD*f2XOd^`O3U zlO;ImEy0SYI_J05cMW{dk@%d@iZFCNhIVtOm8$viM>=zM+EKJG%c0)dZ0D$4*-psQ zW+Fq|WmbYkBh5|^-l$w-`Uy8#T#<+3=}z!(6RadEpFlr1f6OFuQ5sG735YicWaoYR z`wuEZT2dntHGC7G*Kzk$tsm?Fd25LTHJj?Zo2RH;9rW9WY1`;@t_O3NC};dayX;Ib zgq6afb4!50qL-o5%yzgcR-1Xm-l4SE!rE>o!L=E`Jeug(IoZ36piq6d)aek0AV)EJ zaha2uBM!>RkZHRN0#w07A=yf4(DBmy(IN6NdGe$?(7h?5H)*?(Li#GjB!M{nq@C3# z^y{4CK_XQKuO>(88PRb&&8LbRDW1Ib>gl6qu(7g}zSkf<8=nFPXE1~pvmOT3pn^sa z+6oK0Bn$TBMWYTmhJzk_6)$>>W)nF^N$ld9 z8f^Y^MLVz@5b}F0fZID^9%hRL#()Xw*%yhs&~|PK|MGI8zuO!f!FqbmX9icd zXU(JOCwac|Z|=Yr(>Q3)HsXl!^$8VSzsgI#)D2XkpZ2=WOBcFF!2&d;*nF%h0I!`mRHl$91jYzqtLfNHUoYzrMzjR)u zP_|Hti4^){G?Ge6L_T^zVdS@KHwtq^+*+aBNl=hVc6#KB-It()qb&8LhnVW9Yxn&S z&^s^u1OzB(d_ByXz=xm4cpJzNzV+Txh`~H(176n4RGlY6( zg?ed(a!J?4(oL}@UfBpgPL*)KrGtM_hMIdu!RywK@d!b-{YAY?(?w3yB@Fi3g|G)| zho%)<=%Q$Lo7S-BxEjTL;M74{y+`Q^Xg#j}VvF|Y>X7s+Ps~aqT--tJNd9U6;Ej&o zj@|!`{Xy90t_Zdb>+m8tCFJ@X(Y$mR>%)gv4Vt;oGr`idhQ7H1^L3v4<_2}-UoguorcscRfdgumUVa0mK7-Wm~#vbrnX9ro}@82q=9t;lM9nH<} zLL#=1L7*f+mQWfyFnETMi*fe8AI+gdY6BM7CkRS&i4$ZRv$v*=*`oo>TjZ84sYD&T zI!DgZ4ueeJKvjBAmHNu|A?R2>?p{kQCRy zRnGg@C%oB#-;H-o-n##G`wcPWhTviRCjB{?mR20|wE9Kn3m6(%Sf_oNXWP^b;dz7( zb{blETKwpl`AT#W7E6T|0*bl?%r{}-BYdwrn0zN(DZXM1~53hGjjP9xzr$p z>ZH?35!~7LHiD7yo7-zzH18eTSAZjW>7-q5TYzDvJ$$S$Z@q)h)ZnY(3YBl+_ZK~* zd6T1UEKdrzmv2xc>eFj2^eQPu;gqBdB@TLqWgPk|#WAS0c@!t08Ph)b>F3 zGP}9_Pfp;kelV05nUfnb%*Oa{h;3Yi^B5xyDM~1r@o%v#RYi-%EYfSYY&02eW#bGb zu8(H8i9zhyn%?kx5Txx^6 z2i}CK(HeQ_R2_u?PFp#6CK zjr}k8Cx#C?DFgP`uN<;}x*Gd$-JgG3J_i3s>fk@_Po}b|JNz=Dm+<{^51m=mO;n4B&azYm{>+VhB{iyxuW+j>w@>VHcJyoSBQi=hu0;p zPw3Aj?%Ai^UeD{ySPIqsf|v0L&f_fmE7oh(s|jwbkK5^AQ9F|;a5V}EdSE?fyxdgf zHTq!f0;+-V{0oF+l_~>rMGk?f~m^wDXlxqt1@+)6Zv?BNR$+%$i z*NF93f}~4d9H2C7@?IibyqUtLL!XZW2ap4fkkxMqDZuZ>`+AfWJQ%~O2WR}NoA=OP zieg@q!mP z?=qU=EE6L0_UpzXt0qwX2tF~}c|;`#MUY2TMz6k({hpkiSz>Dxt*4-PtkAdAA*0hn zk~CK6#V=*^m5 zg$tB6rSO-=9l>GAl^DjJBHdk0wD0(L!OrcZ?qmtYbl+}s(@rtE-O=RTx*1cZq~u~5 zQPVt(IB=*?Pm;Le%#i1SFxHY|>=Y$^RF-FGAUSkBpn`|+p!4RHyv-Q(XgZ5Xg5W}J z8RcT?+4FdVQ>z~9kP5By8eM95f_LDnsnA%K;i6`OpcuJS=^n|6nH-B2EhH=dLbO@Z zuw=Ug>7gsu33`Pzy3Lji0x8OCH={?VRqFEi;@oDIS<*?dG@9X1*tlYCm4YUIMhyfo zJ~=K@-X$D z<-4dH<-5o#yMj%f@U{nfWYVdrREJ}_o4&|c*_+M6gk z-Up9-i~jM-bwR;Bf0&C5wteli>r7ZjGi+mHk3aC4mS5 zPC^{w+G%menlWun+&<#i&DJ41thvk;OKZEB`S%sZ6 zzYpO2x_Ce@fa0LuIeC=7gRHN#os!MQ7h}m9k3@u68K2$&;_mSe2`>uvV<`RgC)TKX z`J}&Kb%*f{Oznj$%-QafB}Zb$Pi%@D&^ZTcgJ0+Bk6-iOJ-P|Q10)5ie2u0JzKb2r z2C@{f?ZBcPw5%h&aKG+6%Qvhw(t1Y{hZ82YE4(Tlk`2VCgE&1x;AUt+5U*$%>P|iWLeb_PJL!VX=b4#>#QM;TGjFHBNRy+d{v>2cVXFyqaLd300 zFHWrc8lB1KSOH3dkJClJ%A5oE^31WrQZ3^-3`Zk?1GqoV7Wr62=V9C=(;#R zhzXAT03)d z9OdZ|;CjSnqQeqF-CUNR=x9x76JYnpr|T+6u#$y=7cMVG72k4f*BJIG>l1NNvyv6NQzr4U`r;= z&%W1Ri2sI5p|8%q5~zM-AMptHj_eX7FzJN7t(%+2dA)efyFbePBsClxY_yMqWbEdT z+jm?SZgH3mCzU?e^psnyd8UK zfZ$^_^}C1WYB1-$m4qwT@#=wsAq$9Xj=%IRvc#V?1azEi|RSc;M zQn;3%Gjk3D)R+3`gZplB>Pt;g?#EiwRzxON;% z#P5IK*YAh1Md<$o21R}j^8Y#t#`fP`nErnb@&CkI{`XNXulcVIXwLcS%VE4i4-!8a zpj-q)#TqXkFg&z4G9pG45A-$B_Lfacr)H85ge*yqTLAb(oY1$6Xu7Rc%^aVOmzsKd z=WEXA40~hm@7FKD9t14nSRt)m0XWkP1YbAE009nIupf`md=v&J;C}estaY0%^Z;;lf>5AF-y%Xf1QEK(}4n+ zhKsTx^bQSpwM=UWd3WRcpEQfw>P%zuhLeEdY}s%cGitMZa14Ui*Mzm%=(7<#b2gHmJ?kdeymT7H+Z8k8tgd zp-dhC)R!P!)w(n%RgOi%^)LGZX)yxC%@f@d4x@IRbq{elrCHyIuphEE6qd6l6O`;B zi0WQg;j`hcu51uYTBSSYNvY{Lkn$iu=Ae0g6o1cSTRwXmEvNcNI zv;)Z_?g>?aG`Zp}*gY8%LGI}{>J#`x;v=*ykuY@z2Erz>@b*)tMp2>=C20MI8|{Z2 z9hbyDJ7d#MdWK&fyZB>Jdm!#x_uRw%>`OuM!&QMim}baa76{L|VAuq%1UpXVHsClm zPD4}hjj{lj`)aaD;x|PJ9v@?8gZ!t5hER6!b~HJ_l9P|(h&R6js3mAfrC|c+fcH^1 zPF*w*_~+k%_~6|eE;-x}zc%qi-D-UpTcAg|5@FCEbYw6FhECLo+mVn^>@s-RqkhuDbDmM~lo<4sa`|9|$AltN_;g>$|B}Qs zpWVSnKNq69{}?|I`EOT~owb>vzQg|?@OEL`xKtkxLeMnWZ@ejqjJ%orYIs!jq3 zTfqdNelN8sLy2|MAkv`bxx`RN?4Dq{EIvjMbjI57d*`pO?Ns{7jxNsbUp=rF$GCut z7#7Dm#Gvh}E8~2Tyhj2reA%=ji|G6yr%@QV{(90cE{JYOW$0F|2MO+TM^`cAu$B7s zmBV^{IqUIbw5~muv}st`dDdIxSU@Eb>xf3$qwEcg;H+vp1^ArN@A)RtQ4hrid2B{9 zb~pG8?SC3#xctpJXWRGXt=cx6Cw!IqoJrK)kuLL&`UYYB{R6Dw)k9nKy>R#q_X|V* z%zVsST$=d(HozVBc|=9<175^~M$v$hL9azT^)TL7BIA#qt>N2^iWvMQgt;!YZt~cv zn!x^OB!3mOVj>^^{mloGiJhLI4qy3Vt-148>9j~d8coH)q|Cg5P89Xj>>hjtzq5iT z%go41Nhi}x7ZztTWj|deVpj>Oc#IrI{NxIm;qhnuNlvNZ0}d=DVa}=H0}Vi-I+wKK z*1uD=0_)b-!9S^5#(%_>3jcS-mv^;yFtq$1)!wGk2QP%=EbpoW++nvbFgbun1Eqri z<%yp)iPo|>^$*IHm@*O74Jve%nSmDeNGrZ&)N9 z)1rSz4ib+_{4ss2rSXRiDy zgh(descvk^&W|y)Oj#V@#)C658!**J#=ckpxGniX#zs0tA~NG>E#Hn3Q3wdKBfMG& zK}2y#|FLt}E`UQ6t3jK#G&e22bMBc3=C)LyqU706frdCAqa;~Q0L5)KJ4?@h*FFu4 z!s=hOC;G?Q)BRKJ1q_XJ9W5LLejp1L*187&5Bo4Of)k>T=WpQl3v#4iX$574fW`p+ z3m}r-F8Gjv1m3yTia=+2An1+E&psbXKjH2{<1xMb37`|D<%7c`0`~m0r>AQD^%nUJ`%PxS>)*{i zg?VHw)ju!$@$>xGszUyM_BsCF3*%>rxVZ8vrYB?PvDBBHQWz04T&UpxKU7{ zrb~8R4W>e)){FrKo^O5ts8O^r^t70=!se(2-(8&aTdaFU2;SR=dyECLBp|MVU@JIt z)z$TAHMKRnyX*5;O<*xm+(>Fo41G;Tk0w01ilh#uFJa{teQne`QCOHZp`&du5gkAWr@9Ywz%@P@KB0bD{lXo7PmrPC%J!A z%orlB>F}qRa$`XC2Ai_4L56#h2GWm;>sScPxhMO5a*guk2 z+56H}PZnq-sxASPn!B~W#8B1W=OQPf-lEbhOh%>%{AND;w%w;t<8%a%HNk`LQ0GpT z6au2l)=Brql2Fq{Kw316jHdW-WF<{46(Xad0uxi%3aEARVi*dKaR^jjW)$<$7QEiF z0uK-~dQ@|hxT5M|t$pBl+9IJig2o;?4>qY%<|sZ4Rk0Dc{ud;zd`g$&UcwLjY))aV z4jh&lc(;hjQaWB)K9EB@b^I)LQ~N_;SFEEWA&}`)g!E7-wzF%J8)yZaSOeR=igBiM zaU=T>5*oyz3jYaqv-RSC;r$%d^Z(cbLGwTQiT+3KCMt*OBOD@rPZ}8;)1_*l<5aBp zjl{A?HiE$Y6$NWUgPY(x@k^9)A|CC#nqZ?B&q-ceGE;Y7F{@0{lQuPnsj0~YX(VoZ zdJ})6X8821kH4_0vt$gocDeSve(SuROm_bM98&+q72$1m(x?A;;)@TWyuVXQV!{#( z41CN;(vq_a|56Yny*sb>5`lt+>?dvF0++3L!wQ_eJmXi)z_1UAmNi80_bG^|J$GZs zK^|0X@8jq9pyPt$dpiWWAG)mNg7X_BME=&UYoq>nc0gtk_YoXNb5hYb!hG ztf(P(6Bcy6`wroiv-5NLLjVBx&|;W6WwKMmB+ph%7$AJfV95||OktlFlTMqdKP0i#Y*rj`(XeYUz=adk`3hA(LvO`y z|0%R3GMWC#x}RbCNX_Cf;_wEOS}%lqj#-CXQDIpi8Qis%Radz>q0vjbY&8DdR>jXU zmvR%au!=9lMN?P=hzQpNGOJRw?Cn8@B@kEp4r5$bgdM0?Fdua~*H~mGTf}17rZog% z!Kj#>m=l>Po$A`_fcT-pHy*aya+n%rXmG0CJ6a{nF%>TfyzKC2Dit7a;!8r;X^G$~ zS03MClV}lI)S^Py2I2rLnpjR64L!#Fl!mCP0td}~3GFB3?F31>5JCwIC zC~8VAun2Z}@%MZ{PlIWpU@CJ06F_<61le-_Ws+FSmJ@j>XyyV(BH@K!JRR^~iGjAh zQ+NnRD1C)ttcyijf*{xky2tyhTpJvac8m%=FR-LL@s>rN`?kMDGf2yMliwkYj= zwEEJ0wlFp%TmE6|fiti_^wVrxJ#gh7z@f0+P!kS>c>;BHH)N`PW0JHTqA?B~fz6H+ zdQq>iwU2Kne+4kR2e~l2`>(-^qqujX*@|w7k>s=e)Y-lwoI{$Tx_2}&y$9LZzKG-w z{TH06d?a9;01ze%EvqDCEt;qAaOYdf@X)zT)ScQs**7gQ**A5+o9p#P*X5~lMpNl2 z6p=Ecy7#f++P2sk;I2Nd`w-!5Y^3QHV0RVy2<55pqQ z&Q&b+JIKTf&6N(UjwrECT(BwKhkdpc#(Aq= zyG*N2frC~4B2Ko7O)bOHP8(}XKc;_(GP&+{?#dJ;Y$YXT$y<%YZmc>C?Sik?i?6E1 zk~VKGMLlNws0d#wk-11tBrAf?Tbes4F)oqxr_*7R-?Yn4IlyyP_ce6(J&tXSFI~P^ zYG1K1&Y@OY%nE}Gsa8~iq!!=l4a+yi7?Rxi#owl|2CnVfey<;AkI<2^CN^r`;-)ob zX7Ccao0G6Ic0ENcm7#3(8Y>}hb9aL6Gi?llW(Kss_CW07Z*0rgVhbod7+2-z3EC%( zq7QLJy|>bn^fyDVwISg;I%*4-lpnL5wLoe=B5sV^!Vdseg%7piW`#>KU*HD}MZ&J=jCFG;)9zqX;~A15Xsg;+mAtJruykiiD4Qc5$;lWT@^-j>F$$|0*{U zmrM6Kwy7I0>uJ&DC#8>dW7&)!1!_uGQ@Mvr)n^bH?_w|*J_E0?B{C&x%7+%$9&Umb zMv=?f8jwV=X`(6MfQLkyXGt_A~#T^(h~B7+v?~%F6k&ziM^m_Cqb!a zf0y+(L*8N@-&FfWsxPx%V97(F{QW`L&>2NJyB_}HBTWa|xRs*TT-y}_qovhF=%OCJ zf)sDf8#yYtG3ySQ*(qqz9dXI;CfS6yLi>4H9w9ii-!j5NwHL>oEN83>IsEP+V_1~u z`?}q?(o8RjDY5V?z9HC@t*0V_hFqA|HyZ8k)T!UJQ`KEKMLlNlIq<$2s!x;)o#SW0?w*zVYU?yc(v(2qyZg z0(^T!7Qzhpm)`?PLS7z|(>s+ZUO?_>f0y8LjB9{7he}@4-%l99L!vhyLW=yQr!);4vCSd-wC1QX-%H=?#UM-D_Wg8t3W z0*rY0Q4xwb5i(lBSOs^u(IgRSP$j!PkhbcIr^rh}e})V_kU5jW{q)m0CALP$`wKi& z?444cDxl;D;SqSw0^h%eA6Ro@BhxmD!}qpGb6OxRi6;iFai!)ctW|gmF3jQz2*O}Z z*TPvZAxFr1-Dd!53U_WQMQh$aauyVf;O60e>&G;Mg83(TOZt!6;s2KT{}By>k&-_m zA1YA0q3ID6fx`!qxy=@dYO@Rn%rEb~7P_%;Dxvl(WAfiJUtti0?~ah#_1`K#A}P2n z7^D~GQL#`hC}2w`btD`i%)VBWnn*jWF=d!kI*6T5-wBdsT)$EZD=mrn&EhxJQ^3>1 zbLeDA3&BIDAv=kWsp0t6>a3lITA;khMX^(B8Ecb^U%P-|RNGB@XLq*Q5a zR9aZ8RFNDYvD`dcva-5ti*`CcV%ltLG;emYG)5Hvo^Boe6!Fu0ekZ(k<<5G3_4>Mg z-?ILGT9yB`Gy?Cnu(PO#(bsKyf9>@F_MJQFZFaBE?dA7x40K@HNwA20g&JE&q z6&$MUcmsL)Sq;;@a9!*!?ct(XynVCJutm{pZ5w3Xci1lQ!9oB`xCdL! z6i6sX5X8iljX<8L4KC)P_hyjfBo3W=8BfQ5^inG|_NhXI*k)fvrDRq;Mtl#IdM%t^ zo(9yQnnQj}I{C__YBGYykMvG(5)bL%7>X@vm&+vnDMvZ(QMVC;#;@DZ9#6!r74JA`7phVA#`JE` z>BU^K@B>jj8Maz2m^>t$!%J^m)e|Ylem4L>e=OHtOVBCDy{0or$Np^VjdNl=g3xT8 zqsE*&O{Q9{>LhP;F2vpR<1t@fO4^Fbd{cO753U@l zLFAlS*(cze1w03?ZyLxG9S&n_udo?=8ddzgt#cv5fKd+uyogyl;44IK1&z^wj=!YK zzUD&kgK%`pt9A4nks?WMImECKCAt*xUXcPbo9e1&PmWU$X9~!}HO|j@r(`+=V^^Lc zcLMKF*Yj`EaS|pmb1uaDbkZvx6m%4{=z+MdgTuv?mT=4T&n?h7T_tQNFYhz$`~(DF zx4T%9nS-@(gWPm3?tZwJIpHDGWzAJ__zZKP;Hw>~%&n=s$Pn?6CaJ>bJzY?o)(O#~ z1fxWpkgP7ukZGyitR1C364Jp*?#{WzBom;9o=XrY;V#_Y5@5*}T5v*hcW#I;Sb)H; z6^g4&{fOcGP0zWCURc5J$ExdSY5s?r-^r#;|BS)8NjQH2--6b}!Q-Aa$mx_pNnz4q z(1_zCdqOu|4b4oo+-*jjTTV_j3WmL9=u`0(l@>00B5Vg?4f?fqwWRCX*2JwC(Yd+i z5A-Rm0r4e~4ceSJnEmWF6Nk>Q;(7sYyQ<-CgPa1fO8m6_pu=Maf0e2hd92Q#i7j?U z-VR;%F~r=@Xs>J2`Nx))UK=X`Shhg3AWzbwE<#%hM+KSQ)y~F!~7j*2}qu zgT9Z6kE4Z|n9Leb=N0%JnFI$AeNrV+!>E(WT7dyOjN~44BhNVL4(%Eo(1JGjS^)Oc zjSPsu`3wT8k`$>Na;G3pMU(9;+ov}PpiRt6*)WNMy(rEUak-14^(K`73yJ1#LZna? zS)ypsH=xt_ z1V%Pk;E@JqJeE1&xI}|JylZJSsu+mw#r=)G*5DBGv*`Q|1AC+!MW979QEZ{H5*8ZW z_U8EI1(M1LDjG^#yy~(OGH)?SdmR~=ma_^2Q#k>)`v#$t=~Ih|79!ZutXQTK^S&w` z1)ONotPDL(cz!_@bFBBOo6W@;7Zz--d9JaOs{)ss4P|Mr%>FaiMR=(fn-Y3SA->6~ zp`5h}dOcY_YfweZB*^el7qqa$&_r-Lg-I+9~U z`JxVCD<$VmoiR$g^3dU%7Sij)XYi*?$#ihSxCBHGOaRRr|Lo9+E}O~M>I}tnokI`}F32Aty#b8rpABEKl|B;*o8ge^^)Kyk z0!(>gFV=c)Q2Y%>gz+sa3xYTUy_X`rK5ca{{erC9WJ3EPKG{|Nng_-78kAD{oh_=K zn*wopK3cG}MBJf%6=}9YouD;zyWbjRt%A#pWc1zb3@FB`_Q~~UI!uvse(FQfl zUt=Qy2DSjwpzAUJ048~^;@Yo{C56R_8nZEeF}vm)0xoYe0y|tYI!>Y(d}mSro0`z; zeb6Eg*(a2{5Ypj8S$-_~L)+IlozZn|Iak`$jQKd63hldhts0=m>k~HC&`@|~;XaG6 zLVxC))8>^?13P*mV#ydlkC0V6AWK(BjWpqu| zbh7#bkKuL<kv5;Emm4zkF;X>rfbzAc7!Z)i};f=*bypYUD zho5-B5n;)FP(nzq8FG3TH?7l0vS{G}G9@~zxY>CqbX^mb$|JncS3I_2RD@?I9bz>LbX13A0N_LQmd(!3AxqmR_;3bJavc81%v z)Q~pDm0d1VrVe~>X?GOUOz94e6Nbt|fe6(S@cN64Gy6{i*TPukTmfvgPR>+qe>)@w z8mS6=rvR0~cqVfEWFsL|kZ3t~m-iV}va(IjJ;Hh4R9uISa6;@9d{D+7CwskGx!7MGZ6|rdE_I{cMD}-` zoi0%doDSznN-Evavf!_d@UNJt*Fl;hNrnVT2Fal8iBh(LU^l>8I1%x!q=6A@zO6O} zs0R@~z(6E;t~6L7tclb6A}zwwIvS;W`?F>>P)INWt6N9r4JbH*;&^6B!lHNAY+v3R zwCVoTTSL`1XtRZ_9vWH*(HcV?PImcNBOtbC4{U(v-HA~xMdpP8<);Xv0y_e1i%t|f zdyL`MtgjoC^Z-wGt@&6(9Wx>;qYcYwopK7H4iejT?T|>BSm)-fV&7yB;ANW4ZRzzc z?^;uh#-bDq@QjjBiIf-00TSw~)V;r?BHNEpDb(dLsJ_Z!zT7<{oC-V^NTEs|MeD0- zzuH~jmz>@&JaYIW>X&?~S>~+R!;wQOq|+{tI&#vV^n%|7ksh!vXzONlSb4zc!X;}> zMaUjix==sr4oMiHxL@~MPL%PrMzU{DPuz`9zWln9XnqKqNo3TZc;22OZ{ zy(90FLmd!qHIv!b-q){c(0@VYnzE(k5#rf~N5m{u-X za_J$`vM`7Bh@_`N%&n~35!O^m^pyWGR65?W@EH_fG}veT4I>@L72iny$1yuwBopv> zsSxe4Htw2+2f`M-+7|iva$OjEp*e=6r{J`{W_IyMTo#x0Yayp+V8z~17Hx&~6G%t? zN=#7bc$BWFl&qzMvU^iRl>Rvj(_`fR9T%ZBYX1?fg((%9FgbGrBl_7^rRQW9GA*@E zLN~c4F@W|oNmH$kHZ)4U$u(P4S;GSPDy671d;6L8z}?RfSb0PHN)PsKViOm_PLB-7 z+-+jjpC&oGWj(BQ{|L#DFOC3+-%fvGOOx^u^Ysxsq)Ox4^;}rM$!;(?`m@wtkXb~%u$Zx% za#IBD9hq=no-2H90jB}1^>TfWp)=Sb1v9w#UAHvYbn1PpHFbB+hwSXWK(ta=^8VN< z^j!PhT^ZXf#;?$ZWkn?(vJ20u-_SsGO1os)z;s=hI)d6iN-4mC9>EtcU@Mybflo@| z82lRHB)FEu4k@P9W+a)>t{^Jl;)gL&tWZBy(gWmfXX8XiUdnU>LtbceRd2RogiprV zK3KHRpSd5n#Hy5wQ!-Fg;{(9?K%pRuAEZwPR-E)JGeljq?MUmP=K$zkEO46*td&DL z%C4c|+^C204zq3rsTdE?%Y;lc1vKitClZ79P)GU-k`VCL5(kX_>5D{)C18r$^duj) zab$~pZ#$FLi^ihhytr80x6p2DsA3IsHPguaQ&s4izcL;7qGj1rPQM)4uc!I=d^j7S zs{`eqUlX0}s<8@_Iij-NBLD<2BE3VJ&k4Z6H;z?!7!7-XeeC-aX{Tl6ml!93m*cFJ z#Z5Q7fr}UC|2wXN*{|KEWPZ(V^*agnsVlrYkAd651IAl&yHxt9OnMCJBht5xn*lR2&NabYN zSWC^|d16K9!d@LjLiX4uEhz;%>2G#@i;bdI;t=8bK>y@P)WT!mDr~z}pG- zRg0M$Qpz0mbKF!xENTw8!Wwu{`9|04Gou}nTQ_L@`rl58B6UT^4~-?*}V`fYfKSaDIH zavlsK6XsL9-WmdH$C72oMpwJp)?;)Z4K6Es0B$SXP*QhM!gvpdUyI?}p1c2yYhY~r z_VvRqI~hi$_97U@cE5#Z{Zhy&EqB*`vAMpf?Ya?h{;uuk-}E1T!ah4kx_Q*9mOjl* zv62c1x-eMCSfQ*b3b|P6*~#_2>fN2y=iJQy-I$q_TIV>AHLGvxzY#v#{w}OBR>mny zZ+4AXVq%F7d*h&{U!c8&&KUXS@X->Bu@pTF71|eeQVYw8ns~h`7|n?)2@d35c_1Jn zeG)5*kFZ<}MejgYN(?7Nw?Mod)k5v*wm{$@osr)Ywv-QvXpeI;3Qku^T}zo`go?co z|65!$tORilITCe4GfhNoqaj~NtO|@obiA%Tub@&qQ)*Sn14oz#=<2osGcxe*+@PL< zyx=_nR&*Un8g$Iu#el1FV8xS6kKlqt6Q_nLmsoyCCicctlpM=xVMApO3V7u00mxNJ zn8H5H7~1cY0)_}KJSfc2QSG+HDoQlkX^Iwi_%Qb4&1XPlDw$%cwf-dlhzTK+<_D-) z&P@=34aLr)@%x%0WcLNFBZ4im4biAYc zX48#WytT#YP@@jEfGgaR&J#HZzJa@HjxyMYHe{pLPnxkn;~Nj*Rk*wS5*frI0o^@# z&G3U*-hF=Y_v1Euf&ZeY$+hsoi~%M`iq}OU5nnKjI6qCo7#tk{_f3pIO(8(pMmgCr#+;(8d(-5n@oY{gBKSFB;sfY zEGd8%M6}wgw88w$*dURSw+YzI2N!gycd}~V$*T@AlPt*-f=web80-YsRGL; zIurEoITNgt(oy6p0G%)TAq})jmI~qDOTd#8SWUAuE(*k}kk&NIGfR#?MWZ&@WgOiL z>$#C7>im5ft}NgVUz#o-;GS~3h`u>vuPTQ6J_?slXE&+uSm7V8X2xqGN*g32wQVF? z60uDVd}|BtzXW}IHl+O9$Y${gL@oN<={bc5POfF*UaM4*ulAX=jeCFG9716kCF{ap z+Aa!D*;gIqFWp_D0@7TOln&`G=|&m}X{5WP1i2vScNypR7x`wGaTX8H zJ@~rx)5+w$k^uMixVE%C0WLCO~Q+tBA;H0@eFG) z9eC{^DN&Wg*!QSPZ&6UQTXd8o&~Nom);LFsVoC&=vbu|xNN`s-1=AH*8)z4To#%#y zdd$@UB#=RyuU6;>-mgB-YAnr|4VG~L%5Zu?2?e8cV@hX1%$C z-Y!`@^OUFtA7Pe=$M(LJiXU=J1!QUEtKOP0NQ3X zL0EH2;5m@t@SxuG%G+4`P52~ZYSYtf<5_!E_05F>!Og3NVhP<3((hbndMVWA>MlDv zn$&G-7+NQ3%TTa+SwC{12rdHZ(>d@r=%m6}QzK^c#Jf1mYV4ihwfN65H)@P8$MxDc zTjl)d2R0#MAxtC@z=02~@CN4)F3cc@}c$eNk#9s}m0 zCQU1m>8KltX-7??Rz`KAa9O`78vwc z96b`^On^}8Uq2X$nJstj(oDH3I)|mIuLz zwkCtM6CN9f((dN*4jqG4{_r(Wh z2u?7~;PfTgKZy`BNs+soV7l`vUoj0Zs59#tk&2GGS#}^vM~n9_o1()DH&=e+1J8g6 z?KqAZE{5+wu z^h1JTDHbTO>mUG#C?;6@CZ1@94=<&=#wE65{;Up>sTq@gJ?nsNSa6zE7ZoR|eSK`& ziwVJeio-qK&1`}djVaTPBHAtX-iedlv!W}@HqzoQ&gu~oM(#ZleNhagi2S^z0$`*2 zvXv*_l*3vp7N$6SniJ6keA;%N);Z;F2X+yzHXEKK>|!l-K+oBIB9Rg(r?T)}`0nwz zW>J5H2T!yBBQv!CV3wS!?e?ao$JZGHB3>?^p;I0oEq1rFbn-K-z1;UX^Zco(t|y{F z&aaht8|ducgto&gzsFOSGgDA6d{NN+DwNR7IvD2_ztxv{`PTvRQAD{R>ii;bqI6H$ zi~7*gkXL6sk*D( zRfRn^T)TGZOa5H8)%KL|b$feS+tmm`x=ir7xA_SFtXdrfwMW*l6LlqDsdN9czC4LZ zxQ1hx2G%}RlTH8PFjxmCx{XLh9X)5F)BD@x`3Yu(w&|MQ@Wn))MQ5P40oe6lq zj6&YQ)Y$fsl?yoMn2DRKmBXL&;#5@wIec)ey+_r)wLWKQ$%Nl|=)1S>2v2Br1GB0z z{26J4KqT_fthh6KL4A_nUGh|M?rQeB3d2M>f>?eF=%>&KBi ztb~177I8YO@8HV-(xw2pP4vCgNM_ODMc*XT)Vb84bZ$(aRZCi0SD4Vb5~0yzn-7uD z8&6`h4|PfG#@4O=sM;eev2gieyH}I*Rnq8!MO>k8@S&aMNX9c!hpUjKeRDUN*M<4& z`yP541rMR2;EXAYLf51%0hfLwoLO*VT(v!KEHyrD(8{a*@p_=xOtG6Ck0QfS>k&u_69rGu_Jt&YG97L`S7&3_{l%EQ)VAjX z2UV7D9)#I1Jv#8Fd6X+dOxjZTXFW0vpAv0)rZ!Ck6!Fz&&ZCezKS|5 z__!pv3>!#(zZ}MQfb=Bz4!aBypX`XnE#6B?yfTCmP8;tZVe#%QC2|cSbs$Q7mx9Wk zrhgq}S`lflHu@AX)_|0m0Dgy%FGt|ZP!H;(BN8Ff)p``6P$lT2Z4~=eFDFmYJt6Yd zs+IG46y)X4Cg=VU%>5u$6hq|9hlX$~MPeX{3SWik%ZBMETV^`}7l|$=T9oPv=>MfAuVpVuT?xQI-5MnhAwB~WKF3p#jb^%x)hgQ5w zEYy^HY%m(3qgTb0>_xhyGy49WgkavN*iwr9){qxmZ}0h)}ji`R&Z0sEAcs4@JVrXS$uNXI67&^So5DE z_wSSV)|hizP*Za+cCTn0^tCx`&1B`kM^^O^qqM)Or4WgFyEKhu_AWCV(8q?&7iiv8?d=$)b z1MCx)Px;%)v~QO*(UKzoMpj-f68L&<9G&jy%k26a6l~xWa27d=0zy9Y?Knv>uTy3B z#R4dYL0;(wG{B!VU<) zL0dQ}cE7}kSnh!@UA2Nn@KkO8%G$oaXs^?*bXW`@IS`edO zPr)lZK}u7D_99TTzwi<#blDq<%z2HzF#{9rVJal40r))tDNA4@UK9YkbOz5og)RphDfLoH8TaTJ5@i1x@Ntowsmz3c5mldGTpqbAC8z+-y z3YUgK2;tdm95YQ4$o=gR_I;ot|JG0jq~!w!JryDgGKTgLd#SK)h0Z1kh907bO~U(% zT6jiFnX@TWSv@xNo`&z|2;9Rf1$ArDtzSTk!BFYr;&ymtj4Bt1vK|q*ut&Efy?Wd; zk}_qM;ziWm-`?rC{al#%^wRcw6wOCC6Gv|Oa7>zIK{tOroHE9p3-q;DwTZq9(y|SP zOB|hi75t%%z@ZErp@owZiI?H$xHMR7h2k#XwmQmT>7xof5gx@XC`fVWVA~cioSE&K zoAYasmf;04$arj zg1&eL7=I?+WRf^o3qFw^#Y?d9v=-_zeL94x2|usB_;~yo&#*;J>I2Yf+qzIM|Bzwn zf!lXOXQspLmvN-cJ7Fy^Z9K-=NwWY4W8RL-q!b82mgurWTar+^3SwpU*Swg_MY|-s469h*lM(kJ74z%e#v1B%~p6k+k`Zr4M;9Y)5 zrQ#%yC8mb5QdUfV#)WRwxc!2-9CA{=B zX*|`We_=f<%xhLdJy`#KbR#+lj|R6pJG@ZTcZtr=Ff(n00MTQyi<~xkl6_QIxuYG4 zAn6QsfWJSaT0)kmDQ#9{(H8{k;(F3zbIvl5oA9MZn}6VxAW4VEuDJQJ_tvW3^8<=i zgp3DjuXDefv#|&0?0j(&4lc6i2+%kQ@a&fm9)1GxAuGZrRy#lIac(Y6!xvAGHrz|( z)4AuuEkq7`w4@FDUqah3+{y7xTbMo!P#&kbRy-1zFRXRTL}Q62x?q@Ltwnr zqyF|*{ZdFu!MG|}fKcf)Jk0y#Qk3t&@IZLWry+1U{!CF4(R_B8fZnVnvN#y`yJk&8 z5o|-I$t$7DEs@z0(ie7=MpaKrn9UfAR;(N*a)J1eej0*KIXkIFx?K6bYtjN0RG<87MN5Ph zVo*0Xd;_STda7fc?U{jG%U9FOdo7NOGFCBEBwR&j;4Q&)m*JVsL7mSZgs;+{K}z*uLldQDk~pDMMpTRSMayDpW3jXcP-aFaK4SRwhOg43SAApaG6v=#1q zJc}I6RObkNMZVE@gW2>|4+xVVmeNu`#F_MzWq24w2tz{n%bb;&u07(#9!N=hc`@qKm@EtkN&lDJr;L zvk}HQSsd&o7#d_Yb%Py=9{clqy|F19S81|cMmz<+n!5J&3Ck5~Y}=}arb30r5}^V2 zwD^K-=syNKf8H+4r==Oz7M~|D34$w9WiTg+r6;uognB=hj*}U3^eWO|j0up?kWWmA zbEER8t!`eQ+ApRkQmsrzPN32!_e#P_Bfh6aGOTD3gOGBH=Ob&R+Zi30Sc%Aea9H~7 zEB4j%17ym*rkGd>UA_HLZ^3@`9`Eu;NC;;HEL3An;iEgR+j-;5@XGL#4o02(SG@?! zmNW>y;+PQTA_i>3r%-PIQ`x*!@b_24mk5(I-0 zzIJW*ZBIgn{B;FFhh;m=5q`WK>P;)21@!H0ON)E1P2mW93!PsfiMK!~#1#~LLfyQC z=}TF_5|H{5J7GF~A2vvJiJs7KH5%w}$Y@iz%2sMQefiYTC#VW!XWSEusTc6L|ImO) zFuc>MCylPg;Rn_By}7kLshEh9A0guK0m6Y_KKvx}_MX5@{;8^|M4lHz59q-^n>s3N%P-)wu*Apy1c*uY%ls6{?1UoxSMsVN7r!vmY$4U1ZpCFZp zSB*$nRK#ut<0W7!D`6u+bGR?I9e<3Zx6iW5FM1YNJ5roEjQwT4gD$elG@b7S?XgGj z6?8Gv(sGLkkFv-Bz!vs_FSNi1>W-{uoLZyfxL5}8Z{yqaEK9mx*?8EyKbB&|oe3nO z8VPv6K-BGik_oh;MUxzP=SHYz+sWoU*_Pc|ZAp%rEG2OgkyA{O@|sV48aj}*$c=#ReFzE9^##pCm4G| z2ExX>|7BshOX&F%0r(Syy*@UGUX!?ky}6Zz8#t5q|1GZL;`G!$N@DbUPo4((w_%ge zvSuqV7dVNPK^Ue9v@t}A{2cJ=Vt!H6_jWRDXA_0fHLnagK+aM{WcrW(C(d1S@nS3RlL zUYh7&54coZVswV%&><$802)Ds6(5Ty!)=(|2PPPUY}b*5H@uVe7@L=Qb0@q9St`u+ zN_!X`!fP90I@Pzd3+=S%-p@UT)RD36;vT`l)y>59$+Nk(IHfmD3&VHLW5m_Y`<9v9=7o^jo4Lz36MNl!%1 z3c{>#C-z6vmYddm?8F5!nukB?&9Qdzs!KMBj{!#L!8zi1kBIRuP=&b|uHG%D0++Ww zKF=0w;?gq+M!;#eX^_}Pr4<(R>gE(Ur;1)gwTux=f1IQG>fb4lRG zauq6JTk=W;nN0r%g|iMMZts2#+~Kw1kA-3nBBM<2&r;0npESg~K6u!!V7Y-zgy%jr z!=09xB~ev~Jcp)_SGwX7G$-j)q(48uz%aSH{(e4l252lUj``uz&I8@A_=KdyUZ?@Q(rXR552h$Wp&%Sm$b-Okpa9CMXW*$|8A3#-)8|R{nX6* zrI}P?wPY7piep=yrIXLRu5>57uq2UvzR<1~NwK~f8JrI9srnbs2UA;5UgdfyLRR&X zAXqb}GL2YZjX`a)UZ~1kU9Bst!uiUq9|M?TT{2V70AVJ|-z~5F6{)i=C=%eGKF6%Y z7Ft=6dZdWTXx8KXRhtxFSRyM*AuF=@3GUfDy+`L!cV z`(^xDDBY+K4#OC;>}DddEs8FK>ce{#!e2#ud;xxKyt5wP;!mD`4l^XIWLkqgMWo%f zaflwyB3@QC!jweeSK)r;DGG-cCu&bG3U3{ikLdi;H(v7DU?2%M?3qCC8b93Hb2PJ8 z@QeX-JYCs{mGVMLlFvfm&_dn3r$3Xx;jR^+ts(ChilDJchx+!Diue#c4B z*?P;?K7WLbI!9T{JovmNd>w<{$E!;H66`ObfV*qFGyRM4F5w9=Avky7CqrbX!vrp)1mkD1rC#mdLXdN5pFSJ z*(*Zoh!M$6Z&r2Qz%JRl;UnMd*_o@|;^NH2X#LxwMlEsQulGJjB@VuxX*cV4`Lws> zjl|ByKhtDk-fUo=Yh_xY^aZC}aF!_|(lIkA7TzQRY(t0p>Gd&tc> zes@Omai_pyi@$|MbZVE&ERRd{jvv1`xy40nO-yXFC#y+=4&S)Sp)+(Djck1bYeH4! zm3cZ@u`K`0Js)Lp=f+iJs`n|0M3vE<8>IBf1WpRk4Sn<9nsijK^v9}F8FXx52olT* z%Rek&eO%wFlj3mYQhb}!v=YZXUUOO=$D~YwDZ#~m7 z44|QAFF^b`OSw!ZP+^L^zK)1>UerWGO_E%p^2sP({CtErlFQfrt$O>4 zcuslow^_3ri0HuWcigZz2w%Q*7cm;>40)1o@kz}pysE50TzoIPQwuXFW}elhNffQq ztZ)$Oz@XwhOmbLQ@ zHdq2g<@TQ%lSARCV#zL2X2O~fLkuTD81 z;n(NWjoQXwD1@m_!wBJ5PzLd0<=A+CCKTW<`dnOI=yAmO5HaW9zyjJ<0ws*rHnyd_&^78n&clLII+-hONNCDg>?d-5cWDLC_b)9n6o{P1CU-$7L407s-_ z-pN>_?^HhHRDQmVX3NRF#4(=Jdi27iXbVZSm@Te&4UHIPDSbLIRgksrcMi!}LH8kx zi1kkV?^GlM!Caxc9^)p1vBDD=F(&PD^l79>spQ`#vz{QD@ z9VQiviBfRP&y$x0E-FU?(j7DNYgz5FnO9-1U7Fj10D;J3`ywYGRtdNp5Y>Qo+1-P@|$#4vrd!{It&D4(5 z88MK>t&(M*q{{bk+gKz8BV8NoUls7#Pa(Gk7HG*!WO1MnoAKw=-;D)9T2XpobRN@;R9$ zdDZ*TNdMDRe3pcxxWT#?Gvz6$N>L_At8M<_Nu!G9BUfJBQ zeod4i4j8la+F6~Ch&@o#a%JWXtFx6-@5vSL5;@>X>|ze$N=4Jovjt5>8c*=P)os?J z=UlsoH#$Jz7vfg0g=+%Jf)w{Z(Z%^d5W}1#^0}%BgEhRzNs8I2&P7V?GtK0o$CS>y zS%AH91idyPyNX-#5}K5@2VRQ>?Da%6Q(1)*NzRxW9-2LG&+L zW9v~&N*UPrd!ao6TTvM1O*2z1?grU81wdZsv-2#9){B=Yo58FPq{90cNRy?PdBzqr zbXR&i)#}mnzKE|yj_#pCV$njDr<`4a;0d&q@G_^+74Q(M$6rW^ZRcZS?r=zYm%#Gj z!Sc1I-ZxAVPnlVmU2ukuW86&QC4@4nDGZNmY%^`PdC5+u~%7?p{5Ihg@E{qe%G7|%$x8>B2lP60{y^WAi!)2f5_jj zyAZ&Czma_OcZ!1f$!-?4yN(KE{v8Flf2F|VM_l1=DI&Z}(RBvZ-?=MJurdV+bx}qc zMM>r#Mp-#9xf(Dlj7$ur%9-=K=m+1QT9ro_U?#&Wv%M{`+o5WT)8b>jv9 z{(W;{+`KsjQAHU^2{m;l1<5DCcK8k!lt%~8FU9>xGEa>%xpxcvNwk|}rEBVH6gs&y zcc%2{>C}&E29pz0OWd`^u-ES8cTVPzX`)(qt=d?&K@&=Rotx78SlqgrEVG_qUo)_mC$8U`F#qlHOCD&RSroexT?YJLzvne^0W z@;=|QRR6AVW@n3W0fEJOGM5gbEhzW#FFa{0FL+k>kgt~r3DnajgxZvn2mk*LWvgsJNdYFw~S!X4cFe+Q;Q-_W%N z9+%cg5D+rIfU$v>NB;`!-|$Y|w(+s#2VpgER|yU}|IL~d1DHEF1OAnnMj?dmwqP?|!Tm)27hExl-^LX;b^(CT z!UODGtX!?!0czl=9(xOLEjt>6{g40iN!)JVBc;&q!{D7LBTNX0>kPC%g@yXJ??CR3 z^oF;AH}dO}OTni1fx&;Ra!+t5|8G{gf|ZL4*w`O!41NfJAE&N>zi#R(&V#)+FzyN% z_g90{z|?BLiTfv@hp{u@$1u7B_-1N#iJ#RBzM2BR!2c8QKQ->n9NpJB+kXlz_@(`y zApg-W%GVs=-$=u6Jp_Mfr34rf;5=qxnT`lG`0>Z&B#n)_ODW`1+jPPicN} zhgOBZJau)7R=(j9e&@_!Y{d>iX#+|6|i>`&Q={(}Kji+O zpFcjFOMd9Ss|3O?C362PVeDvZY6)PztKhZE=cg?HTJXn${I25H4xgVwR(eM*+@Z8Irh^0H1^@(vM%fLB8x9<0IcS*cf20Th OJOEd-=rxTO#Qy`$*1Hh^ literal 0 HcmV?d00001 diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..c954cec9 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1 @@ +distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..2f09b4e6 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,7 @@ +FROM openjdk:8-jdk-alpine +VOLUME /tmp +ARG DEPENDENCY=target/dependency +COPY ${DEPENDENCY}/BOOT-INF/lib /app/lib +COPY ${DEPENDENCY}/META-INF /app/META-INF +COPY ${DEPENDENCY}/BOOT-INF/classes /app +ENTRYPOINT ["java","-cp","app:app/lib/*","santander/api/Application"] \ No newline at end of file diff --git a/REST-Project-1-soapui-project.xml b/REST-Project-1-soapui-project.xml new file mode 100644 index 00000000..bab03914 --- /dev/null +++ b/REST-Project-1-soapui-project.xml @@ -0,0 +1,33 @@ + +http://localhost:8080text/plain;charset=UTF-8200dataapplication/json;charset=UTF-8200loc:Response0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0dataapplication/json;charset=UTF-8404loc:Fault0data0data0data0data0dataapplication/json;charset=utf-8200loc:Response<xml-fragment/>http://localhost:8080http://localhost/No Authorizationapplication/json;charset=UTF-8500add:Faultapplication/json0dataapplication/json;charset=UTF-8200add:Response<xml-fragment/>http://localhost:8080{ + "description" : "Teste", + "value": "36", + "userCode": "4321", + "date": "2005-05-07" +} +http://localhost/expense/addNo AuthorizationcodigoUsuarioTEMPLATEdataTEMPLATEapplication/json;charset=UTF-8500 405ns:Faultapplication/json;charset=utf-8200Response0dataapplication/json;charset=UTF-8200Response<xml-fragment/>http://localhost:8080http://localhost/expense/filtrar/1234/2005-05-06No Authorization + + +codigoUsuariodataidTEMPLATEapplication/jsonapplication/json;charset=UTF-8404ns:Faultapplication/json;charset=utf-8200ns:Response<xml-fragment/>http://localhost:8080http://localhost/expense/605173860No AuthorizationiduserCodeTEMPLATEdateTEMPLATEapplication/json;charset=UTF-8500 405ns:Faultapplication/json;charset=utf-8200Response0dataapplication/json;charset=UTF-8200Response<xml-fragment/>http://localhost:8080http://localhost/expense/filtrar/1234/2005-05-06No Authorization + + +userCodedateapplication/json;charset=UTF-8400upd:Faultapplication/jsonapplication/json;charset=utf-8200upd:Response<xml-fragment/>http://localhost:8080{ + "id": 574291043, + "category": { + "id": 3, + "description": "Gastos Caseiros" + } +} +http://localhost/expense/updateNo Authorizationapplication/json;charset=UTF-8200add:Responseapplication/json<xml-fragment/>http://localhost:8080{ + "description":"Gastos Caseiros" +} +http://localhost/category/addNo AuthorizationsearchCategoryTEMPLATEapplication/json;charset=utf-8200Response<xml-fragment/>http://localhost:8080http://localhost/category/find/Gastos%20CaseirosNo AuthorizationsearchCategoryapplication/jsonapplication/json;charset=UTF-8200add:Response<xml-fragment/>http://localhost:8080{ + "description" : "Teste de teste", + "value": "68", + "userCode": "666", + "date": "2005-05-07", + "category": { + "description": "Gastos Caseiros" + } +} +http://localhost/expense/addCategoryNo Authorization \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..35ebc998 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,21 @@ +version: '2.2' +services: + app: + build: . + ports: + - 8080:8080 + networks: + - api-santander + links: + - "db:redis" + db: + image: "redis:alpine" + hostname: redis + ports: + - "6379:6379" + networks: + - api-santander +networks: + api-santander: + driver: bridge + diff --git a/mvnw b/mvnw new file mode 100755 index 00000000..02217b1e --- /dev/null +++ b/mvnw @@ -0,0 +1,233 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven2 Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # + # Look for the Apple JDKs first to preserve the existing behaviour, and then look + # for the new JDKs provided by Oracle. + # + if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then + # + # Apple JDKs + # + export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home + fi + + if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then + # + # Apple JDKs + # + export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home + fi + + if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then + # + # Oracle JDKs + # + export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home + fi + + if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then + # + # Apple JDKs + # + export JAVA_HOME=`/usr/libexec/java_home` + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Migwn, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" + # TODO classpath? +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` +fi + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + local basedir=$(pwd) + local wdir=$(pwd) + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + wdir=$(cd "$wdir/.."; pwd) + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)} +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100755 index 00000000..4b98b78c --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,145 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven2 Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +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 "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +set MAVEN_CMD_LINE_ARGS=%* + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" + +set WRAPPER_JAR="".\.mvn\wrapper\maven-wrapper.jar"" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CMD_LINE_ARGS% +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +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_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..cd21061e --- /dev/null +++ b/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + + dev.wellison + test-santander-api + 0.1.0 + + + org.springframework.boot + spring-boot-starter-parent + 2.1.6.RELEASE + + + + 1.8 + docker.io/hellison999 + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-test + test + + + org.projectlombok + lombok + + + org.springframework.boot + spring-boot-starter-data-redis + + + redis.clients + jedis + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + com.spotify + dockerfile-maven-plugin + 1.4.9 + + ${docker.image.prefix}/${project.artifactId} + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack + package + + unpack + + + + + ${project.groupId} + ${project.artifactId} + ${project.version} + + + + + + + + + + diff --git a/src/main/java/santander/api/Application.java b/src/main/java/santander/api/Application.java new file mode 100644 index 00000000..1887f623 --- /dev/null +++ b/src/main/java/santander/api/Application.java @@ -0,0 +1,35 @@ +package santander.api; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import santander.api.domain.Greetings; + +import java.util.concurrent.atomic.AtomicLong; + +@SpringBootApplication +@RestController +public class Application { + + private static final String template = "Hello, %s!"; + private final AtomicLong counter = new AtomicLong(); + + + @RequestMapping("/") + public String home() { + return "Rest API"; + } + + @RequestMapping("/greeting") + public Greetings greeting(@RequestParam(value="name", defaultValue="World") String name) { + return new Greetings(counter.incrementAndGet(), + String.format(template, name)); + } + + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } + +} \ No newline at end of file diff --git a/src/main/java/santander/api/controller/CategoryController.java b/src/main/java/santander/api/controller/CategoryController.java new file mode 100644 index 00000000..d8f48252 --- /dev/null +++ b/src/main/java/santander/api/controller/CategoryController.java @@ -0,0 +1,36 @@ +package santander.api.controller; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import santander.api.domain.Category; +import santander.api.domain.repository.CategoryRepository; + +import java.util.List; +import java.util.Random; + +@RestController +@RequestMapping("/category") +public class CategoryController { + + + @Autowired + CategoryRepository categoryRepository; + + @PostMapping("/add") + public Category addCategory(@RequestBody Category request){ + String id = String.valueOf(new Random().nextInt()); + Category category = new Category(id,request.getDescription()); + return categoryRepository.save(category); + } + + + @GetMapping(value = "/find/{searchCategory}", produces = "application/json; charset=utf-8") + public ResponseEntity> searchCategoryByDescription(@PathVariable String searchCategory) { + + List categories = categoryRepository.findByDescription(searchCategory); + return ResponseEntity.status(HttpStatus.OK).body(categories); + } + +} diff --git a/src/main/java/santander/api/controller/ExpenseController.java b/src/main/java/santander/api/controller/ExpenseController.java new file mode 100644 index 00000000..7c4ab25c --- /dev/null +++ b/src/main/java/santander/api/controller/ExpenseController.java @@ -0,0 +1,97 @@ +package santander.api.controller; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import santander.api.domain.Category; +import santander.api.domain.Expense; +import santander.api.domain.repository.CategoryRepository; +import santander.api.domain.repository.ExpenseRepository; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Random; + +@RestController +@RequestMapping("/expense") +public class ExpenseController{ + + + @Autowired + ExpenseRepository expenseRepository; + @Autowired + CategoryRepository categoryRepository; + + + @GetMapping(value = "/healthcheck", produces = "application/json; charset=utf-8") + public String getHealthCheck() + { + return "{ \"isWorking\" : true }"; + } + + @PostMapping("/add") + public Expense addExpense(@RequestBody Expense expense) + { + String id = String.valueOf(new Random().nextInt()); + Expense exp = new Expense(id, expense.getDescription(), expense.getValue(), expense.getUserCode(), expense.getDate(), expense.getCategory()); + expenseRepository.save(exp); + return exp; + } + + + @GetMapping("/findAll") + public List getEmployees() + { + Iterable result = expenseRepository.findAll(); + List employeesList = new ArrayList(); + result.forEach(employeesList::add); + return employeesList; + } + + @GetMapping(value = "/find/{userCode}/{date}", produces = "application/json; charset=utf-8") + public ResponseEntity> findExpenseByUserCodeAndDate(@PathVariable Long userCode, @PathVariable String date) throws ParseException { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Date d = sdf.parse(date); + + List expenses = expenseRepository.findByUserCodeAndDate(userCode,d); + return ResponseEntity.status(HttpStatus.OK).body(expenses); + } + + @DeleteMapping(value = "/{id}", produces = "application/json; charset=utf-8") + public String deleteEmployee(@PathVariable String id) { + boolean result = expenseRepository.existsById(id); + expenseRepository.deleteById(id); + return "{ \"success\" : "+ (result ? "true" : "false") +" }"; + } + + + @PutMapping(value = "/update", produces = "application/json; charset=utf-8") + public ResponseEntity updateExpense(@RequestBody Expense expense) { + + return expenseRepository.findById(expense.getId()).map(recordGasto -> { + recordGasto.setCategory(expense.getCategory()); + + Expense updatedExpense = expenseRepository.save(recordGasto); + + return ResponseEntity.ok().body(updatedExpense); + }).orElse(ResponseEntity.notFound().build()); + } + + + @PostMapping("/addCategory") + public Expense addCategoryAutomatically (@RequestBody Expense gasto) { + + List categories = categoryRepository.findByDescription(gasto.getCategory().getDescription()); + if (categories.size()>0){ + gasto.setCategory(categories.get(0)); + } + + return expenseRepository.save(gasto); + } + +} diff --git a/src/main/java/santander/api/domain/Category.java b/src/main/java/santander/api/domain/Category.java new file mode 100644 index 00000000..baf66ef2 --- /dev/null +++ b/src/main/java/santander/api/domain/Category.java @@ -0,0 +1,19 @@ +package santander.api.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NonNull; +import lombok.Setter; +import org.springframework.data.annotation.Id; +import org.springframework.data.redis.core.RedisHash; +import org.springframework.data.redis.core.index.Indexed; + +@AllArgsConstructor +@Getter +@Setter +@RedisHash("Category") +public class Category { + + private @Id String id; + private @Indexed String description; +} diff --git a/src/main/java/santander/api/domain/Expense.java b/src/main/java/santander/api/domain/Expense.java new file mode 100644 index 00000000..af98b326 --- /dev/null +++ b/src/main/java/santander/api/domain/Expense.java @@ -0,0 +1,26 @@ +package santander.api.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NonNull; +import lombok.Setter; +import org.springframework.data.annotation.Id; +import org.springframework.data.redis.core.RedisHash; +import org.springframework.data.redis.core.index.Indexed; + +import java.io.Serializable; +import java.util.Date; + +@AllArgsConstructor +@Getter +@Setter +@RedisHash("Expense") +public class Expense implements Serializable { + + private @Id String id; + private String description; + private Double value; + private @Indexed Long userCode; + private @Indexed Date date; + private Category category; +} diff --git a/src/main/java/santander/api/domain/Greetings.java b/src/main/java/santander/api/domain/Greetings.java new file mode 100644 index 00000000..0c8cefc1 --- /dev/null +++ b/src/main/java/santander/api/domain/Greetings.java @@ -0,0 +1,20 @@ +package santander.api.domain; + +public class Greetings { + private final long id; + private final String content; + + public Greetings(long id, String content) { + this.id = id; + this.content = content; + } + + public long getId() { + return id; + } + + public String getContent() { + return content; + } +} + diff --git a/src/main/java/santander/api/domain/repository/CategoryRepository.java b/src/main/java/santander/api/domain/repository/CategoryRepository.java new file mode 100644 index 00000000..e48257d0 --- /dev/null +++ b/src/main/java/santander/api/domain/repository/CategoryRepository.java @@ -0,0 +1,10 @@ +package santander.api.domain.repository; + +import org.springframework.data.repository.CrudRepository; +import santander.api.domain.Category; + +import java.util.List; + +public interface CategoryRepository extends CrudRepository { + List findByDescription(String description); +} diff --git a/src/main/java/santander/api/domain/repository/ExpenseRepository.java b/src/main/java/santander/api/domain/repository/ExpenseRepository.java new file mode 100644 index 00000000..48b73fb2 --- /dev/null +++ b/src/main/java/santander/api/domain/repository/ExpenseRepository.java @@ -0,0 +1,12 @@ +package santander.api.domain.repository; + +import org.springframework.data.repository.CrudRepository; +import santander.api.domain.Expense; + +import java.util.Date; +import java.util.List; + +public interface ExpenseRepository extends CrudRepository { + List findByUserCodeAndDate(Long userCode, Date date); + +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 00000000..5bbf1bb7 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,4 @@ +spring.session.store-type=redis +server.session.timeout=5 +spring.redis.host=redis +spring.redis.port=6379 \ No newline at end of file From eb9c6da24812ff04d0b66c5ea0dc8978d9f3360a Mon Sep 17 00:00:00 2001 From: Wellison Pereira Date: Fri, 26 Jul 2019 18:05:16 -0300 Subject: [PATCH 2/9] Removido diretorio .idea --- .idea/TestBackJava.iml | 9 -------- .idea/compiler.xml | 21 ------------------- .idea/encodings.xml | 6 ------ ...__ch_qos_logback_logback_classic_1_2_3.xml | 13 ------------ ...ven__ch_qos_logback_logback_core_1_2_3.xml | 13 ------------ .../Maven__com_fasterxml_classmate_1_4_0.xml | 13 ------------ ...jackson_core_jackson_annotations_2_9_0.xml | 13 ------------ ...terxml_jackson_core_jackson_core_2_9_9.xml | 13 ------------ ...ml_jackson_core_jackson_databind_2_9_9.xml | 13 ------------ ...n_datatype_jackson_datatype_jdk8_2_9_9.xml | 13 ------------ ...datatype_jackson_datatype_jsr310_2_9_9.xml | 13 ------------ ...e_jackson_module_parameter_names_2_9_9.xml | 13 ------------ ...n__com_jayway_jsonpath_json_path_2_4_0.xml | 13 ------------ ...ogle_android_json_0_0_20131108_vaadin1.xml | 13 ------------ ..._io_lettuce_lettuce_core_5_1_7_RELEASE.xml | 13 ------------ ...en__io_netty_netty_buffer_4_1_36_Final.xml | 13 ------------ ...ven__io_netty_netty_codec_4_1_36_Final.xml | 13 ------------ ...en__io_netty_netty_common_4_1_36_Final.xml | 13 ------------ ...n__io_netty_netty_handler_4_1_36_Final.xml | 13 ------------ ...__io_netty_netty_resolver_4_1_36_Final.xml | 13 ------------ ..._io_netty_netty_transport_4_1_36_Final.xml | 13 ------------ ...ectreactor_reactor_core_3_2_10_RELEASE.xml | 13 ------------ ..._annotation_javax_annotation_api_1_3_2.xml | 13 ------------ ..._validation_validation_api_2_0_1_Final.xml | 13 ------------ .idea/libraries/Maven__junit_junit_4_12.xml | 13 ------------ ...Maven__net_bytebuddy_byte_buddy_1_9_13.xml | 13 ------------ ..._net_bytebuddy_byte_buddy_agent_1_9_13.xml | 13 ------------ ...Maven__net_minidev_accessors_smart_1_2.xml | 13 ------------ .../Maven__net_minidev_json_smart_2_3.xml | 13 ------------ ...org_apache_commons_commons_pool2_2_6_2.xml | 13 ------------ ..._apache_logging_log4j_log4j_api_2_11_2.xml | 13 ------------ ...he_logging_log4j_log4j_to_slf4j_2_11_2.xml | 13 ------------ ..._tomcat_embed_tomcat_embed_core_9_0_21.xml | 13 ------------ ...he_tomcat_embed_tomcat_embed_el_9_0_21.xml | 13 ------------ ...at_embed_tomcat_embed_websocket_9_0_21.xml | 13 ------------ ...Maven__org_assertj_assertj_core_3_11_1.xml | 13 ------------ .../Maven__org_hamcrest_hamcrest_core_1_3.xml | 13 ------------ ...ven__org_hamcrest_hamcrest_library_1_3.xml | 13 ------------ ...dator_hibernate_validator_6_0_17_Final.xml | 13 ------------ ...boss_logging_jboss_logging_3_3_2_Final.xml | 13 ------------ ...Maven__org_mockito_mockito_core_2_23_4.xml | 13 ------------ .../Maven__org_objenesis_objenesis_2_6.xml | 13 ------------ .../Maven__org_ow2_asm_asm_5_0_4.xml | 13 ------------ ...Maven__org_projectlombok_lombok_1_18_8.xml | 13 ------------ ...reactivestreams_reactive_streams_1_0_2.xml | 13 ------------ ...aven__org_skyscreamer_jsonassert_1_5_0.xml | 13 ------------ .../Maven__org_slf4j_jul_to_slf4j_1_7_26.xml | 13 ------------ .../Maven__org_slf4j_slf4j_api_1_7_26.xml | 13 ------------ ...amework_boot_spring_boot_2_1_6_RELEASE.xml | 13 ------------ ...pring_boot_autoconfigure_2_1_6_RELEASE.xml | 13 ------------ ...boot_spring_boot_starter_2_1_6_RELEASE.xml | 13 ------------ ..._boot_starter_data_redis_2_1_6_RELEASE.xml | 13 ------------ ...spring_boot_starter_json_2_1_6_RELEASE.xml | 13 ------------ ...ing_boot_starter_logging_2_1_6_RELEASE.xml | 13 ------------ ...spring_boot_starter_test_2_1_6_RELEASE.xml | 13 ------------ ...ring_boot_starter_tomcat_2_1_6_RELEASE.xml | 13 ------------ ..._spring_boot_starter_web_2_1_6_RELEASE.xml | 13 ------------ ...rk_boot_spring_boot_test_2_1_6_RELEASE.xml | 13 ------------ ..._boot_test_autoconfigure_2_1_6_RELEASE.xml | 13 ------------ ...data_spring_data_commons_2_1_9_RELEASE.xml | 13 ------------ ...ata_spring_data_keyvalue_2_1_9_RELEASE.xml | 13 ------------ ...k_data_spring_data_redis_2_1_9_RELEASE.xml | 13 ------------ ...ringframework_spring_aop_5_1_8_RELEASE.xml | 13 ------------ ...ngframework_spring_beans_5_1_8_RELEASE.xml | 13 ------------ ...framework_spring_context_5_1_8_RELEASE.xml | 13 ------------ ...k_spring_context_support_5_1_8_RELEASE.xml | 13 ------------ ...ingframework_spring_core_5_1_8_RELEASE.xml | 13 ------------ ...mework_spring_expression_5_1_8_RELEASE.xml | 13 ------------ ...ringframework_spring_jcl_5_1_8_RELEASE.xml | 13 ------------ ...ringframework_spring_oxm_5_1_8_RELEASE.xml | 13 ------------ ...ingframework_spring_test_5_1_8_RELEASE.xml | 13 ------------ ...pringframework_spring_tx_5_1_8_RELEASE.xml | 13 ------------ ...ringframework_spring_web_5_1_8_RELEASE.xml | 13 ------------ ...gframework_spring_webmvc_5_1_8_RELEASE.xml | 13 ------------ .../Maven__org_xmlunit_xmlunit_core_2_6_2.xml | 13 ------------ .../Maven__org_yaml_snakeyaml_1_23.xml | 13 ------------ .../Maven__redis_clients_jedis_2_9_3.xml | 13 ------------ .idea/misc.xml | 7 ------- .idea/modules.xml | 8 ------- .idea/vcs.xml | 6 ------ 80 files changed, 1019 deletions(-) delete mode 100644 .idea/TestBackJava.iml delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml delete mode 100644 .idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_classmate_1_4_0.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_9.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_9.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_9.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_9.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_9.xml delete mode 100644 .idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml delete mode 100644 .idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml delete mode 100644 .idea/libraries/Maven__io_lettuce_lettuce_core_5_1_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_buffer_4_1_36_Final.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_codec_4_1_36_Final.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_common_4_1_36_Final.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_handler_4_1_36_Final.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_resolver_4_1_36_Final.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_transport_4_1_36_Final.xml delete mode 100644 .idea/libraries/Maven__io_projectreactor_reactor_core_3_2_10_RELEASE.xml delete mode 100644 .idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml delete mode 100644 .idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml delete mode 100644 .idea/libraries/Maven__junit_junit_4_12.xml delete mode 100644 .idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_13.xml delete mode 100644 .idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_13.xml delete mode 100644 .idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml delete mode 100644 .idea/libraries/Maven__net_minidev_json_smart_2_3.xml delete mode 100644 .idea/libraries/Maven__org_apache_commons_commons_pool2_2_6_2.xml delete mode 100644 .idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_2.xml delete mode 100644 .idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_11_2.xml delete mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_21.xml delete mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_21.xml delete mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_21.xml delete mode 100644 .idea/libraries/Maven__org_assertj_assertj_core_3_11_1.xml delete mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml delete mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml delete mode 100644 .idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_17_Final.xml delete mode 100644 .idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml delete mode 100644 .idea/libraries/Maven__org_mockito_mockito_core_2_23_4.xml delete mode 100644 .idea/libraries/Maven__org_objenesis_objenesis_2_6.xml delete mode 100644 .idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml delete mode 100644 .idea/libraries/Maven__org_projectlombok_lombok_1_18_8.xml delete mode 100644 .idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_2.xml delete mode 100644 .idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml delete mode 100644 .idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_26.xml delete mode 100644 .idea/libraries/Maven__org_slf4j_slf4j_api_1_7_26.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_1_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_1_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_1_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_6_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_data_spring_data_commons_2_1_9_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_1_9_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_data_spring_data_redis_2_1_9_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_aop_5_1_8_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_beans_5_1_8_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_context_5_1_8_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_context_support_5_1_8_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_core_5_1_8_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_expression_5_1_8_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_jcl_5_1_8_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_oxm_5_1_8_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_test_5_1_8_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_tx_5_1_8_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_web_5_1_8_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_webmvc_5_1_8_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_2.xml delete mode 100644 .idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml delete mode 100644 .idea/libraries/Maven__redis_clients_jedis_2_9_3.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/vcs.xml diff --git a/.idea/TestBackJava.iml b/.idea/TestBackJava.iml deleted file mode 100644 index d6ebd480..00000000 --- a/.idea/TestBackJava.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 276b4fe7..00000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index b26911bd..00000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml deleted file mode 100644 index 6fec8f43..00000000 --- a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml deleted file mode 100644 index 9eb8596a..00000000 --- a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_4_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_4_0.xml deleted file mode 100644 index bbd3a886..00000000 --- a/.idea/libraries/Maven__com_fasterxml_classmate_1_4_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml deleted file mode 100644 index 06441f49..00000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_9.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_9.xml deleted file mode 100644 index 55b3f7bf..00000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_9.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_9.xml deleted file mode 100644 index b007cab3..00000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_9.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_9.xml deleted file mode 100644 index 7fc80365..00000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_9.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_9.xml deleted file mode 100644 index 23c806cf..00000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_9.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_9.xml deleted file mode 100644 index fe2eb1bd..00000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml deleted file mode 100644 index f19f6eb3..00000000 --- a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 b8581a6f..00000000 --- a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_lettuce_lettuce_core_5_1_7_RELEASE.xml b/.idea/libraries/Maven__io_lettuce_lettuce_core_5_1_7_RELEASE.xml deleted file mode 100644 index 2a4e7f57..00000000 --- a/.idea/libraries/Maven__io_lettuce_lettuce_core_5_1_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_buffer_4_1_36_Final.xml b/.idea/libraries/Maven__io_netty_netty_buffer_4_1_36_Final.xml deleted file mode 100644 index d6050757..00000000 --- a/.idea/libraries/Maven__io_netty_netty_buffer_4_1_36_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_codec_4_1_36_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_4_1_36_Final.xml deleted file mode 100644 index 444f2a9a..00000000 --- a/.idea/libraries/Maven__io_netty_netty_codec_4_1_36_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_common_4_1_36_Final.xml b/.idea/libraries/Maven__io_netty_netty_common_4_1_36_Final.xml deleted file mode 100644 index a1563300..00000000 --- a/.idea/libraries/Maven__io_netty_netty_common_4_1_36_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_handler_4_1_36_Final.xml b/.idea/libraries/Maven__io_netty_netty_handler_4_1_36_Final.xml deleted file mode 100644 index 12fdd313..00000000 --- a/.idea/libraries/Maven__io_netty_netty_handler_4_1_36_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_resolver_4_1_36_Final.xml b/.idea/libraries/Maven__io_netty_netty_resolver_4_1_36_Final.xml deleted file mode 100644 index 8bdbb730..00000000 --- a/.idea/libraries/Maven__io_netty_netty_resolver_4_1_36_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_transport_4_1_36_Final.xml b/.idea/libraries/Maven__io_netty_netty_transport_4_1_36_Final.xml deleted file mode 100644 index b46e0c3a..00000000 --- a/.idea/libraries/Maven__io_netty_netty_transport_4_1_36_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_projectreactor_reactor_core_3_2_10_RELEASE.xml b/.idea/libraries/Maven__io_projectreactor_reactor_core_3_2_10_RELEASE.xml deleted file mode 100644 index b23f44ae..00000000 --- a/.idea/libraries/Maven__io_projectreactor_reactor_core_3_2_10_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml b/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml deleted file mode 100644 index e74f3ab2..00000000 --- a/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml deleted file mode 100644 index 6978c0b2..00000000 --- a/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_12.xml b/.idea/libraries/Maven__junit_junit_4_12.xml deleted file mode 100644 index d4110417..00000000 --- a/.idea/libraries/Maven__junit_junit_4_12.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_13.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_13.xml deleted file mode 100644 index 84cc30a1..00000000 --- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_13.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_13.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_13.xml deleted file mode 100644 index 3aa3d625..00000000 --- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_13.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml b/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml deleted file mode 100644 index b3d38583..00000000 --- a/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml b/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml deleted file mode 100644 index 10830235..00000000 --- a/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_6_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_6_2.xml deleted file mode 100644 index 34993494..00000000 --- a/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_6_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_2.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_2.xml deleted file mode 100644 index fe93f544..00000000 --- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_11_2.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_11_2.xml deleted file mode 100644 index 889bf4fb..00000000 --- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_11_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_21.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_21.xml deleted file mode 100644 index 6d34a482..00000000 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_21.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_21.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_21.xml deleted file mode 100644 index 4c5cd6a7..00000000 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_21.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_21.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_21.xml deleted file mode 100644 index 56e82d3a..00000000 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_21.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_assertj_assertj_core_3_11_1.xml b/.idea/libraries/Maven__org_assertj_assertj_core_3_11_1.xml deleted file mode 100644 index 4d16d46c..00000000 --- a/.idea/libraries/Maven__org_assertj_assertj_core_3_11_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml deleted file mode 100644 index f58bbc11..00000000 --- a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml deleted file mode 100644 index 78dbe458..00000000 --- a/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_17_Final.xml b/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_17_Final.xml deleted file mode 100644 index 4025781f..00000000 --- a/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_17_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml deleted file mode 100644 index 5f7dd01e..00000000 --- a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_2_23_4.xml b/.idea/libraries/Maven__org_mockito_mockito_core_2_23_4.xml deleted file mode 100644 index 159204fc..00000000 --- a/.idea/libraries/Maven__org_mockito_mockito_core_2_23_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml b/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml deleted file mode 100644 index af41e3b6..00000000 --- a/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml b/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml deleted file mode 100644 index 0bf8cf2b..00000000 --- a/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_8.xml b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_8.xml deleted file mode 100644 index 9843fa42..00000000 --- a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_8.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_2.xml b/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_2.xml deleted file mode 100644 index 457c7b78..00000000 --- a/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ 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 c4c54d6d..00000000 --- a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_26.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_26.xml deleted file mode 100644 index 087b2a4d..00000000 --- a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_26.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_26.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_26.xml deleted file mode 100644 index 6545f77e..00000000 --- a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_26.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_6_RELEASE.xml deleted file mode 100644 index eee62a16..00000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_6_RELEASE.xml deleted file mode 100644 index 1b9e6227..00000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_6_RELEASE.xml deleted file mode 100644 index b51ea535..00000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_1_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_1_6_RELEASE.xml deleted file mode 100644 index db25ebe0..00000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_1_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_6_RELEASE.xml deleted file mode 100644 index 6a6e8906..00000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_1_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_1_6_RELEASE.xml deleted file mode 100644 index cda4eaee..00000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_1_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_6_RELEASE.xml deleted file mode 100644 index 4f8a3767..00000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_1_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_1_6_RELEASE.xml deleted file mode 100644 index 07998141..00000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_1_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_6_RELEASE.xml deleted file mode 100644 index 1407ba5c..00000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_6_RELEASE.xml deleted file mode 100644 index 283b404c..00000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_6_RELEASE.xml deleted file mode 100644 index 9c971882..00000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_6_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_1_9_RELEASE.xml deleted file mode 100644 index d4981b5c..00000000 --- a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_1_9_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_1_9_RELEASE.xml deleted file mode 100644 index ff613454..00000000 --- a/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_1_9_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_1_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_1_9_RELEASE.xml deleted file mode 100644 index f2f72366..00000000 --- a/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_1_9_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_5_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_5_1_8_RELEASE.xml deleted file mode 100644 index c1a6cbf4..00000000 --- a/.idea/libraries/Maven__org_springframework_spring_aop_5_1_8_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_5_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_5_1_8_RELEASE.xml deleted file mode 100644 index d17293b9..00000000 --- a/.idea/libraries/Maven__org_springframework_spring_beans_5_1_8_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_5_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_5_1_8_RELEASE.xml deleted file mode 100644 index c68626e8..00000000 --- a/.idea/libraries/Maven__org_springframework_spring_context_5_1_8_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_5_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_5_1_8_RELEASE.xml deleted file mode 100644 index beb56376..00000000 --- a/.idea/libraries/Maven__org_springframework_spring_context_support_5_1_8_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_5_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_5_1_8_RELEASE.xml deleted file mode 100644 index 8580e90f..00000000 --- a/.idea/libraries/Maven__org_springframework_spring_core_5_1_8_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_5_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_5_1_8_RELEASE.xml deleted file mode 100644 index aae055d0..00000000 --- a/.idea/libraries/Maven__org_springframework_spring_expression_5_1_8_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jcl_5_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jcl_5_1_8_RELEASE.xml deleted file mode 100644 index 1a99c900..00000000 --- a/.idea/libraries/Maven__org_springframework_spring_jcl_5_1_8_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_oxm_5_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_oxm_5_1_8_RELEASE.xml deleted file mode 100644 index ad396e51..00000000 --- a/.idea/libraries/Maven__org_springframework_spring_oxm_5_1_8_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_5_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_5_1_8_RELEASE.xml deleted file mode 100644 index 684e11b1..00000000 --- a/.idea/libraries/Maven__org_springframework_spring_test_5_1_8_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_5_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_5_1_8_RELEASE.xml deleted file mode 100644 index a1addd77..00000000 --- a/.idea/libraries/Maven__org_springframework_spring_tx_5_1_8_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_5_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_5_1_8_RELEASE.xml deleted file mode 100644 index 1cbea8ac..00000000 --- a/.idea/libraries/Maven__org_springframework_spring_web_5_1_8_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_1_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_1_8_RELEASE.xml deleted file mode 100644 index 8baea9bf..00000000 --- a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_1_8_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_2.xml b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_2.xml deleted file mode 100644 index 9f44657d..00000000 --- a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml deleted file mode 100644 index 7e63769b..00000000 --- a/.idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__redis_clients_jedis_2_9_3.xml b/.idea/libraries/Maven__redis_clients_jedis_2_9_3.xml deleted file mode 100644 index d8dcebb4..00000000 --- a/.idea/libraries/Maven__redis_clients_jedis_2_9_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index f091b54e..00000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 194e3903..00000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1ddf..00000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file From 590f70b5fc436104da01c63c3e437c5f2e8f5a4c Mon Sep 17 00:00:00 2001 From: Wellison Pereira Date: Fri, 26 Jul 2019 18:11:24 -0300 Subject: [PATCH 3/9] Corrigido o README --- README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/README.md b/README.md index 15d8f685..051e6c3e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,18 @@ # Show me the code +### # Como rodar: + +Primeiramente, ir na pasta raiz do projeto e compilar com o maven +``` + ./mvnw clean install +``` + +Depois executar o Docker + +``` + docker-compose up --build +``` + ### # DESAFIO: API REST para Gestão de Gastos! From f1ce65e0a18bae8091bc9d00ad0871b85876f691 Mon Sep 17 00:00:00 2001 From: Wellison Pereira Date: Sun, 28 Jul 2019 09:04:30 -0300 Subject: [PATCH 4/9] Testes --- REST-Project-1-soapui-project.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/REST-Project-1-soapui-project.xml b/REST-Project-1-soapui-project.xml index bab03914..08fa97c1 100644 --- a/REST-Project-1-soapui-project.xml +++ b/REST-Project-1-soapui-project.xml @@ -1,5 +1,5 @@ -http://localhost:8080text/plain;charset=UTF-8200dataapplication/json;charset=UTF-8200loc:Response0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0dataapplication/json;charset=UTF-8404loc:Fault0data0data0data0data0dataapplication/json;charset=utf-8200loc:Response<xml-fragment/>http://localhost:8080http://localhost/No Authorizationapplication/json;charset=UTF-8500add:Faultapplication/json0dataapplication/json;charset=UTF-8200add:Response<xml-fragment/>http://localhost:8080{ +http://localhost:8080text/plain;charset=UTF-8200dataapplication/json;charset=UTF-8200loc:Response0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0dataapplication/json;charset=UTF-8404loc:Fault0data0data0data0data0dataapplication/json;charset=utf-8200loc:Response<xml-fragment/>http://localhost:8080http://localhost/No Authorizationapplication/json;charset=UTF-8500add:Faultapplication/json0dataapplication/json;charset=UTF-8200add:Response<xml-fragment/>http://localhost:8080{ "description" : "Teste", "value": "36", "userCode": "4321", From 026a74d8aa72551078de25a349afcf75142c828d Mon Sep 17 00:00:00 2001 From: Wellison Pereira Date: Sun, 28 Jul 2019 23:14:11 -0300 Subject: [PATCH 5/9] Ajuste das pastas --- .gitignore | 3 +- Dockerfile | 2 +- .../dev/wellison/santander/Application.java | 13 +++ .../controller/CategoryController.java | 15 ++- .../controller/ExpenseController.java | 64 ++++++++++++ .../controller/HealthController.java | 16 +++ .../wellison/santander}/domain/Category.java | 2 +- .../wellison/santander}/domain/Expense.java | 3 +- .../repository/CategoryRepository.java | 4 +- .../repository/ExpenseRepository.java | 4 +- .../santander/service/CategoryService.java | 11 +++ .../santander/service/ExpenseService.java | 16 +++ .../service/impl/CategoryServiceImpl.java | 30 ++++++ .../service/impl/ExpenseServiceImpl.java | 77 +++++++++++++++ src/main/java/santander/api/Application.java | 35 ------- .../api/controller/ExpenseController.java | 97 ------------------- .../java/santander/api/domain/Greetings.java | 20 ---- .../wellison/santander/ApplicationTests.java | 31 ++++++ 18 files changed, 273 insertions(+), 170 deletions(-) create mode 100644 src/main/java/dev/wellison/santander/Application.java rename src/main/java/{santander/api => dev/wellison/santander}/controller/CategoryController.java (60%) create mode 100644 src/main/java/dev/wellison/santander/controller/ExpenseController.java create mode 100644 src/main/java/dev/wellison/santander/controller/HealthController.java rename src/main/java/{santander/api => dev/wellison/santander}/domain/Category.java (91%) rename src/main/java/{santander/api => dev/wellison/santander}/domain/Expense.java (92%) rename src/main/java/{santander/api/domain => dev/wellison/santander}/repository/CategoryRepository.java (71%) rename src/main/java/{santander/api/domain => dev/wellison/santander}/repository/ExpenseRepository.java (74%) create mode 100644 src/main/java/dev/wellison/santander/service/CategoryService.java create mode 100644 src/main/java/dev/wellison/santander/service/ExpenseService.java create mode 100644 src/main/java/dev/wellison/santander/service/impl/CategoryServiceImpl.java create mode 100644 src/main/java/dev/wellison/santander/service/impl/ExpenseServiceImpl.java delete mode 100644 src/main/java/santander/api/Application.java delete mode 100644 src/main/java/santander/api/controller/ExpenseController.java delete mode 100644 src/main/java/santander/api/domain/Greetings.java create mode 100644 src/test/java/dev/wellison/santander/ApplicationTests.java diff --git a/.gitignore b/.gitignore index e673575a..444198c7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .idea/ -target/ \ No newline at end of file +target/ +test-santander-api.iml \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 2f09b4e6..c133ddcf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,4 +4,4 @@ ARG DEPENDENCY=target/dependency COPY ${DEPENDENCY}/BOOT-INF/lib /app/lib COPY ${DEPENDENCY}/META-INF /app/META-INF COPY ${DEPENDENCY}/BOOT-INF/classes /app -ENTRYPOINT ["java","-cp","app:app/lib/*","santander/api/Application"] \ No newline at end of file +ENTRYPOINT ["java","-cp","app:app/lib/*","dev/wellison/santander/Application"] \ No newline at end of file diff --git a/src/main/java/dev/wellison/santander/Application.java b/src/main/java/dev/wellison/santander/Application.java new file mode 100644 index 00000000..0e823a26 --- /dev/null +++ b/src/main/java/dev/wellison/santander/Application.java @@ -0,0 +1,13 @@ +package dev.wellison.santander; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class Application { + + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } + +} \ No newline at end of file diff --git a/src/main/java/santander/api/controller/CategoryController.java b/src/main/java/dev/wellison/santander/controller/CategoryController.java similarity index 60% rename from src/main/java/santander/api/controller/CategoryController.java rename to src/main/java/dev/wellison/santander/controller/CategoryController.java index d8f48252..7f997330 100644 --- a/src/main/java/santander/api/controller/CategoryController.java +++ b/src/main/java/dev/wellison/santander/controller/CategoryController.java @@ -1,14 +1,13 @@ -package santander.api.controller; +package dev.wellison.santander.controller; +import dev.wellison.santander.domain.Category; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import santander.api.domain.Category; -import santander.api.domain.repository.CategoryRepository; +import dev.wellison.santander.service.CategoryService; import java.util.List; -import java.util.Random; @RestController @RequestMapping("/category") @@ -16,20 +15,18 @@ public class CategoryController { @Autowired - CategoryRepository categoryRepository; + CategoryService categoryService; @PostMapping("/add") public Category addCategory(@RequestBody Category request){ - String id = String.valueOf(new Random().nextInt()); - Category category = new Category(id,request.getDescription()); - return categoryRepository.save(category); + return categoryService.addCategory(request); } @GetMapping(value = "/find/{searchCategory}", produces = "application/json; charset=utf-8") public ResponseEntity> searchCategoryByDescription(@PathVariable String searchCategory) { - List categories = categoryRepository.findByDescription(searchCategory); + List categories = categoryService.searchCategoryByDescription(searchCategory); return ResponseEntity.status(HttpStatus.OK).body(categories); } diff --git a/src/main/java/dev/wellison/santander/controller/ExpenseController.java b/src/main/java/dev/wellison/santander/controller/ExpenseController.java new file mode 100644 index 00000000..09472eed --- /dev/null +++ b/src/main/java/dev/wellison/santander/controller/ExpenseController.java @@ -0,0 +1,64 @@ +package dev.wellison.santander.controller; + +import dev.wellison.santander.domain.Expense; +import dev.wellison.santander.service.CategoryService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import dev.wellison.santander.service.ExpenseService; + +import java.text.ParseException; +import java.util.List; + +@RestController +@RequestMapping("/expense") +public class ExpenseController{ + + + @Autowired + ExpenseService expenseService; + @Autowired + CategoryService categoryService; + + + @PostMapping("/add") + public Expense addExpense(@RequestBody Expense expense) + { + return expenseService.saveExpense(expense); + } + + + @GetMapping("/findAll") + public List getAllExpenses() + { + return expenseService.getAllEmployees(); + } + + @GetMapping(value = "/find/{userCode}/{date}", produces = "application/json; charset=utf-8") + public ResponseEntity> findExpenseByUserCodeAndDate(@PathVariable Long userCode, @PathVariable String date) throws ParseException { + + List expenses = expenseService.findExpenseByUserCodeAndDate(userCode,date); + return ResponseEntity.status(HttpStatus.OK).body(expenses); + } + + @DeleteMapping(value = "/{id}", produces = "application/json; charset=utf-8") + public String deleteExpense(@PathVariable String id) { + return expenseService.deleteExpense(id); + } + + @PutMapping(value = "/update", produces = "application/json; charset=utf-8") + public ResponseEntity updateExpense(@RequestBody Expense request) { + + Expense result = expenseService.updateExpense(request); + return (result!=null)?ResponseEntity.ok().body(result):ResponseEntity.notFound().build(); + } + + + @PostMapping("/addCategory") + public Expense addCategoryAutomatically (@RequestBody Expense expense) { + + return expenseService.addCategoryAutomatically(expense); + } + +} diff --git a/src/main/java/dev/wellison/santander/controller/HealthController.java b/src/main/java/dev/wellison/santander/controller/HealthController.java new file mode 100644 index 00000000..25806016 --- /dev/null +++ b/src/main/java/dev/wellison/santander/controller/HealthController.java @@ -0,0 +1,16 @@ +package dev.wellison.santander.controller; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HealthController { + + @GetMapping(value = "/healthcheck", produces = "application/json; charset=utf-8") + public String getHealthCheck() + { + return "{ \"isWorking\" : true }"; + } + +} diff --git a/src/main/java/santander/api/domain/Category.java b/src/main/java/dev/wellison/santander/domain/Category.java similarity index 91% rename from src/main/java/santander/api/domain/Category.java rename to src/main/java/dev/wellison/santander/domain/Category.java index baf66ef2..f4e853bb 100644 --- a/src/main/java/santander/api/domain/Category.java +++ b/src/main/java/dev/wellison/santander/domain/Category.java @@ -1,4 +1,4 @@ -package santander.api.domain; +package dev.wellison.santander.domain; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/santander/api/domain/Expense.java b/src/main/java/dev/wellison/santander/domain/Expense.java similarity index 92% rename from src/main/java/santander/api/domain/Expense.java rename to src/main/java/dev/wellison/santander/domain/Expense.java index af98b326..6295e971 100644 --- a/src/main/java/santander/api/domain/Expense.java +++ b/src/main/java/dev/wellison/santander/domain/Expense.java @@ -1,8 +1,7 @@ -package santander.api.domain; +package dev.wellison.santander.domain; import lombok.AllArgsConstructor; import lombok.Getter; -import lombok.NonNull; import lombok.Setter; import org.springframework.data.annotation.Id; import org.springframework.data.redis.core.RedisHash; diff --git a/src/main/java/santander/api/domain/repository/CategoryRepository.java b/src/main/java/dev/wellison/santander/repository/CategoryRepository.java similarity index 71% rename from src/main/java/santander/api/domain/repository/CategoryRepository.java rename to src/main/java/dev/wellison/santander/repository/CategoryRepository.java index e48257d0..3a80a1db 100644 --- a/src/main/java/santander/api/domain/repository/CategoryRepository.java +++ b/src/main/java/dev/wellison/santander/repository/CategoryRepository.java @@ -1,7 +1,7 @@ -package santander.api.domain.repository; +package dev.wellison.santander.repository; +import dev.wellison.santander.domain.Category; import org.springframework.data.repository.CrudRepository; -import santander.api.domain.Category; import java.util.List; diff --git a/src/main/java/santander/api/domain/repository/ExpenseRepository.java b/src/main/java/dev/wellison/santander/repository/ExpenseRepository.java similarity index 74% rename from src/main/java/santander/api/domain/repository/ExpenseRepository.java rename to src/main/java/dev/wellison/santander/repository/ExpenseRepository.java index 48b73fb2..6dd900f5 100644 --- a/src/main/java/santander/api/domain/repository/ExpenseRepository.java +++ b/src/main/java/dev/wellison/santander/repository/ExpenseRepository.java @@ -1,7 +1,7 @@ -package santander.api.domain.repository; +package dev.wellison.santander.repository; +import dev.wellison.santander.domain.Expense; import org.springframework.data.repository.CrudRepository; -import santander.api.domain.Expense; import java.util.Date; import java.util.List; diff --git a/src/main/java/dev/wellison/santander/service/CategoryService.java b/src/main/java/dev/wellison/santander/service/CategoryService.java new file mode 100644 index 00000000..0ab688cf --- /dev/null +++ b/src/main/java/dev/wellison/santander/service/CategoryService.java @@ -0,0 +1,11 @@ +package dev.wellison.santander.service; + +import dev.wellison.santander.domain.Category; + +import java.util.List; + +public interface CategoryService { + + Category addCategory(Category request); + List searchCategoryByDescription(String searchCategory); +} diff --git a/src/main/java/dev/wellison/santander/service/ExpenseService.java b/src/main/java/dev/wellison/santander/service/ExpenseService.java new file mode 100644 index 00000000..b0ea5380 --- /dev/null +++ b/src/main/java/dev/wellison/santander/service/ExpenseService.java @@ -0,0 +1,16 @@ +package dev.wellison.santander.service; + +import dev.wellison.santander.domain.Expense; + +import java.text.ParseException; +import java.util.List; + +public interface ExpenseService { + + Expense saveExpense(Expense expense); + List getAllEmployees(); + List findExpenseByUserCodeAndDate(Long userCode, String date) throws ParseException; + String deleteExpense(String id); + Expense updateExpense(Expense expense); + Expense addCategoryAutomatically (Expense expense); +} diff --git a/src/main/java/dev/wellison/santander/service/impl/CategoryServiceImpl.java b/src/main/java/dev/wellison/santander/service/impl/CategoryServiceImpl.java new file mode 100644 index 00000000..b5d2a0c2 --- /dev/null +++ b/src/main/java/dev/wellison/santander/service/impl/CategoryServiceImpl.java @@ -0,0 +1,30 @@ +package dev.wellison.santander.service.impl; + +import dev.wellison.santander.domain.Category; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import dev.wellison.santander.repository.CategoryRepository; +import dev.wellison.santander.service.CategoryService; + +import java.util.List; +import java.util.UUID; + +@Service(value = "categoryService") +public class CategoryServiceImpl implements CategoryService { + + @Autowired + CategoryRepository categoryRepository; + + @Override + public Category addCategory(Category request) { + String id = UUID.randomUUID().toString(); + Category category = new Category(id,request.getDescription()); + return categoryRepository.save(category); + } + + @Override + public List searchCategoryByDescription(String searchCategory) { + + return categoryRepository.findByDescription(searchCategory); + } +} diff --git a/src/main/java/dev/wellison/santander/service/impl/ExpenseServiceImpl.java b/src/main/java/dev/wellison/santander/service/impl/ExpenseServiceImpl.java new file mode 100644 index 00000000..6408154b --- /dev/null +++ b/src/main/java/dev/wellison/santander/service/impl/ExpenseServiceImpl.java @@ -0,0 +1,77 @@ +package dev.wellison.santander.service.impl; + +import dev.wellison.santander.domain.Category; +import dev.wellison.santander.domain.Expense; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import dev.wellison.santander.repository.CategoryRepository; +import dev.wellison.santander.repository.ExpenseRepository; +import dev.wellison.santander.service.ExpenseService; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.UUID; + +@Service(value = "expenseService") +public class ExpenseServiceImpl implements ExpenseService { + + @Autowired + ExpenseRepository expenseRepository; + @Autowired + CategoryRepository categoryRepository; + + + public Expense saveExpense(Expense expense) { + String id = UUID.randomUUID().toString(); + Expense exp = new Expense(id, expense.getDescription(), expense.getValue(), expense.getUserCode(), expense.getDate(), expense.getCategory()); + expenseRepository.save(exp); + return exp; + } + + @Override + public List getAllEmployees() { + Iterable result = expenseRepository.findAll(); + List employeesList = new ArrayList(); + result.forEach(employeesList::add); + return employeesList; + } + + @Override + public List findExpenseByUserCodeAndDate(Long userCode, String date) throws ParseException { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Date d = sdf.parse(date); + + return expenseRepository.findByUserCodeAndDate(userCode, d); + } + + @Override + public String deleteExpense(String id) { + boolean result = expenseRepository.existsById(id); + expenseRepository.deleteById(id); + return "{ \"success\" : "+ (result ? "true" : "false") +" }"; + } + + @Override + public Expense updateExpense(Expense expense) { + return expenseRepository.findById(expense.getId()).map(recordedExpense -> { + recordedExpense.setCategory(expense.getCategory()); + + Expense updatedExpense = expenseRepository.save(recordedExpense); + + return updatedExpense; + }).orElse(null); + } + + @Override + public Expense addCategoryAutomatically(Expense expense) { + List categories = categoryRepository.findByDescription(expense.getCategory().getDescription()); + if (categories.size()>0){ + expense.setCategory(categories.get(0)); + } + + return expenseRepository.save(expense); + } +} diff --git a/src/main/java/santander/api/Application.java b/src/main/java/santander/api/Application.java deleted file mode 100644 index 1887f623..00000000 --- a/src/main/java/santander/api/Application.java +++ /dev/null @@ -1,35 +0,0 @@ -package santander.api; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import santander.api.domain.Greetings; - -import java.util.concurrent.atomic.AtomicLong; - -@SpringBootApplication -@RestController -public class Application { - - private static final String template = "Hello, %s!"; - private final AtomicLong counter = new AtomicLong(); - - - @RequestMapping("/") - public String home() { - return "Rest API"; - } - - @RequestMapping("/greeting") - public Greetings greeting(@RequestParam(value="name", defaultValue="World") String name) { - return new Greetings(counter.incrementAndGet(), - String.format(template, name)); - } - - public static void main(String[] args) { - SpringApplication.run(Application.class, args); - } - -} \ No newline at end of file diff --git a/src/main/java/santander/api/controller/ExpenseController.java b/src/main/java/santander/api/controller/ExpenseController.java deleted file mode 100644 index 7c4ab25c..00000000 --- a/src/main/java/santander/api/controller/ExpenseController.java +++ /dev/null @@ -1,97 +0,0 @@ -package santander.api.controller; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; -import santander.api.domain.Category; -import santander.api.domain.Expense; -import santander.api.domain.repository.CategoryRepository; -import santander.api.domain.repository.ExpenseRepository; - -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Random; - -@RestController -@RequestMapping("/expense") -public class ExpenseController{ - - - @Autowired - ExpenseRepository expenseRepository; - @Autowired - CategoryRepository categoryRepository; - - - @GetMapping(value = "/healthcheck", produces = "application/json; charset=utf-8") - public String getHealthCheck() - { - return "{ \"isWorking\" : true }"; - } - - @PostMapping("/add") - public Expense addExpense(@RequestBody Expense expense) - { - String id = String.valueOf(new Random().nextInt()); - Expense exp = new Expense(id, expense.getDescription(), expense.getValue(), expense.getUserCode(), expense.getDate(), expense.getCategory()); - expenseRepository.save(exp); - return exp; - } - - - @GetMapping("/findAll") - public List getEmployees() - { - Iterable result = expenseRepository.findAll(); - List employeesList = new ArrayList(); - result.forEach(employeesList::add); - return employeesList; - } - - @GetMapping(value = "/find/{userCode}/{date}", produces = "application/json; charset=utf-8") - public ResponseEntity> findExpenseByUserCodeAndDate(@PathVariable Long userCode, @PathVariable String date) throws ParseException { - - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - Date d = sdf.parse(date); - - List expenses = expenseRepository.findByUserCodeAndDate(userCode,d); - return ResponseEntity.status(HttpStatus.OK).body(expenses); - } - - @DeleteMapping(value = "/{id}", produces = "application/json; charset=utf-8") - public String deleteEmployee(@PathVariable String id) { - boolean result = expenseRepository.existsById(id); - expenseRepository.deleteById(id); - return "{ \"success\" : "+ (result ? "true" : "false") +" }"; - } - - - @PutMapping(value = "/update", produces = "application/json; charset=utf-8") - public ResponseEntity updateExpense(@RequestBody Expense expense) { - - return expenseRepository.findById(expense.getId()).map(recordGasto -> { - recordGasto.setCategory(expense.getCategory()); - - Expense updatedExpense = expenseRepository.save(recordGasto); - - return ResponseEntity.ok().body(updatedExpense); - }).orElse(ResponseEntity.notFound().build()); - } - - - @PostMapping("/addCategory") - public Expense addCategoryAutomatically (@RequestBody Expense gasto) { - - List categories = categoryRepository.findByDescription(gasto.getCategory().getDescription()); - if (categories.size()>0){ - gasto.setCategory(categories.get(0)); - } - - return expenseRepository.save(gasto); - } - -} diff --git a/src/main/java/santander/api/domain/Greetings.java b/src/main/java/santander/api/domain/Greetings.java deleted file mode 100644 index 0c8cefc1..00000000 --- a/src/main/java/santander/api/domain/Greetings.java +++ /dev/null @@ -1,20 +0,0 @@ -package santander.api.domain; - -public class Greetings { - private final long id; - private final String content; - - public Greetings(long id, String content) { - this.id = id; - this.content = content; - } - - public long getId() { - return id; - } - - public String getContent() { - return content; - } -} - diff --git a/src/test/java/dev/wellison/santander/ApplicationTests.java b/src/test/java/dev/wellison/santander/ApplicationTests.java new file mode 100644 index 00000000..8576a5d8 --- /dev/null +++ b/src/test/java/dev/wellison/santander/ApplicationTests.java @@ -0,0 +1,31 @@ +package dev.wellison.santander; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.web.servlet.MockMvc; + +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +@RunWith(SpringRunner.class) +@SpringBootTest +@AutoConfigureMockMvc +public class ApplicationTests { + + @Autowired + private MockMvc mockMvc; + + @Test + public void shouldReturnDefaultMessage() throws Exception { + this.mockMvc.perform(get("/healthcheck")).andDo(print()).andExpect(status().isOk()) + .andExpect(content().json("{ \"isWorking\" : true }")); + } + + +} \ No newline at end of file From ee3a0dae8d9a8aee39755408958069a035b6eba0 Mon Sep 17 00:00:00 2001 From: Wellison Pereira Date: Mon, 29 Jul 2019 10:49:35 -0300 Subject: [PATCH 6/9] Tests e autorizacao --- REST-Project-1-soapui-project.xml | 23 ++++----- pom.xml | 10 ++++ .../config/SpringSecurityConfig.java | 47 ++++++++++++++++++ .../controller/ExpenseController.java | 13 ++++- .../wellison/santander/domain/Expense.java | 4 ++ .../repository/ExpenseRepository.java | 1 + .../santander/service/ExpenseService.java | 3 +- .../service/impl/ExpenseServiceImpl.java | 11 +++-- .../wellison/santander/ApplicationTests.java | 49 +++++++++++++++++++ 9 files changed, 142 insertions(+), 19 deletions(-) create mode 100644 src/main/java/dev/wellison/santander/config/SpringSecurityConfig.java diff --git a/REST-Project-1-soapui-project.xml b/REST-Project-1-soapui-project.xml index 08fa97c1..56b37870 100644 --- a/REST-Project-1-soapui-project.xml +++ b/REST-Project-1-soapui-project.xml @@ -1,16 +1,13 @@ -http://localhost:8080text/plain;charset=UTF-8200dataapplication/json;charset=UTF-8200loc:Response0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0dataapplication/json;charset=UTF-8404loc:Fault0data0data0data0data0dataapplication/json;charset=utf-8200loc:Response<xml-fragment/>http://localhost:8080http://localhost/No Authorizationapplication/json;charset=UTF-8500add:Faultapplication/json0dataapplication/json;charset=UTF-8200add:Response<xml-fragment/>http://localhost:8080{ - "description" : "Teste", - "value": "36", - "userCode": "4321", +http://localhost:8080text/plain;charset=UTF-8200dataapplication/json;charset=UTF-8200loc:Response0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0data0dataapplication/json;charset=UTF-8404loc:Fault0data0data0data0data0dataapplication/json;charset=utf-8200loc:Response0data<xml-fragment/>http://localhost:8080http://localhost/No Authorizationapplication/json;charset=UTF-8500 401add:Faultapplication/json0dataapplication/json;charset=UTF-8200add:Response<xml-fragment/>http://localhost:8080{ + "description" : "Almoco", + "value": "55", + "userCode": "6789", "date": "2005-05-07" } -http://localhost/expense/addNo AuthorizationcodigoUsuarioTEMPLATEdataTEMPLATEapplication/json;charset=UTF-8500 405ns:Faultapplication/json;charset=utf-8200Response0dataapplication/json;charset=UTF-8200Response<xml-fragment/>http://localhost:8080http://localhost/expense/filtrar/1234/2005-05-06No Authorization - - -codigoUsuariodataidTEMPLATEapplication/jsonapplication/json;charset=UTF-8404ns:Faultapplication/json;charset=utf-8200ns:Response<xml-fragment/>http://localhost:8080http://localhost/expense/605173860No AuthorizationiduserCodeTEMPLATEdateTEMPLATEapplication/json;charset=UTF-8500 405ns:Faultapplication/json;charset=utf-8200Response0dataapplication/json;charset=UTF-8200Response<xml-fragment/>http://localhost:8080http://localhost/expense/filtrar/1234/2005-05-06No Authorization +http://localhost/expense/addadminadminBasicBasicGlobal HTTP Settingsapplication/json;charset=UTF-8500 405 401 403ns:Faultapplication/json;charset=utf-8200Response0dataapplication/json;charset=UTF-8200Response<xml-fragment/>http://localhost:8080http://localhost/expense/filtrar/1234/2005-05-06adminadminBasicBasicGlobal HTTP SettingsidTEMPLATEapplication/jsonapplication/json;charset=UTF-8404ns:Faultapplication/json;charset=utf-8200ns:Response<xml-fragment/>http://localhost:8080http://localhost/expense/605173860adminadminBasicBasicGlobal HTTP SettingsiduserCodeTEMPLATEdateTEMPLATEapplication/json;charset=UTF-8500 405ns:Faultapplication/json;charset=utf-8200Response0dataapplication/json;charset=UTF-8200Response<xml-fragment/>http://localhost:8080http://localhost/expense/filtrar/1234/2005-05-06useruserBasicBasicGlobal HTTP Settings - + userCodedateapplication/json;charset=UTF-8400upd:Faultapplication/jsonapplication/json;charset=utf-8200upd:Response<xml-fragment/>http://localhost:8080{ "id": 574291043, "category": { @@ -18,10 +15,10 @@ "description": "Gastos Caseiros" } } -http://localhost/expense/updateNo Authorizationapplication/json;charset=UTF-8200add:Responseapplication/json<xml-fragment/>http://localhost:8080{ - "description":"Gastos Caseiros" +http://localhost/expense/updateadminadminBasicBasicGlobal HTTP Settingsapplication/json;charset=UTF-8200add:Responseapplication/json<xml-fragment/>http://localhost:8080{ + "description":"PC" } -http://localhost/category/addNo AuthorizationsearchCategoryTEMPLATEapplication/json;charset=utf-8200Response<xml-fragment/>http://localhost:8080http://localhost/category/find/Gastos%20CaseirosNo AuthorizationsearchCategoryapplication/jsonapplication/json;charset=UTF-8200add:Response<xml-fragment/>http://localhost:8080{ +http://localhost/category/adduseruserBasicBasicGlobal HTTP SettingssearchCategoryTEMPLATEapplication/json;charset=utf-8200Response<xml-fragment/>http://localhost:8080http://localhost/category/find/Gastos%20CaseirosuseruserBasicBasicGlobal HTTP SettingssearchCategoryapplication/jsonapplication/json;charset=UTF-8200add:Response<xml-fragment/>http://localhost:8080{ "description" : "Teste de teste", "value": "68", "userCode": "666", @@ -30,4 +27,4 @@ "description": "Gastos Caseiros" } } -http://localhost/expense/addCategoryNo Authorization \ No newline at end of file +http://localhost/expense/addCategoryadminadminBasicBasicGlobal HTTP SettingsuserCodeTEMPLATEapplication/json;charset=UTF-8500 405ns:Faultapplication/json;charset=utf-8200Response0dataapplication/json;charset=UTF-8200Response<xml-fragment/>http://localhost:8080http://localhost/expense/filtrar/1234/2005-05-06useruserBasicBasicGlobal HTTP SettingsuserCode \ No newline at end of file diff --git a/pom.xml b/pom.xml index cd21061e..2839b908 100644 --- a/pom.xml +++ b/pom.xml @@ -19,15 +19,25 @@ + + org.springframework.boot + spring-boot-starter-security + org.springframework.boot spring-boot-starter-web + org.springframework.boot spring-boot-starter-test test + + org.springframework.security + spring-security-test + test + org.projectlombok lombok diff --git a/src/main/java/dev/wellison/santander/config/SpringSecurityConfig.java b/src/main/java/dev/wellison/santander/config/SpringSecurityConfig.java new file mode 100644 index 00000000..91a23440 --- /dev/null +++ b/src/main/java/dev/wellison/santander/config/SpringSecurityConfig.java @@ -0,0 +1,47 @@ +package dev.wellison.santander.config; + +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.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; + +@Configuration +@EnableGlobalMethodSecurity(prePostEnabled = true) +public class SpringSecurityConfig extends WebSecurityConfigurerAdapter { + + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + + auth.inMemoryAuthentication() + .withUser("admin").password(encoder().encode("admin")).roles("ADMIN") + .and() + .withUser("user").password(encoder().encode("user")).roles("USER"); + + } + + @Bean + public PasswordEncoder encoder() { + return new BCryptPasswordEncoder(); + } + + @Override + protected void configure(HttpSecurity http) throws Exception { + + http.httpBasic() + .and() + .authorizeRequests() + .antMatchers(HttpMethod.GET, "/expense/**").hasAnyRole("USER","ADMIN") + .antMatchers(HttpMethod.POST, "/expense/*").hasRole("ADMIN") + .antMatchers(HttpMethod.PUT, "/expense/**").hasAnyRole("USER","ADMIN") + .antMatchers(HttpMethod.GET, "/category/**").hasAnyRole("USER","ADMIN") + .antMatchers(HttpMethod.POST, "/category/*").hasAnyRole("USER","ADMIN") + .and() + .csrf().disable() + .formLogin().disable(); + } +} diff --git a/src/main/java/dev/wellison/santander/controller/ExpenseController.java b/src/main/java/dev/wellison/santander/controller/ExpenseController.java index 09472eed..e828bd81 100644 --- a/src/main/java/dev/wellison/santander/controller/ExpenseController.java +++ b/src/main/java/dev/wellison/santander/controller/ExpenseController.java @@ -5,6 +5,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import dev.wellison.santander.service.ExpenseService; @@ -23,6 +24,7 @@ public class ExpenseController{ @PostMapping("/add") + @PreAuthorize("hasRole('ADMIN')") public Expense addExpense(@RequestBody Expense expense) { return expenseService.saveExpense(expense); @@ -30,9 +32,10 @@ public Expense addExpense(@RequestBody Expense expense) @GetMapping("/findAll") + @PreAuthorize("hasRole('ADMIN')") public List getAllExpenses() { - return expenseService.getAllEmployees(); + return expenseService.getAllExpenses(); } @GetMapping(value = "/find/{userCode}/{date}", produces = "application/json; charset=utf-8") @@ -42,7 +45,15 @@ public ResponseEntity> findExpenseByUserCodeAndDate(@PathVariable return ResponseEntity.status(HttpStatus.OK).body(expenses); } + @GetMapping(value = "/find/{userCode}", produces = "application/json; charset=utf-8") + public ResponseEntity> findExpenseByUserCode(@PathVariable Long userCode) throws ParseException { + + List expenses = expenseService.findExpenseByUserCode(userCode); + return ResponseEntity.status(HttpStatus.OK).body(expenses); + } + @DeleteMapping(value = "/{id}", produces = "application/json; charset=utf-8") + @PreAuthorize("hasRole('ADMIN')") public String deleteExpense(@PathVariable String id) { return expenseService.deleteExpense(id); } diff --git a/src/main/java/dev/wellison/santander/domain/Expense.java b/src/main/java/dev/wellison/santander/domain/Expense.java index 6295e971..546ec0d1 100644 --- a/src/main/java/dev/wellison/santander/domain/Expense.java +++ b/src/main/java/dev/wellison/santander/domain/Expense.java @@ -22,4 +22,8 @@ public class Expense implements Serializable { private @Indexed Long userCode; private @Indexed Date date; private Category category; + + + public Expense() { + } } diff --git a/src/main/java/dev/wellison/santander/repository/ExpenseRepository.java b/src/main/java/dev/wellison/santander/repository/ExpenseRepository.java index 6dd900f5..5fdfb913 100644 --- a/src/main/java/dev/wellison/santander/repository/ExpenseRepository.java +++ b/src/main/java/dev/wellison/santander/repository/ExpenseRepository.java @@ -9,4 +9,5 @@ public interface ExpenseRepository extends CrudRepository { List findByUserCodeAndDate(Long userCode, Date date); + List findByUserCodeOrderByDateAsc(Long userCode); } diff --git a/src/main/java/dev/wellison/santander/service/ExpenseService.java b/src/main/java/dev/wellison/santander/service/ExpenseService.java index b0ea5380..d0d0ab39 100644 --- a/src/main/java/dev/wellison/santander/service/ExpenseService.java +++ b/src/main/java/dev/wellison/santander/service/ExpenseService.java @@ -8,8 +8,9 @@ public interface ExpenseService { Expense saveExpense(Expense expense); - List getAllEmployees(); + List getAllExpenses(); List findExpenseByUserCodeAndDate(Long userCode, String date) throws ParseException; + List findExpenseByUserCode(Long userCode); String deleteExpense(String id); Expense updateExpense(Expense expense); Expense addCategoryAutomatically (Expense expense); diff --git a/src/main/java/dev/wellison/santander/service/impl/ExpenseServiceImpl.java b/src/main/java/dev/wellison/santander/service/impl/ExpenseServiceImpl.java index 6408154b..e6612201 100644 --- a/src/main/java/dev/wellison/santander/service/impl/ExpenseServiceImpl.java +++ b/src/main/java/dev/wellison/santander/service/impl/ExpenseServiceImpl.java @@ -32,7 +32,7 @@ public Expense saveExpense(Expense expense) { } @Override - public List getAllEmployees() { + public List getAllExpenses() { Iterable result = expenseRepository.findAll(); List employeesList = new ArrayList(); result.forEach(employeesList::add); @@ -47,6 +47,11 @@ public List findExpenseByUserCodeAndDate(Long userCode, String date) th return expenseRepository.findByUserCodeAndDate(userCode, d); } + @Override + public List findExpenseByUserCode(Long userCode){ + return expenseRepository.findByUserCodeOrderByDateAsc(userCode); + } + @Override public String deleteExpense(String id) { boolean result = expenseRepository.existsById(id); @@ -59,9 +64,7 @@ public Expense updateExpense(Expense expense) { return expenseRepository.findById(expense.getId()).map(recordedExpense -> { recordedExpense.setCategory(expense.getCategory()); - Expense updatedExpense = expenseRepository.save(recordedExpense); - - return updatedExpense; + return expenseRepository.save(recordedExpense); }).orElse(null); } diff --git a/src/test/java/dev/wellison/santander/ApplicationTests.java b/src/test/java/dev/wellison/santander/ApplicationTests.java index 8576a5d8..b8581d13 100644 --- a/src/test/java/dev/wellison/santander/ApplicationTests.java +++ b/src/test/java/dev/wellison/santander/ApplicationTests.java @@ -1,5 +1,10 @@ package dev.wellison.santander; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectWriter; +import com.fasterxml.jackson.databind.SerializationFeature; +import dev.wellison.santander.domain.Expense; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -7,12 +12,19 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.MockMvc; +import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.*; +import java.text.ParseException; +import java.text.SimpleDateFormat; + +import static org.springframework.http.MediaType.APPLICATION_JSON; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + @RunWith(SpringRunner.class) @SpringBootTest @AutoConfigureMockMvc @@ -27,5 +39,42 @@ public void shouldReturnDefaultMessage() throws Exception { .andExpect(content().json("{ \"isWorking\" : true }")); } + @Test + public void testAddExpenseInvalidUser() throws Exception { + + Expense expense = getSampleExpense(); + + String requestBody = transformObjectToJson(expense); + + mockMvc.perform(post("/expense/add").with(httpBasic("invalidUser","oooo")).contentType(APPLICATION_JSON).content(requestBody)).andExpect(status().isUnauthorized()).andReturn(); + } + + @Test + public void testAddExpenseValidUser() throws Exception { + + Expense expense = getSampleExpense(); + + String requestBody = transformObjectToJson(expense); + mockMvc.perform(post("/expense/add").with(httpBasic("admin","admin")).contentType(APPLICATION_JSON).content(requestBody)).andExpect(status().isOk()).andReturn(); + } + + private String transformObjectToJson(Object obj) throws JsonProcessingException { + ObjectMapper mapper = new ObjectMapper(); + mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, false); + ObjectWriter ow = mapper.writer().withDefaultPrettyPrinter(); + return ow.writeValueAsString(obj); + } + + private Expense getSampleExpense() throws ParseException { + Expense expense = new Expense(); + expense.setDescription("Almoco"); + expense.setValue(46.0); + expense.setUserCode(Long.valueOf("1234") ); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + java.sql.Date data = new java.sql.Date(sdf.parse("2019-06-10").getTime()); + expense.setDate(data); + return expense; + } + } \ No newline at end of file From 5d5369fdb29a5cac4024dee5d63d63ed1dd8f166 Mon Sep 17 00:00:00 2001 From: Wellison Pereira Date: Mon, 29 Jul 2019 11:47:11 -0300 Subject: [PATCH 7/9] Adicionado Test de usur valid --- .../wellison/santander/ApplicationTests.java | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/src/test/java/dev/wellison/santander/ApplicationTests.java b/src/test/java/dev/wellison/santander/ApplicationTests.java index b8581d13..88c2eda9 100644 --- a/src/test/java/dev/wellison/santander/ApplicationTests.java +++ b/src/test/java/dev/wellison/santander/ApplicationTests.java @@ -5,17 +5,20 @@ import com.fasterxml.jackson.databind.ObjectWriter; import com.fasterxml.jackson.databind.SerializationFeature; import dev.wellison.santander.domain.Expense; +import dev.wellison.santander.service.ExpenseService; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.MockMvc; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.*; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.Date; import static org.springframework.http.MediaType.APPLICATION_JSON; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; @@ -33,6 +36,9 @@ public class ApplicationTests { @Autowired private MockMvc mockMvc; + @MockBean + ExpenseService expenseService; + @Test public void shouldReturnDefaultMessage() throws Exception { this.mockMvc.perform(get("/healthcheck")).andDo(print()).andExpect(status().isOk()) @@ -44,7 +50,7 @@ public void testAddExpenseInvalidUser() throws Exception { Expense expense = getSampleExpense(); - String requestBody = transformObjectToJson(expense); + String requestBody = asJsonString(expense); mockMvc.perform(post("/expense/add").with(httpBasic("invalidUser","oooo")).contentType(APPLICATION_JSON).content(requestBody)).andExpect(status().isUnauthorized()).andReturn(); } @@ -54,15 +60,20 @@ public void testAddExpenseValidUser() throws Exception { Expense expense = getSampleExpense(); - String requestBody = transformObjectToJson(expense); - mockMvc.perform(post("/expense/add").with(httpBasic("admin","admin")).contentType(APPLICATION_JSON).content(requestBody)).andExpect(status().isOk()).andReturn(); + String requestBody = asJsonString(expense); + mockMvc.perform(post("/expense/add") + .with(httpBasic("admin","admin")) + .contentType(APPLICATION_JSON) + .content(requestBody)) + .andExpect(status().isOk()); } - private String transformObjectToJson(Object obj) throws JsonProcessingException { - ObjectMapper mapper = new ObjectMapper(); - mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, false); - ObjectWriter ow = mapper.writer().withDefaultPrettyPrinter(); - return ow.writeValueAsString(obj); + public static String asJsonString(final Object obj) { + try { + return new ObjectMapper().writeValueAsString(obj); + } catch (Exception e) { + throw new RuntimeException(e); + } } private Expense getSampleExpense() throws ParseException { @@ -71,7 +82,7 @@ private Expense getSampleExpense() throws ParseException { expense.setValue(46.0); expense.setUserCode(Long.valueOf("1234") ); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - java.sql.Date data = new java.sql.Date(sdf.parse("2019-06-10").getTime()); + Date data = new Date(sdf.parse("2019-06-10").getTime()); expense.setDate(data); return expense; } From 6afd83ca7f71480dc8830306b2eaf58cb20993de Mon Sep 17 00:00:00 2001 From: hellison999 <39624390+hellison999@users.noreply.github.com> Date: Mon, 29 Jul 2019 14:25:46 -0300 Subject: [PATCH 8/9] Update README.md Adicionando as informacoes do arquivo de project do SoapUI --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 051e6c3e..b456b554 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,8 @@ Depois executar o Docker docker-compose up --build ``` +As chamadas podem ser importadas no SoapUI, através do arquivo `REST-Project-1-soapui-project.xml` + ### # DESAFIO: API REST para Gestão de Gastos! From 5f57523c0b3ccc2c3afc2b158876a1b6b0b2116f Mon Sep 17 00:00:00 2001 From: Wellison Pereira Date: Wed, 31 Jul 2019 18:04:15 -0300 Subject: [PATCH 9/9] Novos testes adicionados e classe de Util para testes --- .../wellison/santander/domain/Category.java | 3 + .../wellison/santander/ApplicationTests.java | 112 +++++++++++++++--- .../dev/wellison/santander/util/UtilTest.java | 14 +++ 3 files changed, 115 insertions(+), 14 deletions(-) create mode 100644 src/test/java/dev/wellison/santander/util/UtilTest.java diff --git a/src/main/java/dev/wellison/santander/domain/Category.java b/src/main/java/dev/wellison/santander/domain/Category.java index f4e853bb..961529dc 100644 --- a/src/main/java/dev/wellison/santander/domain/Category.java +++ b/src/main/java/dev/wellison/santander/domain/Category.java @@ -16,4 +16,7 @@ public class Category { private @Id String id; private @Indexed String description; + + public Category() { + } } diff --git a/src/test/java/dev/wellison/santander/ApplicationTests.java b/src/test/java/dev/wellison/santander/ApplicationTests.java index 88c2eda9..4a427e87 100644 --- a/src/test/java/dev/wellison/santander/ApplicationTests.java +++ b/src/test/java/dev/wellison/santander/ApplicationTests.java @@ -1,28 +1,34 @@ package dev.wellison.santander; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.ObjectWriter; -import com.fasterxml.jackson.databind.SerializationFeature; +import dev.wellison.santander.domain.Category; import dev.wellison.santander.domain.Expense; +import dev.wellison.santander.repository.CategoryRepository; +import dev.wellison.santander.repository.ExpenseRepository; +import dev.wellison.santander.service.CategoryService; import dev.wellison.santander.service.ExpenseService; +import dev.wellison.santander.util.UtilTest; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.MockMvc; -import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.*; +import java.lang.reflect.Array; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Date; +import java.util.List; +import java.util.Optional; import static org.springframework.http.MediaType.APPLICATION_JSON; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.httpBasic; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -39,6 +45,15 @@ public class ApplicationTests { @MockBean ExpenseService expenseService; + @MockBean + CategoryService categoryService; + + @MockBean + ExpenseRepository expenseRepository; + + @MockBean + CategoryRepository categoryRepository; + @Test public void shouldReturnDefaultMessage() throws Exception { this.mockMvc.perform(get("/healthcheck")).andDo(print()).andExpect(status().isOk()) @@ -50,7 +65,7 @@ public void testAddExpenseInvalidUser() throws Exception { Expense expense = getSampleExpense(); - String requestBody = asJsonString(expense); + String requestBody = UtilTest.asJsonString(expense); mockMvc.perform(post("/expense/add").with(httpBasic("invalidUser","oooo")).contentType(APPLICATION_JSON).content(requestBody)).andExpect(status().isUnauthorized()).andReturn(); } @@ -60,7 +75,7 @@ public void testAddExpenseValidUser() throws Exception { Expense expense = getSampleExpense(); - String requestBody = asJsonString(expense); + String requestBody = UtilTest.asJsonString(expense); mockMvc.perform(post("/expense/add") .with(httpBasic("admin","admin")) .contentType(APPLICATION_JSON) @@ -68,12 +83,79 @@ public void testAddExpenseValidUser() throws Exception { .andExpect(status().isOk()); } - public static String asJsonString(final Object obj) { - try { - return new ObjectMapper().writeValueAsString(obj); - } catch (Exception e) { - throw new RuntimeException(e); - } + @Test + public void getAllExpensesValid() throws Exception { + mockMvc.perform(get("/expense/findAll") + .with(httpBasic("admin","admin")) + .contentType(APPLICATION_JSON)) + .andExpect(status().isOk()); + } + + @Test + public void findExpenseByUserCodeAndDateValid() throws Exception { + mockMvc.perform(get("/expense/find/1234/2019-02-02") + .with(httpBasic("user","user")) + .contentType(APPLICATION_JSON)) + .andExpect(status().isOk()); + } + + @Test + public void findExpenseByUserCodeValid() throws Exception { + mockMvc.perform(get("/expense/find/1234") + .with(httpBasic("user","user")) + .contentType(APPLICATION_JSON)) + .andExpect(status().isOk()); + } + + @Test + public void deleteExpenseValid() throws Exception { + mockMvc.perform(delete("/expense/991ec2ca-ed72-499d-9772-0f7c5cb34a74") + .with(httpBasic("admin","admin")) + .contentType(APPLICATION_JSON)) + .andExpect(status().isOk()); + } + + @Test + public void updateExpenseValid() throws Exception { + Expense expense = getSampleExpense(); + expense.setId("991ec2ca-ed72-499d-9772-0f7c5cb34a74"); + Category c = new Category("047ac76b-1831-4454-b7ec-55658917a1cf","Automovel"); + expense.setCategory(c); + + Optional optionalExpense = Optional.of(expense); + Mockito.when(expenseRepository.findById(expense.getId())).thenReturn(optionalExpense); + Mockito.when(expenseRepository.save(expense)) + .thenReturn(expense); + expenseService.updateExpense(expense); + + + } + + @Test + public void addCategoryAutomaticallyValid() throws Exception { + + Expense expense = getSampleExpense(); + Category c = new Category(); + c.setDescription("Automovel"); + Category savedCategory = new Category("047ac76b-1831-4454-b7ec-55658917a1cf","Automovel"); + List list = new ArrayList<>(); + list.add(savedCategory); + expense.setCategory(savedCategory); + + Mockito.when(categoryRepository.findByDescription(c.getDescription())) + .thenReturn(list); + Mockito.when(expenseRepository.save(expense)) + .thenReturn(expense); + expenseService.updateExpense(expense); + + +// +// String requestBody = UtilTest.asJsonString(expense); +// mockMvc.perform(post("/expense/update") +// .with(httpBasic("admin","admin")) +// .contentType(APPLICATION_JSON) +// .content(requestBody)) +// .andExpect(status().isOk()); } private Expense getSampleExpense() throws ParseException { @@ -88,4 +170,6 @@ private Expense getSampleExpense() throws ParseException { } + + } \ No newline at end of file diff --git a/src/test/java/dev/wellison/santander/util/UtilTest.java b/src/test/java/dev/wellison/santander/util/UtilTest.java new file mode 100644 index 00000000..9121a20e --- /dev/null +++ b/src/test/java/dev/wellison/santander/util/UtilTest.java @@ -0,0 +1,14 @@ +package dev.wellison.santander.util; + +import com.fasterxml.jackson.databind.ObjectMapper; + +public class UtilTest { + + public static String asJsonString(final Object obj) { + try { + return new ObjectMapper().writeValueAsString(obj); + } catch (Exception e) { + throw new RuntimeException(e); + } + } +}