diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml
deleted file mode 100644
index b8d93d8..0000000
--- a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml
deleted file mode 100644
index 30ff5cb..0000000
--- a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_woodstox_woodstox_core_5_3_0.xml b/.idea/libraries/Maven__com_fasterxml_woodstox_woodstox_core_5_3_0.xml
deleted file mode 100644
index 9cf1f37..0000000
--- a/.idea/libraries/Maven__com_fasterxml_woodstox_woodstox_core_5_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_feature_flip_flips_core_1_0_1.xml b/.idea/libraries/Maven__com_github_feature_flip_flips_core_1_0_1.xml
deleted file mode 100644
index fca74d0..0000000
--- a/.idea/libraries/Maven__com_github_feature_flip_flips_core_1_0_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_8_6.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_8_6.xml
deleted file mode 100644
index 82a9f20..0000000
--- a/.idea/libraries/Maven__com_google_code_gson_gson_2_8_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_guava_guava_18_0.xml b/.idea/libraries/Maven__com_google_guava_guava_18_0.xml
deleted file mode 100644
index bbd71d7..0000000
--- a/.idea/libraries/Maven__com_google_guava_guava_18_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_inject_guice_4_1_0.xml b/.idea/libraries/Maven__com_google_inject_guice_4_1_0.xml
deleted file mode 100644
index e956197..0000000
--- a/.idea/libraries/Maven__com_google_inject_guice_4_1_0.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 f19f6eb..0000000
--- 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_netflix_archaius_archaius_core_0_7_6.xml b/.idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_6.xml
deleted file mode 100644
index bd9061c..0000000
--- a/.idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_eureka_eureka_client_1_9_25.xml b/.idea/libraries/Maven__com_netflix_eureka_eureka_client_1_9_25.xml
deleted file mode 100644
index 82b2c5f..0000000
--- a/.idea/libraries/Maven__com_netflix_eureka_eureka_client_1_9_25.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_eureka_eureka_core_1_9_25.xml b/.idea/libraries/Maven__com_netflix_eureka_eureka_core_1_9_25.xml
deleted file mode 100644
index 40e9ef0..0000000
--- a/.idea/libraries/Maven__com_netflix_eureka_eureka_core_1_9_25.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_4_3.xml b/.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_4_3.xml
deleted file mode 100644
index 7502eea..0000000
--- a/.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_4_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_commons_util_0_1_1.xml b/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_commons_util_0_1_1.xml
deleted file mode 100644
index 9854a4d..0000000
--- a/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_commons_util_0_1_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_eventbus_0_3_0.xml b/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_eventbus_0_3_0.xml
deleted file mode 100644
index 85ba8c9..0000000
--- a/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_eventbus_0_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_infix_0_3_0.xml b/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_infix_0_3_0.xml
deleted file mode 100644
index c8b512e..0000000
--- a/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_infix_0_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_statistics_0_1_1.xml b/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_statistics_0_1_1.xml
deleted file mode 100644
index 09c6f6e..0000000
--- a/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_statistics_0_1_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_2_3_0.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_2_3_0.xml
deleted file mode 100644
index 28cf880..0000000
--- a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_2_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_core_2_3_0.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_core_2_3_0.xml
deleted file mode 100644
index eff738d..0000000
--- a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_core_2_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_eureka_2_3_0.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_eureka_2_3_0.xml
deleted file mode 100644
index 4b0af0d..0000000
--- a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_eureka_2_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_httpclient_2_3_0.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_httpclient_2_3_0.xml
deleted file mode 100644
index 1312269..0000000
--- a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_httpclient_2_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_loadbalancer_2_3_0.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_loadbalancer_2_3_0.xml
deleted file mode 100644
index a1ff3f0..0000000
--- a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_loadbalancer_2_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_transport_2_3_0.xml b/.idea/libraries/Maven__com_netflix_ribbon_ribbon_transport_2_3_0.xml
deleted file mode 100644
index 658fe0c..0000000
--- a/.idea/libraries/Maven__com_netflix_ribbon_ribbon_transport_2_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_netflix_servo_servo_core_0_12_21.xml b/.idea/libraries/Maven__com_netflix_servo_servo_core_0_12_21.xml
deleted file mode 100644
index 837985a..0000000
--- a/.idea/libraries/Maven__com_netflix_servo_servo_core_0_12_21.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_stoyanr_evictor_1_0_0.xml b/.idea/libraries/Maven__com_stoyanr_evictor_1_0_0.xml
deleted file mode 100644
index 4f6676e..0000000
--- a/.idea/libraries/Maven__com_stoyanr_evictor_1_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_sun_jersey_contribs_jersey_apache_client4_1_19_1.xml b/.idea/libraries/Maven__com_sun_jersey_contribs_jersey_apache_client4_1_19_1.xml
deleted file mode 100644
index 2061d8c..0000000
--- a/.idea/libraries/Maven__com_sun_jersey_contribs_jersey_apache_client4_1_19_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_19_1.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_19_1.xml
deleted file mode 100644
index 2b077bc..0000000
--- a/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_19_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml
deleted file mode 100644
index 91d65b2..0000000
--- a/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_11_1.xml b/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_11_1.xml
deleted file mode 100644
index ba904ef..0000000
--- a/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_11_1.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 b8581a6..0000000
--- 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__commons_codec_commons_codec_1_14.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_14.xml
deleted file mode 100644
index 50b8f2b..0000000
--- a/.idea/libraries/Maven__commons_codec_commons_codec_1_14.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
deleted file mode 100644
index 13afda2..0000000
--- a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_configuration_commons_configuration_1_10.xml b/.idea/libraries/Maven__commons_configuration_commons_configuration_1_10.xml
deleted file mode 100644
index 12e4c69..0000000
--- a/.idea/libraries/Maven__commons_configuration_commons_configuration_1_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_jxpath_commons_jxpath_1_3.xml b/.idea/libraries/Maven__commons_jxpath_commons_jxpath_1_3.xml
deleted file mode 100644
index 1816895..0000000
--- a/.idea/libraries/Maven__commons_jxpath_commons_jxpath_1_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml
deleted file mode 100644
index 2ec8376..0000000
--- a/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_projectreactor_addons_reactor_extra_3_3_3_RELEASE.xml b/.idea/libraries/Maven__io_projectreactor_addons_reactor_extra_3_3_3_RELEASE.xml
deleted file mode 100644
index 45d9a6f..0000000
--- a/.idea/libraries/Maven__io_projectreactor_addons_reactor_extra_3_3_3_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_reactivex_rxjava_1_3_8.xml b/.idea/libraries/Maven__io_reactivex_rxjava_1_3_8.xml
deleted file mode 100644
index cda742b..0000000
--- a/.idea/libraries/Maven__io_reactivex_rxjava_1_3_8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_reactivex_rxnetty_0_4_9.xml b/.idea/libraries/Maven__io_reactivex_rxnetty_0_4_9.xml
deleted file mode 100644
index 82613f4..0000000
--- a/.idea/libraries/Maven__io_reactivex_rxnetty_0_4_9.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_reactivex_rxnetty_contexts_0_4_9.xml b/.idea/libraries/Maven__io_reactivex_rxnetty_contexts_0_4_9.xml
deleted file mode 100644
index 1ce62ff..0000000
--- a/.idea/libraries/Maven__io_reactivex_rxnetty_contexts_0_4_9.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_reactivex_rxnetty_servo_0_4_9.xml b/.idea/libraries/Maven__io_reactivex_rxnetty_servo_0_4_9.xml
deleted file mode 100644
index f9da5f7..0000000
--- a/.idea/libraries/Maven__io_reactivex_rxnetty_servo_0_4_9.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_core_2_7_0.xml b/.idea/libraries/Maven__io_springfox_springfox_core_2_7_0.xml
deleted file mode 100644
index abb3fd9..0000000
--- a/.idea/libraries/Maven__io_springfox_springfox_core_2_7_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_schema_2_7_0.xml b/.idea/libraries/Maven__io_springfox_springfox_schema_2_7_0.xml
deleted file mode 100644
index 706ae46..0000000
--- a/.idea/libraries/Maven__io_springfox_springfox_schema_2_7_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_spi_2_7_0.xml b/.idea/libraries/Maven__io_springfox_springfox_spi_2_7_0.xml
deleted file mode 100644
index 4d0a278..0000000
--- a/.idea/libraries/Maven__io_springfox_springfox_spi_2_7_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_7_0.xml b/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_7_0.xml
deleted file mode 100644
index 0813776..0000000
--- a/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_7_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_7_0.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_7_0.xml
deleted file mode 100644
index 117d4ee..0000000
--- a/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_7_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_7_0.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_7_0.xml
deleted file mode 100644
index e6679b3..0000000
--- a/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_7_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_7_0.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_7_0.xml
deleted file mode 100644
index b1342e2..0000000
--- a/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_7_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_13.xml b/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_13.xml
deleted file mode 100644
index 1fd5fc3..0000000
--- a/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_13.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_swagger_swagger_models_1_5_13.xml b/.idea/libraries/Maven__io_swagger_swagger_models_1_5_13.xml
deleted file mode 100644
index fa7a4b3..0000000
--- a/.idea/libraries/Maven__io_swagger_swagger_models_1_5_13.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml b/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml
deleted file mode 100644
index be90656..0000000
--- a/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml b/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml
deleted file mode 100644
index 04213f7..0000000
--- a/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_inject_javax_inject_1.xml b/.idea/libraries/Maven__javax_inject_javax_inject_1.xml
deleted file mode 100644
index 93cf65a..0000000
--- a/.idea/libraries/Maven__javax_inject_javax_inject_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml b/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml
deleted file mode 100644
index a0c4d76..0000000
--- a/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__joda_time_joda_time_2_3.xml b/.idea/libraries/Maven__joda_time_joda_time_2_3.xml
deleted file mode 100644
index 20f5108..0000000
--- a/.idea/libraries/Maven__joda_time_joda_time_2_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__junit_junit_4_13.xml b/.idea/libraries/Maven__junit_junit_4_13.xml
deleted file mode 100644
index 59fc5c4..0000000
--- a/.idea/libraries/Maven__junit_junit_4_13.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_11.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_11.xml
deleted file mode 100644
index 54fe6ae..0000000
--- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_11.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_10_11.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_11.xml
deleted file mode 100644
index 3dca578..0000000
--- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_11.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 b3d3858..0000000
--- 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 1083023..0000000
--- 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_antlr_antlr_runtime_3_4.xml b/.idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml
deleted file mode 100644
index fd0779a..0000000
--- a/.idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml b/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml
deleted file mode 100644
index 6998bac..0000000
--- a/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_math_2_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_math_2_2.xml
deleted file mode 100644
index 8f3e315..0000000
--- a/.idea/libraries/Maven__org_apache_commons_commons_math_2_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_12.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_12.xml
deleted file mode 100644
index 9cb68a2..0000000
--- a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_12.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_13.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_13.xml
deleted file mode 100644
index b475675..0000000
--- a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_13.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml
deleted file mode 100644
index f854ab0..0000000
--- a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_aspectj_aspectjrt_1_9_5.xml b/.idea/libraries/Maven__org_aspectj_aspectjrt_1_9_5.xml
deleted file mode 100644
index 649cc0e..0000000
--- a/.idea/libraries/Maven__org_aspectj_aspectjrt_1_9_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_5.xml b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_5.xml
deleted file mode 100644
index 1a387a4..0000000
--- a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_assertj_assertj_core_3_16_1.xml b/.idea/libraries/Maven__org_assertj_assertj_core_3_16_1.xml
deleted file mode 100644
index 8976500..0000000
--- a/.idea/libraries/Maven__org_assertj_assertj_core_3_16_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_attoparser_attoparser_2_0_5_RELEASE.xml b/.idea/libraries/Maven__org_attoparser_attoparser_2_0_5_RELEASE.xml
deleted file mode 100644
index 5bad7db..0000000
--- a/.idea/libraries/Maven__org_attoparser_attoparser_2_0_5_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_64.xml b/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_64.xml
deleted file mode 100644
index 56cfc40..0000000
--- a/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_64.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_64.xml b/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_64.xml
deleted file mode 100644
index 861cb28..0000000
--- a/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_64.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_3_7.xml b/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_4_1.xml
similarity index 62%
rename from .idea/libraries/Maven__org_codehaus_jettison_jettison_1_3_7.xml
rename to .idea/libraries/Maven__org_codehaus_jettison_jettison_1_4_1.xml
index ca43e29..17ce590 100644
--- a/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_3_7.xml
+++ b/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_4_1.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_4_2.xml b/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_4_2.xml
deleted file mode 100644
index 30ed863..0000000
--- a/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_4_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml
deleted file mode 100644
index 6b5496f..0000000
--- a/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_21_0_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_21_0_GA.xml
deleted file mode 100644
index 09c4cf0..0000000
--- a/.idea/libraries/Maven__org_javassist_javassist_3_21_0_GA.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_6_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_6_2.xml
deleted file mode 100644
index 7171153..0000000
--- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_6_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_2.xml
deleted file mode 100644
index ef160d2..0000000
--- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_2.xml
deleted file mode 100644
index fc4c644..0000000
--- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_6_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_6_2.xml
deleted file mode 100644
index 45b4af3..0000000
--- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_6_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_2.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_2.xml
deleted file mode 100644
index f2699b9..0000000
--- a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_2.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_2.xml
deleted file mode 100644
index c13a302..0000000
--- a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_junit_vintage_junit_vintage_engine_5_6_2.xml b/.idea/libraries/Maven__org_junit_vintage_junit_vintage_engine_5_6_2.xml
deleted file mode 100644
index 697c91f..0000000
--- a/.idea/libraries/Maven__org_junit_vintage_junit_vintage_engine_5_6_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_3_3_3.xml b/.idea/libraries/Maven__org_mockito_mockito_core_3_3_3.xml
deleted file mode 100644
index d2f4afa..0000000
--- a/.idea/libraries/Maven__org_mockito_mockito_core_3_3_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_3_3.xml b/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_3_3.xml
deleted file mode 100644
index 6c02a63..0000000
--- a/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_3_3.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 af41e3b..0000000
--- 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_opentest4j_opentest4j_1_2_0.xml b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml
deleted file mode 100644
index fbc1b16..0000000
--- a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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 0bf8cf2..0000000
--- 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_reflections_reflections_0_9_11.xml b/.idea/libraries/Maven__org_reflections_reflections_0_9_11.xml
deleted file mode 100644
index d8b2fb5..0000000
--- a/.idea/libraries/Maven__org_reflections_reflections_0_9_11.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 c4c54d6..0000000
--- 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_jcl_over_slf4j_1_7_30.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_30.xml
deleted file mode 100644
index f92b959..0000000
--- a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_30.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_aop_2_3_1_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_3_1_RELEASE.xml
deleted file mode 100644
index 615346b..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_3_1_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_cache_2_3_1_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_cache_2_3_1_RELEASE.xml
deleted file mode 100644
index 241a051..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_cache_2_3_1_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_3_1_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_3_1_RELEASE.xml
deleted file mode 100644
index b0b5e61..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_3_1_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_thymeleaf_2_3_1_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_3_1_RELEASE.xml
deleted file mode 100644
index f59d516..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_3_1_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_3_1_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_3_1_RELEASE.xml
deleted file mode 100644
index e123659..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_3_1_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_3_1_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_3_1_RELEASE.xml
deleted file mode 100644
index 7917708..0000000
--- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_3_1_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_2_2_5_RELEASE.xml
deleted file mode 100644
index 7a3477e..0000000
--- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_2_2_5_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_config_client_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_config_client_2_2_5_RELEASE.xml
deleted file mode 100644
index 22c4a13..0000000
--- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_config_client_2_2_5_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_2_2_5_RELEASE.xml
deleted file mode 100644
index f7eb169..0000000
--- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_2_2_5_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_loadbalancer_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_loadbalancer_2_2_5_RELEASE.xml
deleted file mode 100644
index 1ace932..0000000
--- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_loadbalancer_2_2_5_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_2_5_RELEASE.xml
deleted file mode 100644
index 1f971e4..0000000
--- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_2_5_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_client_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_client_2_2_5_RELEASE.xml
deleted file mode 100644
index ca9d36a..0000000
--- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_client_2_2_5_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_hystrix_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_hystrix_2_2_5_RELEASE.xml
deleted file mode 100644
index 4741adc..0000000
--- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_hystrix_2_2_5_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_2_5_RELEASE.xml
deleted file mode 100644
index eccd43a..0000000
--- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_2_5_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_2_2_5_RELEASE.xml
deleted file mode 100644
index 3a0def6..0000000
--- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_2_2_5_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_config_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_config_2_2_5_RELEASE.xml
deleted file mode 100644
index 111e3fa..0000000
--- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_config_2_2_5_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_loadbalancer_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_loadbalancer_2_2_5_RELEASE.xml
deleted file mode 100644
index 798fd3b..0000000
--- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_loadbalancer_2_2_5_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_2_5_RELEASE.xml
deleted file mode 100644
index 3e290d6..0000000
--- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_2_5_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_eureka_client_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_eureka_client_2_2_5_RELEASE.xml
deleted file mode 100644
index 1f7933f..0000000
--- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_eureka_client_2_2_5_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_2_2_5_RELEASE.xml
deleted file mode 100644
index a132e78..0000000
--- a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_2_2_5_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml
deleted file mode 100644
index fbc0452..0000000
--- a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml
deleted file mode 100644
index 7e6f096..0000000
--- a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_3_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_3_3_RELEASE.xml
deleted file mode 100644
index 7917663..0000000
--- a/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_3_3_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_9_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_9_RELEASE.xml
deleted file mode 100644
index 6097256..0000000
--- a/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_9_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_2_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_5_2_7_RELEASE.xml
deleted file mode 100644
index 2eff1cd..0000000
--- a/.idea/libraries/Maven__org_springframework_spring_test_5_2_7_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_4_RELEASE.xml b/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_4_RELEASE.xml
deleted file mode 100644
index 7b246ae..0000000
--- a/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_4_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_11_RELEASE.xml b/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_11_RELEASE.xml
deleted file mode 100644
index 7b72bab..0000000
--- a/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_11_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_11_RELEASE.xml b/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_11_RELEASE.xml
deleted file mode 100644
index 3370587..0000000
--- a/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_11_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_unbescape_unbescape_1_1_6_RELEASE.xml b/.idea/libraries/Maven__org_unbescape_unbescape_1_1_6_RELEASE.xml
deleted file mode 100644
index 2334aa0..0000000
--- a/.idea/libraries/Maven__org_unbescape_unbescape_1_1_6_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_7_0.xml b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_7_0.xml
deleted file mode 100644
index 006a8d3..0000000
--- a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_7_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__stax_stax_api_1_0_1.xml b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml
deleted file mode 100644
index 0b13335..0000000
--- a/.idea/libraries/Maven__stax_stax_api_1_0_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml b/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml
deleted file mode 100644
index 0f2d9ef..0000000
--- a/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml b/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml
deleted file mode 100644
index 6726a2d..0000000
--- a/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Klaus.iml b/Klaus.iml
index 6c25899..b9413d4 100644
--- a/Klaus.iml
+++ b/Klaus.iml
@@ -34,21 +34,22 @@
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+
@@ -58,10 +59,9 @@
-
-
-
+
+
@@ -71,61 +71,16 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -139,82 +94,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 71cab7e..75d8fe6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,18 +28,18 @@
-
- org.springframework.boot
- spring-boot-starter-thymeleaf
-
+
+
+
+
org.springframework.boot
spring-boot-starter-web
-
- org.springframework.boot
- spring-boot-starter-aop
-
+
+
+
+
org.springframework.boot
spring-boot-devtools
@@ -55,11 +55,11 @@
org.springframework.boot
spring-boot-starter-validation
-
- org.springframework.cloud
- spring-cloud-starter-config
- 2.2.5.RELEASE
-
+
+
+
+
+
org.projectlombok
lombok
@@ -70,17 +70,17 @@
mapstruct
${mapstruct.version}
-
- org.springframework.boot
- spring-boot-starter-test
- test
-
-
- org.assertj
- assertj-core
- ${assertj.version}
- test
-
+
+
+
+
+
+
+
+
+
+
+
org.springframework.boot
spring-boot-starter-data-redis
@@ -96,25 +96,30 @@
${jedis.version}
- io.springfox
- springfox-swagger2
- ${springfox-swagger2.version}
-
-
- io.springfox
- springfox-swagger-ui
- ${springfox-swagger-ui.version}
-
-
- org.springframework.cloud
- spring-cloud-starter-netflix-eureka-client
- ${eureka-client.version}
-
-
- com.github.feature-flip
- flips-core
- 1.0.1
+ org.codehaus.jettison
+ jettison
+ 1.4.1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/release11/klaus/config/LocalDiscovery.java b/src/main/java/com/release11/klaus/config/LocalDiscovery.java
deleted file mode 100644
index fe65521..0000000
--- a/src/main/java/com/release11/klaus/config/LocalDiscovery.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.release11.klaus.config;
-
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@EnableDiscoveryClient
-public class LocalDiscovery {
-}
diff --git a/src/main/java/com/release11/klaus/config/SwaggerConfig.java b/src/main/java/com/release11/klaus/config/SwaggerConfig.java
deleted file mode 100644
index a41dd4e..0000000
--- a/src/main/java/com/release11/klaus/config/SwaggerConfig.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.release11.klaus.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-import static springfox.documentation.builders.PathSelectors.regex;
-
-/**
- * Points to swagger version and package containing controller classes
- */
-@Configuration
-@EnableSwagger2
-public class SwaggerConfig {
- @Bean
- public Docket productApi() {
- return new Docket(DocumentationType.SWAGGER_2).select()
- .apis(RequestHandlerSelectors.basePackage("com.release11.klaus.controller"))
- .paths(regex("/klaus/v1.*"))
- .build();
- }
-}
-
-
diff --git a/src/main/java/com/release11/klaus/controller/EventController.java b/src/main/java/com/release11/klaus/controller/EventController.java
index c573843..b18eef0 100644
--- a/src/main/java/com/release11/klaus/controller/EventController.java
+++ b/src/main/java/com/release11/klaus/controller/EventController.java
@@ -24,7 +24,7 @@ import java.util.UUID;
*/
@Slf4j
@Controller
-@RequestMapping
+@RequestMapping(path = "/event")
@AllArgsConstructor
public class EventController {
@@ -32,44 +32,44 @@ public class EventController {
private final List eventList = new LinkedList<>();
- @GetMapping("/etrack/{uuid}")
- public String showEtrack(@Valid EventRequestDto eventRequestDto, @PathVariable UUID uuid, final Model model,
- BindingResult bindingResult){
- model.addAttribute("clientUUID", uuid);
- model.addAttribute("eventRequestDto", eventRequestDto);
- return "etrack";
- }
-
- @PostMapping("/etrack/{uuid}")
- public String getLogs(@Valid EventRequestDto eventRequestDto, final Model model, BindingResult bindingResult,
- @PathVariable UUID uuid){
- model.addAttribute("clientUUID", uuid);
- populateModelWithLists(model, eventRequestDto, true);
- return "etrack";
- }
-
- private void populateModelWithLists(Model model, EventRequestDto eventRequestDto, boolean updateList){
- if (updateList){
- eventList.clear();
- eventList.addAll(etrackService.getEventsByDateTimeAndBusinessKeys(eventRequestDto));
- }
- model.addAttribute("eventList", eventList);
- }
-
- @ModelAttribute("eventRequestDto")
- public EventRequestDto eventRequestDto() {
- return EventRequestDto.builder()
- .mockedResponseId(1)
- .localDateTimeFrom(LocalDateTime.of(LocalDate.now(), LocalTime.MIN))
- .localDateTimeTo(LocalDateTime.of(LocalDate.now().plusDays(1), LocalTime.MIDNIGHT))
- .build();
- }
-
-
- @ModelAttribute("eventList")
- public List eventList() {
- return eventList;
- }
+// @GetMapping("/etrack/{uuid}")
+// public String showEtrack(@Valid EventRequestDto eventRequestDto, @PathVariable UUID uuid, final Model model,
+// BindingResult bindingResult){
+// model.addAttribute("clientUUID", uuid);
+// model.addAttribute("eventRequestDto", eventRequestDto);
+// return "etrack";
+// }
+//
+// @PostMapping("/etrack/{uuid}")
+// public String getLogs(@Valid EventRequestDto eventRequestDto, final Model model, BindingResult bindingResult,
+// @PathVariable UUID uuid){
+// model.addAttribute("clientUUID", uuid);
+// populateModelWithLists(model, eventRequestDto, true);
+// return "etrack";
+// }
+//
+// private void populateModelWithLists(Model model, EventRequestDto eventRequestDto, boolean updateList){
+// if (updateList){
+// eventList.clear();
+// eventList.addAll(etrackService.getEventsByDateTimeAndBusinessKeys(eventRequestDto));
+// }
+// model.addAttribute("eventList", eventList);
+// }
+//
+// @ModelAttribute("eventRequestDto")
+// public EventRequestDto eventRequestDto() {
+// return EventRequestDto.builder()
+// .mockedResponseId(1)
+// .localDateTimeFrom(LocalDateTime.of(LocalDate.now(), LocalTime.MIN))
+// .localDateTimeTo(LocalDateTime.of(LocalDate.now().plusDays(1), LocalTime.MIDNIGHT))
+// .build();
+// }
+//
+//
+// @ModelAttribute("eventList")
+// public List eventList() {
+// return eventList;
+// }
}
diff --git a/src/main/java/com/release11/klaus/controller/KlausController.java b/src/main/java/com/release11/klaus/controller/KlausController.java
index 52342ee..5891f45 100644
--- a/src/main/java/com/release11/klaus/controller/KlausController.java
+++ b/src/main/java/com/release11/klaus/controller/KlausController.java
@@ -27,7 +27,7 @@ import java.util.UUID;
* A class responds to generated message uri's requests.
* It deletes or fetches the requested message
*/
-@Controller("/")
+@Controller("/klaus/v1")
@Slf4j
//@Profile({"DEV", "default"})
@AllArgsConstructor
@@ -36,7 +36,7 @@ public class KlausController {
private final KlausService klausService;
- @DeleteMapping(value = "klaus/v1/delete/{clientUUID}/{mockedResponseId}")
+ @DeleteMapping(value = "/delete/{clientUUID}/{mockedResponseId}")
public ResponseEntity deleteMockedResponse(@PathVariable UUID clientUUID,
@PathVariable int mockedResponseId){
TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "deleteMockedResponse",
@@ -46,7 +46,7 @@ public class KlausController {
return new ResponseEntity<>("message has been deleted", HttpStatus.OK);
}
- @GetMapping(value = "klaus/v1/getAll/{clientUUID}")
+ @GetMapping(value = "/getAll/{clientUUID}")
public ResponseEntity getAllMockedResponses(@PathVariable UUID clientUUID){
TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "getAllMockedResponse",
BusinessKey.CLIENT_UUID, String.valueOf(clientUUID)));
@@ -54,7 +54,7 @@ public class KlausController {
return new ResponseEntity<>(mockedMessages.toString(), HttpStatus.OK);
}
- @RequestMapping(value = "klaus/v1/get/{clientUUID}/{mockedResponseId}")
+ @RequestMapping(value = "/get/{clientUUID}/{mockedResponseId}")
public ResponseEntity getMockedResponse(RequestEntity requestEntity,
@PathVariable UUID clientUUID,
@PathVariable int mockedResponseId) {
diff --git a/src/main/java/com/release11/klaus/controller/MockController.java b/src/main/java/com/release11/klaus/controller/MockController.java
index 4adcfce..951746e 100644
--- a/src/main/java/com/release11/klaus/controller/MockController.java
+++ b/src/main/java/com/release11/klaus/controller/MockController.java
@@ -10,6 +10,7 @@ import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
import java.time.LocalDateTime;
import java.util.*;
@@ -28,12 +29,17 @@ public class MockController {
* @return
*/
@SneakyThrows
- @GetMapping({"/","/mock"})
- public String showHome(){
- return "mock";
+ @GetMapping
+ public ModelAndView showHome(){
+ ModelAndView mov = new ModelAndView();
+ mov.setViewName("html/mock");
+ System.out.println("Trying to return view");
+ return mov;
}
+// TODO: Remove object mapper
@SneakyThrows
+ @ResponseBody
@PutMapping("/mock/json")
public ResponseEntity updateMessage(@RequestBody String body){
ObjectMapper mapper = new ObjectMapper();
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 5b60490..bd52dd8 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,13 +1,7 @@
#environment:
server.port = 8097
spring.application.name = klaus
-eureka.client.service-url.defaultZone=http://netflix:eureka@eureka:8761/eureka/
-spring.cloud.config.discovery.service-id = klaus-config-service
-#spring.cloud.config.fail-fast=true
-#spring.cloud.config.username = SpringConfigUsername
-#spring.cloud.config.password = SpringConfigPassword
-#logging:
-spring.output.ansi.enabled = always
+spring.mvc.view.suffix=.html
logging.level.root=INFO
logging.level.org.springframework.web=INFO
logging.level.com.release11=INFO
diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml
deleted file mode 100644
index 75b6faf..0000000
--- a/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-spring:
- profiles:
- active: DEV
- application:
- name: klaus
- cloud:
- spring:
- cloud:
- config:
- uri: http://localhost:8888
- retry:
- max-attempts: 20
- max-interval: 15000
- initial-interval: 10000
diff --git a/src/main/resources/templates/mock.html b/src/main/resources/static/html/mock.html
similarity index 100%
rename from src/main/resources/templates/mock.html
rename to src/main/resources/static/html/mock.html