From 4089087cb4a69b28036672003adcbf390b9bb521 Mon Sep 17 00:00:00 2001 From: Thomas Turrell-Croft Date: Thu, 23 Mar 2023 15:57:54 +0000 Subject: [PATCH 1/2] Add Eclipse formatter settings --- .../.settings/org.eclipse.jdt.core.prefs | 404 ++++++++++++++++++ .../.settings/org.eclipse.jdt.ui.prefs | 150 +++++++ .../.settings/org.eclipse.jdt.core.prefs | 404 ++++++++++++++++++ .../.settings/org.eclipse.jdt.ui.prefs | 150 +++++++ .../.settings/org.eclipse.jdt.core.prefs | 404 ++++++++++++++++++ xapi-model/.settings/org.eclipse.jdt.ui.prefs | 150 +++++++ 6 files changed, 1662 insertions(+) create mode 100644 samples/xapi-server/.settings/org.eclipse.jdt.core.prefs create mode 100644 samples/xapi-server/.settings/org.eclipse.jdt.ui.prefs create mode 100644 xapi-client/.settings/org.eclipse.jdt.core.prefs create mode 100644 xapi-client/.settings/org.eclipse.jdt.ui.prefs create mode 100644 xapi-model/.settings/org.eclipse.jdt.core.prefs create mode 100644 xapi-model/.settings/org.eclipse.jdt.ui.prefs diff --git a/samples/xapi-server/.settings/org.eclipse.jdt.core.prefs b/samples/xapi-server/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..89df520e --- /dev/null +++ b/samples/xapi-server/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,404 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.methodParameters=generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false +org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 +org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false +org.eclipse.jdt.core.formatter.align_with_spaces=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_annotations_on_enum_constant=0 +org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field=49 +org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable=49 +org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method=49 +org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package=49 +org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter=0 +org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type=49 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assertion_message=0 +org.eclipse.jdt.core.formatter.alignment_for_assignment=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon=0 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_module_statements=16 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_record_components=16 +org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0 +org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow=0 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_type_annotations=0 +org.eclipse.jdt.core.formatter.alignment_for_type_arguments=16 +org.eclipse.jdt.core.formatter.alignment_for_type_parameters=16 +org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=0 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=0 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch=0 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=2 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_record_constructor=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_record_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false +org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true +org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=true +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.indent_tag_description=false +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert +org.eclipse.jdt.core.formatter.comment.line_length=100 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_record_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_not_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_record_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert +org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_record_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_constructor=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_record_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=true +org.eclipse.jdt.core.formatter.join_wrapped_lines=true +org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_record_constructor_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_record_declaration_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false +org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false +org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false +org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false +org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.lineSplit=100 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block=0 +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block=0 +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block=0 +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=3 +org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=2 +org.eclipse.jdt.core.formatter.text_block_indentation=0 +org.eclipse.jdt.core.formatter.use_on_off_tags=true +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator=true +org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true +org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true +org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true +org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator=false +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true +org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/samples/xapi-server/.settings/org.eclipse.jdt.ui.prefs b/samples/xapi-server/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 00000000..6ff1edef --- /dev/null +++ b/samples/xapi-server/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,150 @@ +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +formatter_profile=_GoogleStyle +formatter_settings_version=22 +jautodoc.cleanup.add_header=false +jautodoc.cleanup.replace_header=false +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=\#;; +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.staticondemandthreshold=99 +sp_cleanup.add_all=false +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=true +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_methods=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_missing_override_annotations_interface_methods=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.array_with_curly=false +sp_cleanup.arrays_fill=false +sp_cleanup.bitwise_conditional_expression=false +sp_cleanup.boolean_literal=false +sp_cleanup.boolean_value_rather_than_comparison=false +sp_cleanup.break_loop=false +sp_cleanup.collection_cloning=false +sp_cleanup.comparing_on_criteria=false +sp_cleanup.comparison_statement=false +sp_cleanup.controlflow_merge=true +sp_cleanup.convert_functional_interfaces=true +sp_cleanup.convert_to_enhanced_for_loop=true +sp_cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false +sp_cleanup.convert_to_switch_expressions=true +sp_cleanup.correct_indentation=true +sp_cleanup.do_while_rather_than_while=false +sp_cleanup.double_negation=false +sp_cleanup.else_if=false +sp_cleanup.embedded_if=false +sp_cleanup.evaluate_nullable=false +sp_cleanup.extract_increment=false +sp_cleanup.format_source_code=true +sp_cleanup.format_source_code_changes_only=false +sp_cleanup.hash=false +sp_cleanup.if_condition=false +sp_cleanup.insert_inferred_type_arguments=false +sp_cleanup.instanceof=true +sp_cleanup.instanceof_keyword=false +sp_cleanup.invert_equals=false +sp_cleanup.join=false +sp_cleanup.lazy_logical_operator=false +sp_cleanup.make_local_variable_final=true +sp_cleanup.make_parameters_final=false +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=true +sp_cleanup.map_cloning=false +sp_cleanup.merge_conditional_blocks=true +sp_cleanup.multi_catch=true +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.no_string_creation=false +sp_cleanup.no_super=false +sp_cleanup.number_suffix=false +sp_cleanup.objects_equals=false +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=true +sp_cleanup.operand_factorization=true +sp_cleanup.organize_imports=true +sp_cleanup.overridden_assignment=false +sp_cleanup.overridden_assignment_move_decl=true +sp_cleanup.plain_replacement=false +sp_cleanup.precompile_regex=false +sp_cleanup.primitive_comparison=false +sp_cleanup.primitive_parsing=false +sp_cleanup.primitive_rather_than_wrapper=false +sp_cleanup.primitive_serialization=false +sp_cleanup.pull_out_if_from_if_else=false +sp_cleanup.pull_up_assignment=false +sp_cleanup.push_down_negation=false +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.reduce_indentation=false +sp_cleanup.redundant_comparator=false +sp_cleanup.redundant_falling_through_block_end=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_redundant_modifiers=false +sp_cleanup.remove_redundant_semicolons=false +sp_cleanup.remove_redundant_type_arguments=true +sp_cleanup.remove_trailing_whitespaces=true +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_array_creation=false +sp_cleanup.remove_unnecessary_casts=true +sp_cleanup.remove_unnecessary_nls_tags=false +sp_cleanup.remove_unused_imports=true +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_method_parameters=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.return_expression=false +sp_cleanup.simplify_lambda_expression_and_method_ref=false +sp_cleanup.single_used_field=false +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.standard_comparison=false +sp_cleanup.static_inner_class=false +sp_cleanup.strictly_equal_or_different=false +sp_cleanup.stringbuffer_to_stringbuilder=false +sp_cleanup.stringbuilder=false +sp_cleanup.stringbuilder_for_local_vars=true +sp_cleanup.stringconcat_to_textblock=true +sp_cleanup.substring=false +sp_cleanup.switch=false +sp_cleanup.system_property=false +sp_cleanup.system_property_boolean=false +sp_cleanup.system_property_file_encoding=false +sp_cleanup.system_property_file_separator=false +sp_cleanup.system_property_line_separator=false +sp_cleanup.system_property_path_separator=false +sp_cleanup.ternary_operator=true +sp_cleanup.try_with_resource=true +sp_cleanup.unlooped_while=false +sp_cleanup.unreachable_block=false +sp_cleanup.use_anonymous_class_creation=false +sp_cleanup.use_autoboxing=false +sp_cleanup.use_blocks=false +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_directly_map_method=false +sp_cleanup.use_lambda=true +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_string_is_blank=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true +sp_cleanup.use_unboxing=false +sp_cleanup.use_var=true +sp_cleanup.useless_continue=false +sp_cleanup.useless_return=false +sp_cleanup.valueof_rather_than_instantiation=false diff --git a/xapi-client/.settings/org.eclipse.jdt.core.prefs b/xapi-client/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..89df520e --- /dev/null +++ b/xapi-client/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,404 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.methodParameters=generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false +org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 +org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false +org.eclipse.jdt.core.formatter.align_with_spaces=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_annotations_on_enum_constant=0 +org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field=49 +org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable=49 +org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method=49 +org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package=49 +org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter=0 +org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type=49 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assertion_message=0 +org.eclipse.jdt.core.formatter.alignment_for_assignment=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon=0 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_module_statements=16 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_record_components=16 +org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0 +org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow=0 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_type_annotations=0 +org.eclipse.jdt.core.formatter.alignment_for_type_arguments=16 +org.eclipse.jdt.core.formatter.alignment_for_type_parameters=16 +org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=0 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=0 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch=0 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=2 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_record_constructor=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_record_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false +org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true +org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=true +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.indent_tag_description=false +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert +org.eclipse.jdt.core.formatter.comment.line_length=100 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_record_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_not_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_record_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert +org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_record_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_constructor=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_record_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=true +org.eclipse.jdt.core.formatter.join_wrapped_lines=true +org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_record_constructor_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_record_declaration_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false +org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false +org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false +org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false +org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.lineSplit=100 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block=0 +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block=0 +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block=0 +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=3 +org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=2 +org.eclipse.jdt.core.formatter.text_block_indentation=0 +org.eclipse.jdt.core.formatter.use_on_off_tags=true +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator=true +org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true +org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true +org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true +org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator=false +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true +org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/xapi-client/.settings/org.eclipse.jdt.ui.prefs b/xapi-client/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 00000000..6ff1edef --- /dev/null +++ b/xapi-client/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,150 @@ +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +formatter_profile=_GoogleStyle +formatter_settings_version=22 +jautodoc.cleanup.add_header=false +jautodoc.cleanup.replace_header=false +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=\#;; +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.staticondemandthreshold=99 +sp_cleanup.add_all=false +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=true +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_methods=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_missing_override_annotations_interface_methods=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.array_with_curly=false +sp_cleanup.arrays_fill=false +sp_cleanup.bitwise_conditional_expression=false +sp_cleanup.boolean_literal=false +sp_cleanup.boolean_value_rather_than_comparison=false +sp_cleanup.break_loop=false +sp_cleanup.collection_cloning=false +sp_cleanup.comparing_on_criteria=false +sp_cleanup.comparison_statement=false +sp_cleanup.controlflow_merge=true +sp_cleanup.convert_functional_interfaces=true +sp_cleanup.convert_to_enhanced_for_loop=true +sp_cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false +sp_cleanup.convert_to_switch_expressions=true +sp_cleanup.correct_indentation=true +sp_cleanup.do_while_rather_than_while=false +sp_cleanup.double_negation=false +sp_cleanup.else_if=false +sp_cleanup.embedded_if=false +sp_cleanup.evaluate_nullable=false +sp_cleanup.extract_increment=false +sp_cleanup.format_source_code=true +sp_cleanup.format_source_code_changes_only=false +sp_cleanup.hash=false +sp_cleanup.if_condition=false +sp_cleanup.insert_inferred_type_arguments=false +sp_cleanup.instanceof=true +sp_cleanup.instanceof_keyword=false +sp_cleanup.invert_equals=false +sp_cleanup.join=false +sp_cleanup.lazy_logical_operator=false +sp_cleanup.make_local_variable_final=true +sp_cleanup.make_parameters_final=false +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=true +sp_cleanup.map_cloning=false +sp_cleanup.merge_conditional_blocks=true +sp_cleanup.multi_catch=true +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.no_string_creation=false +sp_cleanup.no_super=false +sp_cleanup.number_suffix=false +sp_cleanup.objects_equals=false +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=true +sp_cleanup.operand_factorization=true +sp_cleanup.organize_imports=true +sp_cleanup.overridden_assignment=false +sp_cleanup.overridden_assignment_move_decl=true +sp_cleanup.plain_replacement=false +sp_cleanup.precompile_regex=false +sp_cleanup.primitive_comparison=false +sp_cleanup.primitive_parsing=false +sp_cleanup.primitive_rather_than_wrapper=false +sp_cleanup.primitive_serialization=false +sp_cleanup.pull_out_if_from_if_else=false +sp_cleanup.pull_up_assignment=false +sp_cleanup.push_down_negation=false +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.reduce_indentation=false +sp_cleanup.redundant_comparator=false +sp_cleanup.redundant_falling_through_block_end=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_redundant_modifiers=false +sp_cleanup.remove_redundant_semicolons=false +sp_cleanup.remove_redundant_type_arguments=true +sp_cleanup.remove_trailing_whitespaces=true +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_array_creation=false +sp_cleanup.remove_unnecessary_casts=true +sp_cleanup.remove_unnecessary_nls_tags=false +sp_cleanup.remove_unused_imports=true +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_method_parameters=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.return_expression=false +sp_cleanup.simplify_lambda_expression_and_method_ref=false +sp_cleanup.single_used_field=false +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.standard_comparison=false +sp_cleanup.static_inner_class=false +sp_cleanup.strictly_equal_or_different=false +sp_cleanup.stringbuffer_to_stringbuilder=false +sp_cleanup.stringbuilder=false +sp_cleanup.stringbuilder_for_local_vars=true +sp_cleanup.stringconcat_to_textblock=true +sp_cleanup.substring=false +sp_cleanup.switch=false +sp_cleanup.system_property=false +sp_cleanup.system_property_boolean=false +sp_cleanup.system_property_file_encoding=false +sp_cleanup.system_property_file_separator=false +sp_cleanup.system_property_line_separator=false +sp_cleanup.system_property_path_separator=false +sp_cleanup.ternary_operator=true +sp_cleanup.try_with_resource=true +sp_cleanup.unlooped_while=false +sp_cleanup.unreachable_block=false +sp_cleanup.use_anonymous_class_creation=false +sp_cleanup.use_autoboxing=false +sp_cleanup.use_blocks=false +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_directly_map_method=false +sp_cleanup.use_lambda=true +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_string_is_blank=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true +sp_cleanup.use_unboxing=false +sp_cleanup.use_var=true +sp_cleanup.useless_continue=false +sp_cleanup.useless_return=false +sp_cleanup.valueof_rather_than_instantiation=false diff --git a/xapi-model/.settings/org.eclipse.jdt.core.prefs b/xapi-model/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..89df520e --- /dev/null +++ b/xapi-model/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,404 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.methodParameters=generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false +org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 +org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false +org.eclipse.jdt.core.formatter.align_with_spaces=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_annotations_on_enum_constant=0 +org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field=49 +org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable=49 +org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method=49 +org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package=49 +org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter=0 +org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type=49 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assertion_message=0 +org.eclipse.jdt.core.formatter.alignment_for_assignment=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon=0 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 +org.eclipse.jdt.core.formatter.alignment_for_module_statements=16 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 +org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_record_components=16 +org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0 +org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow=0 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_type_annotations=0 +org.eclipse.jdt.core.formatter.alignment_for_type_arguments=16 +org.eclipse.jdt.core.formatter.alignment_for_type_parameters=16 +org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=0 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=0 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch=0 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=2 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_record_constructor=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_record_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false +org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true +org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=true +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.indent_tag_description=false +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert +org.eclipse.jdt.core.formatter.comment.line_length=100 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_record_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_not_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_record_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert +org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_record_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_constructor=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_record_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=true +org.eclipse.jdt.core.formatter.join_wrapped_lines=true +org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_record_constructor_on_one_line=one_line_if_empty +org.eclipse.jdt.core.formatter.keep_record_declaration_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false +org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false +org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false +org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false +org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never +org.eclipse.jdt.core.formatter.lineSplit=100 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block=0 +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block=0 +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block=0 +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=3 +org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines +org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=2 +org.eclipse.jdt.core.formatter.text_block_indentation=0 +org.eclipse.jdt.core.formatter.use_on_off_tags=true +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator=true +org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true +org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true +org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true +org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator=false +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true +org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/xapi-model/.settings/org.eclipse.jdt.ui.prefs b/xapi-model/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 00000000..6ff1edef --- /dev/null +++ b/xapi-model/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,150 @@ +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +formatter_profile=_GoogleStyle +formatter_settings_version=22 +jautodoc.cleanup.add_header=false +jautodoc.cleanup.replace_header=false +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=\#;; +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.staticondemandthreshold=99 +sp_cleanup.add_all=false +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=true +sp_cleanup.add_missing_deprecated_annotations=true +sp_cleanup.add_missing_methods=false +sp_cleanup.add_missing_nls_tags=false +sp_cleanup.add_missing_override_annotations=true +sp_cleanup.add_missing_override_annotations_interface_methods=true +sp_cleanup.add_serial_version_id=false +sp_cleanup.always_use_blocks=true +sp_cleanup.always_use_parentheses_in_expressions=false +sp_cleanup.always_use_this_for_non_static_field_access=false +sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.array_with_curly=false +sp_cleanup.arrays_fill=false +sp_cleanup.bitwise_conditional_expression=false +sp_cleanup.boolean_literal=false +sp_cleanup.boolean_value_rather_than_comparison=false +sp_cleanup.break_loop=false +sp_cleanup.collection_cloning=false +sp_cleanup.comparing_on_criteria=false +sp_cleanup.comparison_statement=false +sp_cleanup.controlflow_merge=true +sp_cleanup.convert_functional_interfaces=true +sp_cleanup.convert_to_enhanced_for_loop=true +sp_cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false +sp_cleanup.convert_to_switch_expressions=true +sp_cleanup.correct_indentation=true +sp_cleanup.do_while_rather_than_while=false +sp_cleanup.double_negation=false +sp_cleanup.else_if=false +sp_cleanup.embedded_if=false +sp_cleanup.evaluate_nullable=false +sp_cleanup.extract_increment=false +sp_cleanup.format_source_code=true +sp_cleanup.format_source_code_changes_only=false +sp_cleanup.hash=false +sp_cleanup.if_condition=false +sp_cleanup.insert_inferred_type_arguments=false +sp_cleanup.instanceof=true +sp_cleanup.instanceof_keyword=false +sp_cleanup.invert_equals=false +sp_cleanup.join=false +sp_cleanup.lazy_logical_operator=false +sp_cleanup.make_local_variable_final=true +sp_cleanup.make_parameters_final=false +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=true +sp_cleanup.map_cloning=false +sp_cleanup.merge_conditional_blocks=true +sp_cleanup.multi_catch=true +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.no_string_creation=false +sp_cleanup.no_super=false +sp_cleanup.number_suffix=false +sp_cleanup.objects_equals=false +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=true +sp_cleanup.operand_factorization=true +sp_cleanup.organize_imports=true +sp_cleanup.overridden_assignment=false +sp_cleanup.overridden_assignment_move_decl=true +sp_cleanup.plain_replacement=false +sp_cleanup.precompile_regex=false +sp_cleanup.primitive_comparison=false +sp_cleanup.primitive_parsing=false +sp_cleanup.primitive_rather_than_wrapper=false +sp_cleanup.primitive_serialization=false +sp_cleanup.pull_out_if_from_if_else=false +sp_cleanup.pull_up_assignment=false +sp_cleanup.push_down_negation=false +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.reduce_indentation=false +sp_cleanup.redundant_comparator=false +sp_cleanup.redundant_falling_through_block_end=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_redundant_modifiers=false +sp_cleanup.remove_redundant_semicolons=false +sp_cleanup.remove_redundant_type_arguments=true +sp_cleanup.remove_trailing_whitespaces=true +sp_cleanup.remove_trailing_whitespaces_all=true +sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_array_creation=false +sp_cleanup.remove_unnecessary_casts=true +sp_cleanup.remove_unnecessary_nls_tags=false +sp_cleanup.remove_unused_imports=true +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_method_parameters=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.return_expression=false +sp_cleanup.simplify_lambda_expression_and_method_ref=false +sp_cleanup.single_used_field=false +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.standard_comparison=false +sp_cleanup.static_inner_class=false +sp_cleanup.strictly_equal_or_different=false +sp_cleanup.stringbuffer_to_stringbuilder=false +sp_cleanup.stringbuilder=false +sp_cleanup.stringbuilder_for_local_vars=true +sp_cleanup.stringconcat_to_textblock=true +sp_cleanup.substring=false +sp_cleanup.switch=false +sp_cleanup.system_property=false +sp_cleanup.system_property_boolean=false +sp_cleanup.system_property_file_encoding=false +sp_cleanup.system_property_file_separator=false +sp_cleanup.system_property_line_separator=false +sp_cleanup.system_property_path_separator=false +sp_cleanup.ternary_operator=true +sp_cleanup.try_with_resource=true +sp_cleanup.unlooped_while=false +sp_cleanup.unreachable_block=false +sp_cleanup.use_anonymous_class_creation=false +sp_cleanup.use_autoboxing=false +sp_cleanup.use_blocks=false +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_directly_map_method=false +sp_cleanup.use_lambda=true +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_string_is_blank=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true +sp_cleanup.use_unboxing=false +sp_cleanup.use_var=true +sp_cleanup.useless_continue=false +sp_cleanup.useless_return=false +sp_cleanup.valueof_rather_than_instantiation=false From b47a3293aa64c7f58e43f75fb24d4f0c86c2c744 Mon Sep 17 00:00:00 2001 From: Thomas Turrell-Croft Date: Thu, 23 Mar 2023 16:37:05 +0000 Subject: [PATCH 2/2] Format all code according to formatter rules --- .../xapiserver/StatementController.java | 10 +- .../samples/xapiserver/StatementService.java | 8 +- .../xapiserver/XapiServerApplication.java | 3 - .../dev/learning/xapi/client/Request.java | 1 - .../dev/learning/xapi/client/XapiClient.java | 57 +++++++-- .../dev/learning/xapi/model/Statement.java | 4 +- .../dev/learning/xapi/model/SubStatement.java | 6 +- .../dev/learning/xapi/model/AboutTests.java | 38 +++--- .../dev/learning/xapi/model/AccountTests.java | 30 +++-- .../xapi/model/ActivityDefinitionTests.java | 94 +++++++-------- .../learning/xapi/model/ActivityTests.java | 26 ++-- .../dev/learning/xapi/model/AgentTests.java | 42 ++++--- .../xapi/model/ContextActivitiesTests.java | 49 ++++---- .../dev/learning/xapi/model/ContextTests.java | 64 +++++----- .../dev/learning/xapi/model/GroupTests.java | 34 +++--- .../xapi/model/InteractionComponentTests.java | 28 ++--- .../learning/xapi/model/LanguageMapTests.java | 36 +++--- .../dev/learning/xapi/model/PersonTests.java | 37 +++--- .../dev/learning/xapi/model/ResultTests.java | 34 +++--- .../dev/learning/xapi/model/ScoreTests.java | 30 +++-- .../xapi/model/StatementFormatTests.java | 12 +- .../xapi/model/StatementReferenceTest.java | 25 ++-- .../xapi/model/StatementResultTest.java | 30 +++-- .../learning/xapi/model/StatementTests.java | 112 +++++++++--------- .../xapi/model/SubStatementTests.java | 82 +++++++------ .../dev/learning/xapi/model/VerbTests.java | 54 ++++----- .../ActivityDefinitionValidatorTests.java | 59 ++++----- .../validators/ActorValidatorTests.java | 70 +++++------ .../validators/AuthorityValidatorTests.java | 26 ++-- .../HasSchemeValidatorForUriTests.java | 6 +- .../validators/MboxValidatorTest.java | 86 -------------- .../validators/MboxValidatorTests.java | 6 +- .../NotUndeterminedValidatorTests.java | 6 +- .../validators/ScaledScoreValidatorTests.java | 14 +-- .../StatementPlatformValidatorTest.java | 26 ++-- .../StatementRevisionValidatorTest.java | 26 ++-- .../StatementVerbValidatorTest.java | 26 ++-- .../VariantValidatorForUuidTests.java | 10 +- 38 files changed, 610 insertions(+), 697 deletions(-) delete mode 100644 xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/MboxValidatorTest.java diff --git a/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementController.java b/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementController.java index ff7707c0..d55b4c38 100644 --- a/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementController.java +++ b/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementController.java @@ -28,7 +28,7 @@ * @see xAPI * resources - * + * * @author István Rátkai (Selindek) */ @Validated @@ -46,9 +46,9 @@ public class StatementController { * * @param statementId the statementId of the statement * @param statement The statement to process - * + * * @return the ResponseEntity - * + * * @see PUT * statements @@ -68,9 +68,9 @@ public ResponseEntity putStatement(@RequestParam(required = true) UUID sta * Post Statements. * * @param statements The statements to process. - * + * * @return the ResponseEntity - * + * * @see POST * statements diff --git a/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementService.java b/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementService.java index 39356259..65ec11c8 100644 --- a/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementService.java +++ b/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementService.java @@ -22,7 +22,7 @@ @Service public class StatementService { - private Logger log = LoggerFactory.getLogger(StatementController.class); + private final Logger log = LoggerFactory.getLogger(StatementController.class); /** * Processes a single Statement. @@ -41,14 +41,14 @@ public void processStatement(UUID statementId, Statement statement) { * Processes multiple Statements. * * @param statements the Statements to process - * + * * @return the statement id's that were processed */ public Collection processStatements(List statements) { - List processedStatements = new ArrayList<>(); + final List processedStatements = new ArrayList<>(); - for (Statement statement : statements) { + for (final Statement statement : statements) { log.info("processing statement: {}", statement); if (statement.getId() == null) { diff --git a/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/XapiServerApplication.java b/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/XapiServerApplication.java index e57b9be0..593ee901 100644 --- a/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/XapiServerApplication.java +++ b/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/XapiServerApplication.java @@ -8,10 +8,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; /** - *

* This sample demonstrates how the xAPI model can be used in applications that receive statements. - *

- * *

* The xapi-model package can be used on server side too. Most commercial xAPI LRS implementations * provide some kind of statement-forwarding feature. Using this feature you can easily implement diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/Request.java b/xapi-client/src/main/java/dev/learning/xapi/client/Request.java index a36acadf..1ea7d76c 100644 --- a/xapi-client/src/main/java/dev/learning/xapi/client/Request.java +++ b/xapi-client/src/main/java/dev/learning/xapi/client/Request.java @@ -24,5 +24,4 @@ interface Request { */ HttpMethod getMethod(); - } diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/XapiClient.java b/xapi-client/src/main/java/dev/learning/xapi/client/XapiClient.java index 5b9aa3ff..7eeb9361 100644 --- a/xapi-client/src/main/java/dev/learning/xapi/client/XapiClient.java +++ b/xapi-client/src/main/java/dev/learning/xapi/client/XapiClient.java @@ -26,6 +26,7 @@ * * @author Thomas Turrell-Croft * @author István Rátkai (Selindek) + * * @see xAPI * communication resources @@ -35,19 +36,17 @@ public class XapiClient { private final WebClient webClient; private final MultipartService multipartService; - private static final ParameterizedTypeReference< - List> LIST_UUID_TYPE = new ParameterizedTypeReference<>() { - }; + private static final ParameterizedTypeReference> LIST_UUID_TYPE = + new ParameterizedTypeReference<>() {}; - private static final ParameterizedTypeReference< - List> LIST_STRING_TYPE = new ParameterizedTypeReference<>() { - }; + private static final ParameterizedTypeReference> LIST_STRING_TYPE = + new ParameterizedTypeReference<>() {}; /** * Default constructor for XapiClient. * * @param builder a {@link WebClient.Builder} object. The caller must set the baseUrl and the - * authorization header. + * authorization header. */ public XapiClient(WebClient.Builder builder, ObjectMapper objectMapper) { this.multipartService = new MultipartService(objectMapper); @@ -261,6 +260,7 @@ public Mono> getStatements() { *

* * @param request The parameters of the get statements request + * * @return the ResponseEntity */ public Mono> getStatements(GetStatementsRequest request) { @@ -287,6 +287,7 @@ public Mono> getStatements(GetStatementsRequest *

* * @param request The Consumer Builder for the get statements request + * * @return the ResponseEntity */ public Mono> getStatements( @@ -308,6 +309,7 @@ public Mono> getStatements( *

* * @param request The parameters of the get more statements request + * * @return the ResponseEntity */ public Mono> getMoreStatements(GetMoreStatementsRequest request) { @@ -334,6 +336,7 @@ public Mono> getMoreStatements(GetMoreStatements *

* * @param request The Consumer Builder for the get more statements request + * * @return the ResponseEntity */ public Mono> getMoreStatements( @@ -357,6 +360,7 @@ public Mono> getMoreStatements( *

* * @param request The parameters of the get state request + * * @return the ResponseEntity */ public Mono> getState(GetStateRequest request, Class bodyType) { @@ -383,6 +387,7 @@ public Mono> getState(GetStateRequest request, Class bo *

* * @param request The Consumer Builder for the get state request + * * @return the ResponseEntity */ public Mono> getState(Consumer> request, @@ -404,6 +409,7 @@ public Mono> getState(Consumer * * @param request The parameters of the post state request + * * @return the ResponseEntity */ public Mono> postState(PostStateRequest request) { @@ -434,6 +440,7 @@ public Mono> postState(PostStateRequest request) { *

* * @param request The Consumer Builder for the post state request + * * @return the ResponseEntity */ public Mono> postState(Consumer> request) { @@ -454,6 +461,7 @@ public Mono> postState(Consumer * * @param request The parameters of the put state request + * * @return the ResponseEntity */ public Mono> putState(PutStateRequest request) { @@ -484,6 +492,7 @@ public Mono> putState(PutStateRequest request) { *

* * @param request The Consumer Builder for the put state request + * * @return the ResponseEntity */ public Mono> putState(Consumer> request) { @@ -504,6 +513,7 @@ public Mono> putState(Consumer * * @param request The parameters of the delete state request + * * @return the ResponseEntity */ public Mono> deleteState(DeleteStateRequest request) { @@ -530,6 +540,7 @@ public Mono> deleteState(DeleteStateRequest request) { *

* * @param request The Consumer Builder for the delete state request + * * @return the ResponseEntity */ public Mono> deleteState( @@ -548,6 +559,7 @@ public Mono> deleteState( * parameters. * * @param request The parameters of the get states request + * * @return the ResponseEntity */ public Mono>> getStates(GetStatesRequest request) { @@ -574,6 +586,7 @@ public Mono>> getStates(GetStatesRequest request) { *

* * @param request The Consumer Builder for the get states request + * * @return the ResponseEntity */ public Mono>> getStates( @@ -594,6 +607,7 @@ public Mono>> getStates( *

* * @param request The parameters of the delete states request + * * @return the ResponseEntity */ public Mono> deleteStates(DeleteStatesRequest request) { @@ -619,6 +633,7 @@ public Mono> deleteStates(DeleteStatesRequest request) { *

* * @param request The Consumer Builder for the delete states request + * * @return the ResponseEntity */ public Mono> deleteStates( @@ -640,6 +655,7 @@ public Mono> deleteStates( * value, and it is legal to include multiple identifying properties. * * @param request The parameters of the get agents request + * * @return the ResponseEntity */ public Mono> getAgents(GetAgentsRequest request) { @@ -664,6 +680,7 @@ public Mono> getAgents(GetAgentsRequest request) { * value, and it is legal to include multiple identifying properties. * * @param request The Consumer Builder for the get agents request + * * @return the ResponseEntity */ public Mono> getAgents(Consumer request) { @@ -682,6 +699,7 @@ public Mono> getAgents(Consumer * Loads the complete Activity Object specified. * * @param request The parameters of the get activity request + * * @return the ResponseEntity */ public Mono> getActivity(GetActivityRequest request) { @@ -704,6 +722,7 @@ public Mono> getActivity(GetActivityRequest request) { * Loads the complete Activity Object specified. * * @param request The Consumer Builder for the get activity request + * * @return the ResponseEntity */ public Mono> getActivity(Consumer request) { @@ -725,6 +744,7 @@ public Mono> getActivity(Consumer * * @param request The parameters of the get agent profile request + * * @return the ResponseEntity */ public Mono> getAgentProfile(GetAgentProfileRequest request, @@ -751,6 +771,7 @@ public Mono> getAgentProfile(GetAgentProfileRequest reques *

* * @param request The Consumer Builder for the get agent profile request + * * @return the ResponseEntity */ public Mono> getAgentProfile( @@ -771,6 +792,7 @@ public Mono> getAgentProfile( *

* * @param request The parameters of the delete agent profile request + * * @return the ResponseEntity */ public Mono> deleteAgentProfile(DeleteAgentProfileRequest request) { @@ -796,6 +818,7 @@ public Mono> deleteAgentProfile(DeleteAgentProfileRequest r *

* * @param request The Consumer Builder for the delete agent profile request + * * @return the ResponseEntity */ public Mono> deleteAgentProfile( @@ -816,6 +839,7 @@ public Mono> deleteAgentProfile( *

* * @param request The parameters of the put agent profile request + * * @return the ResponseEntity */ public Mono> putAgentProfile(PutAgentProfileRequest request) { @@ -845,6 +869,7 @@ public Mono> putAgentProfile(PutAgentProfileRequest request *

* * @param request The Consumer Builder for the put agent profile request + * * @return the ResponseEntity */ public Mono> putAgentProfile( @@ -865,6 +890,7 @@ public Mono> putAgentProfile( *

* * @param request The parameters of the post agent profile request + * * @return the ResponseEntity */ public Mono> postAgentProfile(PostAgentProfileRequest request) { @@ -894,6 +920,7 @@ public Mono> postAgentProfile(PostAgentProfileRequest reque *

* * @param request The Consumer Builder for the post agent profile request + * * @return the ResponseEntity */ public Mono> postAgentProfile( @@ -913,6 +940,7 @@ public Mono> postAgentProfile( * (exclusive). * * @param request The parameters of the get agent profiles request + * * @return the ResponseEntity */ public Mono>> getAgentProfiles(GetAgentProfilesRequest request) { @@ -937,6 +965,7 @@ public Mono>> getAgentProfiles(GetAgentProfilesReque * (exclusive). * * @param request The Consumer Builder for the get agent profiles request + * * @return the ResponseEntity */ public Mono>> getAgentProfiles( @@ -959,6 +988,7 @@ public Mono>> getAgentProfiles( *

* * @param request The parameters of the get activity profile request + * * @return the ResponseEntity */ public Mono> getActivityProfile(GetActivityProfileRequest request, @@ -985,6 +1015,7 @@ public Mono> getActivityProfile(GetActivityProfileRequest *

* * @param request The Consumer Builder for the get activity profile request + * * @return the ResponseEntity */ public Mono> getActivityProfile( @@ -1005,6 +1036,7 @@ public Mono> getActivityProfile( *

* * @param request The parameters of the post activity profile request + * * @return the ResponseEntity */ public Mono> postActivityProfile(PostActivityProfileRequest request) { @@ -1034,6 +1066,7 @@ public Mono> postActivityProfile(PostActivityProfileRequest *

* * @param request The Consumer Builder for the post activity profile request + * * @return the ResponseEntity */ public Mono> postActivityProfile( @@ -1054,6 +1087,7 @@ public Mono> postActivityProfile( *

* * @param request The parameters of the put activity profile request + * * @return the ResponseEntity */ public Mono> putActivityProfile(PutActivityProfileRequest request) { @@ -1083,6 +1117,7 @@ public Mono> putActivityProfile(PutActivityProfileRequest r *

* * @param request The Consumer Builder for the put activity profile request + * * @return the ResponseEntity */ public Mono> putActivityProfile( @@ -1103,6 +1138,7 @@ public Mono> putActivityProfile( *

* * @param request The parameters of the delete activity profile request + * * @return the ResponseEntity */ public Mono> deleteActivityProfile(DeleteActivityProfileRequest request) { @@ -1128,13 +1164,14 @@ public Mono> deleteActivityProfile(DeleteActivityProfileReq *

* * @param request The Consumer Builder for the delete activity profile request + * * @return the ResponseEntity */ public Mono> deleteActivityProfile( Consumer> request) { - final DeleteActivityProfileRequest.Builder builder = DeleteActivityProfileRequest.builder(); + final DeleteActivityProfileRequest.Builder builder = + DeleteActivityProfileRequest.builder(); request.accept(builder); @@ -1151,6 +1188,7 @@ public Mono> deleteActivityProfile( *

* * @param request The parameters of the get activity profiles request + * * @return the ResponseEntity */ public Mono>> getActivityProfiles( @@ -1179,6 +1217,7 @@ public Mono>> getActivityProfiles( *

* * @param request The Consumer Builder for the get activity profiles request + * * @return the ResponseEntity */ public Mono>> getActivityProfiles( diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Statement.java b/xapi-model/src/main/java/dev/learning/xapi/model/Statement.java index 3c94b89c..06fc81d9 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/Statement.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/Statement.java @@ -325,7 +325,7 @@ public Builder context(Context context) { * @param attachment An {@link Attachment} object. * * @return This builder - * + * * @see Statement#attachments */ public Builder addAttachment(Attachment attachment) { @@ -337,7 +337,7 @@ public Builder addAttachment(Attachment attachment) { this.attachments.add(attachment); return this; } - + /** * Consumer Builder for attachment. * diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/SubStatement.java b/xapi-model/src/main/java/dev/learning/xapi/model/SubStatement.java index 0f3c8b13..3410f909 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/SubStatement.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/SubStatement.java @@ -176,15 +176,15 @@ public Builder addAttachment(Consumer attachment) { attachment.accept(builder); return addAttachment(builder.build()); - } - + } + /** * Adds an attachment. * * @param attachment An {@link Attachment} object. * * @return This builder - * + * * @see SubStatement#attachments */ public Builder addAttachment(Attachment attachment) { diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/AboutTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/AboutTests.java index 217f208d..c409800c 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/AboutTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/AboutTests.java @@ -8,9 +8,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import java.io.File; import java.io.IOException; import java.net.URI; import java.util.Arrays; @@ -35,10 +33,10 @@ class AboutTests { @Test void whenDeserializingAboutThenResultIsInstanceOfAbout() throws IOException { - final File file = ResourceUtils.getFile("classpath:about/about.json"); + final var file = ResourceUtils.getFile("classpath:about/about.json"); // When Deserializing About - final About result = objectMapper.readValue(file, About.class); + final var result = objectMapper.readValue(file, About.class); // Then Result Is Instance Of About assertThat(result, instanceOf(About.class)); @@ -48,10 +46,10 @@ void whenDeserializingAboutThenResultIsInstanceOfAbout() throws IOException { @Test void whenDeserializingAboutWithVersionThenVersionIsExpected() throws IOException { - final File file = ResourceUtils.getFile("classpath:about/about.json"); + final var file = ResourceUtils.getFile("classpath:about/about.json"); // When Deserializing About With Version - final About result = objectMapper.readValue(file, About.class); + final var result = objectMapper.readValue(file, About.class); // Then Version Is Expected assertThat(result.getVersion(), is(Collections.singletonList("1.0"))); @@ -62,10 +60,10 @@ void whenDeserializingAboutWithVersionThenVersionIsExpected() throws IOException void whenDeserializingAboutWithMultipleVersionsThenMultipleVersionsAreExpected() throws IOException { - final File file = ResourceUtils.getFile("classpath:about/about_with_multiple_versions.json"); + final var file = ResourceUtils.getFile("classpath:about/about_with_multiple_versions.json"); // When Deserializing About With Multiple Versions - final About result = objectMapper.readValue(file, About.class); + final var result = objectMapper.readValue(file, About.class); // Then Multiple Versions Are Expected assertThat(result.getVersion(), is(Arrays.asList("1.0", "1.0.1"))); @@ -76,10 +74,10 @@ void whenDeserializingAboutWithMultipleVersionsThenMultipleVersionsAreExpected() @Test void whenDeserializingAboutWithExtensionsThenExtensionsAreExpected() throws IOException { - final File file = ResourceUtils.getFile("classpath:about/about_with_extensions.json"); + final var file = ResourceUtils.getFile("classpath:about/about_with_extensions.json"); // When Deserializing About With Extensions - final About result = objectMapper.readValue(file, About.class); + final var result = objectMapper.readValue(file, About.class); // Then Extensions Are Expected assertThat(result.getExtensions().get(URI.create("http://url")), is("www.example.com")); @@ -89,10 +87,10 @@ void whenDeserializingAboutWithExtensionsThenExtensionsAreExpected() throws IOEx @Test void whenDeserializingAboutWithVersionAsNumberThenVersionIsExpected() throws IOException { - final File file = ResourceUtils.getFile("classpath:about/about_with_version_as_number.json"); + final var file = ResourceUtils.getFile("classpath:about/about_with_version_as_number.json"); // When Deserializing About With Version As Number - final About result = objectMapper.readValue(file, About.class); + final var result = objectMapper.readValue(file, About.class); // Then Version Is Expected assertThat(result.getVersion(), is(Collections.singletonList("1.0"))); @@ -101,14 +99,14 @@ void whenDeserializingAboutWithVersionAsNumberThenVersionIsExpected() throws IOE @Test void whenSerializingAboutThenResultIsEqualToExpectedJson() throws IOException { - final About about = About.builder() + final var about = About.builder() .version(Collections.singletonList("1.0")) .build(); // When Serializing About - final JsonNode result = objectMapper.readTree(objectMapper.writeValueAsString(about)); + final var result = objectMapper.readTree(objectMapper.writeValueAsString(about)); // Then Result Is Equal To Expected Json assertThat(result, @@ -119,10 +117,10 @@ void whenSerializingAboutThenResultIsEqualToExpectedJson() throws IOException { @Test void whenSerializingAboutWithExtensionsThenResultIsEqualToExpectedJson() throws IOException { - final LinkedHashMap extensions = new LinkedHashMap<>(); + final var extensions = new LinkedHashMap(); extensions.put(URI.create("http://url"), "www.example.com"); - final About about = About.builder() + final var about = About.builder() .version(Collections.singletonList("1.0")) @@ -131,7 +129,7 @@ void whenSerializingAboutWithExtensionsThenResultIsEqualToExpectedJson() throws .build(); // When Serializing About With Extensions - final JsonNode result = objectMapper.readTree(objectMapper.writeValueAsString(about)); + final var result = objectMapper.readTree(objectMapper.writeValueAsString(about)); // Then Result Is Equal To Expected Json assertThat(result, is(objectMapper @@ -142,10 +140,10 @@ void whenSerializingAboutWithExtensionsThenResultIsEqualToExpectedJson() throws @Test void whenCallingToStringThenResultIsExpected() throws IOException { - final LinkedHashMap extensions = new LinkedHashMap<>(); + final var extensions = new LinkedHashMap(); extensions.put(URI.create("http://url"), "www.example.com"); - final About about = About.builder() + final var about = About.builder() .version(Collections.singletonList("1.0")) @@ -154,7 +152,7 @@ void whenCallingToStringThenResultIsExpected() throws IOException { .build(); // When Calling ToString - final String result = about.toString(); + final var result = about.toString(); // Then Result Is Expected assertThat(result, is("About(version=[1.0], extensions={http://url=www.example.com})")); diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/AccountTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/AccountTests.java index b16d2bc7..fe5964e6 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/AccountTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/AccountTests.java @@ -9,12 +9,10 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.validation.ConstraintViolation; import jakarta.validation.Validation; import jakarta.validation.Validator; -import java.io.File; import java.io.IOException; import java.net.URI; import java.util.Set; @@ -39,10 +37,10 @@ class AccountTests { @Test void whenDeserializingAccountThenResultIsInstanceOfAccount() throws Exception { - final File file = ResourceUtils.getFile("classpath:account/account.json"); + final var file = ResourceUtils.getFile("classpath:account/account.json"); // When Deserializing Account - final Account result = objectMapper.readValue(file, Account.class); + final var result = objectMapper.readValue(file, Account.class); // Then Result Is Instance Of Account assertThat(result, instanceOf(Account.class)); @@ -52,10 +50,10 @@ void whenDeserializingAccountThenResultIsInstanceOfAccount() throws Exception { @Test void whenDeserializingAccountThenHomePageIsExpected() throws Exception { - final File file = ResourceUtils.getFile("classpath:account/account.json"); + final var file = ResourceUtils.getFile("classpath:account/account.json"); // When Deserializing Account - final Account result = objectMapper.readValue(file, Account.class); + final var result = objectMapper.readValue(file, Account.class); // Then HomePage Is Expected assertThat(result.getHomePage().toString(), is("https://www.example.com")); @@ -65,10 +63,10 @@ void whenDeserializingAccountThenHomePageIsExpected() throws Exception { @Test void whenDeserializingAccountThenNameIsExpected() throws Exception { - final File file = ResourceUtils.getFile("classpath:account/account.json"); + final var file = ResourceUtils.getFile("classpath:account/account.json"); // When Deserializing Account - final Account result = objectMapper.readValue(file, Account.class); + final var result = objectMapper.readValue(file, Account.class); // Then Name Is Expected assertThat(result.getName(), is("Example")); @@ -78,7 +76,7 @@ void whenDeserializingAccountThenNameIsExpected() throws Exception { @Test void whenSerializingAccountThenResultIsEqualToExpectedJson() throws IOException { - final Account account = Account.builder() + final var account = Account.builder() .name("Example") @@ -87,7 +85,7 @@ void whenSerializingAccountThenResultIsEqualToExpectedJson() throws IOException .build(); // When Serializing Account - final JsonNode result = objectMapper.readTree(objectMapper.writeValueAsString(account)); + final var result = objectMapper.readTree(objectMapper.writeValueAsString(account)); // Then Result Is Equal To Expected Json assertThat(result, @@ -98,7 +96,7 @@ void whenSerializingAccountThenResultIsEqualToExpectedJson() throws IOException @Test void whenCallingToStringThenResultIsExpected() throws IOException { - final Account account = Account.builder() + final var account = Account.builder() .name("Example") @@ -107,7 +105,7 @@ void whenCallingToStringThenResultIsExpected() throws IOException { .build(); // When Calling ToString - final String result = account.toString(); + final var result = account.toString(); // Then Result Is Expected assertThat(result, is("Account(homePage=https://www.example.com, name=Example)")); @@ -118,7 +116,7 @@ void whenCallingToStringThenResultIsExpected() throws IOException { void whenValidatingAccountWithAllRequiredPropertiesThenConstraintViolationsSizeIsZero() { - final Account account = Account.builder() + final var account = Account.builder() .name("Example") @@ -137,7 +135,7 @@ void whenValidatingAccountWithAllRequiredPropertiesThenConstraintViolationsSizeI @Test void whenValidatingAccountWithoutNameThenConstraintViolationsSizeIsOne() { - final Account account = Account.builder() + final var account = Account.builder() .homePage(URI.create("https://www.example.com")) @@ -154,7 +152,7 @@ void whenValidatingAccountWithoutNameThenConstraintViolationsSizeIsOne() { @Test void whenValidatingAccountWithoutHomepageThenConstraintViolationsSizeIsOne() { - final Account account = Account.builder() + final var account = Account.builder() .name("Example") @@ -171,7 +169,7 @@ void whenValidatingAccountWithoutHomepageThenConstraintViolationsSizeIsOne() { @Test void whenValidatingAccountWithEmptyNameThenConstraintViolationsSizeIsOne() { - final Account account = Account.builder() + final var account = Account.builder() .name("") diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/ActivityDefinitionTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/ActivityDefinitionTests.java index 8b2b9e3e..83eade6d 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/ActivityDefinitionTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/ActivityDefinitionTests.java @@ -10,9 +10,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import java.io.File; import java.io.IOException; import java.net.URI; import java.util.Collections; @@ -37,11 +35,11 @@ class ActivityDefinitionTests { void whenDeserializingActivityDefinitionThenResultIsInstanceOfActivityDefinition() throws Exception { - final File file = + final var file = ResourceUtils.getFile("classpath:activity_definition/activity_definition.json"); // When Deserializing ActivityDefinition - final ActivityDefinition result = objectMapper.readValue(file, ActivityDefinition.class); + final var result = objectMapper.readValue(file, ActivityDefinition.class); // Then Result Is Instance Of Activity Definition assertThat(result, instanceOf(ActivityDefinition.class)); @@ -51,11 +49,11 @@ void whenDeserializingActivityDefinitionThenResultIsInstanceOfActivityDefinition @Test void whenDeserializingActivityDefinitionThenMoreInfoIsExpected() throws Exception { - final File file = + final var file = ResourceUtils.getFile("classpath:activity_definition/activity_definition.json"); // When Deserializing ActivityDefinition - final ActivityDefinition result = objectMapper.readValue(file, ActivityDefinition.class); + final var result = objectMapper.readValue(file, ActivityDefinition.class); // Then MoreInfo Is Expected assertThat(result.getMoreInfo(), is(URI.create("http://example.com/more"))); @@ -65,11 +63,11 @@ void whenDeserializingActivityDefinitionThenMoreInfoIsExpected() throws Exceptio @Test void whenDeserializingActivityDefinitionThenInteractionTypeIsExpected() throws Exception { - final File file = + final var file = ResourceUtils.getFile("classpath:activity_definition/activity_definition.json"); // When Deserializing ActivityDefinition - final ActivityDefinition result = objectMapper.readValue(file, ActivityDefinition.class); + final var result = objectMapper.readValue(file, ActivityDefinition.class); // Then InteractionType Is Expected assertThat(result.getInteractionType(), is(InteractionType.TRUE_FALSE)); @@ -79,11 +77,11 @@ void whenDeserializingActivityDefinitionThenInteractionTypeIsExpected() throws E @Test void whenDeserializingActivityDefinitionThenCorrectResponsesPatternIsExpected() throws Exception { - final File file = + final var file = ResourceUtils.getFile("classpath:activity_definition/activity_definition.json"); // When Deserializing ActivityDefinition - final ActivityDefinition result = objectMapper.readValue(file, ActivityDefinition.class); + final var result = objectMapper.readValue(file, ActivityDefinition.class); // Then CorrectResponsesPattern Is Expected assertThat(result.getCorrectResponsesPattern(), is(Collections.singletonList( @@ -94,11 +92,11 @@ void whenDeserializingActivityDefinitionThenCorrectResponsesPatternIsExpected() @Test void whenDeserializingActivityDefinitionThenExtensionsAreExpected() throws Exception { - final File file = + final var file = ResourceUtils.getFile("classpath:activity_definition/activity_definition.json"); // When Deserializing ActivityDefinition - final ActivityDefinition result = objectMapper.readValue(file, ActivityDefinition.class); + final var result = objectMapper.readValue(file, ActivityDefinition.class); // Then Extensions Are Expected assertThat(result.getExtensions().get(URI.create("http://url")), is("www.example.com")); @@ -108,11 +106,11 @@ void whenDeserializingActivityDefinitionThenExtensionsAreExpected() throws Excep @Test void whenDeserializingActivityDefinitionThenNameIsExpected() throws Exception { - final File file = + final var file = ResourceUtils.getFile("classpath:activity_definition/activity_definition.json"); // When Deserializing ActivityDefinition - final ActivityDefinition result = objectMapper.readValue(file, ActivityDefinition.class); + final var result = objectMapper.readValue(file, ActivityDefinition.class); // Then Name Is Expected assertThat(result.getName().get(Locale.US), @@ -123,11 +121,11 @@ void whenDeserializingActivityDefinitionThenNameIsExpected() throws Exception { @Test void whenDeserializingActivityDefinitionThenDescriptionIsExpected() throws Exception { - final File file = + final var file = ResourceUtils.getFile("classpath:activity_definition/activity_definition.json"); // When Deserializing ActivityDefinition - final ActivityDefinition result = objectMapper.readValue(file, ActivityDefinition.class); + final var result = objectMapper.readValue(file, ActivityDefinition.class); // Then Description Is Expected assertThat(result.getDescription().get(Locale.US), is("pong[.]1:[,]dg[.]:10[,]lunch[.]")); @@ -137,11 +135,11 @@ void whenDeserializingActivityDefinitionThenDescriptionIsExpected() throws Excep @Test void whenDeserializingActivityDefinitionThenTypeIsExpected() throws Exception { - final File file = + final var file = ResourceUtils.getFile("classpath:activity_definition/activity_definition.json"); // When Deserializing ActivityDefinition - final ActivityDefinition result = objectMapper.readValue(file, ActivityDefinition.class); + final var result = objectMapper.readValue(file, ActivityDefinition.class); // Then Type Is Expected assertThat(result.getType(), @@ -153,11 +151,11 @@ void whenDeserializingActivityDefinitionThenTypeIsExpected() throws Exception { void whenDeserializingActivityDefinitionWithoutTypeWhenDeserializedThenTypeIsNull() throws Exception { - final File file = ResourceUtils + final var file = ResourceUtils .getFile("classpath:activity_definition/activity_definition_without_type.json"); // When Deserializing Activity Definition Without Type - final ActivityDefinition result = objectMapper.readValue(file, ActivityDefinition.class); + final var result = objectMapper.readValue(file, ActivityDefinition.class); // Then Type Is Null assertThat(result.getType(), nullValue()); @@ -167,11 +165,11 @@ void whenDeserializingActivityDefinitionWithoutTypeWhenDeserializedThenTypeIsNul @Test void whenDeserializingActivityDefinitionWithChoicesThenChoicesIDIsExpected() throws Exception { - final File file = + final var file = ResourceUtils.getFile("classpath:activity_definition/activity_definition.json"); // When Deserializing ActivityDefinition With Choices - final ActivityDefinition result = objectMapper.readValue(file, ActivityDefinition.class); + final var result = objectMapper.readValue(file, ActivityDefinition.class); // Then Choices ID Is Expected assertThat(result.getChoices().get(0).getId(), is("1")); @@ -182,11 +180,11 @@ void whenDeserializingActivityDefinitionWithChoicesThenChoicesIDIsExpected() thr void whenDeserializingActivityDefinitionWithChoicesThenChoicesDescriptionIsExpected() throws Exception { - final File file = + final var file = ResourceUtils.getFile("classpath:activity_definition/activity_definition.json"); // When Deserializing ActivityDefinition With Choices - final ActivityDefinition result = objectMapper.readValue(file, ActivityDefinition.class); + final var result = objectMapper.readValue(file, ActivityDefinition.class); // Then Choices Description Is Expected assertThat(result.getChoices().get(0).getDescription().get(Locale.US), @@ -197,11 +195,11 @@ void whenDeserializingActivityDefinitionWithChoicesThenChoicesDescriptionIsExpec @Test void whenDeserializingActivityDefinitionWithScaledThenScaleIDIsExpected() throws Exception { - final File file = + final var file = ResourceUtils.getFile("classpath:activity_definition/activity_definition.json"); // When Deserializing ActivityDefinition With Scaled - final ActivityDefinition result = objectMapper.readValue(file, ActivityDefinition.class); + final var result = objectMapper.readValue(file, ActivityDefinition.class); // Then Scale ID Is Expected assertThat(result.getScale().get(0).getId(), is("1")); @@ -212,11 +210,11 @@ void whenDeserializingActivityDefinitionWithScaledThenScaleIDIsExpected() throws void whenDeserializingActivityDefinitionWithScaledThenScaleDescriptionIsExpected() throws Exception { - final File file = + final var file = ResourceUtils.getFile("classpath:activity_definition/activity_definition.json"); // When Deserializing Activity Definition With Scaled - final ActivityDefinition result = objectMapper.readValue(file, ActivityDefinition.class); + final var result = objectMapper.readValue(file, ActivityDefinition.class); // Then Scale Description Is Expected assertThat(result.getScale().get(0).getDescription().get(Locale.US), @@ -227,11 +225,11 @@ void whenDeserializingActivityDefinitionWithScaledThenScaleDescriptionIsExpected @Test void whenDeserializingActivityDefinitionWithSourceThenSourceIDIsExpected() throws Exception { - final File file = + final var file = ResourceUtils.getFile("classpath:activity_definition/activity_definition.json"); // When Deserializing Activity Definition With Source - final ActivityDefinition result = objectMapper.readValue(file, ActivityDefinition.class); + final var result = objectMapper.readValue(file, ActivityDefinition.class); // Then Source ID Is Expected assertThat(result.getSource().get(0).getId(), is("1")); @@ -242,11 +240,11 @@ void whenDeserializingActivityDefinitionWithSourceThenSourceIDIsExpected() throw void whenDeserializingActivityDefinitionWithSourceThenSourceDescriptionIsExpected() throws Exception { - final File file = + final var file = ResourceUtils.getFile("classpath:activity_definition/activity_definition.json"); // When Deserializing Activity Definition With Source - final ActivityDefinition result = objectMapper.readValue(file, ActivityDefinition.class); + final var result = objectMapper.readValue(file, ActivityDefinition.class); // Then Source Description Is Expected assertThat(result.getSource().get(0).getDescription().get(Locale.US), @@ -257,11 +255,11 @@ void whenDeserializingActivityDefinitionWithSourceThenSourceDescriptionIsExpecte @Test void whenDeserializingActivityDefinitionWithTargetThenTargetIDIsExpected() throws Exception { - final File file = + final var file = ResourceUtils.getFile("classpath:activity_definition/activity_definition.json"); // When Deserializing Activity Definition With Target - final ActivityDefinition result = objectMapper.readValue(file, ActivityDefinition.class); + final var result = objectMapper.readValue(file, ActivityDefinition.class); // Then Target ID Is Expected assertThat(result.getTarget().get(0).getId(), is("1")); @@ -272,11 +270,11 @@ void whenDeserializingActivityDefinitionWithTargetThenTargetIDIsExpected() throw void whenDeserializingActivityDefinitionWithTargetThenTargetDescriptionIsExpected() throws Exception { - final File file = + final var file = ResourceUtils.getFile("classpath:activity_definition/activity_definition.json"); // When Deserializing Activity Definition With Target - final ActivityDefinition result = objectMapper.readValue(file, ActivityDefinition.class); + final var result = objectMapper.readValue(file, ActivityDefinition.class); // Then Target Description Is Expected assertThat(result.getTarget().get(0).getDescription().get(Locale.US), @@ -287,11 +285,11 @@ void whenDeserializingActivityDefinitionWithTargetThenTargetDescriptionIsExpecte @Test void whenDeserializingActivityDefinitionWithStepsThenStepsIDIsExpected() throws Exception { - final File file = + final var file = ResourceUtils.getFile("classpath:activity_definition/activity_definition.json"); // When Deserializing Activity Definition With Steps - final ActivityDefinition result = objectMapper.readValue(file, ActivityDefinition.class); + final var result = objectMapper.readValue(file, ActivityDefinition.class); // Then Steps ID Is Expected assertThat(result.getSteps().get(0).getId(), is("1")); @@ -302,11 +300,11 @@ void whenDeserializingActivityDefinitionWithStepsThenStepsIDIsExpected() throws void whenDeserializingActivityDefinitionWithStepsThenStepsDescriptionIsExpected() throws Exception { - final File file = + final var file = ResourceUtils.getFile("classpath:activity_definition/activity_definition.json"); // When Deserializing Activity Definition With Steps - final ActivityDefinition result = objectMapper.readValue(file, ActivityDefinition.class); + final var result = objectMapper.readValue(file, ActivityDefinition.class); // Then Steps Description Is Expected assertThat(result.getSteps().get(0).getDescription().get(Locale.US), @@ -318,7 +316,7 @@ void whenDeserializingActivityDefinitionWithStepsThenStepsDescriptionIsExpected( void whenSerializingActivityDefinitionOfInteractionTypeTrueFalseThenResultIsEqualToExpectedJson() throws IOException { - final ActivityDefinition activityDefinition = ActivityDefinition.builder() + final var activityDefinition = ActivityDefinition.builder() .addName(Locale.US, "True false question") @@ -333,7 +331,7 @@ void whenSerializingActivityDefinitionOfInteractionTypeTrueFalseThenResultIsEqua .build(); // When Serializing Activity Definition Of InteractionType True False - final JsonNode result = + final var result = objectMapper.readTree(objectMapper.writeValueAsString(activityDefinition)); // Then Result Is Equal To Expected Json @@ -346,7 +344,7 @@ void whenSerializingActivityDefinitionOfInteractionTypeTrueFalseThenResultIsEqua void whenSerializingActivityDefinitionOfInteractionTypeChoiceThenResultIsEqualToExpectedJson() throws IOException { - final ActivityDefinition activityDefinition = ActivityDefinition.builder() + final var activityDefinition = ActivityDefinition.builder() .addName(Locale.US, "Choice") @@ -369,7 +367,7 @@ void whenSerializingActivityDefinitionOfInteractionTypeChoiceThenResultIsEqualTo .build(); // When Serializing Activity Definition Of InteractionType Choice - final JsonNode result = + final var result = objectMapper.readTree(objectMapper.writeValueAsString(activityDefinition)); // Then Result Is Equal To Expected Json @@ -381,12 +379,12 @@ void whenSerializingActivityDefinitionOfInteractionTypeChoiceThenResultIsEqualTo @Test void whenCallingToStringThenResultIsExpected() throws Exception { - final ActivityDefinition activityDefinition = objectMapper.readValue( + final var activityDefinition = objectMapper.readValue( ResourceUtils.getFile("classpath:activity_definition/activity_definition.json"), ActivityDefinition.class); // When Calling ToString - final String result = activityDefinition.toString(); + final var result = activityDefinition.toString(); // Then Result Is Expected assertThat(result, is( @@ -397,7 +395,7 @@ void whenCallingToStringThenResultIsExpected() throws Exception { void whenBuildingActivityDefinitionWithTwoNameValuesThenNameLanguageMapHasTwoEntries() { // When Building ActivityDefinition With Two Name Values - final ActivityDefinition activityDefinition = ActivityDefinition.builder() + final var activityDefinition = ActivityDefinition.builder() .addName(Locale.US, "True false question") @@ -422,7 +420,7 @@ void whenBuildingActivityDefinitionWithTwoNameValuesThenNameLanguageMapHasTwoEnt void whenBuildingActivityDefinitionWithTwoDescriptionValuesThenDescriptionLanguageMapHasTwoEntries() { // When Building ActivityDefinition With Two Description Values - final ActivityDefinition activityDefinition = ActivityDefinition.builder() + final var activityDefinition = ActivityDefinition.builder() .addName(Locale.US, "True false question") diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/ActivityTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/ActivityTests.java index 11eed346..b1a97760 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/ActivityTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/ActivityTests.java @@ -8,9 +8,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import java.io.File; import java.io.IOException; import java.net.URI; import java.util.Locale; @@ -32,10 +30,10 @@ class ActivityTests { @Test void whenDeserializingActivityThenResultIsInstanceOfActivity() throws Exception { - final File file = ResourceUtils.getFile("classpath:activity/activity.json"); + final var file = ResourceUtils.getFile("classpath:activity/activity.json"); // When Deserializing Activity - final Activity result = objectMapper.readValue(file, Activity.class); + final var result = objectMapper.readValue(file, Activity.class); // Then Result Is Instance Of Activity assertThat(result, instanceOf(Activity.class)); @@ -45,10 +43,10 @@ void whenDeserializingActivityThenResultIsInstanceOfActivity() throws Exception @Test void whenDeserializingActivityThenIdIsExpected() throws Exception { - final File file = ResourceUtils.getFile("classpath:activity/activity.json"); + final var file = ResourceUtils.getFile("classpath:activity/activity.json"); // When Deserializing Activity - final Activity result = objectMapper.readValue(file, Activity.class); + final var result = objectMapper.readValue(file, Activity.class); // Then Id Is Expected assertThat(result.getId(), is(URI.create("http://example.com/xapi/activity/simplestatement"))); @@ -58,10 +56,10 @@ void whenDeserializingActivityThenIdIsExpected() throws Exception { @Test void whenDeserializingActivityThenDefinitionIsInstanceOfActivityDefinition() throws Exception { - final File file = ResourceUtils.getFile("classpath:activity/activity.json"); + final var file = ResourceUtils.getFile("classpath:activity/activity.json"); // When Deserializing Activity - final Activity result = objectMapper.readValue(file, Activity.class); + final var result = objectMapper.readValue(file, Activity.class); // Then Definition Is Instance Of Activity Definition assertThat(result.getDefinition(), instanceOf(ActivityDefinition.class)); @@ -74,7 +72,7 @@ void whenSerializingActivityThenResultIsEqualToExpectedJson() throws IOException // This test uses the English locale because Jackson uses underscores instead of hyphens to // separate variants - final Activity activity = Activity.builder() + final var activity = Activity.builder() .id(URI.create("http://example.com/xapi/activity/simplestatement")) @@ -88,7 +86,7 @@ void whenSerializingActivityThenResultIsEqualToExpectedJson() throws IOException .build(); // When Serializing Activity - final JsonNode result = objectMapper.readTree(objectMapper.writeValueAsString(activity)); + final var result = objectMapper.readTree(objectMapper.writeValueAsString(activity)); // Then Result Is Equal To Expected Json assertThat(result, is((objectMapper @@ -99,7 +97,7 @@ void whenSerializingActivityThenResultIsEqualToExpectedJson() throws IOException @Test void whenCallingToStringThenResultIsExpected() throws IOException { - final Activity activity = Activity.builder() + final var activity = Activity.builder() .id(URI.create("http://www.example.co.uk/exampleactivity")) @@ -109,7 +107,7 @@ void whenCallingToStringThenResultIsExpected() throws IOException { .build(); // When Calling ToString - final String result = activity.toString(); + final var result = activity.toString(); // Then Result Is Expected assertThat(result, is( @@ -125,7 +123,7 @@ void whenCallingToStringThenResultIsExpected() throws IOException { void whenActivityIsConstructedWithIdThenIdIsExpected() { // When Activity Is Constructed With Id - final Activity activity = new Activity("http://www.example.co.uk/exampleactivity"); + final var activity = new Activity("http://www.example.co.uk/exampleactivity"); // Then Id Is Expected assertThat(activity.getId(), is(URI.create("http://www.example.co.uk/exampleactivity"))); @@ -140,7 +138,7 @@ void whenActivityIsConstructedWithIdThenIdIsExpected() { void whenActivityIsBuiltWithStringIdThenIdIsExpected() { // When Activity Is Built With String Id - final Activity activity = + final var activity = Activity.builder().id("http://www.example.co.uk/exampleactivity").build(); // Then Id Is Expected diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/AgentTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/AgentTests.java index 6804572f..a72b9e16 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/AgentTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/AgentTests.java @@ -8,9 +8,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import java.io.File; import java.io.IOException; import java.net.URI; import org.junit.jupiter.api.DisplayName; @@ -32,15 +30,15 @@ class AgentTests { private final ObjectMapper objectMapper = new ObjectMapper().findAndRegisterModules(); @ParameterizedTest - @ValueSource(strings = {"classpath:agent/agent.json", - "classpath:agent/agent_without_object_type.json", - "classpath:agent/agent_with_object_type.json"}) + @ValueSource( + strings = {"classpath:agent/agent.json", "classpath:agent/agent_without_object_type.json", + "classpath:agent/agent_with_object_type.json"}) void whenDeserializingAgentThenResultIsInstanceOfAgent(String fileName) throws IOException { - final File file = ResourceUtils.getFile(fileName); + final var file = ResourceUtils.getFile(fileName); // When Deserializing Agent - final Agent result = objectMapper.readValue(file, Agent.class); + final var result = objectMapper.readValue(file, Agent.class); // Then Result Is Instance Of Agent assertThat(result, instanceOf(Agent.class)); @@ -50,10 +48,10 @@ void whenDeserializingAgentThenResultIsInstanceOfAgent(String fileName) throws I @Test void whenDeserializingAgentWithNameThenNameIsExpected() throws IOException { - final File file = ResourceUtils.getFile("classpath:agent/agent_with_name.json"); + final var file = ResourceUtils.getFile("classpath:agent/agent_with_name.json"); // When Deserializing Agent With Name - final Agent result = objectMapper.readValue(file, Agent.class); + final var result = objectMapper.readValue(file, Agent.class); // Then Name Is Expected assertThat(result.getName(), is("A N Other")); @@ -63,10 +61,10 @@ void whenDeserializingAgentWithNameThenNameIsExpected() throws IOException { @Test void whenDeserializingAgentWithMboxThenMboxIsExpected() throws IOException { - final File file = ResourceUtils.getFile("classpath:agent/agent_with_mbox.json"); + final var file = ResourceUtils.getFile("classpath:agent/agent_with_mbox.json"); // When Deserializing Agent With Mbox - final Agent result = objectMapper.readValue(file, Agent.class); + final var result = objectMapper.readValue(file, Agent.class); // Then Mbox Is Expected assertThat(result.getMbox(), is("mailto:other@example.com")); @@ -76,10 +74,10 @@ void whenDeserializingAgentWithMboxThenMboxIsExpected() throws IOException { @Test void whenDeserializingAgentWithMboxSha1sumThenMboxSha1sumIsExpected() throws IOException { - final File file = ResourceUtils.getFile("classpath:agent/agent_with_mbox_sha1sum.json"); + final var file = ResourceUtils.getFile("classpath:agent/agent_with_mbox_sha1sum.json"); // When Deserializing Agent With MboxSha1sum - final Agent result = objectMapper.readValue(file, Agent.class); + final var result = objectMapper.readValue(file, Agent.class); // Then MboxSha1sum Is Expected assertThat(result.getMboxSha1sum(), is("1234")); @@ -89,10 +87,10 @@ void whenDeserializingAgentWithMboxSha1sumThenMboxSha1sumIsExpected() throws IOE @Test void whenDeserializingAgentWithOpenIdThenOpenIdIsExpected() throws IOException { - final File file = ResourceUtils.getFile("classpath:agent/agent_with_openid.json"); + final var file = ResourceUtils.getFile("classpath:agent/agent_with_openid.json"); // When Deserializing Agent With OpenId - final Agent result = objectMapper.readValue(file, Agent.class); + final var result = objectMapper.readValue(file, Agent.class); // Then OpenId Is Expected assertThat(result.getOpenid(), is(URI.create("1234"))); @@ -102,10 +100,10 @@ void whenDeserializingAgentWithOpenIdThenOpenIdIsExpected() throws IOException { @Test void whenDeserializingAgentWithAccountThenAccountIsInstanceOfAccount() throws IOException { - final File file = ResourceUtils.getFile("classpath:agent/agent_with_account.json"); + final var file = ResourceUtils.getFile("classpath:agent/agent_with_account.json"); // When Deserializing Agent With Account - final Agent result = objectMapper.readValue(file, Agent.class); + final var result = objectMapper.readValue(file, Agent.class); // Then Account Is Instance Of Account assertThat(result.getAccount(), instanceOf(Account.class)); @@ -124,7 +122,7 @@ void whenSerializingAgentWithNameThenResultIsEqualToExpectedJson() throws IOExce .build(); // When Serializing Agent With Name - final JsonNode result = objectMapper.readTree(objectMapper.writeValueAsString(agent)); + final var result = objectMapper.readTree(objectMapper.writeValueAsString(agent)); // Then Result Is Equal To Expected Json assertThat(result, @@ -144,7 +142,7 @@ void whenSerializingAgentWithMboxThenResultIsEqualToExpectedJson() throws IOExce .build(); // When Serializing Agent With Mbox - final JsonNode result = objectMapper.readTree(objectMapper.writeValueAsString(agent)); + final var result = objectMapper.readTree(objectMapper.writeValueAsString(agent)); // Then Result Is Equal To Expected Json assertThat(result, @@ -164,7 +162,7 @@ void whenSerializingAgentWithMboxSha1sumThenResultIsEqualToExpectedJson() throws .build(); // When Serializing Agent With MboxSha1sum - final JsonNode result = objectMapper.readTree(objectMapper.writeValueAsString(agent)); + final var result = objectMapper.readTree(objectMapper.writeValueAsString(agent)); // Then Result Is Equal To Expected Json assertThat(result, is(objectMapper @@ -184,7 +182,7 @@ void whenSerializingAgentWithOpenIdThenResultIsEqualToExpectedJson() throws IOEx .build(); // When Serializing Agent With OpenId - final JsonNode result = objectMapper.readTree(objectMapper.writeValueAsString(agent)); + final var result = objectMapper.readTree(objectMapper.writeValueAsString(agent)); // Then Result Is Equal To Expected Json assertThat(result, @@ -204,7 +202,7 @@ void whenSerializingAgentWithAccountThenResultIsEqualToExpectedJson() throws IOE .build(); // when Serializing Agent With Account - final JsonNode result = objectMapper.readTree(objectMapper.writeValueAsString(agent)); + final var result = objectMapper.readTree(objectMapper.writeValueAsString(agent)); // Then Result Is Equal To Expected Json assertThat(result, is( diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/ContextActivitiesTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/ContextActivitiesTests.java index 07050135..235e2076 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/ContextActivitiesTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/ContextActivitiesTests.java @@ -9,9 +9,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import java.io.File; import java.io.IOException; import java.net.URI; import org.junit.jupiter.api.DisplayName; @@ -33,10 +31,10 @@ class ContextActivitiesTests { void whenDeserializingContextActivitiesThenResultIsInstanceOfContextActivities() throws Exception { - final File file = ResourceUtils.getFile("classpath:context_activities/context_activities.json"); + final var file = ResourceUtils.getFile("classpath:context_activities/context_activities.json"); // When Deserializing ContextActivities - final ContextActivities result = objectMapper.readValue(file, ContextActivities.class); + final var result = objectMapper.readValue(file, ContextActivities.class); // Then Result Is Instance Of ContextActivities assertThat(result, instanceOf(ContextActivities.class)); @@ -46,10 +44,10 @@ void whenDeserializingContextActivitiesThenResultIsInstanceOfContextActivities() @Test void whenDeserializingContextActivitiesThenParentIsInstanceOfActivity() throws Exception { - final File file = ResourceUtils.getFile("classpath:context_activities/context_activities.json"); + final var file = ResourceUtils.getFile("classpath:context_activities/context_activities.json"); // When Deserializing ContextActivities - final ContextActivities result = objectMapper.readValue(file, ContextActivities.class); + final var result = objectMapper.readValue(file, ContextActivities.class); // Then Parent Is Instance Of Activity assertThat(result.getParent().get(0), instanceOf(Activity.class)); @@ -59,10 +57,10 @@ void whenDeserializingContextActivitiesThenParentIsInstanceOfActivity() throws E @Test void whenDeserializingContextActivitiesThenGroupingIsInstanceOfActivity() throws Exception { - final File file = ResourceUtils.getFile("classpath:context_activities/context_activities.json"); + final var file = ResourceUtils.getFile("classpath:context_activities/context_activities.json"); // When Deserializing ContextActivities - final ContextActivities result = objectMapper.readValue(file, ContextActivities.class); + final var result = objectMapper.readValue(file, ContextActivities.class); // Then Grouping Is Instance Of Activity assertThat(result.getGrouping().get(0), instanceOf(Activity.class)); @@ -72,10 +70,10 @@ void whenDeserializingContextActivitiesThenGroupingIsInstanceOfActivity() throws @Test void whenDeserializingContextActivitiesThenCategoryIsInstanceOfActivity() throws Exception { - final File file = ResourceUtils.getFile("classpath:context_activities/context_activities.json"); + final var file = ResourceUtils.getFile("classpath:context_activities/context_activities.json"); // When Deserializing ContextActivities - final ContextActivities result = objectMapper.readValue(file, ContextActivities.class); + final var result = objectMapper.readValue(file, ContextActivities.class); // Then Category Is Instance Of Activity assertThat(result.getCategory().get(0), instanceOf(Activity.class)); @@ -85,10 +83,10 @@ void whenDeserializingContextActivitiesThenCategoryIsInstanceOfActivity() throws @Test void whenDeserializingContextActivitiesThenOtherIsInstanceOfActivity() throws Exception { - final File file = ResourceUtils.getFile("classpath:context_activities/context_activities.json"); + final var file = ResourceUtils.getFile("classpath:context_activities/context_activities.json"); // When Deserializing ContextActivities - final ContextActivities result = objectMapper.readValue(file, ContextActivities.class); + final var result = objectMapper.readValue(file, ContextActivities.class); // Then Other Is Instance Of Activity assertThat(result.getOther().get(0), instanceOf(Activity.class)); @@ -98,7 +96,7 @@ void whenDeserializingContextActivitiesThenOtherIsInstanceOfActivity() throws Ex @Test void whenSerializingAttachmentThenResultIsEqualToExpectedJson() throws IOException { - final ContextActivities contextActivities = ContextActivities.builder() + final var contextActivities = ContextActivities.builder() .addParent(p -> p.id(URI.create("https://example.com/activity/1"))) @@ -111,7 +109,7 @@ void whenSerializingAttachmentThenResultIsEqualToExpectedJson() throws IOExcepti .build(); // When Serializing Attachment - final JsonNode result = + final var result = objectMapper.readTree(objectMapper.writeValueAsString(contextActivities)); // Then Result Is Equal To Expected Json @@ -123,12 +121,12 @@ void whenSerializingAttachmentThenResultIsEqualToExpectedJson() throws IOExcepti @Test void whenCallingToStringThenResultIsExpected() throws IOException { - final ContextActivities contextActivities = objectMapper.readValue( + final var contextActivities = objectMapper.readValue( ResourceUtils.getFile("classpath:context_activities/context_activities.json"), ContextActivities.class); // When Calling ToString - final String result = contextActivities.toString(); + final var result = contextActivities.toString(); // Then Result Is Expected assertThat(result, is( @@ -137,11 +135,10 @@ void whenCallingToStringThenResultIsExpected() throws IOException { } @Test - void whenBuildingContextActivitiesWithTwoParentsThenParentIshasSizeTwo() - throws IOException { + void whenBuildingContextActivitiesWithTwoParentsThenParentIshasSizeTwo() throws IOException { // When Building ContextActivities With Two Parents - final ContextActivities contextActivities = ContextActivities.builder() + final var contextActivities = ContextActivities.builder() .addParent(p -> p.id(URI.create("https://example.com/activity/1"))) @@ -155,11 +152,10 @@ void whenBuildingContextActivitiesWithTwoParentsThenParentIshasSizeTwo() } @Test - void whenBuildingContextActivitiesWithTwoGroupingThenGroupingIshasSizeTwo() - throws IOException { + void whenBuildingContextActivitiesWithTwoGroupingThenGroupingIshasSizeTwo() throws IOException { // When Building ContextActivities With Two Groupings - final ContextActivities contextActivities = ContextActivities.builder() + final var contextActivities = ContextActivities.builder() .addGrouping(p -> p.id(URI.create("https://example.com/activity/1"))) @@ -176,7 +172,7 @@ void whenBuildingContextActivitiesWithTwoGroupingThenGroupingIshasSizeTwo() void whenBuildingContextActivitiesWithTwoOtherThenOtherIshasSizeTwo() throws IOException { // When Building ContextActivities With Two Others - final ContextActivities contextActivities = ContextActivities.builder() + final var contextActivities = ContextActivities.builder() .addOther(p -> p.id(URI.create("https://example.com/activity/1"))) @@ -190,11 +186,10 @@ void whenBuildingContextActivitiesWithTwoOtherThenOtherIshasSizeTwo() throws IOE } @Test - void whenBuildingContextActivitiesWithTwoCategoriesThenCategoryIshasSizeTwo() - throws IOException { + void whenBuildingContextActivitiesWithTwoCategoriesThenCategoryIshasSizeTwo() throws IOException { // When Building ContextActivities With Two Categories - final ContextActivities contextActivities = ContextActivities.builder() + final var contextActivities = ContextActivities.builder() .addCategory(p -> p.id(URI.create("https://example.com/activity/1"))) @@ -212,7 +207,7 @@ void whenBuildingContextActivitiesWithTwoParentsWithSameIdThenParentIshasSizeTwo throws IOException { // When Building ContextActivities With Two Parents With Same Id - final ContextActivities contextActivities = ContextActivities.builder() + final var contextActivities = ContextActivities.builder() .addParent(p -> p.id(URI.create("https://example.com/activity/1"))) diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/ContextTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/ContextTests.java index f11cca2c..ac46d329 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/ContextTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/ContextTests.java @@ -9,9 +9,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import java.io.File; import java.io.IOException; import java.net.URI; import java.util.LinkedHashMap; @@ -35,10 +33,10 @@ class ContextTests { @Test void whenDeserializingContextThenResultIsInstanceOfContext() throws Exception { - final File file = ResourceUtils.getFile("classpath:context/context.json"); + final var file = ResourceUtils.getFile("classpath:context/context.json"); // When Deserializing Context - final Context result = objectMapper.readValue(file, Context.class); + final var result = objectMapper.readValue(file, Context.class); // Then Result Is Instance Of Context assertThat(result, instanceOf(Context.class)); @@ -48,10 +46,10 @@ void whenDeserializingContextThenResultIsInstanceOfContext() throws Exception { @Test void whenDeserializingContextThenRegistrationIsExpected() throws Exception { - final File file = ResourceUtils.getFile("classpath:context/context.json"); + final var file = ResourceUtils.getFile("classpath:context/context.json"); // When Deserializing Context - final Context result = objectMapper.readValue(file, Context.class); + final var result = objectMapper.readValue(file, Context.class); // Then Registration Is Expected assertThat(result.getRegistration(), @@ -62,10 +60,10 @@ void whenDeserializingContextThenRegistrationIsExpected() throws Exception { @Test void whenDeserializingContextThenRevisionIsExpected() throws Exception { - final File file = ResourceUtils.getFile("classpath:context/context.json"); + final var file = ResourceUtils.getFile("classpath:context/context.json"); // When Deserializing Context - final Context result = objectMapper.readValue(file, Context.class); + final var result = objectMapper.readValue(file, Context.class); // Then Revision Is Expected assertThat(result.getRevision(), is("revision")); @@ -75,10 +73,10 @@ void whenDeserializingContextThenRevisionIsExpected() throws Exception { @Test void whenDeserializingContextThenPlatformIsExpected() throws Exception { - final File file = ResourceUtils.getFile("classpath:context/context.json"); + final var file = ResourceUtils.getFile("classpath:context/context.json"); // When Deserializing Context - final Context result = objectMapper.readValue(file, Context.class); + final var result = objectMapper.readValue(file, Context.class); // Then Platform Is Expected assertThat(result.getPlatform(), is("platform")); @@ -88,10 +86,10 @@ void whenDeserializingContextThenPlatformIsExpected() throws Exception { @Test void whenDeserializingContextThenLanguageIsExpected() throws Exception { - final File file = ResourceUtils.getFile("classpath:context/context.json"); + final var file = ResourceUtils.getFile("classpath:context/context.json"); // When Deserializing Context - final Context result = objectMapper.readValue(file, Context.class); + final var result = objectMapper.readValue(file, Context.class); // Then Language Is Expected assertThat(result.getLanguage(), is(Locale.US)); @@ -101,10 +99,10 @@ void whenDeserializingContextThenLanguageIsExpected() throws Exception { @Test void whenDeserializingContextThenInstructorIsInstanceOfActor() throws Exception { - final File file = ResourceUtils.getFile("classpath:context/context.json"); + final var file = ResourceUtils.getFile("classpath:context/context.json"); // When Deserializing Context - final Context result = objectMapper.readValue(file, Context.class); + final var result = objectMapper.readValue(file, Context.class); // Then Instructor Is Instance Of Actor assertThat(result.getInstructor(), instanceOf(Actor.class)); @@ -114,10 +112,10 @@ void whenDeserializingContextThenInstructorIsInstanceOfActor() throws Exception @Test void whenDeserializingContextThenTeamIsInstanceOfGroup() throws Exception { - final File file = ResourceUtils.getFile("classpath:context/context.json"); + final var file = ResourceUtils.getFile("classpath:context/context.json"); // When Deserializing Context - final Context result = objectMapper.readValue(file, Context.class); + final var result = objectMapper.readValue(file, Context.class); // Then Team Is Instance Of Group assertThat(result.getTeam(), instanceOf(Group.class)); @@ -127,10 +125,10 @@ void whenDeserializingContextThenTeamIsInstanceOfGroup() throws Exception { @Test void whenDeserializingContextThenStatementIsInstanceOfStatementReference() throws Exception { - final File file = ResourceUtils.getFile("classpath:context/context.json"); + final var file = ResourceUtils.getFile("classpath:context/context.json"); // When Deserializing Context - final Context result = objectMapper.readValue(file, Context.class); + final var result = objectMapper.readValue(file, Context.class); // Then Statement Is Instance Of StatementReference assertThat(result.getStatement(), instanceOf(StatementReference.class)); @@ -141,10 +139,10 @@ void whenDeserializingContextThenStatementIsInstanceOfStatementReference() throw void whenDeserializingContextThenContextActivitiesIsInstanceOfContextActivities() throws Exception { - final File file = ResourceUtils.getFile("classpath:context/context.json"); + final var file = ResourceUtils.getFile("classpath:context/context.json"); // When Deserializing Context - final Context result = objectMapper.readValue(file, Context.class); + final var result = objectMapper.readValue(file, Context.class); // Then ContextActivities Is Instance Of ContextActivities assertThat(result.getContextActivities(), instanceOf(ContextActivities.class)); @@ -154,10 +152,10 @@ void whenDeserializingContextThenContextActivitiesIsInstanceOfContextActivities( @Test void whenDeserializingContextThenExtensionsAreExpected() throws Exception { - final File file = ResourceUtils.getFile("classpath:context/context.json"); + final var file = ResourceUtils.getFile("classpath:context/context.json"); // When Deserializing Context - final Context result = objectMapper.readValue(file, Context.class); + final var result = objectMapper.readValue(file, Context.class); // Then Extensions Are Expected assertThat(result.getExtensions().get(URI.create("http://url")), is("www.example.com")); @@ -166,10 +164,10 @@ void whenDeserializingContextThenExtensionsAreExpected() throws Exception { @Test void whenDeserializingContextWithoutRegistrationThenRegistrationIsNull() throws Exception { - final File file = ResourceUtils.getFile("classpath:context/context_without_registration.json"); + final var file = ResourceUtils.getFile("classpath:context/context_without_registration.json"); // When Deserializing Context Without Registration - final Context result = objectMapper.readValue(file, Context.class); + final var result = objectMapper.readValue(file, Context.class); // Then Registration Is Null assertThat(result.getRegistration(), is(nullValue())); @@ -178,11 +176,11 @@ void whenDeserializingContextWithoutRegistrationThenRegistrationIsNull() throws @Test void whenDeserializingContextWithEmptyRegistrationThenExtensionsAreExpected() throws Exception { - final File file = + final var file = ResourceUtils.getFile("classpath:context/context_with_empty_registration.json"); // When Deserializing Context With Empty Registration - final Context result = objectMapper.readValue(file, Context.class); + final var result = objectMapper.readValue(file, Context.class); // Then Registration Is Null assertThat(result.getRegistration(), is(nullValue())); @@ -198,14 +196,14 @@ void whenSerializingContextWithGroupInstructorThenResultIsEqualToExpectedJson() final Agent leader2 = Agent.builder().name("Leader 2").mbox("mailto:leader2@example.com").build(); - final Context context = Context.builder() + final var context = Context.builder() .groupInstructor(g -> g.addMember(leader1).addMember(leader2)) .build(); // When Serializing Context With Group Instructor - final JsonNode result = objectMapper.readTree(objectMapper.writeValueAsString(context)); + final var result = objectMapper.readTree(objectMapper.writeValueAsString(context)); // Then Result Is Equal To Expected Json assertThat(result, is(objectMapper @@ -216,10 +214,10 @@ void whenSerializingContextWithGroupInstructorThenResultIsEqualToExpectedJson() @Test void whenSerializingContextThenResultIsEqualToExpectedJson() throws IOException { - final LinkedHashMap extensions = new LinkedHashMap<>(); + final var extensions = new LinkedHashMap(); extensions.put(URI.create("http://url"), "www.example.com"); - final Context context = Context.builder() + final var context = Context.builder() .registration(UUID.fromString("1d527164-ed0d-4b1d-9f9b-39aab0e4a089")) @@ -250,7 +248,7 @@ void whenSerializingContextThenResultIsEqualToExpectedJson() throws IOException .build(); // When Serializing Context - final JsonNode result = objectMapper.readTree(objectMapper.writeValueAsString(context)); + final var result = objectMapper.readTree(objectMapper.writeValueAsString(context)); // Then Result Is Equal To Expected Json assertThat(result, @@ -261,11 +259,11 @@ void whenSerializingContextThenResultIsEqualToExpectedJson() throws IOException @Test void whenCallingToStringThenResultIsExpected() throws IOException { - final Context context = objectMapper + final var context = objectMapper .readValue(ResourceUtils.getFile("classpath:context/context.json"), Context.class); // When Calling ToString - final String result = context.toString(); + final var result = context.toString(); // Then Result Is Expected assertThat(result, is( diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/GroupTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/GroupTests.java index 9ef55caa..e6b20fd9 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/GroupTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/GroupTests.java @@ -10,9 +10,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import java.io.File; import java.io.IOException; import java.net.URI; import java.util.ArrayList; @@ -34,10 +32,10 @@ class GroupTests { @Test void whenDeserializingGroupThenResultIsInstanceOfGroup() throws IOException { - final File file = ResourceUtils.getFile("classpath:group/group.json"); + final var file = ResourceUtils.getFile("classpath:group/group.json"); // When Deserializing Group - final Group result = objectMapper.readValue(file, Group.class); + final var result = objectMapper.readValue(file, Group.class); // Then Result Is Instance Of Group assertThat(result, instanceOf(Group.class)); @@ -48,11 +46,11 @@ void whenDeserializingGroupThenResultIsInstanceOfGroup() throws IOException { void whenDeserializingGroupWithMembersWithObjectTypeThenResultIsInstanceOfGroup() throws IOException { - final File file = + final var file = ResourceUtils.getFile("classpath:group/group_with_members_with_object_type.json"); // When Deserializing Group With Members With Object Type - final Group result = objectMapper.readValue(file, Group.class); + final var result = objectMapper.readValue(file, Group.class); // Then Result Is Instance Of Group assertThat(result, instanceOf(Group.class)); @@ -62,10 +60,10 @@ void whenDeserializingGroupWithMembersWithObjectTypeThenResultIsInstanceOfGroup( @Test void whenDeserializingGroupThenMemberIsInstanceOfAgent() throws IOException { - final File file = ResourceUtils.getFile("classpath:group/group.json"); + final var file = ResourceUtils.getFile("classpath:group/group.json"); // When Deserializing Group - final Group result = objectMapper.readValue(file, Group.class); + final var result = objectMapper.readValue(file, Group.class); // Then Member Is Instance Of Agent assertThat(result.getMember().get(0), instanceOf(Agent.class)); @@ -87,7 +85,7 @@ void whenSerializingGroupThenResultIsEqualToExpectedJson() throws IOException { .build(); // When Serializing Group - final JsonNode result = objectMapper.readTree(objectMapper.writeValueAsString(group)); + final var result = objectMapper.readTree(objectMapper.writeValueAsString(group)); // Then Result Is Equal To Expected Json assertThat(result, @@ -98,11 +96,11 @@ void whenSerializingGroupThenResultIsEqualToExpectedJson() throws IOException { @Test void whenCallingToStringThenResultIsExpected() throws IOException { - final Group group = + final var group = objectMapper.readValue(ResourceUtils.getFile("classpath:group/group.json"), Group.class); // When Calling ToString - final String result = group.toString(); + final var result = group.toString(); // Then Result Is Expected assertThat(result, is( @@ -125,7 +123,7 @@ void givenGroupWithNameAndMembersWhenCallingIsAnonymousThenResultIsTrue() throws .build(); // When Calling Is Anonymous - boolean result = group.isAnonymous(); + final var result = group.isAnonymous(); // Then Result Is True assertTrue(result); @@ -145,7 +143,7 @@ void givenGroupWithNameAndNoMembersWhenCallingIsAnonymousThenResultIsFalse() thr .build(); // When Calling Is Anonymous - boolean result = group.isAnonymous(); + final var result = group.isAnonymous(); // Then Result Is False assertFalse(result); @@ -166,7 +164,7 @@ void givenGroupWithNameAndNullMembersWhenCallingIsAnonymousThenResultIsFalse() .build(); // When Calling Is Anonymous - boolean result = group.isAnonymous(); + final var result = group.isAnonymous(); // Then Result Is False assertFalse(result); @@ -188,7 +186,7 @@ void givenGroupWithMboxAndMembersWhenCallingIsAnonymousThenResultIsFalse() throw .build(); // When Calling Is Anonymous - boolean result = group.isAnonymous(); + final var result = group.isAnonymous(); // Then Result Is False assertFalse(result); @@ -211,7 +209,7 @@ void givenGroupWithMboxSha1sumAndMembersWhenCallingIsAnonymousThenResultIsFalse( .build(); // When Calling Is Anonymous - boolean result = group.isAnonymous(); + final var result = group.isAnonymous(); // Then Result Is False assertFalse(result); @@ -233,7 +231,7 @@ void givenGroupWithOpenIDAndMembersWhenCallingIsAnonymousThenResultIsFalse() thr .build(); // When Calling Is Anonymous - boolean result = group.isAnonymous(); + final var result = group.isAnonymous(); // Then Result Is False assertFalse(result); @@ -257,7 +255,7 @@ void givenGroupWithAccountAndMembersWhenCallingIsAnonymousThenResultIsFalse() th .build(); // When Calling Is Anonymous - boolean result = group.isAnonymous(); + final var result = group.isAnonymous(); // Then Result Is False assertFalse(result); diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/InteractionComponentTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/InteractionComponentTests.java index 8da90ffc..391fbb1e 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/InteractionComponentTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/InteractionComponentTests.java @@ -10,12 +10,10 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.validation.ConstraintViolation; import jakarta.validation.Validation; import jakarta.validation.Validator; -import java.io.File; import java.io.IOException; import java.util.Locale; import java.util.Set; @@ -41,11 +39,11 @@ class InteractionComponentTests { void whenDeserializingInteractionComponentThenResultIsInstanceOfInteractionComponent() throws Exception { - final File file = + final var file = ResourceUtils.getFile("classpath:interaction_component/interaction_component.json"); // When Deserializing InteractionComponent - final InteractionComponent result = objectMapper.readValue(file, InteractionComponent.class); + final var result = objectMapper.readValue(file, InteractionComponent.class); // Then Result Is Instance Of InteractionComponent assertThat(result, instanceOf(InteractionComponent.class)); @@ -55,11 +53,11 @@ void whenDeserializingInteractionComponentThenResultIsInstanceOfInteractionCompo @Test void whenDeserializingInteractionComponentThenIDIsExpected() throws Exception { - final File file = + final var file = ResourceUtils.getFile("classpath:interaction_component/interaction_component.json"); // When Deserializing InteractionComponent - final InteractionComponent result = objectMapper.readValue(file, InteractionComponent.class); + final var result = objectMapper.readValue(file, InteractionComponent.class); // Then ID Is Expected assertThat(result.getId(), is("1")); @@ -69,11 +67,11 @@ void whenDeserializingInteractionComponentThenIDIsExpected() throws Exception { @Test void whenDeserializingInteractionComponentThenDescriptionIsExpected() throws Exception { - final File file = + final var file = ResourceUtils.getFile("classpath:interaction_component/interaction_component.json"); // When Deserializing InteractionComponent - final InteractionComponent result = objectMapper.readValue(file, InteractionComponent.class); + final var result = objectMapper.readValue(file, InteractionComponent.class); // Then Description Is Expected assertThat(result.getDescription().get(Locale.US), is("value")); @@ -83,7 +81,7 @@ void whenDeserializingInteractionComponentThenDescriptionIsExpected() throws Exc @Test void whenSerializingInteractionComponentThenResultIsEqualToExpectedJson() throws IOException { - final InteractionComponent interactionComponent = InteractionComponent.builder() + final var interactionComponent = InteractionComponent.builder() .id("1") @@ -92,7 +90,7 @@ void whenSerializingInteractionComponentThenResultIsEqualToExpectedJson() throws .build(); // When Serializing InteractionComponent - final JsonNode result = + final var result = objectMapper.readTree(objectMapper.writeValueAsString(interactionComponent)); // Then Result Is Equal To Expected Json @@ -104,12 +102,12 @@ void whenSerializingInteractionComponentThenResultIsEqualToExpectedJson() throws @Test void whenCallingToStringThenResultIsExpected() throws IOException { - final InteractionComponent interactionComponent = objectMapper.readValue( + final var interactionComponent = objectMapper.readValue( ResourceUtils.getFile("classpath:interaction_component/interaction_component.json"), InteractionComponent.class); // When Calling ToString - final String result = interactionComponent.toString(); + final var result = interactionComponent.toString(); // Then Result Is Expected assertThat(result, is("InteractionComponent(id=1, description={en_US=value})")); @@ -120,7 +118,7 @@ void whenCallingToStringThenResultIsExpected() throws IOException { void whenBuildingInteractionComponentWithTwoDescriptionValuesThenDisplayLanguageMapHasTwoEntries() { // When Building InteractionComponent With Two Description Values - final InteractionComponent interactionComponent = InteractionComponent.builder().id("1") + final var interactionComponent = InteractionComponent.builder().id("1") .addDescription(Locale.US, "value").addDescription(Locale.GERMAN, "Wert").build(); // Then Description Language Map Has Two Entries @@ -131,7 +129,7 @@ void whenBuildingInteractionComponentWithTwoDescriptionValuesThenDisplayLanguage @Test void whenValidatingInteractionComponentWithAllRequiredPropertiesThenConstraintViolationsSizeIsZero() { - final InteractionComponent interactionComponent = + final var interactionComponent = InteractionComponent.builder().id("1").addDescription(Locale.US, "value").build(); // When Validating Interaction Component With All Required Properties @@ -146,7 +144,7 @@ void whenValidatingInteractionComponentWithAllRequiredPropertiesThenConstraintVi @Test void whenValidatingInteractionComponentWithoutIdThenConstraintViolationsSizeIsOne() { - final InteractionComponent interactionComponent = + final var interactionComponent = InteractionComponent.builder().addDescription(Locale.US, "value").build(); // When Validating Interaction Component Without Id diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/LanguageMapTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/LanguageMapTests.java index 6e5e8aef..8a835902 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/LanguageMapTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/LanguageMapTests.java @@ -24,20 +24,18 @@ class LanguageMapTests { @ParameterizedTest - @CsvSource({ - "en-GB, Colour", - "en-US, Color", - "de, Colour"}) - void givenUkAndUSKeyWhenGettingLocaleValueThenValueIsExpected(String locale, String expected) throws Exception { + @CsvSource({"en-GB, Colour", "en-US, Color", "de, Colour"}) + void givenUkAndUSKeyWhenGettingLocaleValueThenValueIsExpected(String locale, String expected) + throws Exception { - final LanguageMap languageMap = new LanguageMap(); + final var languageMap = new LanguageMap(); // Given UK and US Key languageMap.put(Locale.UK, "Colour"); languageMap.put(Locale.US, "Color"); // When Getting Locale Value - final String value = languageMap.get(LanguageRange.parse(locale)); + final var value = languageMap.get(LanguageRange.parse(locale)); // Then Value Is Expected assertThat(value, is(expected)); @@ -47,7 +45,7 @@ void givenUkAndUSKeyWhenGettingLocaleValueThenValueIsExpected(String locale, Str @Test void givenFranceGermanyandUSKeyWhenGettingUKValueThenValueIsEnglish() throws Exception { - final LanguageMap languageMap = new LanguageMap(); + final var languageMap = new LanguageMap(); // Given France Germany and US Key languageMap.put(Locale.FRANCE, "Couleur"); @@ -55,7 +53,7 @@ void givenFranceGermanyandUSKeyWhenGettingUKValueThenValueIsEnglish() throws Exc languageMap.put(Locale.ENGLISH, "Color"); // When Getting UK Value - final String value = languageMap.get(LanguageRange.parse("en-GB")); + final var value = languageMap.get(LanguageRange.parse("en-GB")); // Then Value Is English assertThat(value, is("Color")); @@ -65,14 +63,14 @@ void givenFranceGermanyandUSKeyWhenGettingUKValueThenValueIsEnglish() throws Exc @Test void givenFrenchAndEnglishKeyWhenGettingUSValueThenValueIsEnglish() throws Exception { - final LanguageMap languageMap = new LanguageMap(); + final var languageMap = new LanguageMap(); // Given French And English Key languageMap.put(Locale.FRENCH, "Couleur"); languageMap.put(Locale.US, "Color"); // When Getting US Value - final String value = languageMap.get(LanguageRange.parse("en-US")); + final var value = languageMap.get(LanguageRange.parse("en-US")); // Then Value Is English assertThat(value, is("Color")); @@ -82,14 +80,14 @@ void givenFrenchAndEnglishKeyWhenGettingUSValueThenValueIsEnglish() throws Excep @Test void givenFrenchAndUsKeyWhenGettingCanadaFrenchValueThenValueIsFrench() throws Exception { - final LanguageMap languageMap = new LanguageMap(); + final var languageMap = new LanguageMap(); // Given US Key And French languageMap.put(Locale.US, "Color"); languageMap.put(Locale.FRENCH, "Couleur"); // When Getting Canada French Value - final String value = languageMap.get(LanguageRange.parse("fr-ca")); + final var value = languageMap.get(LanguageRange.parse("fr-ca")); // Then Value Is French assertThat(value, is("Couleur")); @@ -99,12 +97,12 @@ void givenFrenchAndUsKeyWhenGettingCanadaFrenchValueThenValueIsFrench() throws E @Test void givenMapIsEmptyWhenGettingGermanValueThenValueIsNull() throws Exception { - final LanguageMap languageMap = new LanguageMap(); + final var languageMap = new LanguageMap(); // Given Map Is Empty // When Getting German Value - final String value = languageMap.get(LanguageRange.parse("de")); + final var value = languageMap.get(LanguageRange.parse("de")); // Then Value Is Null assertNull(value); @@ -114,14 +112,14 @@ void givenMapIsEmptyWhenGettingGermanValueThenValueIsNull() throws Exception { @Test void givenUsAndUndKeyWhenGettingGermanValueThenValueIsUnd() throws Exception { - final LanguageMap languageMap = new LanguageMap(); + final var languageMap = new LanguageMap(); // Given US And UND Key languageMap.put(Locale.US, "Color"); languageMap.put(new Locale("und"), "Colour"); // When Getting German Value - final String value = languageMap.get(LanguageRange.parse("de")); + final var value = languageMap.get(LanguageRange.parse("de")); // Then Value Is UND assertThat(value, is("Colour")); @@ -137,10 +135,10 @@ void givenUkAndUsKeyInMapUsedToConstructLanguageMapWhenGettingUKValueThenValueIs map.put(Locale.US, "Color"); // Given UK and US Key In Map Used To Construct LanguageMap - final LanguageMap languageMap = new LanguageMap(map); + final var languageMap = new LanguageMap(map); // When Getting UK Value - final String value = languageMap.get(LanguageRange.parse("en-GB")); + final var value = languageMap.get(LanguageRange.parse("en-GB")); // Then Value Is UK assertThat(value, is("Colour")); diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/PersonTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/PersonTests.java index 02839ab8..6b05c327 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/PersonTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/PersonTests.java @@ -8,9 +8,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import java.io.File; import java.io.IOException; import java.net.URI; import java.util.Collections; @@ -32,10 +30,10 @@ class PersonTests { @Test void whenDeserializingPersonWhenDeserializedThenResultIsInstanceOfPerson() throws Exception { - final File file = ResourceUtils.getFile("classpath:person/person.json"); + final var file = ResourceUtils.getFile("classpath:person/person.json"); // When Deserializing Person - final Person result = objectMapper.readValue(file, Person.class); + final var result = objectMapper.readValue(file, Person.class); // Then Result Is Instance Of Person assertThat(result, instanceOf(Person.class)); @@ -45,10 +43,10 @@ void whenDeserializingPersonWhenDeserializedThenResultIsInstanceOfPerson() throw @Test void whenDeserializingPersonWhenDeserializedThenNameIsExpected() throws Exception { - final File file = ResourceUtils.getFile("classpath:person/person.json"); + final var file = ResourceUtils.getFile("classpath:person/person.json"); // When Deserializing Person - final Person result = objectMapper.readValue(file, Person.class); + final var result = objectMapper.readValue(file, Person.class); // Then Name Is Expected assertThat(result.getName(), is(Collections.singletonList("Normal Person"))); @@ -58,10 +56,10 @@ void whenDeserializingPersonWhenDeserializedThenNameIsExpected() throws Exceptio @Test void whenDeserializingPersonWhenDeserializedThenMboxIsExpected() throws Exception { - final File file = ResourceUtils.getFile("classpath:person/person.json"); + final var file = ResourceUtils.getFile("classpath:person/person.json"); // When Deserializing Person - final Person result = objectMapper.readValue(file, Person.class); + final var result = objectMapper.readValue(file, Person.class); // Then Mbox Is Expected assertThat(result.getMbox(), is(Collections.singletonList("normal.person@normal.mail"))); @@ -71,10 +69,10 @@ void whenDeserializingPersonWhenDeserializedThenMboxIsExpected() throws Exceptio @Test void whenDeserializingPersonWhenDeserializedThenShaSumIsExpected() throws Exception { - final File file = ResourceUtils.getFile("classpath:person/person.json"); + final var file = ResourceUtils.getFile("classpath:person/person.json"); // When Deserializing Person - final Person result = objectMapper.readValue(file, Person.class); + final var result = objectMapper.readValue(file, Person.class); // Then ShaSum Is Expected assertThat(result.getMboxSha1sum(), is(Collections.singletonList("123"))); @@ -84,23 +82,24 @@ void whenDeserializingPersonWhenDeserializedThenShaSumIsExpected() throws Except @Test void whenDeserializingPersonWhenDeserializedThenOpenidIsExpected() throws Exception { - final File file = ResourceUtils.getFile("classpath:person/person.json"); + final var file = ResourceUtils.getFile("classpath:person/person.json"); // When Deserializing Person - final Person result = objectMapper.readValue(file, Person.class); + final var result = objectMapper.readValue(file, Person.class); // Then Openid Is Expected - assertThat(result.getOpenid(), is(Collections.singletonList(URI.create("https://example.com")))); + assertThat(result.getOpenid(), + is(Collections.singletonList(URI.create("https://example.com")))); } @Test void whenDeserializingPersonThenAccountIsInstanceOfAccount() throws Exception { - final File file = ResourceUtils.getFile("classpath:person/person.json"); + final var file = ResourceUtils.getFile("classpath:person/person.json"); // When Deserializing Person - final Person result = objectMapper.readValue(file, Person.class); + final var result = objectMapper.readValue(file, Person.class); // Then Account Is Instance Of Account assertThat(result.getAccount().get(0), instanceOf(Account.class)); @@ -110,7 +109,7 @@ void whenDeserializingPersonThenAccountIsInstanceOfAccount() throws Exception { @Test void whenSerializingPersonThenResultIsEqualToExpectedJson() throws IOException { - final Person person = Person.builder() + final var person = Person.builder() .name(Collections.singletonList("Normal Person")) @@ -127,7 +126,7 @@ void whenSerializingPersonThenResultIsEqualToExpectedJson() throws IOException { .build(); // When Serializing Person - final JsonNode result = objectMapper.readTree(objectMapper.writeValueAsString(person)); + final var result = objectMapper.readTree(objectMapper.writeValueAsString(person)); // Then Result Is Equal To Expected Json assertThat(result, @@ -138,11 +137,11 @@ void whenSerializingPersonThenResultIsEqualToExpectedJson() throws IOException { @Test void whenCallingToStringThenResultIsExpected() throws IOException { - final Person person = + final var person = objectMapper.readValue(ResourceUtils.getFile("classpath:person/person.json"), Person.class); // When Calling ToString - final String result = person.toString(); + final var result = person.toString(); // Then Result Is Expected assertThat(result, is( diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/ResultTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/ResultTests.java index c1eae0ab..2127a852 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/ResultTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/ResultTests.java @@ -8,9 +8,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import java.io.File; import java.io.IOException; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -30,10 +28,10 @@ class ResultTests { @Test void whenDeserializingResultThenResultIsInstanceOfResult() throws Exception { - final File file = ResourceUtils.getFile("classpath:result/result.json"); + final var file = ResourceUtils.getFile("classpath:result/result.json"); // When Deserializing Result - final Result result = objectMapper.readValue(file, Result.class); + final var result = objectMapper.readValue(file, Result.class); // Then Result Is Instance Of Result assertThat(result, instanceOf(Result.class)); @@ -43,10 +41,10 @@ void whenDeserializingResultThenResultIsInstanceOfResult() throws Exception { @Test void whenDeserializingResultThenScoreIsInstanceOfScore() throws Exception { - final File file = ResourceUtils.getFile("classpath:result/result.json"); + final var file = ResourceUtils.getFile("classpath:result/result.json"); // When Deserializing Result - final Result result = objectMapper.readValue(file, Result.class); + final var result = objectMapper.readValue(file, Result.class); // Then Score Is Instance Of Score assertThat(result.getScore(), instanceOf(Score.class)); @@ -56,10 +54,10 @@ void whenDeserializingResultThenScoreIsInstanceOfScore() throws Exception { @Test void whenDeserializingResultThenSuccessIsExpected() throws Exception { - final File file = ResourceUtils.getFile("classpath:result/result.json"); + final var file = ResourceUtils.getFile("classpath:result/result.json"); // When Deserializing Result - final Result result = objectMapper.readValue(file, Result.class); + final var result = objectMapper.readValue(file, Result.class); // Then Success Is Expected assertThat(result.getSuccess(), is(true)); @@ -69,10 +67,10 @@ void whenDeserializingResultThenSuccessIsExpected() throws Exception { @Test void whenDeserializingResultThenCompletionIsExpected() throws Exception { - final File file = ResourceUtils.getFile("classpath:result/result.json"); + final var file = ResourceUtils.getFile("classpath:result/result.json"); // When Deserializing Result - final Result result = objectMapper.readValue(file, Result.class); + final var result = objectMapper.readValue(file, Result.class); // Then Completion Is Expected assertThat(result.getCompletion(), is(true)); @@ -82,10 +80,10 @@ void whenDeserializingResultThenCompletionIsExpected() throws Exception { @Test void whenDeserializingResultThenResponseIsExpected() throws Exception { - final File file = ResourceUtils.getFile("classpath:result/result.json"); + final var file = ResourceUtils.getFile("classpath:result/result.json"); // When Deserializing Result - final Result result = objectMapper.readValue(file, Result.class); + final var result = objectMapper.readValue(file, Result.class); // Then Response Is Expected assertThat(result.getResponse(), is("test")); @@ -95,10 +93,10 @@ void whenDeserializingResultThenResponseIsExpected() throws Exception { @Test void whenDeserializingResultThenDurationIsExpected() throws Exception { - final File file = ResourceUtils.getFile("classpath:result/result.json"); + final var file = ResourceUtils.getFile("classpath:result/result.json"); // When Deserializing Result - final Result result = objectMapper.readValue(file, Result.class); + final var result = objectMapper.readValue(file, Result.class); // Then Duration Is Expected assertThat(result.getDuration(), is("P1D")); @@ -108,7 +106,7 @@ void whenDeserializingResultThenDurationIsExpected() throws Exception { @Test void whenSerializingResultThenResultIsEqualToExpectedJson() throws IOException { - final Result resultInstance = Result.builder() + final var resultInstance = Result.builder() .score(s -> s.max(5.0f).min(0.0f).raw(1.0f).scaled(1.0f)) @@ -123,7 +121,7 @@ void whenSerializingResultThenResultIsEqualToExpectedJson() throws IOException { .build(); // When Serializing Result - final JsonNode result = objectMapper.readTree(objectMapper.writeValueAsString(resultInstance)); + final var result = objectMapper.readTree(objectMapper.writeValueAsString(resultInstance)); // Then Result Is Equal To Expected Json assertThat(result, @@ -134,7 +132,7 @@ void whenSerializingResultThenResultIsEqualToExpectedJson() throws IOException { @Test void whenCallingToStringThenResultIsExpected() throws IOException { - final Result resultInstance = Result.builder() + final var resultInstance = Result.builder() .score(s -> s.max(5.0f).min(0.0f).raw(1.0f).scaled(1.0f)) @@ -149,7 +147,7 @@ void whenCallingToStringThenResultIsExpected() throws IOException { .build(); // When Calling ToString - final String result = resultInstance.toString(); + final var result = resultInstance.toString(); // Then Result Is Expected assertThat(result, is( diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/ScoreTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/ScoreTests.java index 2fe023a9..24f25d54 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/ScoreTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/ScoreTests.java @@ -8,9 +8,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import java.io.File; import java.io.IOException; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -30,10 +28,10 @@ class ScoreTests { @Test void whenSerializingScoreThenResultIsInstanceOfScore() throws IOException { - final File file = ResourceUtils.getFile("classpath:score/score.json"); + final var file = ResourceUtils.getFile("classpath:score/score.json"); // When Serializing Score - final Score result = objectMapper.readValue(file, Score.class); + final var result = objectMapper.readValue(file, Score.class); // Then Result Is Instance Of Score assertThat(result, instanceOf(Score.class)); @@ -43,10 +41,10 @@ void whenSerializingScoreThenResultIsInstanceOfScore() throws IOException { @Test void whenSerializingScoreThenScaledIsExpected() throws IOException { - final File file = ResourceUtils.getFile("classpath:score/score.json"); + final var file = ResourceUtils.getFile("classpath:score/score.json"); // When Serializing Score - final Score result = objectMapper.readValue(file, Score.class); + final var result = objectMapper.readValue(file, Score.class); // Then Scaled Is Expected assertThat(result.getScaled(), is(1.0F)); @@ -56,10 +54,10 @@ void whenSerializingScoreThenScaledIsExpected() throws IOException { @Test void whenSerializingScoreThenRawIsExpected() throws IOException { - final File file = ResourceUtils.getFile("classpath:score/score.json"); + final var file = ResourceUtils.getFile("classpath:score/score.json"); // When Serializing Score - final Score result = objectMapper.readValue(file, Score.class); + final var result = objectMapper.readValue(file, Score.class); // Then Raw Is Expected assertThat(result.getRaw(), is(1.0F)); @@ -69,10 +67,10 @@ void whenSerializingScoreThenRawIsExpected() throws IOException { @Test void whenSerializingScoreThenMinIsExpected() throws IOException { - final File file = ResourceUtils.getFile("classpath:score/score.json"); + final var file = ResourceUtils.getFile("classpath:score/score.json"); // When Serializing Score - final Score result = objectMapper.readValue(file, Score.class); + final var result = objectMapper.readValue(file, Score.class); // Then Min Is Expected assertThat(result.getMin(), is(0.0F)); @@ -82,10 +80,10 @@ void whenSerializingScoreThenMinIsExpected() throws IOException { @Test void whenSerializingScoreThenMaxIsExpected() throws IOException { - final File file = ResourceUtils.getFile("classpath:score/score.json"); + final var file = ResourceUtils.getFile("classpath:score/score.json"); // When Serializing Score - final Score result = objectMapper.readValue(file, Score.class); + final var result = objectMapper.readValue(file, Score.class); // Then Max Is Expected assertThat(result.getMax(), is(5.0F)); @@ -95,7 +93,7 @@ void whenSerializingScoreThenMaxIsExpected() throws IOException { @Test void whenSerializingScoreThenResultIsEqualToExpectedJson() throws IOException { - final Score score = Score.builder() + final var score = Score.builder() .max(5.0f) @@ -108,7 +106,7 @@ void whenSerializingScoreThenResultIsEqualToExpectedJson() throws IOException { .build(); // When Serializing Score - final JsonNode result = objectMapper.readTree(objectMapper.writeValueAsString(score)); + final var result = objectMapper.readTree(objectMapper.writeValueAsString(score)); // Then Result Is Equal To Expected Json assertThat(result, @@ -119,11 +117,11 @@ void whenSerializingScoreThenResultIsEqualToExpectedJson() throws IOException { @Test void whenCallingToStringThenResultIsExpected() throws IOException { - final Score score = + final var score = objectMapper.readValue(ResourceUtils.getFile("classpath:score/score.json"), Score.class); // When Calling ToString - final String result = score.toString(); + final var result = score.toString(); // Then Result Is Expected assertThat(result, is("Score(scaled=1.0, raw=1.0, min=0.0, max=5.0)")); diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/StatementFormatTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/StatementFormatTests.java index 498c9c72..72c7d166 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/StatementFormatTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/StatementFormatTests.java @@ -15,7 +15,7 @@ class StatementFormatTests { void whenCallingToStringOnCanonicalEnumResultIsLowerCase() { // When Calling ToString On Canonical Enum - String result = StatementFormat.CANONICAL.toString(); + final var result = StatementFormat.CANONICAL.toString(); // Result Is Lower Case assertThat(result, is("canonical")); @@ -25,7 +25,7 @@ void whenCallingToStringOnCanonicalEnumResultIsLowerCase() { void whenCallingGetFormatOnCanonicalEnumResultIsLowerCase() { // When Calling GetFormat On Canonical Enum - String result = StatementFormat.CANONICAL.getFormat(); + final var result = StatementFormat.CANONICAL.getFormat(); // Result Is Lower Case assertThat(result, is("canonical")); @@ -35,7 +35,7 @@ void whenCallingGetFormatOnCanonicalEnumResultIsLowerCase() { void whenCallingToStringOnExactEnumResultIsLowerCase() { // When Calling ToString On Exact Enum - String result = StatementFormat.EXACT.toString(); + final var result = StatementFormat.EXACT.toString(); // Result Is Lower Case assertThat(result, is("exact")); @@ -45,7 +45,7 @@ void whenCallingToStringOnExactEnumResultIsLowerCase() { void whenCallingGetFormatOnExactEnumResultIsLowerCase() { // When Calling GetFormat On Exact Enum - String result = StatementFormat.EXACT.getFormat(); + final var result = StatementFormat.EXACT.getFormat(); // Result Is Lower Case assertThat(result, is("exact")); @@ -55,7 +55,7 @@ void whenCallingGetFormatOnExactEnumResultIsLowerCase() { void whenCallingToStringOnIdsEnumResultIsLowerCase() { // When Calling ToString On Ids Enum - String result = StatementFormat.IDS.toString(); + final var result = StatementFormat.IDS.toString(); // Result Is Lower Case assertThat(result, is("ids")); @@ -65,7 +65,7 @@ void whenCallingToStringOnIdsEnumResultIsLowerCase() { void whenCallingGetFormatOnIdsEnumResultIsLowerCase() { // When Calling GetFormat On Ids Enum - String result = StatementFormat.IDS.getFormat(); + final var result = StatementFormat.IDS.getFormat(); // Result Is Lower Case assertThat(result, is("ids")); diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/StatementReferenceTest.java b/xapi-model/src/test/java/dev/learning/xapi/model/StatementReferenceTest.java index f711f141..6a59238a 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/StatementReferenceTest.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/StatementReferenceTest.java @@ -9,12 +9,10 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.validation.ConstraintViolation; import jakarta.validation.Validation; import jakarta.validation.Validator; -import java.io.File; import java.io.IOException; import java.util.Set; import java.util.UUID; @@ -39,11 +37,11 @@ class StatementReferenceTest { void whenDeserializingStatementReferenceThenResultIsInstanceOfStatementReference() throws Exception { - final File file = + final var file = ResourceUtils.getFile("classpath:statement_reference/statement_reference.json"); // When Deserializing StatementReference - final StatementReference result = objectMapper.readValue(file, StatementReference.class); + final var result = objectMapper.readValue(file, StatementReference.class); // Then Result Is Instance Of StatementReference assertThat(result, instanceOf(StatementReference.class)); @@ -53,11 +51,11 @@ void whenDeserializingStatementReferenceThenResultIsInstanceOfStatementReference @Test void whenDeserializingStatementReferenceThenIdIsExpected() throws Exception { - final File file = + final var file = ResourceUtils.getFile("classpath:statement_reference/statement_reference.json"); // When Deserializing StatementReference - final StatementReference result = objectMapper.readValue(file, StatementReference.class); + final var result = objectMapper.readValue(file, StatementReference.class); // Then Id Is Expected assertThat(result.getId(), is(UUID.fromString("099bbde8-780e-483f-8181-128393db0f53"))); @@ -67,11 +65,11 @@ void whenDeserializingStatementReferenceThenIdIsExpected() throws Exception { @Test void whenSerializingContextThenResultIsEqualToExpectedJson() throws IOException { - final StatementReference statementReference = StatementReference.builder() + final var statementReference = StatementReference.builder() .id(UUID.fromString("099bbde8-780e-483f-8181-128393db0f53")).build(); // When Serializing Context - final JsonNode result = + final var result = objectMapper.readTree(objectMapper.writeValueAsString(statementReference)); // Then Result Is Equal To Expected Json @@ -83,23 +81,22 @@ void whenSerializingContextThenResultIsEqualToExpectedJson() throws IOException @Test void whenCallingToStringThenResultIsExpected() throws IOException { - final StatementReference statementReference = objectMapper.readValue( + final var statementReference = objectMapper.readValue( ResourceUtils.getFile("classpath:statement_reference/statement_reference.json"), StatementReference.class); // When Calling ToString - final String result = statementReference.toString(); + final var result = statementReference.toString(); // Then Result Is Expected - assertThat(result, - is("StatementReference(id=099bbde8-780e-483f-8181-128393db0f53)")); + assertThat(result, is("StatementReference(id=099bbde8-780e-483f-8181-128393db0f53)")); } @Test void whenValidatingStatementReferenceWithAllRequiredPropertiesThenConstraintViolationsSizeIsZero() { - final StatementReference statementReference = StatementReference.builder() + final var statementReference = StatementReference.builder() .id(UUID.fromString("099bbde8-780e-483f-8181-128393db0f53")).build(); // When Validating Statement Reference With All Required Properties @@ -114,7 +111,7 @@ void whenValidatingStatementReferenceWithAllRequiredPropertiesThenConstraintViol @Test void whenStatementReferenceIsBuiltWithoutIdThenNullPointerIsThrown() { - final StatementReference statementReference = StatementReference.builder().build(); + final var statementReference = StatementReference.builder().build(); // When Validating Statement Reference Without Id final Set> constraintViolations = diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/StatementResultTest.java b/xapi-model/src/test/java/dev/learning/xapi/model/StatementResultTest.java index 63c339ce..71af7999 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/StatementResultTest.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/StatementResultTest.java @@ -9,9 +9,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import java.io.File; import java.io.IOException; import java.net.URI; import java.util.UUID; @@ -34,10 +32,10 @@ class StatementResultTest { @Test void whenDeserializingStatementResultThenResultIsInstanceOfStatementResult() throws Exception { - final File file = ResourceUtils.getFile("classpath:statement_result/statement_result.json"); + final var file = ResourceUtils.getFile("classpath:statement_result/statement_result.json"); // When Deserializing StatementResult - final StatementResult result = objectMapper.readValue(file, StatementResult.class); + final var result = objectMapper.readValue(file, StatementResult.class); // Then Result Is Instance Of StatementResult assertThat(result, instanceOf(StatementResult.class)); @@ -47,10 +45,10 @@ void whenDeserializingStatementResultThenResultIsInstanceOfStatementResult() thr @Test void whenDeserializingStatementResultThenStatementsIsInstanceOfStatement() throws Exception { - final File file = ResourceUtils.getFile("classpath:statement_result/statement_result.json"); + final var file = ResourceUtils.getFile("classpath:statement_result/statement_result.json"); // When Deserializing StatementResult - final StatementResult result = objectMapper.readValue(file, StatementResult.class); + final var result = objectMapper.readValue(file, StatementResult.class); // Then Statements Is Instance Of Statement assertThat(result.getStatements().get(0), instanceOf(Statement.class)); @@ -60,10 +58,10 @@ void whenDeserializingStatementResultThenStatementsIsInstanceOfStatement() throw @Test void whenDeserializingStatementResultThenMoreIsExpected() throws Exception { - final File file = ResourceUtils.getFile("classpath:statement_result/statement_result.json"); + final var file = ResourceUtils.getFile("classpath:statement_result/statement_result.json"); // When Deserializing StatementResult - final StatementResult result = objectMapper.readValue(file, StatementResult.class); + final var result = objectMapper.readValue(file, StatementResult.class); // Then More Is Expected assertThat(result.getMore(), is(URI.create("123"))); @@ -73,7 +71,7 @@ void whenDeserializingStatementResultThenMoreIsExpected() throws Exception { @Test void whenSerializingStatementResultThenResultIsEqualToExpectedJson() throws IOException { - final StatementResult statementResult = StatementResult.builder() + final var statementResult = StatementResult.builder() .addStatement(s -> s.id(UUID.fromString("fd41c918-b88b-4b20-a0a5-a4c32391aaa0"))) @@ -82,7 +80,7 @@ void whenSerializingStatementResultThenResultIsEqualToExpectedJson() throws IOEx .build(); // When Serializing StatementResult - final JsonNode result = objectMapper.readTree(objectMapper.writeValueAsString(statementResult)); + final var result = objectMapper.readTree(objectMapper.writeValueAsString(statementResult)); // Then Result Is Equal To Expected Json assertThat(result, is(objectMapper.readTree( @@ -92,7 +90,7 @@ void whenSerializingStatementResultThenResultIsEqualToExpectedJson() throws IOEx @Test void whenCallingToStringThenResultIsExpected() throws IOException { - final StatementResult statementResult = StatementResult.builder() + final var statementResult = StatementResult.builder() .addStatement(s -> s @@ -105,7 +103,7 @@ void whenCallingToStringThenResultIsExpected() throws IOException { .build(); // When Calling To String - final String result = statementResult.toString(); + final var result = statementResult.toString(); // Then Result Is Expected assertThat(result, is( @@ -118,7 +116,7 @@ void whenCallingToStringThenResultIsExpected() throws IOException { void whenBuildingStatementResultWithTwoStatementsThenStatmentsIsArrayWithSizeTwo() { // When Building StatementResult With Two Statements - final StatementResult statementResult = StatementResult.builder() + final var statementResult = StatementResult.builder() .addStatement(s -> s.id(UUID.fromString("fd41c918-b88b-4b20-a0a5-a4c32391aaa0"))) @@ -137,7 +135,7 @@ void whenBuildingStatementResultWithTwoStatementsThenStatmentsIsArrayWithSizeTwo void whenBuildingStatementResultWithEmptyMoreThenHasMoreIsFalse() { // When Building StatementResult With Empty More - final StatementResult statementResult = StatementResult.builder() + final var statementResult = StatementResult.builder() .more(URI.create("")) @@ -152,7 +150,7 @@ void whenBuildingStatementResultWithEmptyMoreThenHasMoreIsFalse() { void whenBuildingStatementResultWithNullMoreThenHasMoreIsFalse() { // When Building StatementResult With Null More - final StatementResult statementResult = StatementResult.builder() + final var statementResult = StatementResult.builder() .more(null) @@ -167,7 +165,7 @@ void whenBuildingStatementResultWithNullMoreThenHasMoreIsFalse() { void whenBuildingStatementResultWithMoreThenHasMoreIsTrue() { // When Building StatementResult With More - final StatementResult statementResult = StatementResult.builder() + final var statementResult = StatementResult.builder() .more(URI.create("123")) diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/StatementTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/StatementTests.java index bff16ef0..db267d8d 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/StatementTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/StatementTests.java @@ -9,12 +9,10 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.validation.ConstraintViolation; import jakarta.validation.Validation; import jakarta.validation.Validator; -import java.io.File; import java.io.IOException; import java.net.URI; import java.time.Instant; @@ -48,10 +46,10 @@ class StatementTests { @Test void whenDeserializingStatementThenResultIsInstanceOfStatement() throws IOException { - final File file = ResourceUtils.getFile("classpath:statement/statement.json"); + final var file = ResourceUtils.getFile("classpath:statement/statement.json"); // When Deserializing Statement - final Statement result = objectMapper.readValue(file, Statement.class); + final var result = objectMapper.readValue(file, Statement.class); // Then Result Is Instance Of Statement assertThat(result, instanceOf(Statement.class)); @@ -61,10 +59,10 @@ void whenDeserializingStatementThenResultIsInstanceOfStatement() throws IOExcept @Test void whenDeserializingStatementWithIdThenIdIsExpected() throws IOException { - final File file = ResourceUtils.getFile("classpath:statement/statement.json"); + final var file = ResourceUtils.getFile("classpath:statement/statement.json"); // When Deserializing Statement With Id - final Statement result = objectMapper.readValue(file, Statement.class); + final var result = objectMapper.readValue(file, Statement.class); // Then Id Is Expected assertThat(result.getId(), is(UUID.fromString("4b9175ba-367d-4b93-990b-34d4180039f1"))); @@ -74,10 +72,10 @@ void whenDeserializingStatementWithIdThenIdIsExpected() throws IOException { @Test void whenDeserializingStatementWithActorThenActorIsInstanceOfActor() throws Exception { - final File file = ResourceUtils.getFile("classpath:statement/statement.json"); + final var file = ResourceUtils.getFile("classpath:statement/statement.json"); // When Deserializing Statement With Actor - final Statement result = objectMapper.readValue(file, Statement.class); + final var result = objectMapper.readValue(file, Statement.class); // Then Actor Is Instance Of Actor assertThat(result.getActor(), instanceOf(Actor.class)); @@ -87,10 +85,10 @@ void whenDeserializingStatementWithActorThenActorIsInstanceOfActor() throws Exce @Test void whenDeserializingStatementWithVerbThenVerbIsInstanceOfVerb() throws Exception { - final File file = ResourceUtils.getFile("classpath:statement/statement.json"); + final var file = ResourceUtils.getFile("classpath:statement/statement.json"); // When Deserializing Statement With Verb - final Statement result = objectMapper.readValue(file, Statement.class); + final var result = objectMapper.readValue(file, Statement.class); // Then Verb Is Instance Of Verb assertThat(result.getVerb(), instanceOf(Verb.class)); @@ -101,10 +99,10 @@ void whenDeserializingStatementWithVerbThenVerbIsInstanceOfVerb() throws Excepti void whenDeserializingStatementWithObjectThenObjectIsInstanceOfStatementObject() throws Exception { - final File file = ResourceUtils.getFile("classpath:statement/statement.json"); + final var file = ResourceUtils.getFile("classpath:statement/statement.json"); // When Deserializing Statement With Object - final Statement result = objectMapper.readValue(file, Statement.class); + final var result = objectMapper.readValue(file, Statement.class); // Then Object Is Instance Of StatementObject assertThat(result.getObject(), instanceOf(StatementObject.class)); @@ -114,10 +112,10 @@ void whenDeserializingStatementWithObjectThenObjectIsInstanceOfStatementObject() @Test void whenDeserializingStatementWithResultThenResultIsInstanceOfResult() throws Exception { - final File file = ResourceUtils.getFile("classpath:statement/statement.json"); + final var file = ResourceUtils.getFile("classpath:statement/statement.json"); // When Deserializing Statement With Result - final Statement result = objectMapper.readValue(file, Statement.class); + final var result = objectMapper.readValue(file, Statement.class); // Then Result Is Instance Of Result assertThat(result.getResult(), instanceOf(Result.class)); @@ -127,10 +125,10 @@ void whenDeserializingStatementWithResultThenResultIsInstanceOfResult() throws E @Test void whenDeserializingStatementWithContextThenContextIsInstanceOfContext() throws Exception { - final File file = ResourceUtils.getFile("classpath:statement/statement.json"); + final var file = ResourceUtils.getFile("classpath:statement/statement.json"); // When Deserializing Statement With Context - final Statement result = objectMapper.readValue(file, Statement.class); + final var result = objectMapper.readValue(file, Statement.class); // Then Context Is Instance Of Context assertThat(result.getContext(), instanceOf(Context.class)); @@ -140,10 +138,10 @@ void whenDeserializingStatementWithContextThenContextIsInstanceOfContext() throw @Test void whenDeserializingStatementWithTimestampThenTimestampIsExpected() throws Exception { - final File file = ResourceUtils.getFile("classpath:statement/statement.json"); + final var file = ResourceUtils.getFile("classpath:statement/statement.json"); // When Deserializing Statement With Timestamp - final Statement result = objectMapper.readValue(file, Statement.class); + final var result = objectMapper.readValue(file, Statement.class); // Then Timestamp Is Expected assertThat(result.getTimestamp().toString(), is("2013-05-18T05:32:34.804Z")); @@ -153,10 +151,10 @@ void whenDeserializingStatementWithTimestampThenTimestampIsExpected() throws Exc @Test void whenDeserializingStatementWithStoredThenStoredIsExpected() throws Exception { - final File file = ResourceUtils.getFile("classpath:statement/statement.json"); + final var file = ResourceUtils.getFile("classpath:statement/statement.json"); // When Deserializing Statement With Stored - final Statement result = objectMapper.readValue(file, Statement.class); + final var result = objectMapper.readValue(file, Statement.class); // Then Stored Is Expected assertThat(result.getStored().toString(), is("2013-05-18T05:32:34.804Z")); @@ -166,10 +164,10 @@ void whenDeserializingStatementWithStoredThenStoredIsExpected() throws Exception @Test void whenDeserializedStatementWithAuthorityThenAuthorityIsInstanceOfActor() throws Exception { - final File file = ResourceUtils.getFile("classpath:statement/statement.json"); + final var file = ResourceUtils.getFile("classpath:statement/statement.json"); // When Deserialized Statement With Authority - final Statement result = objectMapper.readValue(file, Statement.class); + final var result = objectMapper.readValue(file, Statement.class); // Then Authority Is Instance Of Actor assertThat(result.getAuthority(), instanceOf(Actor.class)); @@ -179,10 +177,10 @@ void whenDeserializedStatementWithAuthorityThenAuthorityIsInstanceOfActor() thro @Test void whenDeserializingStatementWithVersionThenVersionIsExpected() throws Exception { - final File file = ResourceUtils.getFile("classpath:statement/statement.json"); + final var file = ResourceUtils.getFile("classpath:statement/statement.json"); // When Deserializing Statement With Version - final Statement result = objectMapper.readValue(file, Statement.class); + final var result = objectMapper.readValue(file, Statement.class); // Then Version Is Expected assertThat(result.getVersion(), is("1.0.0")); @@ -193,10 +191,10 @@ void whenDeserializingStatementWithVersionThenVersionIsExpected() throws Excepti void whenDeserializingStatementWithAttachmentsThenAttachmentsIsInstanceOfAttachment() throws Exception { - final File file = ResourceUtils.getFile("classpath:statement/statement.json"); + final var file = ResourceUtils.getFile("classpath:statement/statement.json"); // When Deserializing Statement With Attachments - final Statement result = objectMapper.readValue(file, Statement.class); + final var result = objectMapper.readValue(file, Statement.class); // Then Attachments Is Instance Of Attachment assertThat(result.getAttachments().get(0), instanceOf(Attachment.class)); @@ -208,7 +206,7 @@ void whenDeserializingStatementWithAttachmentsThenAttachmentsIsInstanceOfAttachm void whenSerializingStatementWithAgentWithAccountThenResultIsEqualToExpectedJson() throws IOException { - final Statement statement = Statement.builder() + final var statement = Statement.builder() .actor(a -> a.account( acc -> acc.name("A N Other").homePage(URI.create("https://example.com/account/1234")))) @@ -220,7 +218,7 @@ void whenSerializingStatementWithAgentWithAccountThenResultIsEqualToExpectedJson .build(); // when Serializing Statement With Agent With Account - final JsonNode result = objectMapper.readTree(objectMapper.writeValueAsString(statement)); + final var result = objectMapper.readTree(objectMapper.writeValueAsString(statement)); // Then Result Is Equal To Expected Json assertThat(result, @@ -233,11 +231,11 @@ void whenSerializingStatementWithAgentWithAccountThenResultIsEqualToExpectedJson @Test void whenSerializingStatementThenResultIsEqualToExpectedJson() throws IOException { - final LinkedHashMap extensions = new LinkedHashMap<>(); + final var extensions = new LinkedHashMap(); extensions.put(URI.create("http://name"), "Kilby"); - final Attachment attachment = Attachment.builder().usageType(URI.create("http://example.com")) + final var attachment = Attachment.builder().usageType(URI.create("http://example.com")) .fileUrl(URI.create("http://example.com")) .addDisplay(Locale.US, "value") @@ -252,7 +250,7 @@ void whenSerializingStatementThenResultIsEqualToExpectedJson() throws IOExceptio .build(); - final Account account = Account.builder() + final var account = Account.builder() .homePage(URI.create("https://example.com")) @@ -261,7 +259,7 @@ void whenSerializingStatementThenResultIsEqualToExpectedJson() throws IOExceptio .build(); - final Statement statement = Statement.builder() + final var statement = Statement.builder() .id(UUID.fromString("4b9175ba-367d-4b93-990b-34d4180039f1")) @@ -315,7 +313,7 @@ void whenSerializingStatementThenResultIsEqualToExpectedJson() throws IOExceptio .build(); // When Serializing Statement - final JsonNode result = objectMapper.readTree(objectMapper.writeValueAsString(statement)); + final var result = objectMapper.readTree(objectMapper.writeValueAsString(statement)); // Then Result Is Equal To Expected Json assertThat(result, @@ -327,10 +325,10 @@ void whenSerializingStatementThenResultIsEqualToExpectedJson() throws IOExceptio @Test void whenSerializingStatementWithEnLocaleThenResultIsEqualToExpectedJson() throws IOException { - final LinkedHashMap extensions = new LinkedHashMap<>(); + final var extensions = new LinkedHashMap(); extensions.put(URI.create("http://name"), "Kilby"); - final Attachment attachment = Attachment.builder().usageType(URI.create("http://example.com")) + final var attachment = Attachment.builder().usageType(URI.create("http://example.com")) .fileUrl(URI.create("http://example.com")) .addDisplay(Locale.ENGLISH, "value") @@ -345,7 +343,7 @@ void whenSerializingStatementWithEnLocaleThenResultIsEqualToExpectedJson() throw .build(); - final Account account = Account.builder() + final var account = Account.builder() .homePage(URI.create("https://example.com")) @@ -354,7 +352,7 @@ void whenSerializingStatementWithEnLocaleThenResultIsEqualToExpectedJson() throw .build(); - final Statement statement = Statement.builder() + final var statement = Statement.builder() .id(UUID.fromString("4b9175ba-367d-4b93-990b-34d4180039f1")) @@ -408,7 +406,7 @@ void whenSerializingStatementWithEnLocaleThenResultIsEqualToExpectedJson() throw .build(); // When Serializing Statement With En Locale - final JsonNode result = objectMapper.readTree(objectMapper.writeValueAsString(statement)); + final var result = objectMapper.readTree(objectMapper.writeValueAsString(statement)); // Then Result Is Equal To Expected Json assertThat(result, @@ -422,7 +420,7 @@ void whenSerializingStatementWithEnLocaleThenResultIsEqualToExpectedJson() throw void givenStatementWithPassedVerbWhenCallingToBuilderAndSettingVerbToCompletedThenResultVerbIsCompleted() { // Given Statement With Passed Verb - final Statement passed = Statement.builder() + final var passed = Statement.builder() .actor(a -> a.name("A N Other")) @@ -434,7 +432,7 @@ void givenStatementWithPassedVerbWhenCallingToBuilderAndSettingVerbToCompletedTh // When Calling ToBuilder And Setting Verb To Completed - Statement result = passed.toBuilder() + final var result = passed.toBuilder() .verb(Verb.COMPLETED) @@ -449,7 +447,7 @@ void givenStatementWithPassedVerbWhenCallingToBuilderAndSettingVerbToCompletedTh void WhenCallingToBuilderAndSettingVerbToCompletedThenResultVerbIsCompleted() { // When Building Statement With Statement Reference Object - final Statement statement = Statement.builder() + final var statement = Statement.builder() .actor(a -> a.name("A N Other")) @@ -468,7 +466,7 @@ void WhenCallingToBuilderAndSettingVerbToCompletedThenResultVerbIsCompleted() { @Test void whenValidatingStatementWithAllRequiredPropertiesThenConstraintViolationsSizeIsZero() { - final Statement statement = Statement.builder() + final var statement = Statement.builder() .actor(a -> a.name("A N Other").mbox("mailto:another@example.com")) @@ -489,7 +487,7 @@ void whenValidatingStatementWithAllRequiredPropertiesThenConstraintViolationsSiz @Test void whenValidatingStatementWithoutActorThenConstraintViolationsSizeIsOne() { - final Statement statement = Statement.builder() + final var statement = Statement.builder() .verb(Verb.EXPERIENCED) @@ -508,7 +506,7 @@ void whenValidatingStatementWithoutActorThenConstraintViolationsSizeIsOne() { @Test void whenValidatingStatementWithoutAVerbThenConstraintViolationsSizeIsOne() { - final Statement statement = Statement.builder() + final var statement = Statement.builder() .actor(a -> a.name("A N Other").mbox("mailto:another@example.com")) @@ -527,7 +525,7 @@ void whenValidatingStatementWithoutAVerbThenConstraintViolationsSizeIsOne() { @Test void whenValidatingStatementWithoutAnActivityThenConstraintViolationsSizeIsOne() { - final Statement statement = Statement.builder() + final var statement = Statement.builder() .actor(a -> a.name("A N Other").mbox("mailto:another@example.com")) @@ -546,10 +544,10 @@ void whenValidatingStatementWithoutAnActivityThenConstraintViolationsSizeIsOne() @Test void whenValidatingStatementWithSubStatementWithStatementReferenceThenConstraintViolationsSizeIsZero() { - StatementReference statementRef = StatementReference.builder() + final var statementRef = StatementReference.builder() .id(UUID.fromString("9e13cefd-53d3-4eac-b5ed-2cf6693903bb")).build(); - SubStatement subStatement = SubStatement.builder() + final var subStatement = SubStatement.builder() .actor(a -> a.name("A N Other").mbox("mailto:another@example.com")) @@ -559,7 +557,7 @@ void whenValidatingStatementWithSubStatementWithStatementReferenceThenConstraint .build(); - final Statement statement = Statement.builder() + final var statement = Statement.builder() .actor(a -> a.name("A N Other").mbox("mailto:another@example.com")) @@ -579,12 +577,12 @@ void whenValidatingStatementWithSubStatementWithStatementReferenceThenConstraint @Test void whenBuildingStatementWithTwoAttachmentsThenAttachmentsHasTwoEntries() { - + // When Building Statement With Two Attachments - final LinkedHashMap extensions = new LinkedHashMap<>(); + final var extensions = new LinkedHashMap(); extensions.put(URI.create("http://name"), "Kilby"); - final Attachment attachment = Attachment.builder().usageType(URI.create("http://example.com")) + final var attachment = Attachment.builder().usageType(URI.create("http://example.com")) .fileUrl(URI.create("http://example.com")) .addDisplay(Locale.ENGLISH, "value") @@ -599,7 +597,7 @@ void whenBuildingStatementWithTwoAttachmentsThenAttachmentsHasTwoEntries() { .build(); - final Account account = Account.builder() + final var account = Account.builder() .homePage(URI.create("https://example.com")) @@ -608,7 +606,7 @@ void whenBuildingStatementWithTwoAttachmentsThenAttachmentsHasTwoEntries() { .build(); - final Statement statement = Statement.builder() + final var statement = Statement.builder() .id(UUID.fromString("4b9175ba-367d-4b93-990b-34d4180039f1")) @@ -657,8 +655,8 @@ void whenBuildingStatementWithTwoAttachmentsThenAttachmentsHasTwoEntries() { .addAttachment(attachment) - .addAttachment(a-> a.usageType(URI.create("http://example.com")) - + .addAttachment(a -> a.usageType(URI.create("http://example.com")) + .fileUrl(URI.create("http://example.com/2")) .addDisplay(Locale.ENGLISH, "value2") @@ -672,11 +670,11 @@ void whenBuildingStatementWithTwoAttachmentsThenAttachmentsHasTwoEntries() { .contentType("file") ) - + .version("1.0.0") .build(); - + // Then Attachments Has Two Entries assertThat(statement.getAttachments(), hasSize(2)); diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/SubStatementTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/SubStatementTests.java index c5e8c560..248fbaec 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/SubStatementTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/SubStatementTests.java @@ -9,9 +9,7 @@ import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertThrows; -import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import java.io.File; import java.io.IOException; import java.net.URI; import java.time.Instant; @@ -38,10 +36,10 @@ class SubStatementTests { @Test void whenDeserializingSubStatementThenResultIsInstanceOfSubStatement() throws IOException { - final File file = ResourceUtils.getFile("classpath:sub_statement/sub_statement.json"); + final var file = ResourceUtils.getFile("classpath:sub_statement/sub_statement.json"); // When Deserializing SubStatement - final SubStatement result = objectMapper.readValue(file, SubStatement.class); + final var result = objectMapper.readValue(file, SubStatement.class); // Then Result Is Instance Of SubStatement assertThat(result, instanceOf(SubStatement.class)); @@ -51,10 +49,10 @@ void whenDeserializingSubStatementThenResultIsInstanceOfSubStatement() throws IO @Test void whenDeserializingSubStatementThenTimestampIsExpected() throws IOException { - final File file = ResourceUtils.getFile("classpath:sub_statement/sub_statement.json"); + final var file = ResourceUtils.getFile("classpath:sub_statement/sub_statement.json"); // When Deserializing SubStatement - final SubStatement result = objectMapper.readValue(file, SubStatement.class); + final var result = objectMapper.readValue(file, SubStatement.class); // Then Timestamp Is Expected assertThat(result.getTimestamp(), is(Instant.parse("2015-11-18T11:17:00Z"))); @@ -64,10 +62,10 @@ void whenDeserializingSubStatementThenTimestampIsExpected() throws IOException { @Test void whenDeserializingSubStatementThenVerbIsInstanceOfVerb() throws IOException { - final File file = ResourceUtils.getFile("classpath:sub_statement/sub_statement.json"); + final var file = ResourceUtils.getFile("classpath:sub_statement/sub_statement.json"); // When Deserializing SubStatement - final SubStatement result = objectMapper.readValue(file, SubStatement.class); + final var result = objectMapper.readValue(file, SubStatement.class); // Then Verb Is Instance Of Verb assertThat(result.getVerb(), instanceOf(Verb.class)); @@ -77,10 +75,10 @@ void whenDeserializingSubStatementThenVerbIsInstanceOfVerb() throws IOException @Test void whenDeserializingSubStatementThenObjectIsInstanceOfStatementReference() throws IOException { - final File file = ResourceUtils.getFile("classpath:sub_statement/sub_statement.json"); + final var file = ResourceUtils.getFile("classpath:sub_statement/sub_statement.json"); // When Deserializing SubStatement - final SubStatement result = objectMapper.readValue(file, SubStatement.class); + final var result = objectMapper.readValue(file, SubStatement.class); // Then Object Is Instance Of StatementReference assertThat(result.getObject(), instanceOf(StatementReference.class)); @@ -90,10 +88,10 @@ void whenDeserializingSubStatementThenObjectIsInstanceOfStatementReference() thr @Test void whenDeserializingSubStatementThenResultIsInstanceOfResult() throws IOException { - final File file = ResourceUtils.getFile("classpath:sub_statement/sub_statement.json"); + final var file = ResourceUtils.getFile("classpath:sub_statement/sub_statement.json"); // When Deserializing SubStatement - final SubStatement result = objectMapper.readValue(file, SubStatement.class); + final var result = objectMapper.readValue(file, SubStatement.class); // Then Result Is Instance Of Result assertThat(result.getResult(), instanceOf(Result.class)); @@ -103,10 +101,10 @@ void whenDeserializingSubStatementThenResultIsInstanceOfResult() throws IOExcept @Test void whenDeserializingSubStatementThenContextIsInstanceOfContext() throws IOException { - final File file = ResourceUtils.getFile("classpath:sub_statement/sub_statement.json"); + final var file = ResourceUtils.getFile("classpath:sub_statement/sub_statement.json"); // When Deserializing SubStatement - final SubStatement result = objectMapper.readValue(file, SubStatement.class); + final var result = objectMapper.readValue(file, SubStatement.class); // Then Context Is Instance Of Context assertThat(result.getContext(), instanceOf(Context.class)); @@ -116,10 +114,10 @@ void whenDeserializingSubStatementThenContextIsInstanceOfContext() throws IOExce @Test void whenDeserializingSubStatementThenActorIsInstanceOfActor() throws IOException { - final File file = ResourceUtils.getFile("classpath:sub_statement/sub_statement.json"); + final var file = ResourceUtils.getFile("classpath:sub_statement/sub_statement.json"); // When Deserializing SubStatement - final SubStatement result = objectMapper.readValue(file, SubStatement.class); + final var result = objectMapper.readValue(file, SubStatement.class); // Then Actor Is Instance Of Actor assertThat(result.getActor(), instanceOf(Actor.class)); @@ -129,10 +127,10 @@ void whenDeserializingSubStatementThenActorIsInstanceOfActor() throws IOExceptio @Test void whenDeserializingSubStatementThenAttachmentsIsInstanceOfAttachment() throws IOException { - final File file = ResourceUtils.getFile("classpath:sub_statement/sub_statement.json"); + final var file = ResourceUtils.getFile("classpath:sub_statement/sub_statement.json"); // When Deserializing SubStatement - final SubStatement result = objectMapper.readValue(file, SubStatement.class); + final var result = objectMapper.readValue(file, SubStatement.class); // Then Attachments Is Instance Of Attachment assertThat(result.getAttachments().get(0), instanceOf(Attachment.class)); @@ -143,7 +141,7 @@ void whenDeserializingSubStatementThenAttachmentsIsInstanceOfAttachment() throws void whenDeserializingSubStatementWithObjectOfTypeSubStatementThenExceptionIsThrown() throws IOException { - final File file = ResourceUtils + final var file = ResourceUtils .getFile("classpath:sub_statement/sub_statement_with_object_of_type_sub_statement.json"); assertThrows(Exception.class, () -> { @@ -160,11 +158,11 @@ void whenDeserializingSubStatementWithObjectOfTypeSubStatementThenExceptionIsThr void whenDeserializingSubStatementWithObjectOfTypeActivityThenObjectIsInstanceOfActivity() throws IOException { - final File file = ResourceUtils + final var file = ResourceUtils .getFile("classpath:sub_statement/sub_statement_with_object_of_type_activity.json"); // when Deserializing SubStatement With Object Of Type Activity - final SubStatement result = objectMapper.readValue(file, SubStatement.class); + final var result = objectMapper.readValue(file, SubStatement.class); // Then Object Is Instance Of Activity assertThat(result.getObject(), instanceOf(Activity.class)); @@ -175,11 +173,11 @@ void whenDeserializingSubStatementWithObjectOfTypeActivityThenObjectIsInstanceOf void whenDeserializingSubStatementWithObjectOfTypeAgentThenObjectIsInstanceOfAgentThenObjectIsInstanceOfAgent() throws IOException { - final File file = ResourceUtils + final var file = ResourceUtils .getFile("classpath:sub_statement/sub_statement_with_object_of_type_agent.json"); // When Deserializing SubStatement With Object Of Type Agent - final SubStatement result = objectMapper.readValue(file, SubStatement.class); + final var result = objectMapper.readValue(file, SubStatement.class); // Then Object Is Instance Of Agent assertThat(result.getObject(), instanceOf(Agent.class)); @@ -190,11 +188,11 @@ void whenDeserializingSubStatementWithObjectOfTypeAgentThenObjectIsInstanceOfAge void whenDeserializingSubStatementWithObjectOfTypeGroupThenObjectIsInstanceOfGroup() throws IOException { - final File file = ResourceUtils + final var file = ResourceUtils .getFile("classpath:sub_statement/sub_statement_with_object_of_type_group.json"); // When Deserializing SubStatement With Object Of Type Group - final SubStatement result = objectMapper.readValue(file, SubStatement.class); + final var result = objectMapper.readValue(file, SubStatement.class); // Then Object Is Instance Of Group @@ -207,11 +205,11 @@ void whenDeserializingSubStatementWithObjectOfTypeGroupThenObjectIsInstanceOfGro void whenDeserializingSubStatementWithObjectOfTypeStatementReferenceThenObjectIsInstanceOfStatementReference() throws IOException { - final File file = ResourceUtils.getFile( + final var file = ResourceUtils.getFile( "classpath:sub_statement/sub_statement_with_object_of_type_statement_reference.json"); // When Deserializing SubStatement With Object Of Type StatementReference - final SubStatement result = objectMapper.readValue(file, SubStatement.class); + final var result = objectMapper.readValue(file, SubStatement.class); // Then Object Is Instance Of StatementReference @@ -228,10 +226,10 @@ void whenSerializingSubStatementThenResultIsEqualToExpectedJson() throws IOExcep final Group group = Group.builder().name("Example Group").build(); - final StatementReference statementRef = StatementReference.builder() + final var statementRef = StatementReference.builder() .id(UUID.fromString("9e13cefd-53d3-4eac-b5ed-2cf6693903bb")).build(); - final Score score = Score.builder() + final var score = Score.builder() .max(5.0f) @@ -243,7 +241,7 @@ void whenSerializingSubStatementThenResultIsEqualToExpectedJson() throws IOExcep .build(); - final Result resultInstance = Result.builder() + final var resultInstance = Result.builder() .score(score) @@ -257,10 +255,10 @@ void whenSerializingSubStatementThenResultIsEqualToExpectedJson() throws IOExcep .build(); - final Activity activity = + final var activity = Activity.builder().id(URI.create("http://www.example.co.uk/exampleactivity")).build(); - final ContextActivities contextActivities = ContextActivities.builder() + final var contextActivities = ContextActivities.builder() .parent(Collections.singletonList(activity)) @@ -270,10 +268,10 @@ void whenSerializingSubStatementThenResultIsEqualToExpectedJson() throws IOExcep .other(Collections.singletonList(activity)).build(); - final LinkedHashMap extensions = new LinkedHashMap<>(); + final var extensions = new LinkedHashMap(); extensions.put(URI.create("http://url"), "www.example.com"); - final Context context = Context.builder() + final var context = Context.builder() .registration(UUID.fromString("6d969975-8d7e-4506-ac19-877c57f2921a")) @@ -295,7 +293,7 @@ void whenSerializingSubStatementThenResultIsEqualToExpectedJson() throws IOExcep .build(); - final Attachment attachment = Attachment.builder().usageType(URI.create("http://example.com")) + final var attachment = Attachment.builder().usageType(URI.create("http://example.com")) .fileUrl(URI.create("http://example.com")) .addDisplay(Locale.US, "value") @@ -310,7 +308,7 @@ void whenSerializingSubStatementThenResultIsEqualToExpectedJson() throws IOExcep .build(); - final SubStatement subStatement = SubStatement.builder() + final var subStatement = SubStatement.builder() .timestamp(Instant.parse("2015-11-18T11:17:00Z")) @@ -326,9 +324,9 @@ void whenSerializingSubStatementThenResultIsEqualToExpectedJson() throws IOExcep .context(context) .addAttachment(attachment) - - .addAttachment(a->a.usageType(URI.create("http://example.com")) - + + .addAttachment(a -> a.usageType(URI.create("http://example.com")) + .fileUrl(URI.create("http://example.com")) .addDisplay(Locale.ENGLISH, "value") @@ -344,7 +342,7 @@ void whenSerializingSubStatementThenResultIsEqualToExpectedJson() throws IOExcep .build(); // When Serializing SubStatement - final JsonNode result = objectMapper.readTree(objectMapper.writeValueAsString(subStatement)); + final var result = objectMapper.readTree(objectMapper.writeValueAsString(subStatement)); // Then Result Is Equal To Expected Json assertThat(result, @@ -358,11 +356,11 @@ void whenSerializingSubStatementThenResultIsEqualToExpectedJson() throws IOExcep @Test void whenCallingToStringThenResultIsExpected() throws IOException { - final SubStatement subStatement = objectMapper.readValue( + final var subStatement = objectMapper.readValue( ResourceUtils.getFile("classpath:sub_statement/sub_statement.json"), SubStatement.class); // When Calling ToString - final String result = subStatement.toString(); + final var result = subStatement.toString(); // Then Result Is Expected assertThat(result, is( diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/VerbTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/VerbTests.java index c99afb88..2d0de8d7 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/VerbTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/VerbTests.java @@ -11,12 +11,10 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; -import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.validation.ConstraintViolation; import jakarta.validation.Validation; import jakarta.validation.Validator; -import java.io.File; import java.io.IOException; import java.net.URI; import java.util.Locale; @@ -45,10 +43,10 @@ class VerbTests { @Test void whenDeserializingVerbThenResultIsInstanceOfVerb() throws IOException { - final File file = ResourceUtils.getFile("classpath:verb/verb.json"); + final var file = ResourceUtils.getFile("classpath:verb/verb.json"); // When Deserializing Verb - final Verb result = objectMapper.readValue(file, Verb.class); + final var result = objectMapper.readValue(file, Verb.class); // Then Result Is Instance Of Verb assertThat(result, instanceOf(Verb.class)); @@ -58,10 +56,10 @@ void whenDeserializingVerbThenResultIsInstanceOfVerb() throws IOException { @Test void whenDeserializingVerbThenIdIsExpected() throws IOException { - final File file = ResourceUtils.getFile("classpath:verb/verb.json"); + final var file = ResourceUtils.getFile("classpath:verb/verb.json"); // When Deserializing Verb - final Verb result = objectMapper.readValue(file, Verb.class); + final var result = objectMapper.readValue(file, Verb.class); // Then Id Is Expected assertThat(result.getId(), is(URI.create("http://adlnet.gov/expapi/verbs/answered"))); @@ -75,7 +73,7 @@ void whenDeserializingVerbThenIdIsExpected() throws IOException { @Test void whenSerializingVerbThenResultIsEqualToExpectedJson() throws IOException { - final Verb verb = Verb.builder() + final var verb = Verb.builder() .id(URI.create("http://adlnet.gov/expapi/verbs/answered")) @@ -84,7 +82,7 @@ void whenSerializingVerbThenResultIsEqualToExpectedJson() throws IOException { .build(); // When Serializing Verb - final JsonNode result = objectMapper.readTree(objectMapper.writeValueAsString(verb)); + final var result = objectMapper.readTree(objectMapper.writeValueAsString(verb)); // Then Result Is Equal To Expected Json assertThat(result, @@ -97,14 +95,14 @@ void whenSerializingVerbThenResultIsEqualToExpectedJson() throws IOException { @Test void whenSerializingVerbWithoutDisplayThenResultIsEqualToExpectedJson() throws IOException { - final Verb verb = Verb.builder() + final var verb = Verb.builder() .id(URI.create("http://adlnet.gov/expapi/verbs/answered")) .build(); // When Serializing Verb Without Display - final JsonNode result = objectMapper.readTree(objectMapper.writeValueAsString(verb)); + final var result = objectMapper.readTree(objectMapper.writeValueAsString(verb)); // Then Result Is Equal To Expected Json assertThat(result, is( @@ -121,11 +119,11 @@ void whenSerializingVerbWithoutDisplayThenResultIsEqualToExpectedJson() throws I @Test void whenCallingToStringThenResultIsExpected() throws IOException { - final Verb verb = + final var verb = objectMapper.readValue(ResourceUtils.getFile("classpath:verb/verb.json"), Verb.class); // When Calling ToString - final String result = verb.toString(); + final var result = verb.toString(); // Then Result Is Expected assertThat(result, @@ -141,7 +139,7 @@ void whenCallingToStringThenResultIsExpected() throws IOException { void givenVerbIsConstructedWithIdAndNameWhenGettingDisplayForLocaleUNDThenResultIsExpected() { // Given Verb Is Constructed With Id And Name - final Verb verb = new Verb("http://adlnet.gov/expapi/verbs/answered", "answered"); + final var verb = new Verb("http://adlnet.gov/expapi/verbs/answered", "answered"); // When Getting Display For Locale UND final var result = verb.getDisplay().get(Locale.forLanguageTag("UND")); @@ -154,7 +152,7 @@ void givenVerbIsConstructedWithIdAndNameWhenGettingDisplayForLocaleUNDThenResult void givenVerbIsConstructedWithIdAndNameWhenGettingIdThenIdIsExpected() { // Given Verb Is Constructed With Id And Name - final Verb verb = new Verb("http://adlnet.gov/expapi/verbs/answered", "answered"); + final var verb = new Verb("http://adlnet.gov/expapi/verbs/answered", "answered"); // When Getting Id final var result = verb.getId(); @@ -167,7 +165,7 @@ void givenVerbIsConstructedWithIdAndNameWhenGettingIdThenIdIsExpected() { void givenVerbIsConstructedWithIdWhenGettingIdThenIdIsExpected() { // Given Verb Is Constructed With Id - final Verb verb = new Verb("http://adlnet.gov/expapi/verbs/answered"); + final var verb = new Verb("http://adlnet.gov/expapi/verbs/answered"); // When Getting Id final var result = verb.getId(); @@ -184,7 +182,7 @@ void givenVerbIsConstructedWithIdWhenGettingIdThenIdIsExpected() { void whenBuildingVerbWithTwoDisplayValuesThenDisplayLanguageMapHasTwoEntries() { // When Building Verb With Two Display Values - final Verb verb = Verb.builder() + final var verb = Verb.builder() .id("http://adlnet.gov/expapi/verbs/answered") @@ -207,14 +205,14 @@ void whenBuildingVerbWithTwoDisplayValuesThenDisplayLanguageMapHasTwoEntries() { void givenVerbWithoutDisplayPropertyWhenTestingEqualityWithVerbWithDisplayPropertyThenVerbsAreEqual() { // Given Verb Without Display Property - final Verb verb = Verb.builder() + final var verb = Verb.builder() .id(URI.create("http://adlnet.gov/expapi/verbs/answered")) .build(); // When Testing Equality With Verb With Display Property - final boolean result = verb.equals(Verb.builder() + final var result = verb.equals(Verb.builder() .id("http://adlnet.gov/expapi/verbs/answered") @@ -231,7 +229,7 @@ void givenVerbWithoutDisplayPropertyWhenTestingEqualityWithVerbWithDisplayProper void givenVerbWithGermanDisplayPropertyWhenTestingEqualityWithVerbWithEnglishDisplayPropertyThenVerbsAreEqual() { // Given Verb With German Display Property - final Verb verb = Verb.builder() + final var verb = Verb.builder() .id("http://adlnet.gov/expapi/verbs/answered") @@ -240,7 +238,7 @@ void givenVerbWithGermanDisplayPropertyWhenTestingEqualityWithVerbWithEnglishDis .build(); // When Testing Equality With Verb With English Display Property - final boolean result = verb.equals(Verb.builder() + final var result = verb.equals(Verb.builder() .id("http://adlnet.gov/expapi/verbs/answered") @@ -257,14 +255,14 @@ void givenVerbWithGermanDisplayPropertyWhenTestingEqualityWithVerbWithEnglishDis void givenVerbWithIdWhenTestingEqualityWithVerbWithDifferentIdThenVerbsAreNotEqual() { // Given Verb With Id - final Verb verb = Verb.builder() + final var verb = Verb.builder() .id("http://adlnet.gov/expapi/verbs/answered") .build(); // When Testing Equality With Verb With Different Id - final boolean result = verb.equals(Verb.builder() + final var result = verb.equals(Verb.builder() .id("http://adlnet.gov/expapi/verbs/interacted") @@ -283,14 +281,14 @@ void givenVerbWithIdWhenTestingEqualityWithVerbWithDifferentIdThenVerbsAreNotEqu void givenVerbHasIdVoidedWhenCallingIsVoidedThenResultIsTrue() { // Given Verb Has Id Voided - final Verb verb = (Verb.builder() + final var verb = (Verb.builder() .id("http://adlnet.gov/expapi/verbs/voided") .build()); // When Calling isVoided - final boolean result = verb.isVoided(); + final var result = verb.isVoided(); // Then Result Is True assertThat(result, is(true)); @@ -301,14 +299,14 @@ void givenVerbHasIdVoidedWhenCallingIsVoidedThenResultIsTrue() { void givenVerbDoesNotHaveIdVoidedWhenCallingIsVoidedThenResultIsFalse() { // Given Verb Does Not Have Id Voided - final Verb verb = (Verb.builder() + final var verb = (Verb.builder() .id("http://adlnet.gov/expapi/verbs/answered") .build()); // When Calling isVoided - final boolean result = verb.isVoided(); + final var result = verb.isVoided(); // Then Result Is False assertThat(result, is(false)); @@ -318,7 +316,7 @@ void givenVerbDoesNotHaveIdVoidedWhenCallingIsVoidedThenResultIsFalse() { @Test void whenValidatingVerbWithAllRequiredPropertiesThenConstraintViolationsSizeIsZero() { - final Verb verb = Verb.builder().id("http://adlnet.gov/expapi/verbs/answered") + final var verb = Verb.builder().id("http://adlnet.gov/expapi/verbs/answered") .addDisplay(Locale.US, "answered").build(); // When Validating Interaction Component With All Required Properties @@ -332,7 +330,7 @@ void whenValidatingVerbWithAllRequiredPropertiesThenConstraintViolationsSizeIsZe @Test void whenValidatingVerbWithoutIdThenConstraintViolationsSizeIsOne() { - final Verb verb = Verb.builder().addDisplay(Locale.US, "answered").build(); + final var verb = Verb.builder().addDisplay(Locale.US, "answered").build(); // When Validating Interaction Component Without Id final Set> constraintViolations = validator.validate(verb); diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/ActivityDefinitionValidatorTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/ActivityDefinitionValidatorTests.java index 15ca16c2..caadcb2c 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/ActivityDefinitionValidatorTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/ActivityDefinitionValidatorTests.java @@ -27,7 +27,7 @@ class ActivityDefinitionValidatorTests { void whenIsValidIsCalledWithNullActivityDefinitionThenResultIsTrue() { // When IsValid Is Called With Null Activity Definition - var result = validator.isValid(null, null); + final var result = validator.isValid(null, null); // Then Result Is True assertTrue(result); @@ -36,10 +36,10 @@ void whenIsValidIsCalledWithNullActivityDefinitionThenResultIsTrue() { @Test void whenIsValidIsCalledWithActivityDefinitionThenResultIsTrue() { - var value = ActivityDefinition.builder().build(); + final var value = ActivityDefinition.builder().build(); // When IsValid Is Called With Activity Definition - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is True assertTrue(result); @@ -48,10 +48,10 @@ void whenIsValidIsCalledWithActivityDefinitionThenResultIsTrue() { @Test void whenIsValidIsCalledWithActivityDefinitionThatHasInteractionTypeThenResultIsTrue() { - var value = ActivityDefinition.builder().interactionType(InteractionType.CHOICE).build(); + final var value = ActivityDefinition.builder().interactionType(InteractionType.CHOICE).build(); // When IsValid Is Called With Activity Definition That Has Interaction Type - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is True assertTrue(result); @@ -60,10 +60,11 @@ void whenIsValidIsCalledWithActivityDefinitionThatHasInteractionTypeThenResultIs @Test void whenIsValidIsCalledWithActivityDefinitionThatHasCorrectResponsesPatternThenResultIsFalse() { - var value = ActivityDefinition.builder().correctResponsesPattern(new ArrayList<>()).build(); + final var value = + ActivityDefinition.builder().correctResponsesPattern(new ArrayList<>()).build(); // When IsValid Is Called With Activity Definition That Has Correct Responses Pattern - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is False assertFalse(result); @@ -72,12 +73,12 @@ void whenIsValidIsCalledWithActivityDefinitionThatHasCorrectResponsesPatternThen @Test void whenIsValidIsCalledWithActivityDefinitionThatHasCorrectResponsesPatternAndInteractionTypeThenResultIsTrue() { - var value = ActivityDefinition.builder().correctResponsesPattern(new ArrayList<>()) + final var value = ActivityDefinition.builder().correctResponsesPattern(new ArrayList<>()) .interactionType(InteractionType.CHOICE).build(); // When IsValid Is Called With Activity Definition That Has Correct Responses Pattern And // InteractionType - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is True assertTrue(result); @@ -86,10 +87,10 @@ void whenIsValidIsCalledWithActivityDefinitionThatHasCorrectResponsesPatternAndI @Test void whenIsValidIsCalledWithActivityDefinitionThatHasChoicesThenResultIsFalse() { - var value = ActivityDefinition.builder().choices(new ArrayList<>()).build(); + final var value = ActivityDefinition.builder().choices(new ArrayList<>()).build(); // When IsValid Is Called With Activity Definition That Has Choices - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is False assertFalse(result); @@ -98,11 +99,11 @@ void whenIsValidIsCalledWithActivityDefinitionThatHasChoicesThenResultIsFalse() @Test void whenIsValidIsCalledWithActivityDefinitionThatHasChoicesAndInteractionTypeThenResultIsTrue() { - var value = ActivityDefinition.builder().choices(new ArrayList<>()) + final var value = ActivityDefinition.builder().choices(new ArrayList<>()) .interactionType(InteractionType.CHOICE).build(); // When IsValid Is Called With Activity Definition That Has Choices And InteractionType - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is True assertTrue(result); @@ -111,10 +112,10 @@ void whenIsValidIsCalledWithActivityDefinitionThatHasChoicesAndInteractionTypeTh @Test void whenIsValidIsCalledWithActivityDefinitionThatHasScaleThenResultIsFalse() { - var value = ActivityDefinition.builder().scale(new ArrayList<>()).build(); + final var value = ActivityDefinition.builder().scale(new ArrayList<>()).build(); // When IsValid Is Called With Activity Definition That Has Scale - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is False assertFalse(result); @@ -123,11 +124,11 @@ void whenIsValidIsCalledWithActivityDefinitionThatHasScaleThenResultIsFalse() { @Test void whenIsValidIsCalledWithActivityDefinitionThatHasScaleAndInteractionTypeThenResultIsTrue() { - var value = ActivityDefinition.builder().scale(new ArrayList<>()) + final var value = ActivityDefinition.builder().scale(new ArrayList<>()) .interactionType(InteractionType.LIKERT).build(); // When IsValid Is Called With Activity Definition That Has Scale And InteractionType - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is True assertTrue(result); @@ -136,10 +137,10 @@ void whenIsValidIsCalledWithActivityDefinitionThatHasScaleAndInteractionTypeThen @Test void whenIsValidIsCalledWithActivityDefinitionThatHasSourceThenResultIsFalse() { - var value = ActivityDefinition.builder().source(new ArrayList<>()).build(); + final var value = ActivityDefinition.builder().source(new ArrayList<>()).build(); // When IsValid Is Called With Activity Definition That Has Source - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is False assertFalse(result); @@ -148,11 +149,11 @@ void whenIsValidIsCalledWithActivityDefinitionThatHasSourceThenResultIsFalse() { @Test void whenIsValidIsCalledWithActivityDefinitionAndInteractionTypeThatHasSourceThenResultIsTrue() { - var value = ActivityDefinition.builder().source(new ArrayList<>()) + final var value = ActivityDefinition.builder().source(new ArrayList<>()) .interactionType(InteractionType.MATCHING).build(); // When IsValid Is Called With Activity Definition That Has Source And InteractionType - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is True assertTrue(result); @@ -162,9 +163,9 @@ void whenIsValidIsCalledWithActivityDefinitionAndInteractionTypeThatHasSourceThe void whenIsValidIsCalledWithActivityDefinitionThatHasTargetThenResultIsFalse() { // When IsValid Is Called With Activity Definition That Has Target - var value = ActivityDefinition.builder().target(new ArrayList<>()).build(); + final var value = ActivityDefinition.builder().target(new ArrayList<>()).build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is False assertFalse(result); @@ -174,10 +175,10 @@ void whenIsValidIsCalledWithActivityDefinitionThatHasTargetThenResultIsFalse() { void whenIsValidIsCalledWithActivityDefinitionThatHasTargetAndInteractionTypeThenResultIsTrue() { // When IsValid Is Called With Activity Definition That Has Target And InteractionType - var value = ActivityDefinition.builder().target(new ArrayList<>()) + final var value = ActivityDefinition.builder().target(new ArrayList<>()) .interactionType(InteractionType.MATCHING).build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is True assertTrue(result); @@ -187,10 +188,10 @@ void whenIsValidIsCalledWithActivityDefinitionThatHasTargetAndInteractionTypeThe @Test void whenIsValidIsCalledWithActivityDefinitionThatHasStepsThenResultIsFalse() { - var value = ActivityDefinition.builder().steps(new ArrayList<>()).build(); + final var value = ActivityDefinition.builder().steps(new ArrayList<>()).build(); // When IsValid Is Called With Activity Definition That Has Steps - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is False assertFalse(result); @@ -199,11 +200,11 @@ void whenIsValidIsCalledWithActivityDefinitionThatHasStepsThenResultIsFalse() { @Test void whenIsValidIsCalledWithActivityDefinitionThatHasStepsAndInteractionTypeThenResultIsTrue() { - var value = ActivityDefinition.builder().steps(new ArrayList<>()) + final var value = ActivityDefinition.builder().steps(new ArrayList<>()) .interactionType(InteractionType.PERFORMANCE).build(); // When IsValid Is Called With Activity Definition That Has Steps And InteractionType - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is True assertTrue(result); diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/ActorValidatorTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/ActorValidatorTests.java index 74b65525..057f76ec 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/ActorValidatorTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/ActorValidatorTests.java @@ -31,7 +31,7 @@ class ActorValidatorTests { void whenValueIsNullThenResultIsTrue() { // When Value Is Null - var result = validator.isValid(null, null); + final var result = validator.isValid(null, null); // Then Result Is True assertTrue(result); @@ -41,9 +41,9 @@ void whenValueIsNullThenResultIsTrue() { void whenValueIsActivityThenResultIsTrue() { // When Value Is Activity - var value = Activity.builder().build(); + final var value = Activity.builder().build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is True assertTrue(result); @@ -53,9 +53,9 @@ void whenValueIsActivityThenResultIsTrue() { void whenValueIsSubStatementThenResultIsTrue() { // When Value Is SubStatement - var value = SubStatement.builder().build(); + final var value = SubStatement.builder().build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is True assertTrue(result); @@ -65,9 +65,9 @@ void whenValueIsSubStatementThenResultIsTrue() { void whenValueIsStatementReferenceThenResultIsTrue() { // When Value Is StatementReference - var value = StatementReference.builder().build(); + final var value = StatementReference.builder().build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is True assertTrue(result); @@ -77,9 +77,9 @@ void whenValueIsStatementReferenceThenResultIsTrue() { void whenAgentValueHasNoIdentifierThenResultIsFalse() { // When Agent Value Has No Identifier - var value = Agent.builder().build(); + final var value = Agent.builder().build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is False assertFalse(result); @@ -89,9 +89,9 @@ void whenAgentValueHasNoIdentifierThenResultIsFalse() { void whenAgentValueHasOnlyMboxThenResultIsTrue() { // When Agent Value Has Only Mbox - var value = Agent.builder().mbox("mailto:fred@example.com").build(); + final var value = Agent.builder().mbox("mailto:fred@example.com").build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is True assertTrue(result); @@ -101,9 +101,9 @@ void whenAgentValueHasOnlyMboxThenResultIsTrue() { void whenAgentValueHasOnlyMboxSha1sumThenResultIsTrue() { // When Agent Value Has Only MboxSha1sum - var value = Agent.builder().mboxSha1sum("121212121212121212121212").build(); + final var value = Agent.builder().mboxSha1sum("121212121212121212121212").build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is True assertTrue(result); @@ -113,10 +113,10 @@ void whenAgentValueHasOnlyMboxSha1sumThenResultIsTrue() { void whenAgentValueHasOnlyOpenIdThenResultIsTrue() { // When Agent Value Has Only MboxSha1sum - var value = + final var value = Agent.builder().openid(URI.create("http://example.com/openid/121212121212121212")).build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is True assertTrue(result); @@ -126,10 +126,10 @@ void whenAgentValueHasOnlyOpenIdThenResultIsTrue() { void whenAgentValueHasOnlyAccountThenResultIsTrue() { // When Agent Value Has Only Account - var value = Agent.builder() + final var value = Agent.builder() .account(a -> a.homePage(URI.create("http://example.com")).name("fred")).build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is True assertTrue(result); @@ -139,10 +139,10 @@ void whenAgentValueHasOnlyAccountThenResultIsTrue() { void whenAgentValueHasMoreThanOneIdentifierThenResultIsFalse() { // When Agent Value Has More Than One Identifier - var value = Agent.builder().mbox("mailto:fred@example.com") + final var value = Agent.builder().mbox("mailto:fred@example.com") .mboxSha1sum("121212121212121212121212").build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is False assertFalse(result); @@ -152,9 +152,9 @@ void whenAgentValueHasMoreThanOneIdentifierThenResultIsFalse() { void whenGroupValueHasNoIdentifierThenResultIsFalse() { // When Group Value Has No Identifier - var value = Group.builder().build(); + final var value = Group.builder().build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is False assertFalse(result); @@ -164,9 +164,9 @@ void whenGroupValueHasNoIdentifierThenResultIsFalse() { void whenGroupValueHasNoIdentifierAndEmptyMembersThenResultIsFalse() { // When Group Value Has No Identifier And Empty Members - var value = Group.builder().member(new ArrayList<>()).build(); + final var value = Group.builder().member(new ArrayList<>()).build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is False assertFalse(result); @@ -176,9 +176,9 @@ void whenGroupValueHasNoIdentifierAndEmptyMembersThenResultIsFalse() { void whenGroupValueHasNoIdentifierButHasMemberThenResultIsTrue() { // When Group Value Has No Identifier But Has Member - var value = Group.builder().addMember(a -> a.mbox("mailto:fred@example.com")).build(); + final var value = Group.builder().addMember(a -> a.mbox("mailto:fred@example.com")).build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is True assertTrue(result); @@ -188,9 +188,9 @@ void whenGroupValueHasNoIdentifierButHasMemberThenResultIsTrue() { void whenGroupValueHasOnlyMboxThenResultIsTrue() { // When Group Value Has Only Mbox - var value = Group.builder().mbox("mailto:fred@example.com").build(); + final var value = Group.builder().mbox("mailto:fred@example.com").build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is True assertTrue(result); @@ -200,9 +200,9 @@ void whenGroupValueHasOnlyMboxThenResultIsTrue() { void whenGroupValueHasOnlyMboxSha1sumThenResultIsTrue() { // When Group Value Has Only MboxSha1sum - var value = Group.builder().mboxSha1sum("121212121212121212121212").build(); + final var value = Group.builder().mboxSha1sum("121212121212121212121212").build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is True assertTrue(result); @@ -212,10 +212,10 @@ void whenGroupValueHasOnlyMboxSha1sumThenResultIsTrue() { void whenGroupValueHasOnlyOpenIdThenResultIsTrue() { // When Group Value Has Only MboxSha1sum - var value = + final var value = Group.builder().openid(URI.create("http://example.com/openid/121212121212121212")).build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is True assertTrue(result); @@ -225,10 +225,10 @@ void whenGroupValueHasOnlyOpenIdThenResultIsTrue() { void whenGroupValueHasOnlyAccountThenResultIsTrue() { // When Group Value Has Only Account - var value = Group.builder() + final var value = Group.builder() .account(a -> a.homePage(URI.create("http://example.com")).name("fred")).build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is True assertTrue(result); @@ -238,10 +238,10 @@ void whenGroupValueHasOnlyAccountThenResultIsTrue() { void whenGroupValueHasMoreThanOneIdentifierThenResultIsFalse() { // When Group Value Has More Than One Identifier - var value = Group.builder().mbox("mailto:fred@example.com") + final var value = Group.builder().mbox("mailto:fred@example.com") .mboxSha1sum("121212121212121212121212").build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is False assertFalse(result); diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/AuthorityValidatorTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/AuthorityValidatorTests.java index 1bdfaff2..a664301f 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/AuthorityValidatorTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/AuthorityValidatorTests.java @@ -13,13 +13,13 @@ class AuthorityValidatorTests { - private AuthorityValidator constraintValidator = new AuthorityValidator(); + private final AuthorityValidator constraintValidator = new AuthorityValidator(); @Test void whenCallingIsValidWithNullThenResultIsTrue() { // When Calling Is Valid With Null - boolean result = constraintValidator.isValid(null, null); + final var result = constraintValidator.isValid(null, null); // Then Result Is True assertThat(result, is(true)); @@ -28,10 +28,11 @@ void whenCallingIsValidWithNullThenResultIsTrue() { @Test void whenCallingIsValidWithAgentThenResultIsTrue() { - Agent agent = Agent.builder().name("A N Other").mbox("mailto:another@example.com").build(); + final Agent agent = + Agent.builder().name("A N Other").mbox("mailto:another@example.com").build(); // When Calling Is Valid With Agent - boolean result = constraintValidator.isValid(agent, null); + final var result = constraintValidator.isValid(agent, null); // Then Result Is True assertThat(result, is(true)); @@ -40,10 +41,11 @@ void whenCallingIsValidWithAgentThenResultIsTrue() { @Test void whenCallingIsValidWithIdentifiedGroupThenResultIsFalse() { - Group group = Group.builder().name("A N Other").mbox("mailto:another@example.com").build(); + final Group group = + Group.builder().name("A N Other").mbox("mailto:another@example.com").build(); // When Calling Is Valid With Identified Group - boolean result = constraintValidator.isValid(group, null); + final var result = constraintValidator.isValid(group, null); // Then Result Is False assertThat(result, is(false)); @@ -52,11 +54,11 @@ void whenCallingIsValidWithIdentifiedGroupThenResultIsFalse() { @Test void whenCallingIsValidWithIdentifiedGroupWithMembersThenResultIsFalse() { - Group group = Group.builder().name("A N Other").mbox("mailto:another@example.com") + final Group group = Group.builder().name("A N Other").mbox("mailto:another@example.com") .addMember(m -> m.name("A N Other").mbox("mailto:another@example.com")).build(); // When Calling Is Valid With Identified Group - boolean result = constraintValidator.isValid(group, null); + final var result = constraintValidator.isValid(group, null); // Then Result Is False assertThat(result, is(false)); @@ -65,11 +67,11 @@ void whenCallingIsValidWithIdentifiedGroupWithMembersThenResultIsFalse() { @Test void whenCallingIsValidWithGroupWithOneMemberThenResultIsFalse() { - Group group = Group.builder() + final Group group = Group.builder() .addMember(m -> m.name("A N Other").mbox("mailto:another@example.com")).build(); // When Calling Is Valid With Group With One Member - boolean result = constraintValidator.isValid(group, null); + final var result = constraintValidator.isValid(group, null); // Then Result Is False assertThat(result, is(false)); @@ -78,12 +80,12 @@ void whenCallingIsValidWithGroupWithOneMemberThenResultIsFalse() { @Test void whenCallingIsValidWithGroupWithTwoMembersThenResultIsTrue() { - Group group = + final Group group = Group.builder().addMember(m -> m.name("A N Other").mbox("mailto:another@example.com")) .addMember(m -> m.name("A N Other").mbox("mailto:another@example.com")).build(); // When Calling IsValid With Group With Two Members - boolean result = constraintValidator.isValid(group, null); + final var result = constraintValidator.isValid(group, null); // Then Result Is True assertThat(result, is(true)); diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/HasSchemeValidatorForUriTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/HasSchemeValidatorForUriTests.java index a41d1762..7d822df8 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/HasSchemeValidatorForUriTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/HasSchemeValidatorForUriTests.java @@ -14,13 +14,13 @@ @DisplayName("HasSchemeValidatorForUri tests") class HasSchemeValidatorForUriTests { - private HasSchemeValidatorForUri constraintValidator = new HasSchemeValidatorForUri(); + private final HasSchemeValidatorForUri constraintValidator = new HasSchemeValidatorForUri(); @Test void whenCallingIsValidWithURIWithoutSchemeThenResultIsFalse() { // When Calling IsValid With URI Without Scheme - boolean valid = constraintValidator.isValid(URI.create("example.com"), null); + final var valid = constraintValidator.isValid(URI.create("example.com"), null); // Then Result Is False assertThat(valid, is(false)); @@ -30,7 +30,7 @@ void whenCallingIsValidWithURIWithoutSchemeThenResultIsFalse() { void whenCallingIsValidWithURIWithSchemeThenResultIsTrue() { // When Calling IsValid With URI With Scheme - boolean result = constraintValidator.isValid(URI.create("https://example.com"), null); + final var result = constraintValidator.isValid(URI.create("https://example.com"), null); // Then Result Is True assertThat(result, is(true)); diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/MboxValidatorTest.java b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/MboxValidatorTest.java deleted file mode 100644 index 3ad4ae97..00000000 --- a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/MboxValidatorTest.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright 2016-2023 Berry Cloud Ltd. All rights reserved. - */ - -package dev.learning.xapi.model.validation.internal.validators; - -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import dev.learning.xapi.model.validation.constraints.Mbox; -import jakarta.validation.Payload; -import java.lang.annotation.Annotation; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.ValueSource; - -/** - * MboxValidator Tests. - * - * @author István Rátkai (Selindek) - */ -@DisplayName("MboxValidator tests") -class MboxValidatorTest { - - private static final MboxValidator validator = new MboxValidator(); - - @BeforeAll - static void init() { - validator.initialize(new Mbox() { - - @Override - public Class annotationType() { - return null; - } - - @Override - public Class[] payload() { - return null; - } - - @Override - public String message() { - return null; - } - - @Override - public Class[] groups() { - return null; - } - }); - } - - @Test - void whenValueIsNullThenResultIsTrue() { - - // When Value Is Null - var result = validator.isValid(null, null); - - // Then Result Is True - assertTrue(result); - } - - @Test - void whenValueIsValidMboxThenResultIsTrue() { - - // When Value Is Valid Mbox - var result = validator.isValid("mailto:fred@example.com", null); - - // Then Result Is True - assertTrue(result); - } - - @ParameterizedTest - @ValueSource(strings = {"email:fred@example.com", "fred@example.com", "mailto:fred@example@com"}) - void whenValueIsInvalidThenResultIsFalse(String value) { - - // When Value Is Invalid - var result = validator.isValid(value, null); - - // Then Result Is False - assertFalse(result); - } - -} diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/MboxValidatorTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/MboxValidatorTests.java index 7bb7071a..c7d4d4e5 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/MboxValidatorTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/MboxValidatorTests.java @@ -56,7 +56,7 @@ public Class[] groups() { void whenValueIsNullThenResultIsTrue() { // When Value Is Null - var result = validator.isValid(null, null); + final var result = validator.isValid(null, null); // Then Result Is True assertTrue(result); @@ -66,7 +66,7 @@ void whenValueIsNullThenResultIsTrue() { void whenValueIsValidMboxThenResultIsTrue() { // When Value Is Valid Mbox - var result = validator.isValid("mailto:fred@example.com", null); + final var result = validator.isValid("mailto:fred@example.com", null); // Then Result Is True assertTrue(result); @@ -77,7 +77,7 @@ void whenValueIsValidMboxThenResultIsTrue() { void whenValueIsInvalidThenResultIsFalse(String value) { // When Value Is Invalid - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is False assertFalse(result); diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/NotUndeterminedValidatorTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/NotUndeterminedValidatorTests.java index 862eb54f..108e44f6 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/NotUndeterminedValidatorTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/NotUndeterminedValidatorTests.java @@ -25,7 +25,7 @@ class NotUndeterminedValidatorTests { void whenValueIsNullThenResultIsTrue() { // When Value Is Null - var result = validator.isValid(null, null); + final var result = validator.isValid(null, null); // Then Result Is True assertTrue(result); @@ -36,7 +36,7 @@ void whenValueIsUndeterminedLocaleThenResultIsFalse() throws NoSuchFieldException, SecurityException { // When Value Is Undetermined Locale - var result = validator.isValid(Locale.forLanguageTag("und"), null); + final var result = validator.isValid(Locale.forLanguageTag("und"), null); // Then Result Is False assertFalse(result); @@ -47,7 +47,7 @@ void whenValueIsNotUndeterminedLocaleThenResultIsTrue() throws NoSuchFieldException, SecurityException { // When Value Is Not Undetermined Locale - var result = validator.isValid(Locale.forLanguageTag("en-US"), null); + final var result = validator.isValid(Locale.forLanguageTag("en-US"), null); // Then Result Is True assertTrue(result); diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/ScaledScoreValidatorTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/ScaledScoreValidatorTests.java index 44c1f6c5..76378e17 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/ScaledScoreValidatorTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/ScaledScoreValidatorTests.java @@ -24,7 +24,7 @@ class ScaledScoreValidatorTests { void whenValueIsNullThenResultIsTrue() { // When Value Is Null - var result = validator.isValid(null, null); + final var result = validator.isValid(null, null); // Then Result Is True assertTrue(result); @@ -34,7 +34,7 @@ void whenValueIsNullThenResultIsTrue() { void whenValueIsValidScaledScoreThenResultIsTrue() { // When Value Is Valid Score - var result = validator.isValid(0F, null); + final var result = validator.isValid(0F, null); // Then Result Is True assertTrue(result); @@ -44,7 +44,7 @@ void whenValueIsValidScaledScoreThenResultIsTrue() { void whenValueIsValidMinimumScoreThenResultIsTrue() { // When Value Is Valid Minimum Score - var result = validator.isValid(-1F, null); + final var result = validator.isValid(-1F, null); // Then Result Is True assertTrue(result); @@ -54,7 +54,7 @@ void whenValueIsValidMinimumScoreThenResultIsTrue() { void whenValueIsValidMaximumScoreThenResultIsTrue() { // When Value Is Valid Maximum Score - var result = validator.isValid(1F, null); + final var result = validator.isValid(1F, null); // Then Result Is True assertTrue(result); @@ -64,7 +64,7 @@ void whenValueIsValidMaximumScoreThenResultIsTrue() { void WhenValueIsOverMaximumScoreThenResultIsFalse() { // when Value Is Over Maximum Score - var result = validator.isValid(1.001F, null); + final var result = validator.isValid(1.001F, null); // Then Result Is False assertFalse(result); @@ -74,7 +74,7 @@ void WhenValueIsOverMaximumScoreThenResultIsFalse() { void whenValueIsBelowMinimumScoreThenResultIsFalse() { // When Value Is Below Minimum Score - var result = validator.isValid(-1.001F, null); + final var result = validator.isValid(-1.001F, null); // Then Result Is False assertFalse(result); @@ -84,7 +84,7 @@ void whenValueIsBelowMinimumScoreThenResultIsFalse() { void whenValueIsNanThenResultIsFalse() { // When Value Is NaN - var result = validator.isValid(Float.NaN, null); + final var result = validator.isValid(Float.NaN, null); // Then Result Is False assertFalse(result); diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/StatementPlatformValidatorTest.java b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/StatementPlatformValidatorTest.java index fe6b8d00..7dd31096 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/StatementPlatformValidatorTest.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/StatementPlatformValidatorTest.java @@ -28,7 +28,7 @@ class StatementPlatformValidatorTest { void whenValueIsNullThenResultIsTrue() { // When Value Is Null - var result = validator.isValid(null, null); + final var result = validator.isValid(null, null); // Then Result Is True assertTrue(result); @@ -38,9 +38,9 @@ void whenValueIsNullThenResultIsTrue() { void whenValueHasNoContextThenResultIsTrue() { // When Value has No Context - var value = Statement.builder().build(); + final var value = Statement.builder().build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is True assertTrue(result); @@ -50,9 +50,9 @@ void whenValueHasNoContextThenResultIsTrue() { void whenValueHasNoContextPlatformThenResultIsTrue() { // When Value has No Context Platform - var value = Statement.builder().context(Context.builder().build()).build(); + final var value = Statement.builder().context(Context.builder().build()).build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is True assertTrue(result); @@ -62,9 +62,9 @@ void whenValueHasNoContextPlatformThenResultIsTrue() { void whenValueHasContextPlatformButNoObjectThenResultIsFalse() { // When Value has Context Platform But No Object - var value = Statement.builder().context(c->c.platform("platform")).build(); + final var value = Statement.builder().context(c -> c.platform("platform")).build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is False assertFalse(result); @@ -74,13 +74,13 @@ void whenValueHasContextPlatformButNoObjectThenResultIsFalse() { void whenValueHasContextPlatformAndInvalidObjectThenResultIsFalse() { // When Value has Context Platform And Invalid Object - var value = Statement.builder().context(c->c.platform("platform")) + final var value = Statement.builder().context(c -> c.platform("platform")) - .statementReferenceObject(sr->sr.id(UUID.randomUUID())) + .statementReferenceObject(sr -> sr.id(UUID.randomUUID())) .build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is False assertFalse(result); @@ -90,13 +90,13 @@ void whenValueHasContextPlatformAndInvalidObjectThenResultIsFalse() { void whenValueHasContextPlatformAndValidObjectThenResultIsTrue() { // When Value has Context Platform And Valid Object - var value = Statement.builder().context(c->c.platform("platform")) + final var value = Statement.builder().context(c -> c.platform("platform")) - .activityObject(a->a.id(URI.create("http://example.com/activity"))) + .activityObject(a -> a.id(URI.create("http://example.com/activity"))) .build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is True assertTrue(result); diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/StatementRevisionValidatorTest.java b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/StatementRevisionValidatorTest.java index f3e86250..b67dfa9c 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/StatementRevisionValidatorTest.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/StatementRevisionValidatorTest.java @@ -29,7 +29,7 @@ class StatementRevisionValidatorTest { void whenValueIsNullThenResultIsTrue() { // When Value Is Null - var result = validator.isValid(null, null); + final var result = validator.isValid(null, null); // Then Result Is True assertTrue(result); @@ -39,9 +39,9 @@ void whenValueIsNullThenResultIsTrue() { void whenValueHasNoContextThenResultIsTrue() { // When Value has No Context - var value = Statement.builder().build(); + final var value = Statement.builder().build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is True assertTrue(result); @@ -51,9 +51,9 @@ void whenValueHasNoContextThenResultIsTrue() { void whenValueHasNoContextRevisionThenResultIsTrue() { // When Value has No Context Revision - var value = Statement.builder().context(Context.builder().build()).build(); + final var value = Statement.builder().context(Context.builder().build()).build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is True assertTrue(result); @@ -63,9 +63,9 @@ void whenValueHasNoContextRevisionThenResultIsTrue() { void whenValueHasContextRevisionButNoObjectThenResultIsFalse() { // When Value has Context Revision But No Object - var value = Statement.builder().context(c->c.revision("revision")).build(); + final var value = Statement.builder().context(c -> c.revision("revision")).build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is False assertFalse(result); @@ -75,13 +75,13 @@ void whenValueHasContextRevisionButNoObjectThenResultIsFalse() { void whenValueHasContextRevisionAndInvalidObjectThenResultIsFalse() { // When Value has Context Revision And Invalid Object - var value = Statement.builder().context(c->c.revision("revision")) + final var value = Statement.builder().context(c -> c.revision("revision")) - .statementReferenceObject(sr->sr.id(UUID.randomUUID())) + .statementReferenceObject(sr -> sr.id(UUID.randomUUID())) .build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is False assertFalse(result); @@ -91,13 +91,13 @@ void whenValueHasContextRevisionAndInvalidObjectThenResultIsFalse() { void whenValueHasContextRevisionAndValidObjectThenResultIsTrue() { // When Value has Context Revision And Valid Object - var value = Statement.builder().context(c->c.revision("revision")) + final var value = Statement.builder().context(c -> c.revision("revision")) - .activityObject(a->a.id(URI.create("http://example.com/activity"))) + .activityObject(a -> a.id(URI.create("http://example.com/activity"))) .build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is True assertTrue(result); diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/StatementVerbValidatorTest.java b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/StatementVerbValidatorTest.java index c5d5ddf9..93d4ffd4 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/StatementVerbValidatorTest.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/StatementVerbValidatorTest.java @@ -29,7 +29,7 @@ class StatementVerbValidatorTest { void whenValueIsNullThenResultIsTrue() { // When Value Is Null - var result = validator.isValid(null, null); + final var result = validator.isValid(null, null); // Then Result Is True assertTrue(result); @@ -39,9 +39,9 @@ void whenValueIsNullThenResultIsTrue() { void whenValueHasNoVerbThenResultIsTrue() { // When Value has No Verb - var value = Statement.builder().build(); + final var value = Statement.builder().build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is True assertTrue(result); @@ -51,9 +51,9 @@ void whenValueHasNoVerbThenResultIsTrue() { void whenValueHasNonVoidedVerbThenResultIsTrue() { // When Value has Non-Voided Verb - var value = Statement.builder().verb(Verb.ANSWERED).build(); + final var value = Statement.builder().verb(Verb.ANSWERED).build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is True assertTrue(result); @@ -63,9 +63,9 @@ void whenValueHasNonVoidedVerbThenResultIsTrue() { void whenValueHasVoidedVerbButNoObjectThenResultIsFalse() { // When Value has Voided Verb But No Object - var value = Statement.builder().verb(Verb.VOIDED).build(); + final var value = Statement.builder().verb(Verb.VOIDED).build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is False assertFalse(result); @@ -75,13 +75,13 @@ void whenValueHasVoidedVerbButNoObjectThenResultIsFalse() { void whenValueHasVoidedVerbAndInvalidObjectThenResultIsFalse() { // When Value has Voided Verb And Invalid Object - var value = Statement.builder().verb(Verb.VOIDED) + final var value = Statement.builder().verb(Verb.VOIDED) - .activityObject(a->a.id(URI.create("http://example.com/activity"))) + .activityObject(a -> a.id(URI.create("http://example.com/activity"))) .build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is False assertFalse(result); @@ -91,13 +91,13 @@ void whenValueHasVoidedVerbAndInvalidObjectThenResultIsFalse() { void whenValueHasVoidedVerbAndValidObjectThenResultIsTrue() { // When Value has Voided Verb And Valid Object - var value = Statement.builder().verb(Verb.VOIDED) + final var value = Statement.builder().verb(Verb.VOIDED) - .statementReferenceObject(sr->sr.id(UUID.randomUUID())) + .statementReferenceObject(sr -> sr.id(UUID.randomUUID())) .build(); - var result = validator.isValid(value, null); + final var result = validator.isValid(value, null); // Then Result Is True assertTrue(result); diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/VariantValidatorForUuidTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/VariantValidatorForUuidTests.java index e7227cc2..7db20f55 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/VariantValidatorForUuidTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/validation/internal/validators/VariantValidatorForUuidTests.java @@ -21,7 +21,7 @@ @DisplayName("VariantValidatorForUuidTest tests") class VariantValidatorForUuidTests { - private VariantValidatorForUuid constraintValidator = new VariantValidatorForUuid(); + private final VariantValidatorForUuid constraintValidator = new VariantValidatorForUuid(); @Variant(2) private UUID variant2; @@ -33,7 +33,7 @@ class VariantValidatorForUuidTests { void whenIsValidIsCalledWithNullUUIDThenValidIsTrue() { // When IsValid Is Called With Null UUID - boolean valid = constraintValidator.isValid(null, null); + final var valid = constraintValidator.isValid(null, null); // Then Valid Is True assertTrue(valid); @@ -48,7 +48,7 @@ void GivenValidatorIsInitializedWith2WhenIsValidIsCalledWithVersion4Variant2UUID .findAnnotation(getClass().getDeclaredField("variant2"), Variant.class).get()); // When IsValid Is Called With Version 4 Variant 2 UUID - boolean valid = + final var valid = constraintValidator.isValid(UUID.fromString("3441c47b-c098-4245-b22e-db3d1242098f"), null); // Then Valid Is True @@ -64,7 +64,7 @@ void GivenValidatorIsInitializedWith2whenIsValidIsCalledWithVersion4VariantMicro .findAnnotation(getClass().getDeclaredField("variant2"), Variant.class).get()); // When IsValid Is Called With Version 4 Variant Microsoft GUID UUID - boolean valid = + final var valid = constraintValidator.isValid(UUID.fromString("4c30eeb1-15ac-4833-cb0d-88613ba65267"), null); // Then Valid Is False @@ -81,7 +81,7 @@ void GivenValidatorIsInitializedWith6whenIsValidIsCalledWithVersion4VariantMicro .findAnnotation(getClass().getDeclaredField("variant6"), Variant.class).get()); // When IsValid Is Called With Version 4 Variant Microsoft GUID UUID - boolean valid = + final var valid = constraintValidator.isValid(UUID.fromString("4c30eeb1-15ac-4833-cb0d-88613ba65267"), null); // Then Valid Is False