From 05b15e01e319ca5d01e0025543fc1ad3daadf532 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Sat, 1 Jul 2023 21:49:36 +0200 Subject: [PATCH] Initial commit --- .editorconfig | 669 ++++++++++++++++++ .gitattributes | 2 + .gitignore | 45 ++ .run/MainApplication.run.xml | 15 + LICENSE | 201 ++++++ README.md | 15 + build.gradle | 13 + buildSrc/build.gradle | 15 + buildSrc/settings.gradle | 9 + .../src/main/groovy/twomartens.base.gradle | 6 + .../main/groovy/twomartens.checkstyle.gradle | 23 + .../main/groovy/twomartens.java-base.gradle | 22 + .../groovy/twomartens.java-preview.gradle | 15 + .../src/main/groovy/twomartens.java.gradle | 71 ++ .../groovy/twomartens.nebula-release.gradle | 16 + .../twomartens.spring-boot-cloud.gradle | 40 ++ .../main/groovy/twomartens.spring-boot.gradle | 60 ++ .../main/groovy/twomartens.versions.gradle | 29 + config/checkstyle/checkstyle-suppressions.xml | 10 + config/checkstyle/checkstyle.xml | 367 ++++++++++ gradle.properties | 9 + gradle/libs.versions.toml | 113 +++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 60756 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 240 +++++++ gradlew.bat | 91 +++ lombok.config | 1 + module-lib/lib.gradle | 7 + .../de/twomartens/template/model/Name.java | 5 + module-plain/plain.gradle | 7 + .../java/de/twomartens/template/Main.java | 13 + module-plain/src/main/resources/log4j2.xml | 14 + module-server/server.gradle | 9 + .../twomartens/template/MainApplication.java | 35 + .../configuration/ClockConfiguration.java | 20 + .../InterceptorConfiguration.java | 22 + .../configuration/OpenApiConfiguration.java | 18 + .../RestTemplateConfiguration.java | 34 + .../StatusProbeConfiguration.java | 28 + .../configuration/WebConfiguration.java | 28 + .../controller/ExceptionController.java | 37 + .../controller/VersionHtmlController.java | 95 +++ .../controller/v1/GreetingRestController.java | 59 ++ .../exception/HttpStatusException.java | 20 + .../BufferingClientHttpResponseWrapper.java | 82 +++ .../interceptor/HeaderInterceptor.java | 87 +++ .../interceptor/HeaderInterceptorRest.java | 68 ++ .../interceptor/LoggingInterceptorRest.java | 419 +++++++++++ .../template/mapper/v1/GreetingMapper.java | 21 + .../template/model/db/Greeting.java | 41 ++ .../template/model/dto/ErrorMessage.java | 24 + .../template/model/dto/v1/Greeting.java | 31 + .../actuator/AbstractHealthIndicator.java | 84 +++ .../AbstractStatusProbeHealthIndicator.java | 37 + .../monitoring/actuator/Preparable.java | 10 + .../actuator/RestHealthIndicator.java | 65 ++ .../statusprobe/CountBasedStatusProbe.java | 33 + .../PercentageBasedStatusProbe.java | 63 ++ .../statusprobe/ScheduledStatusProbe.java | 18 + .../monitoring/statusprobe/StatusProbe.java | 62 ++ .../statusprobe/StatusProbeCriticality.java | 7 + .../statusprobe/StatusProbeLogger.java | 124 ++++ .../statusprobe/TimeBasedStatusProbe.java | 64 ++ .../RestTemplateTimeoutProperties.java | 34 + .../template/property/ServiceProperties.java | 21 + .../property/StatusProbeProperties.java | 28 + .../repository/GreetingRepository.java | 11 + .../template/service/GreetingService.java | 40 ++ .../service/PropertyReloadService.java | 37 + .../src/main/resources/application-dev.yaml | 6 + .../src/main/resources/application.yaml | 67 ++ module-server/src/main/resources/log4j2.xml | 20 + .../src/main/resources/templates/error.html | 8 + .../main/resources/templates/error/404.html | 9 + .../resources/templates/errorIncludes.html | 28 + .../src/main/resources/templates/version.html | 37 + settings.gradle | 10 + 77 files changed, 4249 insertions(+) create mode 100644 .editorconfig create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 .run/MainApplication.run.xml create mode 100644 LICENSE create mode 100644 README.md create mode 100644 build.gradle create mode 100644 buildSrc/build.gradle create mode 100644 buildSrc/settings.gradle create mode 100644 buildSrc/src/main/groovy/twomartens.base.gradle create mode 100644 buildSrc/src/main/groovy/twomartens.checkstyle.gradle create mode 100644 buildSrc/src/main/groovy/twomartens.java-base.gradle create mode 100644 buildSrc/src/main/groovy/twomartens.java-preview.gradle create mode 100644 buildSrc/src/main/groovy/twomartens.java.gradle create mode 100644 buildSrc/src/main/groovy/twomartens.nebula-release.gradle create mode 100644 buildSrc/src/main/groovy/twomartens.spring-boot-cloud.gradle create mode 100644 buildSrc/src/main/groovy/twomartens.spring-boot.gradle create mode 100644 buildSrc/src/main/groovy/twomartens.versions.gradle create mode 100644 config/checkstyle/checkstyle-suppressions.xml create mode 100644 config/checkstyle/checkstyle.xml create mode 100644 gradle.properties create mode 100644 gradle/libs.versions.toml create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 lombok.config create mode 100644 module-lib/lib.gradle create mode 100644 module-lib/src/main/java/de/twomartens/template/model/Name.java create mode 100644 module-plain/plain.gradle create mode 100644 module-plain/src/main/java/de/twomartens/template/Main.java create mode 100644 module-plain/src/main/resources/log4j2.xml create mode 100644 module-server/server.gradle create mode 100644 module-server/src/main/java/de/twomartens/template/MainApplication.java create mode 100644 module-server/src/main/java/de/twomartens/template/configuration/ClockConfiguration.java create mode 100644 module-server/src/main/java/de/twomartens/template/configuration/InterceptorConfiguration.java create mode 100644 module-server/src/main/java/de/twomartens/template/configuration/OpenApiConfiguration.java create mode 100644 module-server/src/main/java/de/twomartens/template/configuration/RestTemplateConfiguration.java create mode 100644 module-server/src/main/java/de/twomartens/template/configuration/StatusProbeConfiguration.java create mode 100644 module-server/src/main/java/de/twomartens/template/configuration/WebConfiguration.java create mode 100644 module-server/src/main/java/de/twomartens/template/controller/ExceptionController.java create mode 100644 module-server/src/main/java/de/twomartens/template/controller/VersionHtmlController.java create mode 100644 module-server/src/main/java/de/twomartens/template/controller/v1/GreetingRestController.java create mode 100644 module-server/src/main/java/de/twomartens/template/exception/HttpStatusException.java create mode 100644 module-server/src/main/java/de/twomartens/template/interceptor/BufferingClientHttpResponseWrapper.java create mode 100644 module-server/src/main/java/de/twomartens/template/interceptor/HeaderInterceptor.java create mode 100644 module-server/src/main/java/de/twomartens/template/interceptor/HeaderInterceptorRest.java create mode 100644 module-server/src/main/java/de/twomartens/template/interceptor/LoggingInterceptorRest.java create mode 100644 module-server/src/main/java/de/twomartens/template/mapper/v1/GreetingMapper.java create mode 100644 module-server/src/main/java/de/twomartens/template/model/db/Greeting.java create mode 100644 module-server/src/main/java/de/twomartens/template/model/dto/ErrorMessage.java create mode 100644 module-server/src/main/java/de/twomartens/template/model/dto/v1/Greeting.java create mode 100644 module-server/src/main/java/de/twomartens/template/monitoring/actuator/AbstractHealthIndicator.java create mode 100644 module-server/src/main/java/de/twomartens/template/monitoring/actuator/AbstractStatusProbeHealthIndicator.java create mode 100644 module-server/src/main/java/de/twomartens/template/monitoring/actuator/Preparable.java create mode 100644 module-server/src/main/java/de/twomartens/template/monitoring/actuator/RestHealthIndicator.java create mode 100644 module-server/src/main/java/de/twomartens/template/monitoring/statusprobe/CountBasedStatusProbe.java create mode 100644 module-server/src/main/java/de/twomartens/template/monitoring/statusprobe/PercentageBasedStatusProbe.java create mode 100644 module-server/src/main/java/de/twomartens/template/monitoring/statusprobe/ScheduledStatusProbe.java create mode 100644 module-server/src/main/java/de/twomartens/template/monitoring/statusprobe/StatusProbe.java create mode 100644 module-server/src/main/java/de/twomartens/template/monitoring/statusprobe/StatusProbeCriticality.java create mode 100644 module-server/src/main/java/de/twomartens/template/monitoring/statusprobe/StatusProbeLogger.java create mode 100644 module-server/src/main/java/de/twomartens/template/monitoring/statusprobe/TimeBasedStatusProbe.java create mode 100644 module-server/src/main/java/de/twomartens/template/property/RestTemplateTimeoutProperties.java create mode 100644 module-server/src/main/java/de/twomartens/template/property/ServiceProperties.java create mode 100644 module-server/src/main/java/de/twomartens/template/property/StatusProbeProperties.java create mode 100644 module-server/src/main/java/de/twomartens/template/repository/GreetingRepository.java create mode 100644 module-server/src/main/java/de/twomartens/template/service/GreetingService.java create mode 100644 module-server/src/main/java/de/twomartens/template/service/PropertyReloadService.java create mode 100644 module-server/src/main/resources/application-dev.yaml create mode 100644 module-server/src/main/resources/application.yaml create mode 100644 module-server/src/main/resources/log4j2.xml create mode 100644 module-server/src/main/resources/templates/error.html create mode 100644 module-server/src/main/resources/templates/error/404.html create mode 100644 module-server/src/main/resources/templates/errorIncludes.html create mode 100644 module-server/src/main/resources/templates/version.html create mode 100644 settings.gradle diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..5447b77 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,669 @@ +[*] +charset = utf-8 +end_of_line = lf +indent_size = 2 +indent_style = space +insert_final_newline = false +max_line_length = 100 +tab_width = 2 +ij_continuation_indent_size = 4 +ij_formatter_off_tag = @formatter:off +ij_formatter_on_tag = @formatter:on +ij_formatter_tags_enabled = true +ij_smart_tabs = false +ij_visual_guides = none +ij_wrap_on_typing = false + +[*.java] +ij_java_align_consecutive_assignments = false +ij_java_align_consecutive_variable_declarations = false +ij_java_align_group_field_declarations = false +ij_java_align_multiline_annotation_parameters = false +ij_java_align_multiline_array_initializer_expression = false +ij_java_align_multiline_assignment = false +ij_java_align_multiline_binary_operation = false +ij_java_align_multiline_chained_methods = false +ij_java_align_multiline_deconstruction_list_components = true +ij_java_align_multiline_extends_list = false +ij_java_align_multiline_for = false +ij_java_align_multiline_method_parentheses = false +ij_java_align_multiline_parameters = false +ij_java_align_multiline_parameters_in_calls = false +ij_java_align_multiline_parenthesized_expression = false +ij_java_align_multiline_records = true +ij_java_align_multiline_resources = false +ij_java_align_multiline_ternary_operation = false +ij_java_align_multiline_text_blocks = false +ij_java_align_multiline_throws_list = false +ij_java_align_subsequent_simple_methods = false +ij_java_align_throws_keyword = false +ij_java_align_types_in_multi_catch = true +ij_java_annotation_parameter_wrap = off +ij_java_array_initializer_new_line_after_left_brace = false +ij_java_array_initializer_right_brace_on_new_line = false +ij_java_array_initializer_wrap = normal +ij_java_assert_statement_colon_on_next_line = false +ij_java_assert_statement_wrap = off +ij_java_assignment_wrap = off +ij_java_binary_operation_sign_on_next_line = true +ij_java_binary_operation_wrap = normal +ij_java_blank_lines_after_anonymous_class_header = 0 +ij_java_blank_lines_after_class_header = 1 +ij_java_blank_lines_after_imports = 1 +ij_java_blank_lines_after_package = 1 +ij_java_blank_lines_around_class = 1 +ij_java_blank_lines_around_field = 0 +ij_java_blank_lines_around_field_in_interface = 0 +ij_java_blank_lines_around_initializer = 1 +ij_java_blank_lines_around_method = 1 +ij_java_blank_lines_around_method_in_interface = 1 +ij_java_blank_lines_before_class_end = 0 +ij_java_blank_lines_before_imports = 1 +ij_java_blank_lines_before_method_body = 0 +ij_java_blank_lines_before_package = 0 +ij_java_block_brace_style = end_of_line +ij_java_block_comment_add_space = false +ij_java_block_comment_at_first_column = true +ij_java_builder_methods = none +ij_java_call_parameters_new_line_after_left_paren = false +ij_java_call_parameters_right_paren_on_new_line = false +ij_java_call_parameters_wrap = normal +ij_java_case_statement_on_separate_line = true +ij_java_catch_on_new_line = false +ij_java_class_annotation_wrap = split_into_lines +ij_java_class_brace_style = end_of_line +ij_java_class_count_to_use_import_on_demand = 999 +ij_java_class_names_in_javadoc = 1 +ij_java_deconstruction_list_wrap = normal +ij_java_do_not_indent_top_level_class_members = false +ij_java_do_not_wrap_after_single_annotation = false +ij_java_do_not_wrap_after_single_annotation_in_parameter = false +ij_java_do_while_brace_force = always +ij_java_doc_add_blank_line_after_description = true +ij_java_doc_add_blank_line_after_param_comments = false +ij_java_doc_add_blank_line_after_return = false +ij_java_doc_add_p_tag_on_empty_lines = true +ij_java_doc_align_exception_comments = true +ij_java_doc_align_param_comments = true +ij_java_doc_do_not_wrap_if_one_line = false +ij_java_doc_enable_formatting = true +ij_java_doc_enable_leading_asterisks = true +ij_java_doc_indent_on_continuation = false +ij_java_doc_keep_empty_lines = true +ij_java_doc_keep_empty_parameter_tag = true +ij_java_doc_keep_empty_return_tag = true +ij_java_doc_keep_empty_throws_tag = true +ij_java_doc_keep_invalid_tags = true +ij_java_doc_param_description_on_new_line = false +ij_java_doc_preserve_line_breaks = false +ij_java_doc_use_throws_not_exception_tag = true +ij_java_else_on_new_line = false +ij_java_enum_constants_wrap = off +ij_java_extends_keyword_wrap = off +ij_java_extends_list_wrap = normal +ij_java_field_annotation_wrap = split_into_lines +ij_java_finally_on_new_line = false +ij_java_for_brace_force = always +ij_java_for_statement_new_line_after_left_paren = false +ij_java_for_statement_right_paren_on_new_line = false +ij_java_for_statement_wrap = normal +ij_java_generate_final_locals = false +ij_java_generate_final_parameters = false +ij_java_if_brace_force = always +ij_java_imports_layout = $*,|,* +ij_java_indent_case_from_switch = true +ij_java_insert_inner_class_imports = true +ij_java_insert_override_annotation = true +ij_java_keep_blank_lines_before_right_brace = 2 +ij_java_keep_blank_lines_between_package_declaration_and_header = 2 +ij_java_keep_blank_lines_in_code = 1 +ij_java_keep_blank_lines_in_declarations = 2 +ij_java_keep_builder_methods_indents = false +ij_java_keep_control_statement_in_one_line = false +ij_java_keep_first_column_comment = true +ij_java_keep_indents_on_empty_lines = false +ij_java_keep_line_breaks = true +ij_java_keep_multiple_expressions_in_one_line = false +ij_java_keep_simple_blocks_in_one_line = false +ij_java_keep_simple_classes_in_one_line = false +ij_java_keep_simple_lambdas_in_one_line = false +ij_java_keep_simple_methods_in_one_line = false +ij_java_label_indent_absolute = false +ij_java_label_indent_size = 0 +ij_java_lambda_brace_style = end_of_line +ij_java_layout_static_imports_separately = true +ij_java_line_comment_add_space = false +ij_java_line_comment_add_space_on_reformat = false +ij_java_line_comment_at_first_column = true +ij_java_method_annotation_wrap = split_into_lines +ij_java_method_brace_style = end_of_line +ij_java_method_call_chain_wrap = normal +ij_java_method_parameters_new_line_after_left_paren = false +ij_java_method_parameters_right_paren_on_new_line = false +ij_java_method_parameters_wrap = normal +ij_java_modifier_list_wrap = false +ij_java_multi_catch_types_wrap = normal +ij_java_names_count_to_use_import_on_demand = 999 +ij_java_new_line_after_lparen_in_annotation = false +ij_java_new_line_after_lparen_in_deconstruction_pattern = true +ij_java_new_line_after_lparen_in_record_header = false +ij_java_parameter_annotation_wrap = off +ij_java_parentheses_expression_new_line_after_left_paren = false +ij_java_parentheses_expression_right_paren_on_new_line = false +ij_java_place_assignment_sign_on_next_line = false +ij_java_prefer_longer_names = true +ij_java_prefer_parameters_wrap = false +ij_java_record_components_wrap = normal +ij_java_repeat_synchronized = true +ij_java_replace_instanceof_and_cast = false +ij_java_replace_null_check = true +ij_java_replace_sum_lambda_with_method_ref = true +ij_java_resource_list_new_line_after_left_paren = false +ij_java_resource_list_right_paren_on_new_line = false +ij_java_resource_list_wrap = off +ij_java_rparen_on_new_line_in_annotation = false +ij_java_rparen_on_new_line_in_deconstruction_pattern = true +ij_java_rparen_on_new_line_in_record_header = false +ij_java_space_after_closing_angle_bracket_in_type_argument = false +ij_java_space_after_colon = true +ij_java_space_after_comma = true +ij_java_space_after_comma_in_type_arguments = true +ij_java_space_after_for_semicolon = true +ij_java_space_after_quest = true +ij_java_space_after_type_cast = true +ij_java_space_before_annotation_array_initializer_left_brace = false +ij_java_space_before_annotation_parameter_list = false +ij_java_space_before_array_initializer_left_brace = false +ij_java_space_before_catch_keyword = true +ij_java_space_before_catch_left_brace = true +ij_java_space_before_catch_parentheses = true +ij_java_space_before_class_left_brace = true +ij_java_space_before_colon = true +ij_java_space_before_colon_in_foreach = true +ij_java_space_before_comma = false +ij_java_space_before_deconstruction_list = false +ij_java_space_before_do_left_brace = true +ij_java_space_before_else_keyword = true +ij_java_space_before_else_left_brace = true +ij_java_space_before_finally_keyword = true +ij_java_space_before_finally_left_brace = true +ij_java_space_before_for_left_brace = true +ij_java_space_before_for_parentheses = true +ij_java_space_before_for_semicolon = false +ij_java_space_before_if_left_brace = true +ij_java_space_before_if_parentheses = true +ij_java_space_before_method_call_parentheses = false +ij_java_space_before_method_left_brace = true +ij_java_space_before_method_parentheses = false +ij_java_space_before_opening_angle_bracket_in_type_parameter = false +ij_java_space_before_quest = true +ij_java_space_before_switch_left_brace = true +ij_java_space_before_switch_parentheses = true +ij_java_space_before_synchronized_left_brace = true +ij_java_space_before_synchronized_parentheses = true +ij_java_space_before_try_left_brace = true +ij_java_space_before_try_parentheses = true +ij_java_space_before_type_parameter_list = false +ij_java_space_before_while_keyword = true +ij_java_space_before_while_left_brace = true +ij_java_space_before_while_parentheses = true +ij_java_space_inside_one_line_enum_braces = false +ij_java_space_within_empty_array_initializer_braces = false +ij_java_space_within_empty_method_call_parentheses = false +ij_java_space_within_empty_method_parentheses = false +ij_java_spaces_around_additive_operators = true +ij_java_spaces_around_annotation_eq = true +ij_java_spaces_around_assignment_operators = true +ij_java_spaces_around_bitwise_operators = true +ij_java_spaces_around_equality_operators = true +ij_java_spaces_around_lambda_arrow = true +ij_java_spaces_around_logical_operators = true +ij_java_spaces_around_method_ref_dbl_colon = false +ij_java_spaces_around_multiplicative_operators = true +ij_java_spaces_around_relational_operators = true +ij_java_spaces_around_shift_operators = true +ij_java_spaces_around_type_bounds_in_type_parameters = true +ij_java_spaces_around_unary_operator = false +ij_java_spaces_within_angle_brackets = false +ij_java_spaces_within_annotation_parentheses = false +ij_java_spaces_within_array_initializer_braces = false +ij_java_spaces_within_braces = false +ij_java_spaces_within_brackets = false +ij_java_spaces_within_cast_parentheses = false +ij_java_spaces_within_catch_parentheses = false +ij_java_spaces_within_deconstruction_list = false +ij_java_spaces_within_for_parentheses = false +ij_java_spaces_within_if_parentheses = false +ij_java_spaces_within_method_call_parentheses = false +ij_java_spaces_within_method_parentheses = false +ij_java_spaces_within_parentheses = false +ij_java_spaces_within_record_header = false +ij_java_spaces_within_switch_parentheses = false +ij_java_spaces_within_synchronized_parentheses = false +ij_java_spaces_within_try_parentheses = false +ij_java_spaces_within_while_parentheses = false +ij_java_special_else_if_treatment = true +ij_java_subclass_name_suffix = Impl +ij_java_ternary_operation_signs_on_next_line = true +ij_java_ternary_operation_wrap = normal +ij_java_test_name_suffix = Test +ij_java_throws_keyword_wrap = normal +ij_java_throws_list_wrap = off +ij_java_use_external_annotations = false +ij_java_use_fq_class_names = false +ij_java_use_relative_indents = false +ij_java_use_single_class_imports = true +ij_java_variable_annotation_wrap = off +ij_java_visibility = public +ij_java_while_brace_force = always +ij_java_while_on_new_line = false +ij_java_wrap_comments = true +ij_java_wrap_first_method_in_call_chain = false +ij_java_wrap_long_lines = false + +[*.properties] +ij_properties_align_group_field_declarations = false +ij_properties_keep_blank_lines = false +ij_properties_key_value_delimiter = equals +ij_properties_spaces_around_key_value_delimiter = false + +[.editorconfig] +ij_editorconfig_align_group_field_declarations = false +ij_editorconfig_space_after_colon = false +ij_editorconfig_space_after_comma = true +ij_editorconfig_space_before_colon = false +ij_editorconfig_space_before_comma = false +ij_editorconfig_spaces_around_assignment_operators = true + +[{*.ant,*.fxml,*.jhm,*.jnlp,*.jrxml,*.jspx,*.pom,*.rng,*.tagx,*.tld,*.wsdl,*.xml,*.xsd,*.xsl,*.xslt,*.xul}] +ij_continuation_indent_size = 2 +ij_xml_align_attributes = false +ij_xml_align_text = false +ij_xml_attribute_wrap = normal +ij_xml_block_comment_add_space = false +ij_xml_block_comment_at_first_column = true +ij_xml_keep_blank_lines = 2 +ij_xml_keep_indents_on_empty_lines = false +ij_xml_keep_line_breaks = true +ij_xml_keep_line_breaks_in_text = true +ij_xml_keep_whitespaces = false +ij_xml_keep_whitespaces_around_cdata = preserve +ij_xml_keep_whitespaces_inside_cdata = false +ij_xml_line_comment_at_first_column = true +ij_xml_space_after_tag_name = false +ij_xml_space_around_equals_in_attribute = false +ij_xml_space_inside_empty_tag = false +ij_xml_text_wrap = normal +ij_xml_use_custom_settings = true + +[{*.bash,*.sh,*.zsh}] +ij_shell_binary_ops_start_line = false +ij_shell_keep_column_alignment_padding = false +ij_shell_minify_program = false +ij_shell_redirect_followed_by_space = false +ij_shell_switch_cases_indented = false +ij_shell_use_unix_line_separator = true + +[{*.gant,*.groovy,*.gy}] +indent_size = 4 +tab_width = 4 +ij_continuation_indent_size = 8 +ij_groovy_align_group_field_declarations = false +ij_groovy_align_multiline_array_initializer_expression = false +ij_groovy_align_multiline_assignment = false +ij_groovy_align_multiline_binary_operation = false +ij_groovy_align_multiline_chained_methods = false +ij_groovy_align_multiline_extends_list = false +ij_groovy_align_multiline_for = true +ij_groovy_align_multiline_list_or_map = true +ij_groovy_align_multiline_method_parentheses = false +ij_groovy_align_multiline_parameters = true +ij_groovy_align_multiline_parameters_in_calls = false +ij_groovy_align_multiline_resources = true +ij_groovy_align_multiline_ternary_operation = false +ij_groovy_align_multiline_throws_list = false +ij_groovy_align_named_args_in_map = true +ij_groovy_align_throws_keyword = false +ij_groovy_array_initializer_new_line_after_left_brace = false +ij_groovy_array_initializer_right_brace_on_new_line = false +ij_groovy_array_initializer_wrap = off +ij_groovy_assert_statement_wrap = off +ij_groovy_assignment_wrap = off +ij_groovy_binary_operation_wrap = off +ij_groovy_blank_lines_after_class_header = 0 +ij_groovy_blank_lines_after_imports = 1 +ij_groovy_blank_lines_after_package = 1 +ij_groovy_blank_lines_around_class = 1 +ij_groovy_blank_lines_around_field = 0 +ij_groovy_blank_lines_around_field_in_interface = 0 +ij_groovy_blank_lines_around_method = 1 +ij_groovy_blank_lines_around_method_in_interface = 1 +ij_groovy_blank_lines_before_imports = 1 +ij_groovy_blank_lines_before_method_body = 0 +ij_groovy_blank_lines_before_package = 0 +ij_groovy_block_brace_style = end_of_line +ij_groovy_block_comment_add_space = false +ij_groovy_block_comment_at_first_column = true +ij_groovy_call_parameters_new_line_after_left_paren = false +ij_groovy_call_parameters_right_paren_on_new_line = false +ij_groovy_call_parameters_wrap = off +ij_groovy_catch_on_new_line = false +ij_groovy_class_annotation_wrap = split_into_lines +ij_groovy_class_brace_style = end_of_line +ij_groovy_class_count_to_use_import_on_demand = 5 +ij_groovy_do_while_brace_force = never +ij_groovy_else_on_new_line = false +ij_groovy_enable_groovydoc_formatting = true +ij_groovy_enum_constants_wrap = off +ij_groovy_extends_keyword_wrap = off +ij_groovy_extends_list_wrap = off +ij_groovy_field_annotation_wrap = split_into_lines +ij_groovy_finally_on_new_line = false +ij_groovy_for_brace_force = never +ij_groovy_for_statement_new_line_after_left_paren = false +ij_groovy_for_statement_right_paren_on_new_line = false +ij_groovy_for_statement_wrap = off +ij_groovy_ginq_general_clause_wrap_policy = 2 +ij_groovy_ginq_having_wrap_policy = 1 +ij_groovy_ginq_indent_having_clause = true +ij_groovy_ginq_indent_on_clause = true +ij_groovy_ginq_on_wrap_policy = 1 +ij_groovy_ginq_space_after_keyword = true +ij_groovy_if_brace_force = never +ij_groovy_import_annotation_wrap = 2 +ij_groovy_imports_layout = *,|,javax.**,java.**,|,$* +ij_groovy_indent_case_from_switch = true +ij_groovy_indent_label_blocks = true +ij_groovy_insert_inner_class_imports = false +ij_groovy_keep_blank_lines_before_right_brace = 2 +ij_groovy_keep_blank_lines_in_code = 2 +ij_groovy_keep_blank_lines_in_declarations = 2 +ij_groovy_keep_control_statement_in_one_line = true +ij_groovy_keep_first_column_comment = true +ij_groovy_keep_indents_on_empty_lines = false +ij_groovy_keep_line_breaks = true +ij_groovy_keep_multiple_expressions_in_one_line = false +ij_groovy_keep_simple_blocks_in_one_line = false +ij_groovy_keep_simple_classes_in_one_line = true +ij_groovy_keep_simple_lambdas_in_one_line = true +ij_groovy_keep_simple_methods_in_one_line = true +ij_groovy_label_indent_absolute = false +ij_groovy_label_indent_size = 0 +ij_groovy_lambda_brace_style = end_of_line +ij_groovy_layout_static_imports_separately = true +ij_groovy_line_comment_add_space = false +ij_groovy_line_comment_add_space_on_reformat = false +ij_groovy_line_comment_at_first_column = true +ij_groovy_method_annotation_wrap = split_into_lines +ij_groovy_method_brace_style = end_of_line +ij_groovy_method_call_chain_wrap = off +ij_groovy_method_parameters_new_line_after_left_paren = false +ij_groovy_method_parameters_right_paren_on_new_line = false +ij_groovy_method_parameters_wrap = off +ij_groovy_modifier_list_wrap = false +ij_groovy_names_count_to_use_import_on_demand = 3 +ij_groovy_packages_to_use_import_on_demand = java.awt.*,javax.swing.* +ij_groovy_parameter_annotation_wrap = off +ij_groovy_parentheses_expression_new_line_after_left_paren = false +ij_groovy_parentheses_expression_right_paren_on_new_line = false +ij_groovy_prefer_parameters_wrap = false +ij_groovy_resource_list_new_line_after_left_paren = false +ij_groovy_resource_list_right_paren_on_new_line = false +ij_groovy_resource_list_wrap = off +ij_groovy_space_after_assert_separator = true +ij_groovy_space_after_colon = true +ij_groovy_space_after_comma = true +ij_groovy_space_after_comma_in_type_arguments = true +ij_groovy_space_after_for_semicolon = true +ij_groovy_space_after_quest = true +ij_groovy_space_after_type_cast = true +ij_groovy_space_before_annotation_parameter_list = false +ij_groovy_space_before_array_initializer_left_brace = false +ij_groovy_space_before_assert_separator = false +ij_groovy_space_before_catch_keyword = true +ij_groovy_space_before_catch_left_brace = true +ij_groovy_space_before_catch_parentheses = true +ij_groovy_space_before_class_left_brace = true +ij_groovy_space_before_closure_left_brace = true +ij_groovy_space_before_colon = true +ij_groovy_space_before_comma = false +ij_groovy_space_before_do_left_brace = true +ij_groovy_space_before_else_keyword = true +ij_groovy_space_before_else_left_brace = true +ij_groovy_space_before_finally_keyword = true +ij_groovy_space_before_finally_left_brace = true +ij_groovy_space_before_for_left_brace = true +ij_groovy_space_before_for_parentheses = true +ij_groovy_space_before_for_semicolon = false +ij_groovy_space_before_if_left_brace = true +ij_groovy_space_before_if_parentheses = true +ij_groovy_space_before_method_call_parentheses = false +ij_groovy_space_before_method_left_brace = true +ij_groovy_space_before_method_parentheses = false +ij_groovy_space_before_quest = true +ij_groovy_space_before_record_parentheses = false +ij_groovy_space_before_switch_left_brace = true +ij_groovy_space_before_switch_parentheses = true +ij_groovy_space_before_synchronized_left_brace = true +ij_groovy_space_before_synchronized_parentheses = true +ij_groovy_space_before_try_left_brace = true +ij_groovy_space_before_try_parentheses = true +ij_groovy_space_before_while_keyword = true +ij_groovy_space_before_while_left_brace = true +ij_groovy_space_before_while_parentheses = true +ij_groovy_space_in_named_argument = true +ij_groovy_space_in_named_argument_before_colon = false +ij_groovy_space_within_empty_array_initializer_braces = false +ij_groovy_space_within_empty_method_call_parentheses = false +ij_groovy_spaces_around_additive_operators = true +ij_groovy_spaces_around_assignment_operators = true +ij_groovy_spaces_around_bitwise_operators = true +ij_groovy_spaces_around_equality_operators = true +ij_groovy_spaces_around_lambda_arrow = true +ij_groovy_spaces_around_logical_operators = true +ij_groovy_spaces_around_multiplicative_operators = true +ij_groovy_spaces_around_regex_operators = true +ij_groovy_spaces_around_relational_operators = true +ij_groovy_spaces_around_shift_operators = true +ij_groovy_spaces_within_annotation_parentheses = false +ij_groovy_spaces_within_array_initializer_braces = false +ij_groovy_spaces_within_braces = true +ij_groovy_spaces_within_brackets = false +ij_groovy_spaces_within_cast_parentheses = false +ij_groovy_spaces_within_catch_parentheses = false +ij_groovy_spaces_within_for_parentheses = false +ij_groovy_spaces_within_gstring_injection_braces = false +ij_groovy_spaces_within_if_parentheses = false +ij_groovy_spaces_within_list_or_map = false +ij_groovy_spaces_within_method_call_parentheses = false +ij_groovy_spaces_within_method_parentheses = false +ij_groovy_spaces_within_parentheses = false +ij_groovy_spaces_within_switch_parentheses = false +ij_groovy_spaces_within_synchronized_parentheses = false +ij_groovy_spaces_within_try_parentheses = false +ij_groovy_spaces_within_tuple_expression = false +ij_groovy_spaces_within_while_parentheses = false +ij_groovy_special_else_if_treatment = true +ij_groovy_ternary_operation_wrap = off +ij_groovy_throws_keyword_wrap = off +ij_groovy_throws_list_wrap = off +ij_groovy_use_flying_geese_braces = false +ij_groovy_use_fq_class_names = false +ij_groovy_use_fq_class_names_in_javadoc = true +ij_groovy_use_relative_indents = false +ij_groovy_use_single_class_imports = true +ij_groovy_variable_annotation_wrap = off +ij_groovy_while_brace_force = never +ij_groovy_while_on_new_line = false +ij_groovy_wrap_chain_calls_after_dot = false +ij_groovy_wrap_long_lines = false + +[{*.har,*.json}] +ij_json_array_wrapping = split_into_lines +ij_json_keep_blank_lines_in_code = 0 +ij_json_keep_indents_on_empty_lines = false +ij_json_keep_line_breaks = true +ij_json_keep_trailing_comma = false +ij_json_object_wrapping = split_into_lines +ij_json_property_alignment = do_not_align +ij_json_space_after_colon = true +ij_json_space_after_comma = true +ij_json_space_before_colon = false +ij_json_space_before_comma = false +ij_json_spaces_within_braces = false +ij_json_spaces_within_brackets = false +ij_json_wrap_long_lines = false + +[{*.htm,*.html,*.sht,*.shtm,*.shtml}] +ij_html_add_new_line_before_tags = body,div,p,form,h1,h2,h3 +ij_html_align_attributes = true +ij_html_align_text = false +ij_html_attribute_wrap = normal +ij_html_block_comment_add_space = false +ij_html_block_comment_at_first_column = true +ij_html_do_not_align_children_of_min_lines = 0 +ij_html_do_not_break_if_inline_tags = title,h1,h2,h3,h4,h5,h6,p +ij_html_do_not_indent_children_of_tags = html,body,thead,tbody,tfoot +ij_html_enforce_quotes = false +ij_html_inline_tags = a,abbr,acronym,b,basefont,bdo,big,br,cite,cite,code,dfn,em,font,i,img,input,kbd,label,q,s,samp,select,small,span,strike,strong,sub,sup,textarea,tt,u,var +ij_html_keep_blank_lines = 2 +ij_html_keep_indents_on_empty_lines = false +ij_html_keep_line_breaks = true +ij_html_keep_line_breaks_in_text = true +ij_html_keep_whitespaces = false +ij_html_keep_whitespaces_inside = span,pre,textarea +ij_html_line_comment_at_first_column = true +ij_html_new_line_after_last_attribute = never +ij_html_new_line_before_first_attribute = never +ij_html_quote_style = double +ij_html_remove_new_line_before_tags = br +ij_html_space_after_tag_name = false +ij_html_space_around_equality_in_attribute = false +ij_html_space_inside_empty_tag = false +ij_html_text_wrap = normal + +[{*.kt,*.kts}] +indent_size = 4 +tab_width = 4 +ij_continuation_indent_size = 8 +ij_kotlin_align_in_columns_case_branch = false +ij_kotlin_align_multiline_binary_operation = false +ij_kotlin_align_multiline_extends_list = false +ij_kotlin_align_multiline_method_parentheses = false +ij_kotlin_align_multiline_parameters = true +ij_kotlin_align_multiline_parameters_in_calls = false +ij_kotlin_allow_trailing_comma = false +ij_kotlin_allow_trailing_comma_on_call_site = false +ij_kotlin_assignment_wrap = off +ij_kotlin_blank_lines_after_class_header = 0 +ij_kotlin_blank_lines_around_block_when_branches = 0 +ij_kotlin_blank_lines_before_declaration_with_comment_or_annotation_on_separate_line = 1 +ij_kotlin_block_comment_add_space = false +ij_kotlin_block_comment_at_first_column = true +ij_kotlin_call_parameters_new_line_after_left_paren = false +ij_kotlin_call_parameters_right_paren_on_new_line = false +ij_kotlin_call_parameters_wrap = off +ij_kotlin_catch_on_new_line = false +ij_kotlin_class_annotation_wrap = split_into_lines +ij_kotlin_continuation_indent_for_chained_calls = true +ij_kotlin_continuation_indent_for_expression_bodies = true +ij_kotlin_continuation_indent_in_argument_lists = true +ij_kotlin_continuation_indent_in_elvis = true +ij_kotlin_continuation_indent_in_if_conditions = true +ij_kotlin_continuation_indent_in_parameter_lists = true +ij_kotlin_continuation_indent_in_supertype_lists = true +ij_kotlin_else_on_new_line = false +ij_kotlin_enum_constants_wrap = off +ij_kotlin_extends_list_wrap = off +ij_kotlin_field_annotation_wrap = split_into_lines +ij_kotlin_finally_on_new_line = false +ij_kotlin_if_rparen_on_new_line = false +ij_kotlin_import_nested_classes = false +ij_kotlin_imports_layout = *,java.**,javax.**,kotlin.**,^ +ij_kotlin_insert_whitespaces_in_simple_one_line_method = true +ij_kotlin_keep_blank_lines_before_right_brace = 2 +ij_kotlin_keep_blank_lines_in_code = 2 +ij_kotlin_keep_blank_lines_in_declarations = 2 +ij_kotlin_keep_first_column_comment = true +ij_kotlin_keep_indents_on_empty_lines = false +ij_kotlin_keep_line_breaks = true +ij_kotlin_lbrace_on_next_line = false +ij_kotlin_line_break_after_multiline_when_entry = true +ij_kotlin_line_comment_add_space = false +ij_kotlin_line_comment_add_space_on_reformat = false +ij_kotlin_line_comment_at_first_column = true +ij_kotlin_method_annotation_wrap = split_into_lines +ij_kotlin_method_call_chain_wrap = off +ij_kotlin_method_parameters_new_line_after_left_paren = false +ij_kotlin_method_parameters_right_paren_on_new_line = false +ij_kotlin_method_parameters_wrap = off +ij_kotlin_name_count_to_use_star_import = 5 +ij_kotlin_name_count_to_use_star_import_for_members = 3 +ij_kotlin_packages_to_use_import_on_demand = java.util.*,kotlinx.android.synthetic.**,io.ktor.** +ij_kotlin_parameter_annotation_wrap = off +ij_kotlin_space_after_comma = true +ij_kotlin_space_after_extend_colon = true +ij_kotlin_space_after_type_colon = true +ij_kotlin_space_before_catch_parentheses = true +ij_kotlin_space_before_comma = false +ij_kotlin_space_before_extend_colon = true +ij_kotlin_space_before_for_parentheses = true +ij_kotlin_space_before_if_parentheses = true +ij_kotlin_space_before_lambda_arrow = true +ij_kotlin_space_before_type_colon = false +ij_kotlin_space_before_when_parentheses = true +ij_kotlin_space_before_while_parentheses = true +ij_kotlin_spaces_around_additive_operators = true +ij_kotlin_spaces_around_assignment_operators = true +ij_kotlin_spaces_around_equality_operators = true +ij_kotlin_spaces_around_function_type_arrow = true +ij_kotlin_spaces_around_logical_operators = true +ij_kotlin_spaces_around_multiplicative_operators = true +ij_kotlin_spaces_around_range = false +ij_kotlin_spaces_around_relational_operators = true +ij_kotlin_spaces_around_unary_operator = false +ij_kotlin_spaces_around_when_arrow = true +ij_kotlin_variable_annotation_wrap = off +ij_kotlin_while_on_new_line = false +ij_kotlin_wrap_elvis_expressions = 1 +ij_kotlin_wrap_expression_body_functions = 0 +ij_kotlin_wrap_first_method_in_call_chain = false + +[{*.markdown,*.md}] +indent_size = 4 +tab_width = 4 +ij_continuation_indent_size = 8 +ij_markdown_force_one_space_after_blockquote_symbol = true +ij_markdown_force_one_space_after_header_symbol = true +ij_markdown_force_one_space_after_list_bullet = true +ij_markdown_force_one_space_between_words = true +ij_markdown_format_tables = true +ij_markdown_insert_quote_arrows_on_wrap = true +ij_markdown_keep_indents_on_empty_lines = false +ij_markdown_keep_line_breaks_inside_text_blocks = true +ij_markdown_max_lines_around_block_elements = 1 +ij_markdown_max_lines_around_header = 1 +ij_markdown_max_lines_between_paragraphs = 1 +ij_markdown_min_lines_around_block_elements = 1 +ij_markdown_min_lines_around_header = 1 +ij_markdown_min_lines_between_paragraphs = 1 +ij_markdown_wrap_text_if_long = true +ij_markdown_wrap_text_inside_blockquotes = true + +[{*.toml,Cargo.lock,Cargo.toml.orig,Gopkg.lock,Pipfile,poetry.lock}] +indent_size = 4 +tab_width = 4 +ij_continuation_indent_size = 8 +ij_toml_keep_indents_on_empty_lines = false + +[{*.yaml,*.yml}] +ij_yaml_align_values_properties = do_not_align +ij_yaml_autoinsert_sequence_marker = true +ij_yaml_block_mapping_on_new_line = false +ij_yaml_indent_sequence_value = true +ij_yaml_keep_indents_on_empty_lines = false +ij_yaml_keep_line_breaks = true +ij_yaml_sequence_on_new_line = false +ij_yaml_space_before_colon = false +ij_yaml_spaces_within_braces = true +ij_yaml_spaces_within_brackets = true diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..4b4f16c --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +gradle/wrapper/gradle-wrapper.jar filter= diff= merge= -text +*.sh text eol=lf \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b310fab --- /dev/null +++ b/.gitignore @@ -0,0 +1,45 @@ +/.* +!/.gitignore +!/.gitattributes +!/.editorconfig +!/.run/ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/** +!**/src/test/** +**/*.log +**/*.hprof +**/generated/** + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Swap-Dateien und Backups ### +*.swp +*~ +/lib/ diff --git a/.run/MainApplication.run.xml b/.run/MainApplication.run.xml new file mode 100644 index 0000000..1ad0379 --- /dev/null +++ b/.run/MainApplication.run.xml @@ -0,0 +1,15 @@ + + + + \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://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. diff --git a/README.md b/README.md new file mode 100644 index 0000000..c87425b --- /dev/null +++ b/README.md @@ -0,0 +1,15 @@ +# Template + +Contains a template for a new Java project. By utilising the buildSrc Gradle pattern, +this template provides a fast start for plain Java projects as well as Spring Boot projects. + +It also contains some modules which each show a different way to use the template: +- module-server: A Spring Boot server project +- module-plain: A plain Java project +- module-lib: A Java library that can be used in other modules + +To use the template, simply copy the contents of this repository into a new repository. +Then, replace all occurrences of `template` and `Template` with the name of your project. +Finally, replace the contents of this README with the README of your project. + +The settings.gradle file needs to be changed to import the modules that you want to use. diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..fe145dd --- /dev/null +++ b/build.gradle @@ -0,0 +1,13 @@ +plugins { + id 'twomartens.versions' + id 'twomartens.nebula-release' +} + +versionCatalogUpdate { + sortByKey = false + keep { + keepUnusedVersions = true + keepUnusedLibraries = true + keepUnusedPlugins = true + } +} diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle new file mode 100644 index 0000000..af471e1 --- /dev/null +++ b/buildSrc/build.gradle @@ -0,0 +1,15 @@ +plugins { + id 'groovy-gradle-plugin' +} + +repositories { + gradlePluginPortal() +} + +dependencies { + implementation libs.plugin.springboot + implementation libs.plugin.lombok + implementation libs.plugin.nebula.release + implementation libs.plugin.gradle.versions + implementation libs.plugin.version.catalog +} \ No newline at end of file diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle new file mode 100644 index 0000000..7cd729c --- /dev/null +++ b/buildSrc/settings.gradle @@ -0,0 +1,9 @@ +rootProject.name = 'twomartens.config' + +dependencyResolutionManagement { + versionCatalogs { + create("libs") { + from(files("../gradle/libs.versions.toml")) + } + } +} diff --git a/buildSrc/src/main/groovy/twomartens.base.gradle b/buildSrc/src/main/groovy/twomartens.base.gradle new file mode 100644 index 0000000..c6c8dd5 --- /dev/null +++ b/buildSrc/src/main/groovy/twomartens.base.gradle @@ -0,0 +1,6 @@ +plugins { + id 'idea' + id 'eclipse' +} + +group = projectgroup \ No newline at end of file diff --git a/buildSrc/src/main/groovy/twomartens.checkstyle.gradle b/buildSrc/src/main/groovy/twomartens.checkstyle.gradle new file mode 100644 index 0000000..ef5353a --- /dev/null +++ b/buildSrc/src/main/groovy/twomartens.checkstyle.gradle @@ -0,0 +1,23 @@ +plugins { + id 'checkstyle' + id 'twomartens.java-base' +} + +checkstyle { + toolVersion '10.0' + ignoreFailures = false + maxWarnings = 0 + + configFile rootProject.file('config/checkstyle/checkstyle.xml') + + configProperties = ['org.checkstyle.google.suppressionfilter.config': "${project.rootDir}/config/checkstyle/checkstyle-suppressions.xml"] + + tasks.withType(Checkstyle).tap { + configureEach { + reports { + xml.required = true + html.required = true + } + } + } +} \ No newline at end of file diff --git a/buildSrc/src/main/groovy/twomartens.java-base.gradle b/buildSrc/src/main/groovy/twomartens.java-base.gradle new file mode 100644 index 0000000..c85aa0d --- /dev/null +++ b/buildSrc/src/main/groovy/twomartens.java-base.gradle @@ -0,0 +1,22 @@ +plugins { + id 'java' + id 'java-library' + id 'twomartens.base' +} + +sourceCompatibility = projectSourceCompatibility +targetCompatibility = projectSourceCompatibility + +repositories { + mavenCentral() +} + +tasks.register('buildAll') { + group 'build' + dependsOn(build) + dependsOn(test) +} + +clean { + delete 'out' +} diff --git a/buildSrc/src/main/groovy/twomartens.java-preview.gradle b/buildSrc/src/main/groovy/twomartens.java-preview.gradle new file mode 100644 index 0000000..1459a9d --- /dev/null +++ b/buildSrc/src/main/groovy/twomartens.java-preview.gradle @@ -0,0 +1,15 @@ +plugins { + id 'twomartens.java-base' +} + +tasks.withType(JavaCompile).configureEach { + options.compilerArgs += "--enable-preview" +} + +tasks.withType(Test).configureEach { + jvmArgs += "--enable-preview" +} + +tasks.withType(JavaExec).configureEach { + jvmArgs += '--enable-preview' +} \ No newline at end of file diff --git a/buildSrc/src/main/groovy/twomartens.java.gradle b/buildSrc/src/main/groovy/twomartens.java.gradle new file mode 100644 index 0000000..9b61efa --- /dev/null +++ b/buildSrc/src/main/groovy/twomartens.java.gradle @@ -0,0 +1,71 @@ +import java.text.SimpleDateFormat + +plugins { + id 'jacoco' + id 'io.freefair.lombok' + id 'twomartens.java-base' + id 'twomartens.checkstyle' +} + +dependencies { + constraints.implementation libs.bundles.logging + + implementation libs.slf4j.api + runtimeOnly libs.bundles.logging + + testImplementation libs.bundles.test +} + +configurations { + configureEach { + exclude group: 'junit', module: 'junit' + // we are using log4j-slf4j2-impl, so we need to suppress spring include of log4j-slf4j-impl + exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl' + } +} + +test { + systemProperty 'junit.jupiter.execution.parallel.enabled', true + systemProperty 'junit.jupiter.execution.parallel.mode.default', "concurrent" + useJUnitPlatform() + maxHeapSize = "4g" + workingDir = rootProject.projectDir + finalizedBy jacocoTestReport +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +jacocoTestReport { + dependsOn(test) + reports { + xml.required = true + } +} + +jar { + doFirst { + manifest { + attributes 'Implementation-Title': rootProject.name, + 'Implementation-Version': archiveVersion.get(), + 'Implementation-Vendor': "Jim Martens", + 'Build-Timestamp': new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ").format(new Date()), + 'Created-By': "Gradle ${gradle.gradleVersion}", + 'Build-Jdk': "${System.properties['java.version']} (${System.properties['java.vendor']} ${System.properties['java.vm.version']})", + 'Build-OS': "${System.properties['os.name']} ${System.properties['os.arch']} ${System.properties['os.version']}" + } + } +} + +normalization.runtimeClasspath.metaInf { + ignoreAttribute("Build-Timestamp") +} + +tasks.register('cleanLibs') { + delete("${buildDir}/libs") +} + +tasks.build.dependsOn("cleanLibs") diff --git a/buildSrc/src/main/groovy/twomartens.nebula-release.gradle b/buildSrc/src/main/groovy/twomartens.nebula-release.gradle new file mode 100644 index 0000000..4cf743a --- /dev/null +++ b/buildSrc/src/main/groovy/twomartens.nebula-release.gradle @@ -0,0 +1,16 @@ +plugins { + id 'com.netflix.nebula.release' + id 'twomartens.base' +} + +nebulaRelease { + addReleaseBranchPattern(/main/) +} + +task writeVersionProperties() { + group 'version' + buildDir.mkdirs() + file("$buildDir/version.properties").text = "VERSION=${project.version.toString()}\n" + mustRunAfter("release") + outputs.file("$buildDir/version.properties") +} \ No newline at end of file diff --git a/buildSrc/src/main/groovy/twomartens.spring-boot-cloud.gradle b/buildSrc/src/main/groovy/twomartens.spring-boot-cloud.gradle new file mode 100644 index 0000000..2feb1ed --- /dev/null +++ b/buildSrc/src/main/groovy/twomartens.spring-boot-cloud.gradle @@ -0,0 +1,40 @@ +plugins { + id 'twomartens.spring-boot' +} + +dependencies { + implementation platform(libs.spring.cloud) + implementation libs.bundles.spring.boot.server + implementation libs.spring.openapi + + implementation libs.httpclient + implementation libs.prometheus +} + +sourceSets { + "server-test" { + java { + compileClasspath += main.output + test.output + runtimeClasspath += main.output + test.output + srcDir file('src/server-test/java') + } + resources.srcDir file('src/server-test/resources') + } +} + +configurations { + serverTestImplementation.extendsFrom testImplementation +} + +tasks.register('serverTest', Test) { + outputs.upToDateWhen { false } + systemProperty 'junit.jupiter.execution.parallel.enabled', true + systemProperty 'junit.jupiter.execution.parallel.mode.default', "concurrent" + systemProperty 'junit.jupiter.execution.parallel.mode.classes.default', "concurrent" + useJUnitPlatform() + maxHeapSize = "4g" + group = 'verification' + workingDir = rootProject.projectDir + testClassesDirs = sourceSets."server-test".output.classesDirs + classpath = sourceSets."server-test".runtimeClasspath +} diff --git a/buildSrc/src/main/groovy/twomartens.spring-boot.gradle b/buildSrc/src/main/groovy/twomartens.spring-boot.gradle new file mode 100644 index 0000000..f9ede99 --- /dev/null +++ b/buildSrc/src/main/groovy/twomartens.spring-boot.gradle @@ -0,0 +1,60 @@ +plugins { + id 'org.springframework.boot' + id 'twomartens.java' +} + +dependencies { + implementation platform(libs.spring.boot) + + implementation libs.bundles.spring.boot + testImplementation libs.spring.boot.test + annotationProcessor libs.spring.boot.config +} + +sourceSets { + "integration-test" { + java { + compileClasspath += main.output + test.output + runtimeClasspath += main.output + test.output + srcDir file('src/integration-test/java') + } + resources.srcDir file('src/integration-test/resources') + } +} + +configurations { + configureEach { + exclude group: 'org.springframework.boot', module: 'spring-boot-starter-logging' + exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' + } + integrationTestImplementation.extendsFrom testImplementation +} + +tasks.register('integrationTest', Test) { + systemProperty 'junit.jupiter.execution.parallel.enabled', true + systemProperty 'junit.jupiter.execution.parallel.mode.default', "concurrent" + systemProperty 'junit.jupiter.execution.parallel.mode.classes.default', "concurrent" + useJUnitPlatform() + maxHeapSize = "4g" + group = 'verification' + workingDir = rootProject.projectDir + testClassesDirs = sourceSets."integration-test".output.classesDirs + classpath = sourceSets."integration-test".runtimeClasspath +} + +tasks.named("buildAll").configure() { + dependsOn(integrationTest) +} + +springBoot { + buildInfo() +} + +bootJar { + enabled = false +} + +jar { + enabled = true + archiveClassifier.set("") +} \ No newline at end of file diff --git a/buildSrc/src/main/groovy/twomartens.versions.gradle b/buildSrc/src/main/groovy/twomartens.versions.gradle new file mode 100644 index 0000000..60eb26c --- /dev/null +++ b/buildSrc/src/main/groovy/twomartens.versions.gradle @@ -0,0 +1,29 @@ +plugins { + id "com.github.ben-manes.versions" + id "nl.littlerobots.version-catalog-update" +} + +dependencyUpdates { + revision = "release" + gradleReleaseChannel = "current" +} + +def isNonStable = { String version -> + def stableKeyword = ['RELEASE', 'FINAL', 'GA'].any { it -> version.toUpperCase().contains(it) } + def regex = /^[0-9,.v-]+(-r)?$/ + return !stableKeyword && !(version ==~ regex) +} + +tasks.named("dependencyUpdates").configure { + rejectVersionIf { + isNonStable(it.candidate.version) + } +} + +tasks.named("versionCatalogUpdate").configure { + group 'version' +} + +tasks.named("dependencyUpdates").configure { + group 'version' +} \ No newline at end of file diff --git a/config/checkstyle/checkstyle-suppressions.xml b/config/checkstyle/checkstyle-suppressions.xml new file mode 100644 index 0000000..fb602c4 --- /dev/null +++ b/config/checkstyle/checkstyle-suppressions.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml new file mode 100644 index 0000000..869599b --- /dev/null +++ b/config/checkstyle/checkstyle.xml @@ -0,0 +1,367 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..b360187 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,9 @@ +projectname=template +projectgroup=de.2martens +projectSourceCompatibility=17 +file.encoding=utf-8 +org.gradle.parallel=true +org.gradle.daemon=true +org.gradle.welcome=never +org.gradle.caching=true +org.gradle.jvmargs=-Xmx4g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..2552a79 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,113 @@ +[versions] +spring-boot = "3.0.5" +spring-doc = "2.1.0" +spring-cloud = "2022.0.2" +spring-grpc = "2.14.0.RELEASE" +grpc = "1.54.0" +tomcat-annotations = "6.0.53" +httpclient = "5.2.1" +slf4j = "2.0.7" +log4j = "2.20.0" +log4j-ecs = "1.5.0" +mapstruct = "1.5.3.Final" +junit = "5.9.2" +assertj = "3.24.2" +mockito = "5.3.0" +plugin-nebula-release = "17.1.0" +plugin-lombok = "8.0.1" +plugin-gradle-versions = "0.46.0" +plugin-version-catalog = "0.8.0" + +[libraries] +spring-boot = { module = "org.springframework.boot:spring-boot-dependencies", version.ref = "spring-boot" } +spring-boot-actuator = { module = "org.springframework.boot:spring-boot-starter-actuator" } +spring-boot-web = { module = "org.springframework.boot:spring-boot-starter-web" } +spring-boot-log4j = { module = "org.springframework.boot:spring-boot-starter-log4j2" } +spring-boot-thymeleaf = { module = "org.springframework.boot:spring-boot-starter-thymeleaf" } +spring-boot-mongo = { module = "org.springframework.boot:spring-boot-starter-data-mongodb" } +spring-boot-validation = { module = "org.springframework.boot:spring-boot-starter-validation" } +spring-boot-test = { module = "org.springframework.boot:spring-boot-starter-test" } +spring-boot-config = { module = "org.springframework.boot:spring-boot-configuration-processor", version.ref = "spring-boot" } +spring-cloud = { module = "org.springframework.cloud:spring-cloud-dependencies", version.ref = "spring-cloud" } +spring-cloud-starter = { module = "org.springframework.cloud:spring-cloud-starter" } +spring-boot-starter = { module = "org.springframework.boot:spring-boot-starter" } +spring-grpc = { module = "net.devh:grpc-spring-boot-starter", version.ref = "spring-grpc" } +spring-ui = { module = "org.springdoc:springdoc-openapi-starter-webmvc-ui", version.ref = "spring-doc" } +spring-sec = { module = "org.springdoc:springdoc-openapi-starter-common", version.ref = "spring-doc" } +spring-openapi = { module = "org.springdoc:springdoc-openapi-starter-webmvc-api", version.ref = "spring-doc" } +grpc-api = { module = "io.grpc:grpc-api", version.ref = "grpc" } +grpc-context = { module = "io.grpc:grpc-context", version.ref = "grpc" } +grpc-core = { module = "io.grpc:grpc-core", version.ref = "grpc" } +grpc-netty = { module = "io.grpc:grpc-netty-shaded", version.ref = "grpc" } +grpc-protobuf = { module = "io.grpc:grpc-protobuf", version.ref = "grpc" } +grpc-proto-lite = { module = "io.grpc:grpc-protobuf-lite", version.ref = "grpc" } +grpc-services = { module = "io.grpc:grpc-services", version.ref = "grpc" } +grpc-stub = { module = "io.grpc:grpc-stub", version.ref = "grpc" } +grpc-protocjava = { module = "io.grpc:protoc-gen-grpc-java", version.ref = "grpc" } +grpc-testing = { module = "io.grpc:grpc-testing", version.ref = "grpc" } +tomcat-annotations = { module = "org.apache.tomcat:annotations-api", version.ref = "tomcat-annotations" } +httpclient = { module = "org.apache.httpcomponents.client5:httpclient5", version.ref = "httpclient" } +prometheus = { module = "io.micrometer:micrometer-registry-prometheus" } +mapstruct-base = { module = "org.mapstruct:mapstruct", version.ref = "mapstruct" } +mapstruct-processor = { module = "org.mapstruct:mapstruct-processor", version.ref = "mapstruct" } +slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" } +log4j-ecs = { module = "co.elastic.logging:log4j2-ecs-layout", version.ref = "log4j-ecs" } +log4j-api = { module = "org.apache.logging.log4j:log4j-api", version.ref = "log4j" } +log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" } +log4j-jul = { module = "org.apache.logging.log4j:log4j-jul", version.ref = "log4j" } +log4j-slf4j = { module = "org.apache.logging.log4j:log4j-slf4j2-impl", version.ref = "log4j" } +junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" } +junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" } +assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" } +mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" } +mockito-inline = "org.mockito:mockito-inline:5.2.0" +mockito-junit = { module = "org.mockito:mockito-junit-jupiter", version.ref = "mockito" } +plugin-nebula-release = { module = "com.netflix.nebula:nebula-release-plugin", version.ref = "plugin-nebula-release" } +plugin-springboot = { module = "org.springframework.boot:spring-boot-gradle-plugin", version.ref = "spring-boot" } +plugin-lombok = { module = "io.freefair.gradle:lombok-plugin", version.ref = "plugin-lombok" } +plugin-gradle-versions = { module = "com.github.ben-manes:gradle-versions-plugin", version.ref = "plugin-gradle-versions" } +plugin-version-catalog = { module = "nl.littlerobots.vcu:plugin", version.ref = "plugin-version-catalog" } + +[bundles] +logging = [ + "log4j-api", + "log4j-core", + "log4j-ecs", + "log4j-jul", + "log4j-slf4j", + "slf4j-api", +] +grpc = [ + "grpc-api", + "grpc-context", + "grpc-core", + "grpc-netty", + "grpc-proto-lite", + "grpc-protobuf", + "grpc-services", + "grpc-stub", +] +spring-boot = [ + "spring-boot-starter", + "spring-boot-log4j", +] + +spring-boot-server = [ + "spring-boot-actuator", + "spring-boot-log4j", + "spring-boot-mongo", + "spring-boot-thymeleaf", + "spring-boot-validation", + "spring-boot-web", + "spring-cloud-starter", + "spring-sec", + "spring-ui", +] +test = [ + "assertj", + "junit-jupiter", + "junit-jupiter-api", + "mockito-core", + "mockito-inline", + "mockito-junit", +] diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..249e5832f090a2944b7473328c07c9755baa3196 GIT binary patch literal 60756 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +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 + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..f127cfd --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,91 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem 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, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/lombok.config b/lombok.config new file mode 100644 index 0000000..2a64c64 --- /dev/null +++ b/lombok.config @@ -0,0 +1 @@ +config.stopbubbling = true \ No newline at end of file diff --git a/module-lib/lib.gradle b/module-lib/lib.gradle new file mode 100644 index 0000000..aa3fd97 --- /dev/null +++ b/module-lib/lib.gradle @@ -0,0 +1,7 @@ +plugins { + id 'twomartens.java' +} + +dependencies { + +} \ No newline at end of file diff --git a/module-lib/src/main/java/de/twomartens/template/model/Name.java b/module-lib/src/main/java/de/twomartens/template/model/Name.java new file mode 100644 index 0000000..bc2c605 --- /dev/null +++ b/module-lib/src/main/java/de/twomartens/template/model/Name.java @@ -0,0 +1,5 @@ +package de.twomartens.template.model; + +public record Name(String value) { + +} diff --git a/module-plain/plain.gradle b/module-plain/plain.gradle new file mode 100644 index 0000000..db2effb --- /dev/null +++ b/module-plain/plain.gradle @@ -0,0 +1,7 @@ +plugins { + id 'twomartens.java' +} + +dependencies { + implementation project(':lib') +} \ No newline at end of file diff --git a/module-plain/src/main/java/de/twomartens/template/Main.java b/module-plain/src/main/java/de/twomartens/template/Main.java new file mode 100644 index 0000000..58e6980 --- /dev/null +++ b/module-plain/src/main/java/de/twomartens/template/Main.java @@ -0,0 +1,13 @@ +package de.twomartens.template; + +import de.twomartens.template.model.Name; +import lombok.extern.slf4j.Slf4j; + +@Slf4j +public class Main { + + public static void main(String[] args) { + Name name = new Name("World"); + log.info("Hello %s!".formatted(name)); + } +} diff --git a/module-plain/src/main/resources/log4j2.xml b/module-plain/src/main/resources/log4j2.xml new file mode 100644 index 0000000..24bce61 --- /dev/null +++ b/module-plain/src/main/resources/log4j2.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/module-server/server.gradle b/module-server/server.gradle new file mode 100644 index 0000000..d62c9f8 --- /dev/null +++ b/module-server/server.gradle @@ -0,0 +1,9 @@ +plugins { + id 'twomartens.spring-boot-cloud' +} + +dependencies { + implementation libs.mapstruct.base + annotationProcessor libs.mapstruct.processor + +} \ No newline at end of file diff --git a/module-server/src/main/java/de/twomartens/template/MainApplication.java b/module-server/src/main/java/de/twomartens/template/MainApplication.java new file mode 100644 index 0000000..344c0b3 --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/MainApplication.java @@ -0,0 +1,35 @@ +package de.twomartens.template; + +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; +import org.springframework.context.annotation.Bean; +import org.springframework.scheduling.annotation.EnableScheduling; + +@EnableScheduling +@SpringBootApplication +public class MainApplication extends SpringBootServletInitializer { + + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { + return builder.sources(MainApplication.class); + } + + public static void main(String[] args) { + SpringApplication.run(MainApplication.class, args); + } + + @Bean + public OpenAPI customOpenAPI(@Value("${openapi.description}") String apiDesciption, + @Value("${openapi.version}") String apiVersion, @Value("${openapi.title}") String apiTitle) { + return new OpenAPI() + .info(new Info() + .title(apiTitle) + .version(apiVersion) + .description(apiDesciption)); + } +} diff --git a/module-server/src/main/java/de/twomartens/template/configuration/ClockConfiguration.java b/module-server/src/main/java/de/twomartens/template/configuration/ClockConfiguration.java new file mode 100644 index 0000000..dbfcccc --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/configuration/ClockConfiguration.java @@ -0,0 +1,20 @@ +package de.twomartens.template.configuration; + +import de.twomartens.template.property.ServiceProperties; +import java.time.Clock; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +@RequiredArgsConstructor +public class ClockConfiguration { + + private final ServiceProperties serviceProperties; + + @Bean + public Clock clock() { + return Clock.system(serviceProperties.getDefaultTimeZone()); + } + +} \ No newline at end of file diff --git a/module-server/src/main/java/de/twomartens/template/configuration/InterceptorConfiguration.java b/module-server/src/main/java/de/twomartens/template/configuration/InterceptorConfiguration.java new file mode 100644 index 0000000..b574c8f --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/configuration/InterceptorConfiguration.java @@ -0,0 +1,22 @@ +package de.twomartens.template.configuration; + +import de.twomartens.template.interceptor.HeaderInterceptorRest; +import de.twomartens.template.interceptor.LoggingInterceptorRest; +import java.time.Clock; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class InterceptorConfiguration { + + @Bean + public LoggingInterceptorRest loggingInterceptorRest(Clock clock) { + return new LoggingInterceptorRest(clock); + } + + @Bean + public HeaderInterceptorRest headerInterceptorRest() { + return new HeaderInterceptorRest(); + } + +} diff --git a/module-server/src/main/java/de/twomartens/template/configuration/OpenApiConfiguration.java b/module-server/src/main/java/de/twomartens/template/configuration/OpenApiConfiguration.java new file mode 100644 index 0000000..5b43c18 --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/configuration/OpenApiConfiguration.java @@ -0,0 +1,18 @@ +package de.twomartens.template.configuration; + +import org.springdoc.core.models.GroupedOpenApi; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class OpenApiConfiguration { + + @Bean + public GroupedOpenApi swaggerApi10() { + return GroupedOpenApi.builder() + .group("1.0") + .pathsToMatch("/template/v1/**") + .build(); + } + +} diff --git a/module-server/src/main/java/de/twomartens/template/configuration/RestTemplateConfiguration.java b/module-server/src/main/java/de/twomartens/template/configuration/RestTemplateConfiguration.java new file mode 100644 index 0000000..e03c787 --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/configuration/RestTemplateConfiguration.java @@ -0,0 +1,34 @@ +package de.twomartens.template.configuration; + +import de.twomartens.template.interceptor.HeaderInterceptorRest; +import de.twomartens.template.interceptor.LoggingInterceptorRest; +import de.twomartens.template.property.RestTemplateTimeoutProperties; +import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.client.RestTemplate; + +@Configuration +public class RestTemplateConfiguration { + + @Bean + public RestTemplate restTemplate(HeaderInterceptorRest headerInterceptorRest, + LoggingInterceptorRest loggingInterceptor, + RestTemplateTimeoutProperties restTemplateTimeoutProperties) { + return new RestTemplateBuilder() + .additionalInterceptors(headerInterceptorRest, loggingInterceptor) + .setConnectTimeout(restTemplateTimeoutProperties.getConnectionRestTemplateTimeoutInMillis()) + .setReadTimeout(restTemplateTimeoutProperties.getReadTimeoutRestTemplateInMillis()) + .build(); + } + + @Bean + public RestTemplate restTemplateRestHealthIndicator(HeaderInterceptorRest headerInterceptorRest, + RestTemplateTimeoutProperties restTemplateTimeoutProperties) { + return new RestTemplateBuilder() + .additionalInterceptors(headerInterceptorRest) + .setConnectTimeout(restTemplateTimeoutProperties.getConnectionRestHealthIndicatorTimeoutInMillis()) + .setReadTimeout(restTemplateTimeoutProperties.getReadTimeoutRestHealthIndicatorInMillis()) + .build(); + } +} diff --git a/module-server/src/main/java/de/twomartens/template/configuration/StatusProbeConfiguration.java b/module-server/src/main/java/de/twomartens/template/configuration/StatusProbeConfiguration.java new file mode 100644 index 0000000..de15d24 --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/configuration/StatusProbeConfiguration.java @@ -0,0 +1,28 @@ +package de.twomartens.template.configuration; + +import de.twomartens.template.monitoring.statusprobe.CountBasedStatusProbe; +import de.twomartens.template.monitoring.statusprobe.StatusProbe; +import de.twomartens.template.monitoring.statusprobe.StatusProbeCriticality; +import de.twomartens.template.monitoring.statusprobe.StatusProbeLogger; +import java.time.Clock; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +@RequiredArgsConstructor +public class StatusProbeConfiguration { + + private final Clock clock; + + @Bean + public StatusProbeLogger statusProbeLogger() { + return new StatusProbeLogger(clock); + } + + @Bean + public StatusProbe testStatusProbe(StatusProbeLogger statusProbeLogger) { + return new CountBasedStatusProbe(1, + clock, StatusProbeCriticality.K1, "testStatusProbe", statusProbeLogger); + } +} \ No newline at end of file diff --git a/module-server/src/main/java/de/twomartens/template/configuration/WebConfiguration.java b/module-server/src/main/java/de/twomartens/template/configuration/WebConfiguration.java new file mode 100644 index 0000000..3b6378c --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/configuration/WebConfiguration.java @@ -0,0 +1,28 @@ +package de.twomartens.template.configuration; + +import de.twomartens.template.interceptor.HeaderInterceptorRest; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.CorsRegistration; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +@RequiredArgsConstructor +public class WebConfiguration implements WebMvcConfigurer { + + private final HeaderInterceptorRest headerInterceptorRest; + + @Override + public void addInterceptors(InterceptorRegistry registry) { + registry.addInterceptor(headerInterceptorRest); + } + + @Override + public void addCorsMappings(CorsRegistry registry) { + CorsRegistration registration = registry.addMapping("/**"); + registration.allowedOrigins("*"); + } + +} diff --git a/module-server/src/main/java/de/twomartens/template/controller/ExceptionController.java b/module-server/src/main/java/de/twomartens/template/controller/ExceptionController.java new file mode 100644 index 0000000..c09d4ab --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/controller/ExceptionController.java @@ -0,0 +1,37 @@ +package de.twomartens.template.controller; + +import de.twomartens.template.exception.HttpStatusException; +import de.twomartens.template.model.dto.ErrorMessage; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; + +@ControllerAdvice(annotations = RestController.class) +@Slf4j +public class ExceptionController extends ResponseEntityExceptionHandler { + + @ExceptionHandler(HttpStatusException.class) + public ResponseEntity handleException(HttpStatusException e) { + if (e.getCause() != null) { + log.info(e.getCause().toString(), e.getCause()); + } else { + log.info(e.toString()); + } + return ResponseEntity.status(e.getStatus()).body(ErrorMessage.builder() + .message(e.getMessage()) + .build()); + } + + @ExceptionHandler(RuntimeException.class) + public ResponseEntity handleRuntimeException(RuntimeException e) { + log.error("unexpected exception occurred", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(ErrorMessage.builder() + .message(e.getMessage()) + .build()); + } + +} diff --git a/module-server/src/main/java/de/twomartens/template/controller/VersionHtmlController.java b/module-server/src/main/java/de/twomartens/template/controller/VersionHtmlController.java new file mode 100644 index 0000000..2f23900 --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/controller/VersionHtmlController.java @@ -0,0 +1,95 @@ +package de.twomartens.template.controller; + +import java.io.FileNotFoundException; +import java.io.InputStream; +import java.net.InetAddress; +import java.net.URL; +import java.net.UnknownHostException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Paths; +import java.util.Collection; +import java.util.List; +import java.util.Optional; +import java.util.jar.JarFile; +import java.util.zip.ZipEntry; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + * used to show version and title information on html pages + */ +@Slf4j +@Controller +@RequiredArgsConstructor +@RequestMapping(value = "/vorlage") +public class VersionHtmlController { + + @GetMapping(path = "/html/version.html") + public String version() { + return "version"; + } + + @ControllerAdvice + public static class VersionControllerAdvice { + + @ModelAttribute("version") + public String getApplicationVersion() { + return getTitle() + " " + getVersion(); + } + + @ModelAttribute("footerString") + public String getApplicationVersion(@RequestHeader("host") String hostName) { + return getTitle() + " " + getVersion() + " - " + hostName; + } + + private String getTitle() { + return Optional.ofNullable(VersionControllerAdvice.class.getPackage().getImplementationTitle()) + .filter(s -> !s.isBlank()) + .orElse("application"); + } + + public String getVersion() { + return Optional.ofNullable(VersionControllerAdvice.class.getPackage().getImplementationVersion()) + .filter(s -> !s.isBlank()) + .orElse("DEVELOPER"); + } + + @ModelAttribute("hostname") + public String getHostname() { + try { + return InetAddress.getLocalHost().getHostName(); + } catch (UnknownHostException e) { + log.warn(e.toString(), e); + } + return ""; + } + + @ModelAttribute("manifest") + private Collection getManifest() { + try { + URL location = getClass().getProtectionDomain().getCodeSource().getLocation(); + String jarFileName = Paths.get(location.toURI()).toString(); + try (JarFile jarFile = new JarFile(jarFileName)) { + ZipEntry entry = jarFile.getEntry(JarFile.MANIFEST_NAME); + try (InputStream in = jarFile.getInputStream(entry)) { + return new String(in.readAllBytes(), StandardCharsets.UTF_8).lines().toList(); + } + } + } catch (FileNotFoundException ignored) { + // do nothing if manifest file is not available + } catch (Exception e) { + log.info(e.toString(), e); + } + return List.of(getTitle() + " " + getVersion()); + } + + } + + +} diff --git a/module-server/src/main/java/de/twomartens/template/controller/v1/GreetingRestController.java b/module-server/src/main/java/de/twomartens/template/controller/v1/GreetingRestController.java new file mode 100644 index 0000000..0ac0e81 --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/controller/v1/GreetingRestController.java @@ -0,0 +1,59 @@ +package de.twomartens.template.controller.v1; + +import de.twomartens.template.mapper.v1.GreetingMapper; +import de.twomartens.template.model.dto.v1.Greeting; +import de.twomartens.template.service.GreetingService; +import io.swagger.v3.oas.annotations.Hidden; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.mapstruct.factory.Mappers; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@Slf4j +@RestController +@RequiredArgsConstructor +@RequestMapping(value = "/template/v1") +@Tag(name = "Greeting Example", description = "all requests relating to greetings") +public class GreetingRestController { + + private final GreetingMapper mapper = Mappers.getMapper(GreetingMapper.class); + + private final GreetingService service; + + @Operation( + summary = "Returns a greeting message", + responses = {@ApiResponse( + responseCode = "200") + } + ) + @GetMapping("/greeting") + public Greeting greeting(@RequestParam(value = "name", defaultValue = "World") String name) { + return mapper.map(service.createGreeting(name)); + } + + @Operation( + summary = "Posts a greeting message to db", + responses = {@ApiResponse( + responseCode = "200") + } + ) + @PostMapping("/greeting") + public void postGreeting(@RequestBody Greeting greeting) { + service.postGreeting(mapper.map(greeting)); + } + + @Hidden + @GetMapping("/healthCheck") + public String checkHealth(@RequestParam(value = "message") String message) { + return message; + } + +} diff --git a/module-server/src/main/java/de/twomartens/template/exception/HttpStatusException.java b/module-server/src/main/java/de/twomartens/template/exception/HttpStatusException.java new file mode 100644 index 0000000..8eac239 --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/exception/HttpStatusException.java @@ -0,0 +1,20 @@ +package de.twomartens.template.exception; + +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +public class HttpStatusException extends RuntimeException { + + private final HttpStatus status; + + public HttpStatusException(HttpStatus status, String message) { + super(message); + this.status = status; + } + + public HttpStatusException(HttpStatus status, String message, Throwable cause) { + super(message, cause); + this.status = status; + } +} diff --git a/module-server/src/main/java/de/twomartens/template/interceptor/BufferingClientHttpResponseWrapper.java b/module-server/src/main/java/de/twomartens/template/interceptor/BufferingClientHttpResponseWrapper.java new file mode 100644 index 0000000..4404be0 --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/interceptor/BufferingClientHttpResponseWrapper.java @@ -0,0 +1,82 @@ +/* + * Copyright 2002-2017 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package de.twomartens.template.interceptor; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatusCode; +import org.springframework.http.client.ClientHttpResponse; +import org.springframework.lang.Nullable; +import org.springframework.util.StreamUtils; + +/** + * Simple implementation of {@link ClientHttpResponse} that reads the response's body into memory, thus allowing for + * multiple invocations of {@link #getBody()}. + * + * @author Arjen Poutsma + * @since 3.1 + */ +public final class BufferingClientHttpResponseWrapper implements ClientHttpResponse { + + private final ClientHttpResponse response; + + @Nullable + private byte[] body; + + + public BufferingClientHttpResponseWrapper(ClientHttpResponse response) { + this.response = response; + } + + + @Override + public HttpStatusCode getStatusCode() throws IOException { + return this.response.getStatusCode(); + } + + @Override + @Deprecated + public int getRawStatusCode() throws IOException { + return this.response.getRawStatusCode(); + } + + @Override + public String getStatusText() throws IOException { + return this.response.getStatusText(); + } + + @Override + public HttpHeaders getHeaders() { + return this.response.getHeaders(); + } + + @Override + public InputStream getBody() throws IOException { + if (this.body == null) { + this.body = StreamUtils.copyToByteArray(this.response.getBody()); + } + return new ByteArrayInputStream(this.body); + } + + @Override + public void close() { + this.response.close(); + } + +} diff --git a/module-server/src/main/java/de/twomartens/template/interceptor/HeaderInterceptor.java b/module-server/src/main/java/de/twomartens/template/interceptor/HeaderInterceptor.java new file mode 100644 index 0000000..a750e30 --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/interceptor/HeaderInterceptor.java @@ -0,0 +1,87 @@ +package de.twomartens.template.interceptor; + +import java.io.Closeable; +import java.util.Optional; +import java.util.UUID; +import org.slf4j.MDC; + +public abstract class HeaderInterceptor { + + public static final String LOGGER_TRACE_ID = "trace.id"; + public static final String LOGGER_REQTYPE_ID = "REQTYPE"; + + public static final String HEADER_FIELD_TRACE_ID = "X-TraceId"; + public static final String HEADER_FIELD_B3_TRACE_ID = "x-b3-traceid"; + public static final String HEADER_FIELD_TYPE_ID = "x-type"; + + public static final String REQ_TYPE_HEALTHCHECK = "HEALTH_CHECK"; + public static final String REQ_TYPE_INTEGRATION_TEST = "INTEGRATION_TEST"; + public static final String REQ_TYPE_SERVER_TEST = "SERVER_TEST"; + public static final String REQ_TYPE_WARMUP = "WARMUP"; + + public String getTraceId() { + return Optional.ofNullable(MDC.get(LOGGER_TRACE_ID)) + .filter(s -> !s.isBlank()) + .orElse(createNewTraceId()); + } + + public Optional getRequestType() { + return Optional.ofNullable(MDC.get(LOGGER_REQTYPE_ID)) + .filter(requestType -> !requestType.isBlank()); + } + + public InterceptorCloseables setTraceId(String traceId) { + return new InterceptorCloseables(MDC.putCloseable(LOGGER_TRACE_ID, traceId)); + } + + public InterceptorCloseables mark(String requestType) { + return new InterceptorCloseables(MDC.putCloseable(LOGGER_REQTYPE_ID, requestType)); + } + + public InterceptorCloseables set(String traceId, String requestType) { + return requestType != null + ? new InterceptorCloseables(setTraceId(traceId), mark(requestType)) + : setTraceId(traceId); + } + + public InterceptorCloseables markAsHealthCheck() { + return new InterceptorCloseables(mark(REQ_TYPE_HEALTHCHECK), setTraceId(createNewTraceId())); + } + + public InterceptorCloseables markAsIntegrationTest() { + return new InterceptorCloseables(mark(REQ_TYPE_INTEGRATION_TEST), setTraceId(createNewTraceId())); + } + + public InterceptorCloseables markAsServerTest() { + return new InterceptorCloseables(mark(REQ_TYPE_SERVER_TEST), setTraceId(createNewTraceId())); + } + + public InterceptorCloseables markAsWarmup() { + return new InterceptorCloseables(mark(REQ_TYPE_WARMUP), setTraceId(createNewTraceId())); + } + + private static String createNewTraceId() { + return UUID.randomUUID().toString(); + } + + public static class InterceptorCloseables implements Closeable { + + private final Closeable[] closeables; + + private InterceptorCloseables(Closeable... closeables) { + this.closeables = closeables; + } + + @Override + public void close() { + for (Closeable closeable : closeables) { + try { + closeable.close(); + } catch (Exception ignored) { + // do nothing + } + } + } + } + +} diff --git a/module-server/src/main/java/de/twomartens/template/interceptor/HeaderInterceptorRest.java b/module-server/src/main/java/de/twomartens/template/interceptor/HeaderInterceptorRest.java new file mode 100644 index 0000000..97ddd4f --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/interceptor/HeaderInterceptorRest.java @@ -0,0 +1,68 @@ +package de.twomartens.template.interceptor; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.Optional; +import java.util.UUID; +import org.springframework.http.HttpRequest; +import org.springframework.http.client.ClientHttpRequestExecution; +import org.springframework.http.client.ClientHttpRequestInterceptor; +import org.springframework.http.client.ClientHttpResponse; +import org.springframework.lang.NonNull; +import org.springframework.web.servlet.HandlerInterceptor; +import org.springframework.web.servlet.ModelAndView; + +public class HeaderInterceptorRest extends HeaderInterceptor + implements HandlerInterceptor, ClientHttpRequestInterceptor { + + public static final String CLASS_NAME = HeaderInterceptorRest.class.getName(); + + // ClientHttpRequestInterceptor + @Override + @NonNull + public ClientHttpResponse intercept(HttpRequest request, @NonNull byte[] body, + ClientHttpRequestExecution execution) throws IOException { + request.getHeaders().add(HEADER_FIELD_TRACE_ID, getTraceId()); + getRequestType().ifPresent(requestType -> request.getHeaders().add(HEADER_FIELD_TYPE_ID, requestType)); + try { + return execution.execute(request, body); + } finally { + request.getHeaders().remove(HEADER_FIELD_TRACE_ID); + request.getHeaders().remove(HEADER_FIELD_TYPE_ID); + } + } + + // HandlerInterceptor + @Override + public boolean preHandle(@NonNull HttpServletRequest request, @NonNull HttpServletResponse response, + @NonNull Object handler) { + String traceId = extractTraceId(request); + String requestType = extractRequestType(request); + InterceptorCloseables closeable = set(traceId, requestType); + request.setAttribute(CLASS_NAME, closeable); + return true; + } + + public static String extractTraceId(HttpServletRequest request) { + return Optional.ofNullable(request.getHeader(HEADER_FIELD_TRACE_ID)).filter(s -> !s.isBlank()) + .or(() -> Optional.ofNullable(request.getHeader(HEADER_FIELD_B3_TRACE_ID)).filter(s -> !s.isBlank())) + .orElse(UUID.randomUUID().toString()); + } + + public static String extractRequestType(HttpServletRequest request) { + return Optional.ofNullable(request.getHeader(HEADER_FIELD_TYPE_ID)) + .filter(reqType -> !reqType.isBlank()) + .orElse(null); + } + + // HandlerInterceptor + @Override + public void postHandle(@NonNull HttpServletRequest request, @NonNull HttpServletResponse response, + @NonNull Object handler, ModelAndView modelAndView) { + Optional.ofNullable(request.getAttribute(CLASS_NAME)) + .filter(InterceptorCloseables.class::isInstance) + .map(InterceptorCloseables.class::cast) + .ifPresent(InterceptorCloseables::close); + } +} diff --git a/module-server/src/main/java/de/twomartens/template/interceptor/LoggingInterceptorRest.java b/module-server/src/main/java/de/twomartens/template/interceptor/LoggingInterceptorRest.java new file mode 100644 index 0000000..be23359 --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/interceptor/LoggingInterceptorRest.java @@ -0,0 +1,419 @@ +package de.twomartens.template.interceptor; + +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.net.URL; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.time.Clock; +import java.time.Duration; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Objects; +import java.util.Optional; +import java.util.TreeSet; +import java.util.function.Function; +import java.util.stream.Collectors; +import lombok.Builder; +import lombok.RequiredArgsConstructor; +import lombok.extern.log4j.Log4j2; +import org.apache.logging.log4j.Marker; +import org.apache.logging.log4j.MarkerManager.Log4jMarker; +import org.apache.logging.log4j.message.StringMapMessage; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpRequest; +import org.springframework.http.MediaType; +import org.springframework.http.client.ClientHttpRequestExecution; +import org.springframework.http.client.ClientHttpRequestInterceptor; +import org.springframework.http.client.ClientHttpResponse; +import org.springframework.lang.NonNull; +import org.springframework.util.StreamUtils; +import org.springframework.web.util.ContentCachingRequestWrapper; +import org.springframework.web.util.ContentCachingResponseWrapper; + +@Log4j2 +@RequiredArgsConstructor +public class LoggingInterceptorRest implements Filter, ClientHttpRequestInterceptor { + + public static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ISO_OFFSET_DATE_TIME; + public static final Marker MARKER = new Log4jMarker("communication"); + + private static final int MAX_LOG_SIZE = 20480; // 20 KB - logging could fail with bigger logmessages + + public static final String DIRECTION_IN = "inbound"; + public static final String DIRECTION_OUT = "outbound"; + public static final String PROTOCOL_NAME = "http"; + + public static final String PARAM_URL_FULL = "url.full"; + public static final String PARAM_URL_DOMAIN = "url.domain"; + public static final String PARAM_URL_EXTENSION = "url.extension"; + public static final String PARAM_URL_PATH = "url.path"; + public static final String PARAM_URL_PORT = "url.port"; + public static final String PARAM_URL_SCHEME = "url.scheme"; + public static final String PARAM_URL_QUERY = "url.query"; + public static final String PARAM_BUSINESS_TYPE = "http.request.type"; + public static final String PARAM_REQUEST_BODY = "http.request.body.content"; + public static final String PARAM_RESPONSE_BODY = "http.response.body.content"; + public static final String PARAM_RESPONSE_STATUS = "http.response.status_code"; + public static final String PARAM_REQUEST_HEADERS = "http.request.headers"; + public static final String PARAM_RESPONSE_HEADERS = "http.response.headers"; + public static final String PARAM_REQUEST_BYTES = "http.request.body.bytes"; + public static final String PARAM_RESPONSE_BYTES = "http.response.body.bytes"; + public static final String PARAM_REQUEST_MIMETYPE = "http.request.mime_type"; + public static final String PARAM_RESPONSE_MIMETYPE = "http.response.mime_type"; + public static final String PARAM_REQUEST_METHOD = "http.request.method"; + public static final String PARAM_REQUEST_REFERER = "http.request.referrer"; + public static final String PARAM_REQUEST_TIME = "event.start"; + public static final String PARAM_RESPONSE_TIME = "event.end"; + public static final String PARAM_DURATION = "event.duration"; + public static final String PARAM_USER_AGENT = "user_agent.original"; + public static final String PARAM_DIRECTION = "network.direction"; + public static final String PARAM_PROTOCOL = "network.protocol"; + + private final FieldLogBehaviour requestLogBehaviour; + private final FieldLogBehaviour responseLogBehaviour; + private final Clock clock; + + public LoggingInterceptorRest(Clock clock) { + this(FieldLogBehaviour.NEVER, FieldLogBehaviour.NEVER, clock); + } + + @Override + public void doFilter(ServletRequest request, ServletResponse response, + FilterChain chain) throws IOException, ServletException { + ZonedDateTime requestTime = ZonedDateTime.now(clock); + HttpServletRequest httpRequest = (HttpServletRequest) request; + ContentCachingRequestWrapper requestWrapper = new ContentCachingRequestWrapper(httpRequest); + ContentCachingResponseWrapper responseWrapper = new ContentCachingResponseWrapper( + (HttpServletResponse) response); + + byte[] fullResponseBytes = null; + Throwable throwable = null; + String responseBody = null; + int httpStatusCode = -1; + + try { + try { + chain.doFilter( + requestLogBehaviour != FieldLogBehaviour.NEVER ? requestWrapper : httpRequest, + responseWrapper); + if (responseLogBehaviour != FieldLogBehaviour.NEVER) { + fullResponseBytes = responseWrapper.getContentAsByteArray(); + } + httpStatusCode = responseWrapper.getStatus(); + } finally { + responseWrapper.copyBodyToResponse(); + } + } catch (Exception e) { + throwable = e; + throw e; + } finally { + try { + int responseSize = responseWrapper.getContentSize(); + Map> responseHeaders = extractHeaders( + responseWrapper.getHeaderNames().iterator(), + s -> responseWrapper.getHeaders(s).iterator()); + if ((responseLogBehaviour == FieldLogBehaviour.ONLY_ON_ERROR && isError(httpStatusCode) + || responseLogBehaviour == FieldLogBehaviour.ALWAYS) && fullResponseBytes != null) { + responseBody = new String(fullResponseBytes, + determineResponseEncoding(responseHeaders, fullResponseBytes)); + } + URL requestUrl = new URL(Optional.ofNullable(httpRequest.getQueryString()) + .map(qs -> httpRequest.getRequestURL().toString() + "?" + qs) + .orElse(httpRequest.getRequestURL().toString())); + Map> requestHeaders = extractHeaders( + httpRequest.getHeaderNames().asIterator(), + s -> httpRequest.getHeaders(s).asIterator()); + String requestBody = null; + String businessType = null; + if (requestLogBehaviour == FieldLogBehaviour.ONLY_ON_ERROR && isError(httpStatusCode) + || requestLogBehaviour == FieldLogBehaviour.ALWAYS) { + byte[] fullRequestBytes = requestWrapper.getContentAsByteArray(); + if (fullRequestBytes != null) { + requestBody = new String(fullRequestBytes, + determineRequestEncoding(requestHeaders, fullRequestBytes)); + } + businessType = determineBusinessType(requestUrl, requestBody); + } + log(LogMessage.builder() + .requestHeaders(requestHeaders) + .responseHeaders(responseHeaders) + .url(requestUrl) + .method(httpRequest.getMethod()) + .requestMimeType(typeToString(request.getContentType())) + .responseMimeType(typeToString(response.getContentType())) + .requestBody(requestBody) + .responseBody(responseBody) + .requestSize(httpRequest.getContentLength()) + .responseSize(responseSize) + .httpStatus(httpStatusCode) + .direction(DIRECTION_IN) + .requestTime(requestTime) + .responseTime(ZonedDateTime.now(clock)) + .traceId(HeaderInterceptorRest.extractTraceId(httpRequest)) + .requestType(HeaderInterceptorRest.extractRequestType(httpRequest)) + .businessType(businessType) + .throwable(throwable) + .build()); + } catch (RuntimeException e) { + log.error(e.toString(), e); + } + } + } + + private boolean isError(int httpStatusCode) { + return httpStatusCode >= 400 && httpStatusCode < 600; + } + + @NonNull + @Override + public ClientHttpResponse intercept(@NonNull HttpRequest request, + @NonNull byte[] requestBytes, @NonNull ClientHttpRequestExecution execution) + throws IOException { + + ZonedDateTime requestTime = ZonedDateTime.now(clock); + int responseSize = 0; + Map> responseHeaders = Collections.emptyMap(); + MediaType responseMediaType = null; + int httpStatusCode = -1; + Throwable throwable = null; + String requestBody = null; + String responseBody = null; + String businessType = null; + + try { + BufferingClientHttpResponseWrapper result = new BufferingClientHttpResponseWrapper( + execution.execute(request, requestBytes)); + byte[] responseBytes = StreamUtils.copyToByteArray(result.getBody()); + responseSize = responseBytes.length; + responseHeaders = extractHeaders(result.getHeaders()); + responseMediaType = result.getHeaders().getContentType(); + httpStatusCode = result.getStatusCode().value(); + if (responseLogBehaviour == FieldLogBehaviour.ONLY_ON_ERROR && isError(httpStatusCode) + || responseLogBehaviour == FieldLogBehaviour.ALWAYS) { + responseBody = new String(responseBytes, + determineRequestEncoding(responseHeaders, responseBytes)); + } + return result; + } catch (Exception e) { + throwable = e; + throw e; + } finally { + try { + URL url = request.getURI().toURL(); + Map> requestHeaders = extractHeaders(request.getHeaders()); + if (requestLogBehaviour == FieldLogBehaviour.ONLY_ON_ERROR && isError(httpStatusCode) + || requestLogBehaviour == FieldLogBehaviour.ALWAYS) { + requestBody = new String(requestBytes, + determineRequestEncoding(requestHeaders, requestBytes)); + businessType = determineBusinessType(url, requestBody); + } + log(LogMessage.builder() + .requestHeaders(requestHeaders) + .responseHeaders(responseHeaders) + .url(url) + .method(Objects.requireNonNull(request.getMethod()).toString()) + .requestMimeType(typeToString(request.getHeaders().getContentType())) + .requestBody(requestBody) + .responseBody(responseBody) + .responseMimeType(typeToString(responseMediaType)) + .requestSize(requestBytes.length) + .responseSize(responseSize) + .httpStatus(httpStatusCode) + .direction(DIRECTION_OUT) + .requestTime(requestTime) + .responseTime(ZonedDateTime.now(clock)) + .businessType(businessType) + .throwable(throwable) + .build()); + } catch (RuntimeException e) { + log.error(e.toString(), e); + } + } + } + + private void log(LogMessage logMessage) { + StringMapMessage stringMapMessage = new StringMapMessage(); + addLogString(stringMapMessage, PARAM_REQUEST_HEADERS, + toHeaderString(logMessage.requestHeaders())); + addLogString(stringMapMessage, PARAM_RESPONSE_HEADERS, + toHeaderString(logMessage.responseHeaders())); + addLogString(stringMapMessage, PARAM_URL_FULL, logMessage.url().toString()); + addLogString(stringMapMessage, PARAM_URL_DOMAIN, logMessage.url().getHost()); + addLogString(stringMapMessage, PARAM_URL_EXTENSION, + extractExtension(logMessage.url().getPath())); + addLogString(stringMapMessage, PARAM_URL_PATH, logMessage.url().getPath()); + addLogString(stringMapMessage, PARAM_URL_PORT, Integer.toString(logMessage.url().getPort())); + addLogString(stringMapMessage, PARAM_URL_SCHEME, logMessage.url().getProtocol()); + addLogString(stringMapMessage, PARAM_URL_QUERY, logMessage.url().getQuery()); + addLogString(stringMapMessage, PARAM_REQUEST_METHOD, logMessage.method()); + addLogString(stringMapMessage, PARAM_REQUEST_REFERER, + getHeader(logMessage.requestHeaders(), HttpHeaders.REFERER)); + addLogString(stringMapMessage, PARAM_REQUEST_MIMETYPE, logMessage.requestMimeType()); + addLogString(stringMapMessage, PARAM_RESPONSE_MIMETYPE, logMessage.responseMimeType()); + addLogString(stringMapMessage, PARAM_REQUEST_BYTES, Integer.toString(logMessage.requestSize())); + addLogString(stringMapMessage, PARAM_RESPONSE_BYTES, + Integer.toString(logMessage.responseSize())); + addLogString(stringMapMessage, PARAM_RESPONSE_STATUS, + Integer.toString(logMessage.httpStatus())); + addLogString(stringMapMessage, PARAM_DIRECTION, logMessage.direction()); + addLogString(stringMapMessage, PARAM_PROTOCOL, PROTOCOL_NAME); + addLogString(stringMapMessage, PARAM_REQUEST_TIME, + logMessage.requestTime().format(DATE_TIME_FORMATTER)); + addLogString(stringMapMessage, PARAM_RESPONSE_TIME, + logMessage.responseTime().format(DATE_TIME_FORMATTER)); + addLogString(stringMapMessage, PARAM_DURATION, + Long.toString(getDurationBetweenRequestAndResponseTime(logMessage).toNanos())); + addLogString(stringMapMessage, PARAM_USER_AGENT, + getHeader(logMessage.requestHeaders(), HttpHeaders.USER_AGENT)); + addLogString(stringMapMessage, HeaderInterceptor.LOGGER_TRACE_ID, logMessage.traceId()); + addLogString(stringMapMessage, HeaderInterceptor.LOGGER_REQTYPE_ID, logMessage.requestType()); + addLogString(stringMapMessage, PARAM_BUSINESS_TYPE, logMessage.businessType()); + addLogString(stringMapMessage, PARAM_REQUEST_BODY, cutToMaxLength(logMessage.requestBody())); + addLogString(stringMapMessage, PARAM_RESPONSE_BODY, cutToMaxLength(logMessage.responseBody())); + + log.debug(MARKER, stringMapMessage, logMessage.throwable()); + } + + private Duration getDurationBetweenRequestAndResponseTime(LogMessage logMessage) { + return Duration.between(logMessage.requestTime(), logMessage.responseTime()); + } + + private String getHeader(Map> headers, String headerKey) { + return headers.entrySet().stream() + .filter(e -> e.getKey().equalsIgnoreCase(headerKey)) + .flatMap(e -> e.getValue().stream()) + .findAny() + .orElse(null); + } + + private void addLogString(StringMapMessage stringMapMessage, String key, String value) { + if (value != null && !value.isBlank()) { + stringMapMessage.with(key, value.trim()); + } + } + + private static Map> extractHeaders(Iterator headerNames, + Function> headerValuesSupplier) { + Map> requestHeaders = new HashMap<>(); + while (headerNames.hasNext()) { + String name = headerNames.next(); + Collection values = requestHeaders.computeIfAbsent(name, n -> new TreeSet<>()); + Iterator headerValues = headerValuesSupplier.apply(name); + while (headerValues.hasNext()) { + values.add(headerValues.next()); + } + } + return requestHeaders; + } + + private static Map> extractHeaders(HttpHeaders headers) { + Map> result = new HashMap<>(); + for (Entry> entry : headers.entrySet()) { + result.put(entry.getKey(), new ArrayList<>(entry.getValue())); + } + return result; + } + + private static String toHeaderString(Map> headerMap) { + return headerMap.entrySet().stream() + .flatMap(es -> es.getValue().stream().map(v -> new KeyValuePair(es.getKey(), v))) + .map(kv -> kv.key() + "=" + kv.value()) + .collect(Collectors.joining("\n")); + } + + private static String typeToString(String contentType) { + try { + return Optional.ofNullable(contentType) + .map(MediaType::parseMediaType) + .map(LoggingInterceptorRest::typeToString) + .orElse(null); + } catch (RuntimeException e) { + log.info(e.toString(), e); + return e.toString(); + } + } + + private static String typeToString(MediaType mediaType) { + try { + return Optional.ofNullable(mediaType) + .map(m -> m.getType() + "/" + m.getSubtype()) + .orElse(null); + } catch (RuntimeException e) { + log.info(e.toString(), e); + return e.toString(); + } + } + + private static String extractExtension(String fileName) { + return Optional.ofNullable(fileName) + .filter(name -> name.contains(".")) + .map(name -> name.substring(name.lastIndexOf('.') + 1)) + .orElse(null); + } + + private static String cutToMaxLength(String string) { + if (string != null && string.length() > MAX_LOG_SIZE) { + return string.substring(0, MAX_LOG_SIZE); + } + return string; + } + + /** + * usually returns null, but can be overridden to implement more complex logic + */ + public String determineBusinessType(URL requestUrl, String requestBody) { + return null; + } + + /** + * usually returns UTF-8, but can be overridden to implement more complex logic + */ + public Charset determineRequestEncoding(Map> requestHeaders, + byte[] fullRequest) { + return StandardCharsets.UTF_8; + } + + /** + * usually returns UTF-8, but can be overridden to implement more complex logic + */ + public Charset determineResponseEncoding(Map> responseHeaders, + byte[] fullResponse) { + return StandardCharsets.UTF_8; + } + + @Builder + private record LogMessage(Map> requestHeaders, + Map> responseHeaders, URL url, String method, + String requestMimeType, String responseMimeType, String requestBody, + String responseBody, + int requestSize, int responseSize, int httpStatus, String direction, + ZonedDateTime requestTime, ZonedDateTime responseTime, String traceId, + String requestType, + String businessType, Throwable throwable) { + + } + + private record KeyValuePair(String key, String value) { + + } + + public enum FieldLogBehaviour { + NEVER, ONLY_ON_ERROR, ALWAYS + } + +} diff --git a/module-server/src/main/java/de/twomartens/template/mapper/v1/GreetingMapper.java b/module-server/src/main/java/de/twomartens/template/mapper/v1/GreetingMapper.java new file mode 100644 index 0000000..7bc4d90 --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/mapper/v1/GreetingMapper.java @@ -0,0 +1,21 @@ +package de.twomartens.template.mapper.v1; + +import de.twomartens.template.model.db.Greeting; +import org.mapstruct.CollectionMappingStrategy; +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.NullValueCheckStrategy; +import org.mapstruct.ReportingPolicy; + +@Mapper(collectionMappingStrategy = CollectionMappingStrategy.ADDER_PREFERRED, + nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS, + unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface GreetingMapper { + + de.twomartens.template.model.dto.v1.Greeting map(Greeting greeting); + + @Mapping(target = "id", ignore = true) + @Mapping(target = "created", ignore = true) + @Mapping(target = "lastModified", ignore = true) + Greeting map(de.twomartens.template.model.dto.v1.Greeting greeting); +} diff --git a/module-server/src/main/java/de/twomartens/template/model/db/Greeting.java b/module-server/src/main/java/de/twomartens/template/model/db/Greeting.java new file mode 100644 index 0000000..ed137f0 --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/model/db/Greeting.java @@ -0,0 +1,41 @@ +package de.twomartens.template.model.db; + +import java.util.Date; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.FieldDefaults; +import org.bson.types.ObjectId; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.Id; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.mongodb.core.mapping.Document; + +@Document +@Getter +@Setter +@Builder +@EqualsAndHashCode +@ToString +@FieldDefaults(level = AccessLevel.PRIVATE) +@NoArgsConstructor(force = true, access = AccessLevel.PRIVATE) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +public class Greeting { + + @Id + ObjectId id; + + @CreatedDate + Date created; + + @LastModifiedDate + Date lastModified; + + String message; + +} diff --git a/module-server/src/main/java/de/twomartens/template/model/dto/ErrorMessage.java b/module-server/src/main/java/de/twomartens/template/model/dto/ErrorMessage.java new file mode 100644 index 0000000..cb5a893 --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/model/dto/ErrorMessage.java @@ -0,0 +1,24 @@ +package de.twomartens.template.model.dto; + +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.FieldDefaults; + +@Getter +@Setter +@Builder +@EqualsAndHashCode +@ToString +@FieldDefaults(level = AccessLevel.PRIVATE) +@NoArgsConstructor(force = true, access = AccessLevel.PRIVATE) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +public class ErrorMessage { + + String message; +} diff --git a/module-server/src/main/java/de/twomartens/template/model/dto/v1/Greeting.java b/module-server/src/main/java/de/twomartens/template/model/dto/v1/Greeting.java new file mode 100644 index 0000000..9a8fdde --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/model/dto/v1/Greeting.java @@ -0,0 +1,31 @@ +package de.twomartens.template.model.dto.v1; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.FieldDefaults; +import org.springframework.lang.NonNull; + +@Getter +@Setter +@Builder +@EqualsAndHashCode +@ToString +@FieldDefaults(level = AccessLevel.PRIVATE) +@NoArgsConstructor(force = true, access = AccessLevel.PRIVATE) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Schema(description = "Data container for a greeting message") +public class Greeting { + + @NonNull + @Schema(description = "Data container for a greeting message", example = "Hello Helmut!", + defaultValue = "Hello World!") + private final String message; + +} diff --git a/module-server/src/main/java/de/twomartens/template/monitoring/actuator/AbstractHealthIndicator.java b/module-server/src/main/java/de/twomartens/template/monitoring/actuator/AbstractHealthIndicator.java new file mode 100644 index 0000000..5b0cfd3 --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/monitoring/actuator/AbstractHealthIndicator.java @@ -0,0 +1,84 @@ +package de.twomartens.template.monitoring.actuator; + +import java.io.Closeable; +import java.io.IOException; +import java.time.Clock; +import java.time.Duration; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.slf4j.MDC; +import org.slf4j.MDC.MDCCloseable; +import org.springframework.boot.actuate.health.Health; +import org.springframework.boot.actuate.health.HealthIndicator; +import org.springframework.boot.actuate.health.Status; + +@Slf4j +@RequiredArgsConstructor +public abstract class AbstractHealthIndicator implements HealthIndicator { + + public static final String HOST = "localhost"; + public static final String HTTP_PREFIX = "http://"; + public static final String HOST_PORT_SEPERATOR = ":"; + public static final String PATH_SEPERATOR = "/"; + public static final String PARAMETER_SEPERATOR = "?"; + public static final String DETAIL_ENDPOINT_KEY = "endpoint"; + + private final String logStatusDownMessage = String.format("health indicator '%s' invoked with status '%s'", + indicatorName(), Status.DOWN.getCode()); + private final String logStatusUpMessage = String.format("health indicator '%s' invoked with status '%s'", + indicatorName(), Status.UP.getCode()); + private final Clock clock; + private final Preparable preparable; + private boolean firstTime = true; + + /** + * main method that determines the health of the service + */ + protected abstract Health determineHealth(); + + @Override + public Health health() { + try (Closeable ignored = preparable.prepare()) { + Health result = null; + Exception exception = null; + long start = clock.millis(); + try { + result = determineHealth(); + } catch (RuntimeException e) { + exception = e; + result = Health.down().withException(e).build(); + } finally { + logInvocation(result, exception, start, clock.millis()); + } + return result; + } catch (IOException e) { + log.error("unexpected exception occurred", e); + return Health.down(e).build(); + } + } + + private void logInvocation(Health health, Exception exception, long start, long end) { + Duration duration = Duration.ofMillis(end - start); + try (MDCCloseable ignored = MDC.putCloseable("event.duration", Long.toString(duration.toNanos()))) { + if (exception != null || health == null) { + log.error(logStatusDownMessage, exception); + firstTime = true; + } else if (health.getStatus() == Status.DOWN) { + log.warn(logStatusDownMessage); + firstTime = true; + } else if (firstTime) { + log.info(logStatusUpMessage); + firstTime = false; + } else { + log.trace(logStatusUpMessage); + } + } + } + + private String indicatorName() { + return this.getClass().getSimpleName() + .replace("HealthIndicator", "") + .toLowerCase(); + } + +} diff --git a/module-server/src/main/java/de/twomartens/template/monitoring/actuator/AbstractStatusProbeHealthIndicator.java b/module-server/src/main/java/de/twomartens/template/monitoring/actuator/AbstractStatusProbeHealthIndicator.java new file mode 100644 index 0000000..9ee1ab8 --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/monitoring/actuator/AbstractStatusProbeHealthIndicator.java @@ -0,0 +1,37 @@ +package de.twomartens.template.monitoring.actuator; + +import de.twomartens.template.monitoring.statusprobe.StatusProbe; +import java.time.Clock; +import java.util.Optional; +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.actuate.health.Health; +import org.springframework.boot.actuate.health.Health.Builder; +import org.springframework.boot.actuate.health.HealthIndicator; + +@Slf4j +public abstract class AbstractStatusProbeHealthIndicator extends AbstractHealthIndicator + implements HealthIndicator { + + public static final String MESSAGE_KEY = "message"; + public static final String LAST_STATUS_CHANGE_KEY = "lastStatusChange"; + + private final StatusProbe statusProbe; + + public AbstractStatusProbeHealthIndicator(Clock timeProvider, Preparable headerInterceptor, + StatusProbe statusProbe) { + super(timeProvider, headerInterceptor); + this.statusProbe = statusProbe; + } + + @Override + protected Health determineHealth() { + Builder healthBuilder = Health.status(statusProbe.getStatus()); + Optional.ofNullable(statusProbe.getLastStatusChange()) + .ifPresent(l -> healthBuilder.withDetail(LAST_STATUS_CHANGE_KEY, l)); + Optional.ofNullable(statusProbe.getThrowable()).ifPresent(healthBuilder::withException); + Optional.ofNullable(statusProbe.getMessage()) + .ifPresent(m -> healthBuilder.withDetail(MESSAGE_KEY, m)); + return healthBuilder.build(); + } + +} diff --git a/module-server/src/main/java/de/twomartens/template/monitoring/actuator/Preparable.java b/module-server/src/main/java/de/twomartens/template/monitoring/actuator/Preparable.java new file mode 100644 index 0000000..0b53049 --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/monitoring/actuator/Preparable.java @@ -0,0 +1,10 @@ +package de.twomartens.template.monitoring.actuator; + +import java.io.Closeable; + +@FunctionalInterface +public interface Preparable { + + Closeable prepare(); + +} diff --git a/module-server/src/main/java/de/twomartens/template/monitoring/actuator/RestHealthIndicator.java b/module-server/src/main/java/de/twomartens/template/monitoring/actuator/RestHealthIndicator.java new file mode 100644 index 0000000..62c1a5e --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/monitoring/actuator/RestHealthIndicator.java @@ -0,0 +1,65 @@ +package de.twomartens.template.monitoring.actuator; + +import de.twomartens.template.interceptor.HeaderInterceptorRest; +import java.security.SecureRandom; +import java.time.Clock; +import java.util.Optional; +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.actuate.health.Health; +import org.springframework.boot.actuate.health.HealthIndicator; +import org.springframework.boot.actuate.health.Status; +import org.springframework.boot.autoconfigure.web.ServerProperties; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Component; +import org.springframework.web.client.RestTemplate; + +/** + * A Health check which checks if the rest services are working. + *

+ * If you have a complex service, you should think about an easy greeting or echo service, which + * only tests the + * network/service stack and not the full application. + *

+ * The health check will be called by kubernetes to check if the container/pod should be in load + * balancing. It is possible + * to have as much health checks as you like. + *

+ * There should be a health check which is ok not before all data is loaded. + */ +@Slf4j +@Component +public class RestHealthIndicator extends AbstractHealthIndicator implements HealthIndicator { + + private static final String URL_PATH = "/template/v1/healthCheck"; + private static final String GET_PARAMETER = "message="; + + private final SecureRandom randomizer = new SecureRandom(); + private final RestTemplate restTemplateRestHealthIndicator; + private final String urlPrefix; + + public RestHealthIndicator(Clock clock, HeaderInterceptorRest interceptor, + ServerProperties serverProperties, RestTemplate restTemplateRestHealthIndicator) { + super(clock, interceptor::markAsHealthCheck); + this.restTemplateRestHealthIndicator = restTemplateRestHealthIndicator; + urlPrefix = HTTP_PREFIX + HOST + HOST_PORT_SEPERATOR + serverProperties.getPort() + + URL_PATH + PARAMETER_SEPERATOR + GET_PARAMETER; + } + + /** + * main method that determines the health of the service + */ + @Override + protected Health determineHealth() { + String random = Integer.toString(randomizer.nextInt(100000, 999999)); + String url = urlPrefix + "{random}"; + ResponseEntity response = restTemplateRestHealthIndicator.getForEntity(url, String.class, random); + Status status = Optional.ofNullable(response.getBody()) + .filter(random::equals) + .map(m -> Status.UP) + .orElse(Status.DOWN); + return Health.status(status) + .withDetail(DETAIL_ENDPOINT_KEY, url) + .build(); + } + +} diff --git a/module-server/src/main/java/de/twomartens/template/monitoring/statusprobe/CountBasedStatusProbe.java b/module-server/src/main/java/de/twomartens/template/monitoring/statusprobe/CountBasedStatusProbe.java new file mode 100644 index 0000000..799337e --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/monitoring/statusprobe/CountBasedStatusProbe.java @@ -0,0 +1,33 @@ +package de.twomartens.template.monitoring.statusprobe; + +import java.time.Clock; +import java.util.concurrent.atomic.AtomicInteger; +import org.springframework.boot.actuate.health.Status; + +public class CountBasedStatusProbe extends StatusProbe { + + private final AtomicInteger failureCount = new AtomicInteger(0); + + private final int maxFailureCount; + + public CountBasedStatusProbe(int maxFailureCount, Clock clock, StatusProbeCriticality criticality, String name, + StatusProbeLogger statusProbeLogger) { + super(clock, criticality, name, statusProbeLogger); + this.maxFailureCount = maxFailureCount; + } + + @Override + protected synchronized void setStatus(Status status, Throwable throwable, String message) { + if (status == Status.DOWN) { + int failureCount = this.failureCount.incrementAndGet(); + if (failureCount > maxFailureCount) { + super.setStatus(status, throwable, message); + } + } else if (status == Status.UP) { + this.failureCount.set(0); + super.setStatus(status, throwable, message); + } + } + + +} diff --git a/module-server/src/main/java/de/twomartens/template/monitoring/statusprobe/PercentageBasedStatusProbe.java b/module-server/src/main/java/de/twomartens/template/monitoring/statusprobe/PercentageBasedStatusProbe.java new file mode 100644 index 0000000..a0ae97c --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/monitoring/statusprobe/PercentageBasedStatusProbe.java @@ -0,0 +1,63 @@ +package de.twomartens.template.monitoring.statusprobe; + +import java.time.Clock; +import java.time.Duration; +import org.springframework.boot.actuate.health.Status; +import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; + +/** + * uses the percentage of down statuses within a given period (default: 1 min) to determine if status of probe is down. + * this is meant to be used to avoid flickering status probes on services that have lots of status updates. When there + * is no significant amount of requests during one scheduling period, the behavior may be arbitrary. + */ +public class PercentageBasedStatusProbe extends StatusProbe implements ScheduledStatusProbe { + + private final int maxFailurePercent; + + private int requestCount = 0; + private int downCount = 0; + private Throwable throwable; + private String message; + + public PercentageBasedStatusProbe(int maxFailurePercent, Clock clock, + ThreadPoolTaskScheduler threadPoolTaskScheduler, StatusProbeCriticality criticality, String name, + StatusProbeLogger statusProbeLogger) { + this(maxFailurePercent, clock, threadPoolTaskScheduler, Duration.ofMinutes(1), criticality, name, + statusProbeLogger); + } + + public PercentageBasedStatusProbe(int maxFailurePercent, Clock clock, + ThreadPoolTaskScheduler threadPoolTaskScheduler, Duration schedulePeriod, StatusProbeCriticality criticality, + String name, StatusProbeLogger statusProbeLogger) { + super(clock, criticality, name, statusProbeLogger); + this.maxFailurePercent = maxFailurePercent; + scheduleTask(threadPoolTaskScheduler, schedulePeriod); + } + + @Override + protected synchronized void setStatus(Status status, Throwable throwable, String message) { + if (status == Status.DOWN) { + downCount++; + this.throwable = throwable; + this.message = message; + } + requestCount++; + } + + private void reset() { + requestCount = 0; + downCount = 0; + throwable = null; + message = null; + } + + public synchronized void runScheduledTask() { + if (requestCount > 0 && (downCount * 100.0 / requestCount) > maxFailurePercent) { + super.setStatus(Status.DOWN, throwable, message); + } else { + super.setStatus(Status.UP, null, null); + } + reset(); + } + +} diff --git a/module-server/src/main/java/de/twomartens/template/monitoring/statusprobe/ScheduledStatusProbe.java b/module-server/src/main/java/de/twomartens/template/monitoring/statusprobe/ScheduledStatusProbe.java new file mode 100644 index 0000000..8a19fd1 --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/monitoring/statusprobe/ScheduledStatusProbe.java @@ -0,0 +1,18 @@ +package de.twomartens.template.monitoring.statusprobe; + +import java.time.Duration; +import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; +import org.springframework.scheduling.support.PeriodicTrigger; + +public interface ScheduledStatusProbe { + + void runScheduledTask(); + + default void scheduleTask(ThreadPoolTaskScheduler threadPoolTaskScheduler, + Duration schedulePeriod) { + PeriodicTrigger periodicTrigger = new PeriodicTrigger( + Duration.ofSeconds(schedulePeriod.toSeconds())); + threadPoolTaskScheduler.schedule(this::runScheduledTask, periodicTrigger); + } + +} diff --git a/module-server/src/main/java/de/twomartens/template/monitoring/statusprobe/StatusProbe.java b/module-server/src/main/java/de/twomartens/template/monitoring/statusprobe/StatusProbe.java new file mode 100644 index 0000000..36a0bf9 --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/monitoring/statusprobe/StatusProbe.java @@ -0,0 +1,62 @@ +package de.twomartens.template.monitoring.statusprobe; + +import java.time.Clock; +import java.time.ZonedDateTime; +import lombok.Getter; +import org.springframework.boot.actuate.health.Status; + +@Getter +public class StatusProbe { + + private final Clock clock; + + private Status status = Status.UP; + private Throwable throwable = null; + private String message = null; + private ZonedDateTime lastStatusChange; + private final StatusProbeLogger statusProbeLogger; + private final String name; + + public StatusProbe(Clock clock, StatusProbeCriticality criticality, String name, + StatusProbeLogger statusProbeLogger) { + this.clock = clock; + this.name = name; + this.statusProbeLogger = statusProbeLogger; + statusProbeLogger.registerStatusProbe(name, criticality); + } + + protected void setStatus(Status status, Throwable throwable, String message) { + if (status != this.status) { + lastStatusChange = ZonedDateTime.now(clock); + statusProbeLogger.logStatusChange(name, message, status, lastStatusChange, throwable); + } + this.status = status; + this.throwable = throwable; + this.message = message; + } + + public void up() { + setStatus(Status.UP, null, null); + } + + public void up(String message) { + setStatus(Status.UP, null, message); + } + + public void down() { + setStatus(Status.DOWN, null, null); + } + + public void down(Throwable throwable) { + setStatus(Status.DOWN, throwable, null); + } + + public void down(String message) { + setStatus(Status.DOWN, null, message); + } + + protected void down(Throwable throwable, String message) { + setStatus(Status.DOWN, throwable, message); + } + +} diff --git a/module-server/src/main/java/de/twomartens/template/monitoring/statusprobe/StatusProbeCriticality.java b/module-server/src/main/java/de/twomartens/template/monitoring/statusprobe/StatusProbeCriticality.java new file mode 100644 index 0000000..f7f4f55 --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/monitoring/statusprobe/StatusProbeCriticality.java @@ -0,0 +1,7 @@ +package de.twomartens.template.monitoring.statusprobe; + + +public enum StatusProbeCriticality { + K1, K2, K3 +} + diff --git a/module-server/src/main/java/de/twomartens/template/monitoring/statusprobe/StatusProbeLogger.java b/module-server/src/main/java/de/twomartens/template/monitoring/statusprobe/StatusProbeLogger.java new file mode 100644 index 0000000..9ddfa43 --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/monitoring/statusprobe/StatusProbeLogger.java @@ -0,0 +1,124 @@ +package de.twomartens.template.monitoring.statusprobe; + +import static de.twomartens.template.monitoring.statusprobe.StatusProbeCriticality.K1; +import static de.twomartens.template.monitoring.statusprobe.StatusProbeCriticality.K2; +import static de.twomartens.template.monitoring.statusprobe.StatusProbeCriticality.K3; + +import java.time.Clock; +import java.time.ZonedDateTime; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.Marker; +import org.apache.logging.log4j.MarkerManager; +import org.apache.logging.log4j.message.StringMapMessage; +import org.springframework.boot.actuate.health.Status; + +public class StatusProbeLogger { + + private static final Marker MARKER = MarkerManager.getMarker("statusprobe"); + + private static final String LABEL_CRITICALITY = "label.status.criticality"; + private static final String LABEL_STATUS = "label.status.status"; + private static final String LABEL_REASON = "label.status.reason"; + private static final String LABEL_MESSAGE = "label.status.description"; + private static final String LABEL_LAST_STATUS_CHANGE = "label.status.last_change"; + + private final Clock clock; + private final Logger commLog; + private final Map statusProbeToStatus = new HashMap<>(); + + public StatusProbeLogger(Clock clock) { + this(clock, LogManager.getLogger("statusprobe")); + } + + /** + * only for testing purposes + */ + StatusProbeLogger(Clock clock, Logger commLog) { + this.clock = clock; + this.commLog = commLog; + } + + public void registerStatusProbe(String name, StatusProbeCriticality criticality) { + statusProbeToStatus.put(new ProbeIdent(name, criticality), Status.UP); + logStatusChange(name, "Startup", Status.UP, ZonedDateTime.now(clock), null); + } + + public void logStatusChange(String name, String message, Status status, ZonedDateTime lastStatusChange, + Throwable throwable) { + ProbeIdent probeIdent = getProbeIdent(name); + if (probeIdent == null) { + probeIdent = new ProbeIdent(name, K1); + } + statusProbeToStatus.put(probeIdent, status); + createLog(message, lastStatusChange, throwable); + } + + private ProbeIdent getProbeIdent(String name) { + return statusProbeToStatus.keySet().stream().filter(key -> key.name.equals(name)).findFirst().orElse(null); + } + + private void createLog(String message, ZonedDateTime lastStatusChange, Throwable throwable) { + Status overallStatus = getOverallStatus(); + StatusProbeCriticality criticality = getOverallCriticality(); + if (message == null) { + message = ""; + } + if (Status.UP.equals(overallStatus)) { + commLog.info(MARKER, new StringMapMessage() + .with(LABEL_CRITICALITY, criticality) + .with(LABEL_STATUS, overallStatus) + .with(LABEL_MESSAGE, message) + .with(LABEL_LAST_STATUS_CHANGE, lastStatusChange)); + } else { + commLog.error(MARKER, new StringMapMessage() + .with(LABEL_CRITICALITY, criticality) + .with(LABEL_STATUS, overallStatus) + .with(LABEL_MESSAGE, message) + .with(LABEL_REASON, getReason()) + .with(LABEL_LAST_STATUS_CHANGE, lastStatusChange), throwable); + } + } + + private StatusProbeCriticality getOverallCriticality() { + List crits = statusProbeToStatus.keySet().stream().map(key -> key.criticality).toList(); + return crits.contains(K1) ? K1 : crits.contains(K2) ? K2 : K3; + } + + private Status getOverallStatus() { + if (statusProbeToStatus.containsValue(Status.DOWN)) { + return Status.DOWN; + } + return Status.UP; + } + + private String getReason() { + + List probesDown = statusProbeToStatus.entrySet().stream() + .filter(entry -> Status.DOWN.equals(entry.getValue())) + .map(Map.Entry::getKey) + .toList(); + + String reasonK1 = getDownStatusProbes(probesDown, K1); + String reasonK2 = getDownStatusProbes(probesDown, K2); + String reasonK3 = getDownStatusProbes(probesDown, K3); + + return "%s%s%s".formatted(reasonK1, reasonK2, reasonK3).trim(); + } + + private String getDownStatusProbes(List probesDown, StatusProbeCriticality criticality) { + List downProbeNames = probesDown.stream().filter(probe -> probe.criticality.equals(criticality)) + .map(probe -> probe.name).toList(); + if (downProbeNames.size() > 0) { + return criticality + " failed: " + String.join(",", downProbeNames) + "\n"; + } + return ""; + } + + public record ProbeIdent(String name, StatusProbeCriticality criticality) { + + } +} diff --git a/module-server/src/main/java/de/twomartens/template/monitoring/statusprobe/TimeBasedStatusProbe.java b/module-server/src/main/java/de/twomartens/template/monitoring/statusprobe/TimeBasedStatusProbe.java new file mode 100644 index 0000000..250dcba --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/monitoring/statusprobe/TimeBasedStatusProbe.java @@ -0,0 +1,64 @@ +package de.twomartens.template.monitoring.statusprobe; + +import java.time.Clock; +import java.time.Duration; +import java.time.ZonedDateTime; +import org.springframework.boot.actuate.health.Status; +import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; + +public class TimeBasedStatusProbe extends StatusProbe implements ScheduledStatusProbe { + + private final Clock clock; + + private final Duration maxFailureDuration; + + private ZonedDateTime lastSuccess; + + private Throwable throwable = null; + + private String message = null; + + public TimeBasedStatusProbe(Duration maxFailureDuration, Clock clock, + ThreadPoolTaskScheduler threadPoolTaskScheduler, StatusProbeCriticality criticality, String name, + StatusProbeLogger statusProbeLogger) { + this(maxFailureDuration, clock, threadPoolTaskScheduler, Duration.ofMinutes(1), criticality, name, + statusProbeLogger); + } + + public TimeBasedStatusProbe(Duration maxFailureDuration, Clock clock, + ThreadPoolTaskScheduler threadPoolTaskScheduler, Duration schedulePeriod, StatusProbeCriticality criticality, + String name, StatusProbeLogger statusProbeLogger) { + super(clock, criticality, name, statusProbeLogger); + this.clock = clock; + this.maxFailureDuration = maxFailureDuration; + this.lastSuccess = null; + scheduleTask(threadPoolTaskScheduler, schedulePeriod); + } + + @Override + protected synchronized void setStatus(Status status, Throwable throwable, String message) { + if (status == Status.DOWN) { + this.throwable = throwable; + this.message = message; + } else if (status == Status.UP) { + lastSuccess = ZonedDateTime.now(clock); + super.setStatus(status, throwable, message); + } + } + + private boolean isOverdue() { + if (lastSuccess == null) { + return false; + } + Duration timeSinceLastSuccess = Duration.between(lastSuccess, ZonedDateTime.now(clock)); + return maxFailureDuration.minus(timeSinceLastSuccess).isNegative(); + } + + public synchronized void runScheduledTask() { + if (isOverdue()) { + super.setStatus(Status.DOWN, throwable, message); + } + } + + +} diff --git a/module-server/src/main/java/de/twomartens/template/property/RestTemplateTimeoutProperties.java b/module-server/src/main/java/de/twomartens/template/property/RestTemplateTimeoutProperties.java new file mode 100644 index 0000000..d2673a7 --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/property/RestTemplateTimeoutProperties.java @@ -0,0 +1,34 @@ +package de.twomartens.template.property; + +import java.time.Duration; +import java.time.temporal.ChronoUnit; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.convert.DurationUnit; +import org.springframework.stereotype.Component; + +@Getter +@Setter +@ToString +@EqualsAndHashCode +@AllArgsConstructor +@NoArgsConstructor +@ConfigurationProperties(prefix = "resttemplate.timeout") +@Component +public class RestTemplateTimeoutProperties { + + @DurationUnit(ChronoUnit.MILLIS) + private Duration readTimeoutRestHealthIndicatorInMillis; + @DurationUnit(ChronoUnit.MILLIS) + private Duration connectionRestHealthIndicatorTimeoutInMillis; + @DurationUnit(ChronoUnit.MILLIS) + private Duration readTimeoutRestTemplateInMillis; + @DurationUnit(ChronoUnit.MILLIS) + private Duration connectionRestTemplateTimeoutInMillis; +} + diff --git a/module-server/src/main/java/de/twomartens/template/property/ServiceProperties.java b/module-server/src/main/java/de/twomartens/template/property/ServiceProperties.java new file mode 100644 index 0000000..4b3f4fb --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/property/ServiceProperties.java @@ -0,0 +1,21 @@ +package de.twomartens.template.property; + +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.ZoneId; +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.cloud.context.config.annotation.RefreshScope; +import org.springframework.context.annotation.Configuration; + +@Data +@RefreshScope +@Configuration +@ConfigurationProperties(prefix = "de.twomartens.template") +@Schema(description = "Properties, to configure this Application") +public class ServiceProperties { + + private ZoneId defaultTimeZone; + + private String greeting; + +} \ No newline at end of file diff --git a/module-server/src/main/java/de/twomartens/template/property/StatusProbeProperties.java b/module-server/src/main/java/de/twomartens/template/property/StatusProbeProperties.java new file mode 100644 index 0000000..b1a0095 --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/property/StatusProbeProperties.java @@ -0,0 +1,28 @@ +package de.twomartens.template.property; + +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.Duration; +import java.time.temporal.ChronoUnit; +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.convert.DurationUnit; +import org.springframework.cloud.context.config.annotation.RefreshScope; +import org.springframework.context.annotation.Configuration; + +@Data +@RefreshScope +@Configuration +@ConfigurationProperties(prefix = "de.twomartens.template.statusprobe") +@Schema(description = "Properties, to configure this Application") +public class StatusProbeProperties { + + @DurationUnit(ChronoUnit.SECONDS) + private Duration scheduleDuration; + + @DurationUnit(ChronoUnit.MINUTES) + private Duration maxKafkaFailureDuration; + + private int maxBlobFailureCount; + + private int maxFailurePercent; +} diff --git a/module-server/src/main/java/de/twomartens/template/repository/GreetingRepository.java b/module-server/src/main/java/de/twomartens/template/repository/GreetingRepository.java new file mode 100644 index 0000000..aad78c3 --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/repository/GreetingRepository.java @@ -0,0 +1,11 @@ +package de.twomartens.template.repository; + +import de.twomartens.template.model.db.Greeting; +import java.util.Optional; +import org.springframework.data.mongodb.repository.MongoRepository; + +public interface GreetingRepository extends MongoRepository { + + Optional findByMessageIgnoreCase(String message); + +} diff --git a/module-server/src/main/java/de/twomartens/template/service/GreetingService.java b/module-server/src/main/java/de/twomartens/template/service/GreetingService.java new file mode 100644 index 0000000..994384b --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/service/GreetingService.java @@ -0,0 +1,40 @@ +package de.twomartens.template.service; + +import de.twomartens.template.model.db.Greeting; +import de.twomartens.template.property.ServiceProperties; +import de.twomartens.template.repository.GreetingRepository; +import io.micrometer.core.instrument.Counter; +import io.micrometer.core.instrument.MeterRegistry; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service +public class GreetingService { + + private final MeterRegistry meterRegistry; + private final ServiceProperties serviceProperties; + private final Counter counter; + + private final GreetingRepository greetingRepository; + + public GreetingService(MeterRegistry meterRegistry, ServiceProperties serviceProperties, + GreetingRepository greetingRepository) { + this.meterRegistry = meterRegistry; + this.serviceProperties = serviceProperties; + this.greetingRepository = greetingRepository; + counter = meterRegistry.counter("template.callCounter"); + } + + public Greeting createGreeting(String name) { + log.info("Create greeting for '{}'", name); + counter.increment(); + meterRegistry.gauge("template.nameLength", name.length()); + String greeting = serviceProperties.getGreeting(); + return Greeting.builder().message(String.format(greeting, name)).build(); + } + + public void postGreeting(Greeting greeting) { + greetingRepository.save(greeting); + } +} diff --git a/module-server/src/main/java/de/twomartens/template/service/PropertyReloadService.java b/module-server/src/main/java/de/twomartens/template/service/PropertyReloadService.java new file mode 100644 index 0000000..5864846 --- /dev/null +++ b/module-server/src/main/java/de/twomartens/template/service/PropertyReloadService.java @@ -0,0 +1,37 @@ +package de.twomartens.template.service; + +import java.util.Set; +import java.util.concurrent.TimeUnit; +import lombok.RequiredArgsConstructor; +import lombok.extern.log4j.Log4j2; +import org.apache.logging.log4j.message.StringMapMessage; +import org.springframework.cloud.context.refresh.ContextRefresher; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Service; + +/** + * automatically reloads application*.yaml. reload can also be triggered manually by doing a post + * request on http://localhost:12001/actuator/refresh + */ +@Log4j2 +@Service +@RequiredArgsConstructor +public class PropertyReloadService { + + public static final int REFRESH_SECONDS = 60; + public static final String PARAM_MESSAGE = "message"; + public static final String PARAM_PROPERTIES = "labels.properties"; + + private final ContextRefresher contextRefresher; + + @Scheduled(fixedDelay = REFRESH_SECONDS, initialDelay = REFRESH_SECONDS, timeUnit = TimeUnit.SECONDS) + public void refresh() { + Set properties = contextRefresher.refresh(); + if (!properties.isEmpty()) { + log.info(new StringMapMessage() + .with(PARAM_MESSAGE, "properties changed") + .with(PARAM_PROPERTIES, String.join("\n", properties))); + } + } + +} diff --git a/module-server/src/main/resources/application-dev.yaml b/module-server/src/main/resources/application-dev.yaml new file mode 100644 index 0000000..c64a463 --- /dev/null +++ b/module-server/src/main/resources/application-dev.yaml @@ -0,0 +1,6 @@ +#TODO zufaellige Ports eintragen +server.port: 12000 +grpc.server.port: 12002 +management.server.port: 12001 + +de.twomartens.template.name: "Template" \ No newline at end of file diff --git a/module-server/src/main/resources/application.yaml b/module-server/src/main/resources/application.yaml new file mode 100644 index 0000000..4211d10 --- /dev/null +++ b/module-server/src/main/resources/application.yaml @@ -0,0 +1,67 @@ +server: + port: 8080 + shutdown: graceful +grpc.server.port: 9090 + +### technical configurations ### +management: + # for security, don't use same port as application + server.port: 8081 + health: + livenessState.enabled: true + readinessState.enabled: true + endpoint: + health: + show-details: always + probes.enabled: true + group: + readiness.include: readinessState,diskSpace,grpcChannel,grpc,rest + liveness.include: livenessState + endpoints.web.exposure.include: '*' + # activate percentiles for web and grpc requests + metrics.distribution.percentiles-histogram: + grpc.server.processing.duration: true + http.server.requests: true + +spring: + main: + banner-mode: off + profiles: + default: dev + +# properties for application +de.twomartens.template: + defaultTimeZone: Europe/Berlin + greeting: "Hello %s" + +springdoc: + swagger-ui: + path: '/template/doc/' + api-docs: + path: '/template/api-docs/' + default-produces-media-type: 'application/json' + +openapi: + #TODO write description/ changelog + description: | + Open API Documentation for the Template + + ## Header 2 + + __YOUR TEXT HERE__ + + ## Changelog + + |Version | Change | Author | Date | + | ------ | -------------------------------------- | ------ | ---------- | + | 1.0 | added API Versioning (and changelog) | Jim | 28.05.2023 | + + version: 1.0 + title: 'Template API' + +resttemplate: + timeout: + readTimeoutRestHealthIndicatorInMillis: 5000 + connectionRestHealthIndicatorTimeoutInMillis: 5000 + readTimeoutRestTemplateInMillis: 5000 + connectionRestTemplateTimeoutInMillis: 5000 \ No newline at end of file diff --git a/module-server/src/main/resources/log4j2.xml b/module-server/src/main/resources/log4j2.xml new file mode 100644 index 0000000..31a9745 --- /dev/null +++ b/module-server/src/main/resources/log4j2.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/module-server/src/main/resources/templates/error.html b/module-server/src/main/resources/templates/error.html new file mode 100644 index 0000000..a2d5c37 --- /dev/null +++ b/module-server/src/main/resources/templates/error.html @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/module-server/src/main/resources/templates/error/404.html b/module-server/src/main/resources/templates/error/404.html new file mode 100644 index 0000000..6f9e73e --- /dev/null +++ b/module-server/src/main/resources/templates/error/404.html @@ -0,0 +1,9 @@ + + + + + +

The requested URL was not found on this server.

+ + + diff --git a/module-server/src/main/resources/templates/errorIncludes.html b/module-server/src/main/resources/templates/errorIncludes.html new file mode 100644 index 0000000..78f10ae --- /dev/null +++ b/module-server/src/main/resources/templates/errorIncludes.html @@ -0,0 +1,28 @@ + + + + Error <th:block th:text="${status}"/> (<th:block th:text="${error}"/>) + + + + +

Template

+

+ +

+ +
+ + diff --git a/module-server/src/main/resources/templates/version.html b/module-server/src/main/resources/templates/version.html new file mode 100644 index 0000000..c9da798 --- /dev/null +++ b/module-server/src/main/resources/templates/version.html @@ -0,0 +1,37 @@ + + + + <th:block th:text="${version}"/> + + + +

+ +

+

+ Hostname: + +

+

+ + +
+ +

+ + + diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..a4e51f1 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,10 @@ +rootProject.name = projectname + +include 'plain' +include 'server' +include 'lib' + +rootProject.children.each { subproject -> + subproject.projectDir = file("module-" + subproject.name) + subproject.buildFileName = "${subproject.name}.gradle" +} \ No newline at end of file