Compare commits
48 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 81672115c8 | |||
| 25e6972efd | |||
| 850964932f | |||
| b3364753dd | |||
| a0d96f1322 | |||
| ad3c1f4b7d | |||
| a77db1035d | |||
| f1a31fed56 | |||
| 7c087fcd8f | |||
| 183906dc97 | |||
| 94e5603380 | |||
| f06b5a1edc | |||
| f3f6cd91d0 | |||
| 6c048ac22b | |||
| 755b258ddb | |||
| 4be9f663ac | |||
| 280d86e333 | |||
| 70cbb1aae9 | |||
| 9d5c3c01db | |||
| 148bdcbabd | |||
| 46d1284174 | |||
| 866e28a645 | |||
| 62ec396ff7 | |||
| 4517854749 | |||
| 29a6e7602c | |||
| d94e526bd4 | |||
| b9b008b103 | |||
| c43dfa097a | |||
| 4fd13ceb1d | |||
| 6c8ea9e46e | |||
| e183ea7ff6 | |||
| 69006ca067 | |||
| cfe488f2be | |||
| cb0ee69820 | |||
| cfc7ec2ff1 | |||
| 0605ef0824 | |||
| 3309abe053 | |||
| f069ce7cc3 | |||
| a82c3e725d | |||
| 08124f212a | |||
| 631999e135 | |||
| 7674d9a299 | |||
| 9cd71ab601 | |||
| 4cb8c84312 | |||
| 5acdbfb0c7 | |||
| d35c83fcbf | |||
| 0fe769a203 | |||
| dbe1b469f6 |
375
Formatter.xml
375
Formatter.xml
@@ -1,365 +1,400 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!DOCTYPE xml>
|
||||
<profiles version="18">
|
||||
<profile kind="CodeFormatterProfile" name="Scenarium" version="18">
|
||||
<profiles version="23">
|
||||
<profile kind="CodeFormatterProfile" name="EWOL" version="23">
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment" value="common_lines"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_logical_operator" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation" value="common_lines"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement" value="common_lines"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration" value="common_lines"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration" value="preserve_positions"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.align_with_spaces" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement" value="common_lines"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_record_components" value="49"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_logical_operator" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line" value="one_line_if_empty"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_record_declaration" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="200"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.keep_method_body_on_one_line" value="one_line_if_empty"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line" value="one_line_if_empty"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method" value="1"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line" value="one_line_if_empty"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line" value="one_line_never"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line" value="one_line_if_empty"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause" value="common_lines"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_additive_operator" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_relational_operator" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line" value="one_line_if_empty"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.wrap_before_shift_operator" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_type_parameters" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_loops" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_relational_operator" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation" value="common_lines"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_additive_operator" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_enum_constant" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.text_block_indentation" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_module_statements" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line" value="one_line_if_empty"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_type_annotations" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_additive_operator" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_shift_operator" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="1"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines" value="2147483647"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause" value="common_lines"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.keep_code_block_on_one_line" value="one_line_if_empty"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_not_operator" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration" value="common_lines"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line" value="one_line_if_empty"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_type_arguments" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package" value="49"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_logical_operator" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_record_header" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.wrap_before_relational_operator" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.comment.indent_tag_description" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_record_constructor" value="end_of_line"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_string_concatenation" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.wrap_before_logical_operator" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_shift_operator" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_shift_operator" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.wrap_before_additive_operator" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_record_declaration" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_relational_operator" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_logical_operator" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation" value="common_lines"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration" value="common_lines"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement" value="common_lines"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement" value="common_lines"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line" value="one_line_never"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="200"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.keep_method_body_on_one_line" value="one_line_if_empty"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line" value="one_line_if_empty"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line" value="one_line_if_empty"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_additive_operator" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_constructor" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_relational_operator" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.keep_record_declaration_on_one_line" value="one_line_if_empty"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_relational_operator" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_additive_operator" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_record_declaration" value="end_of_line"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line" value="one_line_never"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type" value="49"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable" value="49"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_additive_operator" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field" value="49"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_shift_operator" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause" value="common_lines"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.keep_code_block_on_one_line" value="one_line_if_empty"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_record_declaration" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line" value="one_line_if_empty"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method" value="49"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.keep_record_constructor_on_one_line" value="one_line_never"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_declaration" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_assertion_message" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_logical_operator" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration" value="33"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.wrap_before_relational_operator" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="48"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.wrap_before_logical_operator" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration" value="common_lines"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_shift_operator" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line" value="one_line_if_empty"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line" value="one_line_never"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.wrap_before_additive_operator" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line" value="false"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block" value="0"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="tab"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_relational_operator" value="insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.wrap_before_string_concatenation" value="true"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="200"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
|
||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
|
||||
</profile>
|
||||
|
||||
202
doc/SQL_wrapper.md
Normal file
202
doc/SQL_wrapper.md
Normal file
@@ -0,0 +1,202 @@
|
||||
Wrapping over the DB
|
||||
====================
|
||||
|
||||
In the current version we consider 2 DB access: MySQL and SQLite, We commonly use the SQLite in test mode to permit to test is a real case.
|
||||
|
||||
Generic Access:
|
||||
---------------
|
||||
|
||||
Some generic function are available to permit you to simply request the DB
|
||||
|
||||
### Create a new Value:
|
||||
|
||||
```java
|
||||
MyDataModel dataToInsert = ...;
|
||||
MyDataModel dataCreated = DataAccess.insert(dataToInsert);
|
||||
```
|
||||
|
||||
|
||||
### Get a full table:
|
||||
|
||||
```java
|
||||
List<MyDataModel> data = DataAccess.gets(MyDataModel.class);
|
||||
```
|
||||
|
||||
### Get a single element in the DB:
|
||||
|
||||
```java
|
||||
UUID id = ...;
|
||||
MyDataModel data = DataAccess.get(MyDataModel.class, id);
|
||||
```
|
||||
|
||||
> **_Note:_** The Id type fully managed are UUID and Long
|
||||
|
||||
### Removing the Data:
|
||||
|
||||
```java
|
||||
UUID id = ...;
|
||||
DataAccess.delete(MyDataModel.class, id);
|
||||
```
|
||||
|
||||
> **_Note:_** Removing the data automatically detect if it is a software remove or definitive remove
|
||||
|
||||
### Updating the Data:
|
||||
|
||||
The update of the data can be managed by 2 way:
|
||||
- Direct update of the Object with direct injection (Good for `PUT`)
|
||||
- Update with input json (Good for `PATCH`)
|
||||
|
||||
The second way is preferable for some reasons
|
||||
- When jakarta transform the data in you object, we can not detect the element set at null or not set (We consider user of `Optional` il all data class will create a too bug amount of unneeded code in all dev parts)
|
||||
- Throw in the jakarta parsing are not well catch when we will generate generic error
|
||||
- The Check will permit to explain what is wrong better than a generic Json parser.
|
||||
|
||||
Updating with JSON:
|
||||
|
||||
```java
|
||||
UUID id = ...;
|
||||
String jsonRequest = "{...}";
|
||||
DataAccess.updateWithJson(MyDataModel.class, id, jsonRequest);
|
||||
```
|
||||
|
||||
Updating with direct data:
|
||||
|
||||
```java
|
||||
UUID id = ...;
|
||||
MyDataModel dataToUpdate = ...;
|
||||
// This update all fields:
|
||||
DataAccess.update(dataToUpdate, id);
|
||||
// Select the field to update:
|
||||
DataAccess.update(dataToUpdate, id, List.of("field1","field2"));
|
||||
```
|
||||
|
||||
Generic option of the request:
|
||||
------------------------------
|
||||
|
||||
Many API have a generic multiple option available like:
|
||||
|
||||
```java
|
||||
public static <T> List<T> getsWhere(final Class<T> clazz, final QueryOption... option) throws Exception
|
||||
```
|
||||
|
||||
You just need to add your options in the list of `option`.
|
||||
|
||||
Filter the list of field read:
|
||||
```java
|
||||
public FilterValue(final String... filterValue)
|
||||
public FilterValue(final List<String> filterValues)
|
||||
// example:
|
||||
new newFilterValue("field1", "field2");
|
||||
```
|
||||
|
||||
Add a condition [more detail](#condition-models)
|
||||
```java
|
||||
public Condition(final QueryItem items)
|
||||
```
|
||||
|
||||
Order the request:
|
||||
```java
|
||||
public OrderBy(final OrderItem... childs);
|
||||
// example:
|
||||
new OrderBy(new OrderItem("name", Order.DESC));
|
||||
```
|
||||
|
||||
Limit the :
|
||||
```java
|
||||
public Limit(final long limit)
|
||||
// example:
|
||||
new Limit(50);
|
||||
```
|
||||
|
||||
Read all column like update date and create date or delete field
|
||||
```java
|
||||
public ReadAllColumn()
|
||||
```
|
||||
|
||||
Condition models:
|
||||
-----------------
|
||||
|
||||
Creating a condition independent of the DB model use need to have a little abstraction of the query model:
|
||||
|
||||
For this we propose some condition that update with the internal "auto" condition that is added (like the soft delete...)
|
||||
|
||||
### default generic comparator
|
||||
|
||||
This is the base of the comparison tool. It compare a column with a value
|
||||
|
||||
```java
|
||||
public QueryCondition(final String key, final String comparator, final Object value);
|
||||
```
|
||||
|
||||
Simple DB comparison element. Note the injected object is injected in the statement and not in the query directly.
|
||||
|
||||
Example:
|
||||
```java
|
||||
String nameToCheck = "plop";
|
||||
new QueryCondition("fieldName", "=", nameToCheck);
|
||||
// OR:
|
||||
UUID uuid = ...;
|
||||
new QueryCondition("uuid", "=", uuid);
|
||||
```
|
||||
|
||||
### List comparator
|
||||
|
||||
It permit to check a column is (NOT) in a list of value
|
||||
|
||||
```java
|
||||
public QueryInList(final String key, final List<T> value)
|
||||
public QueryInList(final String key, final T... value)
|
||||
```
|
||||
and his opposite:
|
||||
```java
|
||||
public QueryNotInList(final String key, final List<T> value)
|
||||
public QueryNotInList(final String key, final T... value)
|
||||
```
|
||||
|
||||
example
|
||||
```java
|
||||
new QueryInList("uuid", List.of(uuid1, uuid2));
|
||||
```
|
||||
|
||||
### NULL and NOT NULL checker
|
||||
|
||||
This permit to check an element is `NULL` or `not NULL`
|
||||
|
||||
```java
|
||||
public QueryNull(final String key);
|
||||
public QueryNotNull(final String key);
|
||||
```
|
||||
|
||||
### The group condition:
|
||||
|
||||
The generic `OR` group:
|
||||
```java
|
||||
public QueryOr(final List<QueryItem> child);
|
||||
public QueryOr(final QueryItem... child);
|
||||
```
|
||||
|
||||
Or the generic `AND group:
|
||||
```java
|
||||
public QueryAnd(final List<QueryItem> child);
|
||||
public QueryAnd(final QueryItem... child);
|
||||
```
|
||||
|
||||
### Full example:
|
||||
|
||||
```java
|
||||
List<MyDataModel> result = DataAccess.getsWhere(MyDataModel.class,
|
||||
new Limit(50),
|
||||
new OrderBy(new OrderItem("name", Order.DESC)),
|
||||
new Condition(
|
||||
new QueryAnd(
|
||||
QueryNull("Field3")
|
||||
new QueryOr(
|
||||
new QueryInList("Field4", 5, 55, 65, 62, 27, 84),
|
||||
new QueryCondition("cityID", ">", 78000);
|
||||
)
|
||||
)
|
||||
)
|
||||
);
|
||||
```
|
||||
|
||||
|
||||
3
doc/TUTORIAL_01_first_install.md
Normal file
3
doc/TUTORIAL_01_first_install.md
Normal file
@@ -0,0 +1,3 @@
|
||||
Basic tutorial
|
||||
==============
|
||||
|
||||
16
doc/data_model.md
Normal file
16
doc/data_model.md
Normal file
@@ -0,0 +1,16 @@
|
||||
Data Model
|
||||
==========
|
||||
|
||||
The data model have 2 parts: the model of the DB and the model of the API. It is important to consider the 2 part due to the fact annotation will be manage by by a part, ot the other. Here we will study the Checking of the Data.
|
||||
|
||||
DB data model
|
||||
=============
|
||||
|
||||
|
||||
API data model
|
||||
==============
|
||||
|
||||
|
||||
Checking of the Data
|
||||
====================
|
||||
|
||||
16
doc/index.md
Normal file
16
doc/index.md
Normal file
@@ -0,0 +1,16 @@
|
||||
Archi-data documentation
|
||||
========================
|
||||
|
||||
Archidata is base on generic Jakarta, grizzly and SQL or SQLite service.
|
||||
|
||||
It permit to simplify the interface of the server to concentrate on the API design.
|
||||
|
||||
|
||||
Archi-data is a group of tools that manage some parts:
|
||||
- [Wrapping over the DB](SQL_wrapper.md)
|
||||
- [Data Model](data_model.md)
|
||||
- [TypeScript Api generation](typescript_api_generation.md)
|
||||
- [Migration tool](migration.md)
|
||||
|
||||
Some initialization tutorials:
|
||||
- [Basic tutorial](TUTORIAL_01_first_install.md)
|
||||
7
doc/migration.md
Normal file
7
doc/migration.md
Normal file
@@ -0,0 +1,7 @@
|
||||
Migration tool
|
||||
==============
|
||||
|
||||
Migration is a big part of the Server environment, it permit to migrate an old DB to a new one, and some tool permit the opposite.
|
||||
|
||||
Archi-data does not permit to do a reverse migration. I implement some code for it, but is was never tested. On my professional activity, we migrate only forward (Request if if really needed).
|
||||
|
||||
5
doc/typescript_api_generation.md
Normal file
5
doc/typescript_api_generation.md
Normal file
@@ -0,0 +1,5 @@
|
||||
TypeScript Api generation
|
||||
=========================
|
||||
|
||||
|
||||
|
||||
30
pom.xml
30
pom.xml
@@ -3,7 +3,7 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>kangaroo-and-rabbit</groupId>
|
||||
<artifactId>archidata</artifactId>
|
||||
<version>0.7.0</version>
|
||||
<version>0.8.9</version>
|
||||
<properties>
|
||||
<maven.compiler.version>3.1</maven.compiler.version>
|
||||
<maven.compiler.source>21</maven.compiler.source>
|
||||
@@ -45,12 +45,12 @@
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
<version>2.0.9</version>
|
||||
<version>2.1.0-alpha1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-simple</artifactId>
|
||||
<version>2.0.9</version>
|
||||
<version>2.1.0-alpha1</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<!-- https://mvnrepository.com/artifact/org.glassfish.jersey.media/jersey-media-multipart -->
|
||||
@@ -78,12 +78,12 @@
|
||||
<dependency>
|
||||
<groupId>org.glassfish.jaxb</groupId>
|
||||
<artifactId>jaxb-runtime</artifactId>
|
||||
<version>4.0.4</version>
|
||||
<version>4.0.5</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jakarta.ws.rs</groupId>
|
||||
<artifactId>jakarta.ws.rs-api</artifactId>
|
||||
<version>3.1.0</version>
|
||||
<version>4.0.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.sun.xml.bind</groupId>
|
||||
@@ -107,30 +107,30 @@
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-databind</artifactId>
|
||||
<version>2.16.1</version>
|
||||
<version>2.17.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.dataformat</groupId>
|
||||
<artifactId>jackson-dataformat-csv</artifactId>
|
||||
<version>2.16.1</version>
|
||||
<version>2.17.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.datatype</groupId>
|
||||
<artifactId>jackson-datatype-jsr310</artifactId>
|
||||
<version>2.16.1</version>
|
||||
<version>2.17.1</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>jakarta.servlet</groupId>
|
||||
<artifactId>jakarta.servlet-api</artifactId>
|
||||
<version>6.1.0-M1</version>
|
||||
<version>6.1.0-M2</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<!-- Interface for My-sql & sqlite DB -->
|
||||
<dependency>
|
||||
<groupId>com.mysql</groupId>
|
||||
<artifactId>mysql-connector-j</artifactId>
|
||||
<version>8.2.0</version>
|
||||
<version>8.4.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.xerial</groupId>
|
||||
@@ -141,18 +141,18 @@
|
||||
<dependency>
|
||||
<groupId>com.nimbusds</groupId>
|
||||
<artifactId>nimbus-jose-jwt</artifactId>
|
||||
<version>9.37.1</version>
|
||||
<version>9.39</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jakarta.persistence</groupId>
|
||||
<artifactId>jakarta.persistence-api</artifactId>
|
||||
<version>3.2.0-M1</version>
|
||||
<version>3.2.0-M2</version>
|
||||
</dependency>
|
||||
<!-- Swagger dependencies -->
|
||||
<dependency>
|
||||
<groupId>io.swagger.core.v3</groupId>
|
||||
<artifactId>swagger-jaxrs2-jakarta</artifactId>
|
||||
<version>2.1.10</version>
|
||||
<version>2.2.21</version>
|
||||
</dependency>
|
||||
<!--
|
||||
************************************************************
|
||||
@@ -162,13 +162,13 @@
|
||||
<dependency>
|
||||
<groupId>org.junit.jupiter</groupId>
|
||||
<artifactId>junit-jupiter-api</artifactId>
|
||||
<version>5.10.1</version>
|
||||
<version>5.11.0-M1</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.junit.jupiter</groupId>
|
||||
<artifactId>junit-jupiter-engine</artifactId>
|
||||
<version>5.10.1</version>
|
||||
<version>5.11.0-M1</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
||||
126
sample/archidata/basic/WebLauncher.java
Executable file
126
sample/archidata/basic/WebLauncher.java
Executable file
@@ -0,0 +1,126 @@
|
||||
package sample.archidata.basic;
|
||||
|
||||
import java.net.URI;
|
||||
|
||||
import org.glassfish.grizzly.http.server.HttpServer;
|
||||
import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory;
|
||||
import org.glassfish.jersey.jackson.JacksonFeature;
|
||||
import org.glassfish.jersey.media.multipart.MultiPartFeature;
|
||||
import org.glassfish.jersey.server.ResourceConfig;
|
||||
import org.kar.archidata.GlobalConfiguration;
|
||||
import org.kar.archidata.UpdateJwtPublicKey;
|
||||
import org.kar.archidata.api.DataResource;
|
||||
import org.kar.archidata.catcher.ExceptionCatcher;
|
||||
import org.kar.archidata.catcher.FailExceptionCatcher;
|
||||
import org.kar.archidata.catcher.InputExceptionCatcher;
|
||||
import org.kar.archidata.catcher.SystemExceptionCatcher;
|
||||
import org.kar.archidata.db.DBConfig;
|
||||
import org.kar.archidata.filter.CORSFilter;
|
||||
import org.kar.archidata.filter.OptionFilter;
|
||||
import org.kar.archidata.migration.MigrationEngine;
|
||||
import org.kar.archidata.tools.ConfigBaseVariable;
|
||||
import sample.archidata.basic.api.Front;
|
||||
import sample.archidata.basic.api.HealthCheck;
|
||||
import sample.archidata.basic.api.MediaResource;
|
||||
import sample.archidata.basic.api.SeasonResource;
|
||||
import sample.archidata.basic.api.SeriesResource;
|
||||
import sample.archidata.basic.api.TypeResource;
|
||||
import sample.archidata.basic.api.UserMediaAdvancementResource;
|
||||
import sample.archidata.basic.api.UserResource;
|
||||
import sample.archidata.basic.filter.KarideoAuthenticationFilter;
|
||||
import sample.archidata.basic.migration.Initialization;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import jakarta.ws.rs.core.UriBuilder;
|
||||
|
||||
public class WebLauncher {
|
||||
final static Logger LOGGER = LoggerFactory.getLogger(WebLauncher.class);
|
||||
public static DBConfig dbConfig;
|
||||
protected UpdateJwtPublicKey keyUpdater = null;
|
||||
protected HttpServer server = null;
|
||||
|
||||
public WebLauncher() {
|
||||
ConfigBaseVariable.bdDatabase = "sample_archidata_basic";
|
||||
}
|
||||
|
||||
private static URI getBaseURI() {
|
||||
return UriBuilder.fromUri(ConfigBaseVariable.getlocalAddress()).build();
|
||||
}
|
||||
|
||||
public void migrateDB() throws Exception {
|
||||
WebLauncher.LOGGER.info("Create migration engine");
|
||||
final MigrationEngine migrationEngine = new MigrationEngine();
|
||||
WebLauncher.LOGGER.info("Add initialization");
|
||||
migrationEngine.setInit(new Initialization());
|
||||
//WebLauncher.LOGGER.info("Add migration since last version");
|
||||
//migrationEngine.add(new Migration20230810());
|
||||
WebLauncher.LOGGER.info("Migrate the DB [START]");
|
||||
migrationEngine.migrateWaitAdmin(GlobalConfiguration.dbConfig);
|
||||
WebLauncher.LOGGER.info("Migrate the DB [STOP]");
|
||||
}
|
||||
|
||||
public static void main(final String[] args) throws Exception {
|
||||
WebLauncher.LOGGER.info("[START] application wake UP");
|
||||
final WebLauncher launcher = new WebLauncher();
|
||||
launcher.migrateDB();
|
||||
launcher.process();
|
||||
WebLauncher.LOGGER.info("end-configure the server & wait finish process:");
|
||||
Thread.currentThread().join();
|
||||
WebLauncher.LOGGER.info("STOP the REST server");
|
||||
}
|
||||
|
||||
public void process() throws InterruptedException {
|
||||
|
||||
// ===================================================================
|
||||
// Configure resources
|
||||
// ===================================================================
|
||||
final ResourceConfig rc = new ResourceConfig();
|
||||
|
||||
// Permit to accept OPTION request
|
||||
rc.register(OptionFilter.class);
|
||||
// remove cors ==> not obviously needed ...
|
||||
rc.register(CORSFilter.class);
|
||||
// register exception catcher (this permit to format return error with a normalized JSON)
|
||||
rc.register(InputExceptionCatcher.class);
|
||||
rc.register(SystemExceptionCatcher.class);
|
||||
rc.register(FailExceptionCatcher.class);
|
||||
rc.register(ExceptionCatcher.class);
|
||||
|
||||
// add default resource:
|
||||
rc.register(MyModelResource.class);
|
||||
|
||||
|
||||
// add jackson to be discover when we are in stand-alone server
|
||||
rc.register(JacksonFeature.class);
|
||||
|
||||
this.server = GrizzlyHttpServerFactory.createHttpServer(getBaseURI(), rc);
|
||||
final HttpServer serverLink = this.server;
|
||||
Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
System.out.println("Stopping server..");
|
||||
serverLink.shutdownNow();
|
||||
}
|
||||
}, "shutdownHook"));
|
||||
|
||||
|
||||
// ===================================================================
|
||||
// run JERSEY
|
||||
// ===================================================================
|
||||
try {
|
||||
this.server.start();
|
||||
LOGGER.info("Jersey app started at {}", getBaseURI());
|
||||
} catch (final Exception e) {
|
||||
LOGGER.error("There was an error while starting Grizzly HTTP server.");
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
// This is used for TEST (See it later)
|
||||
public void stop() {
|
||||
if (this.server != null) {
|
||||
this.server.shutdownNow();
|
||||
this.server = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
45
sample/archidata/basic/WebLauncherLocal.java
Executable file
45
sample/archidata/basic/WebLauncherLocal.java
Executable file
@@ -0,0 +1,45 @@
|
||||
|
||||
package sample.archidata.basic;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.kar.archidata.api.DataResource;
|
||||
import org.kar.archidata.dataAccess.DataFactoryTsApi;
|
||||
import org.kar.archidata.tools.ConfigBaseVariable;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public class WebLauncherLocal extends WebLauncher {
|
||||
private final static Logger LOGGER = LoggerFactory.getLogger(WebLauncherLocal.class);
|
||||
|
||||
private WebLauncherLocal() {}
|
||||
|
||||
public static void main(final String[] args) throws Exception {
|
||||
final WebLauncherLocal launcher = new WebLauncherLocal();
|
||||
launcher.process();
|
||||
LOGGER.info("end-configure the server & wait finish process:");
|
||||
Thread.currentThread().join();
|
||||
LOGGER.info("STOP the REST server:");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void process() throws InterruptedException {
|
||||
if (true) {
|
||||
// for local test:
|
||||
ConfigBaseVariable.apiAddress = "http://0.0.0.0:9000/sample/api/";
|
||||
ConfigBaseVariable.dbPort = "3906";
|
||||
}
|
||||
try {
|
||||
super.migrateDB();
|
||||
} catch (final Exception e) {
|
||||
e.printStackTrace();
|
||||
while (true) {
|
||||
LOGGER.error("============================================================================");
|
||||
LOGGER.error("== Migration fail ==> waiting intervention of administrator...");
|
||||
LOGGER.error("============================================================================");
|
||||
Thread.sleep(60 * 60 * 1000);
|
||||
}
|
||||
}
|
||||
super.process();
|
||||
}
|
||||
}
|
||||
79
sample/archidata/basic/api/MyModelResource.java
Normal file
79
sample/archidata/basic/api/MyModelResource.java
Normal file
@@ -0,0 +1,79 @@
|
||||
package sample.archidata.basic.api;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.sql.SQLException;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
|
||||
import org.glassfish.jersey.media.multipart.FormDataParam;
|
||||
import org.kar.archidata.annotation.AsyncType;
|
||||
import org.kar.archidata.annotation.TypeScriptProgress;
|
||||
import org.kar.archidata.api.DataResource;
|
||||
import org.kar.archidata.dataAccess.DataAccess;
|
||||
import org.kar.archidata.dataAccess.addOn.AddOnDataJson;
|
||||
import org.kar.archidata.exception.FailException;
|
||||
import org.kar.archidata.exception.InputException;
|
||||
import org.kar.archidata.model.Data;
|
||||
import org.kar.archidata.tools.DataTools;
|
||||
import sample.archidata.basic.model.MyModel;
|
||||
import sample.archidata.basic.model.Season;
|
||||
import sample.archidata.basic.model.Series;
|
||||
import sample.archidata.basic.model.Type;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import jakarta.annotation.security.RolesAllowed;
|
||||
import jakarta.ws.rs.Consumes;
|
||||
import jakarta.ws.rs.DELETE;
|
||||
import jakarta.ws.rs.GET;
|
||||
import jakarta.ws.rs.PATCH;
|
||||
import jakarta.ws.rs.POST;
|
||||
import jakarta.ws.rs.Path;
|
||||
import jakarta.ws.rs.PathParam;
|
||||
import jakarta.ws.rs.Produces;
|
||||
import jakarta.ws.rs.core.MyModelType;
|
||||
|
||||
@Path("/media")
|
||||
@Produces(MyModelType.APPLICATION_JSON)
|
||||
public class MyModelResource {
|
||||
|
||||
@GET
|
||||
@PermitAll
|
||||
public List<MyModel> gets() throws Exception {
|
||||
return DataAccess.gets(MyModel.class);
|
||||
}
|
||||
|
||||
@POST
|
||||
@PermitAll
|
||||
@Consumes(MyModelType.APPLICATION_JSON)
|
||||
public MyModel create(final MyModel data) throws Exception {
|
||||
return DataAccess.insert(data);
|
||||
}
|
||||
|
||||
@GET
|
||||
@Path("{id}")
|
||||
@PermitAll
|
||||
public MyModel get(@PathParam("id") final Long id) throws Exception {
|
||||
return DataAccess.get(MyModel.class, id);
|
||||
}
|
||||
|
||||
|
||||
@PATCH
|
||||
@Path("{id}")
|
||||
@PermitAll
|
||||
@Consumes(MyModelType.APPLICATION_JSON)
|
||||
public MyModel patch(@PathParam("id") final Long id, final String jsonRequest) throws Exception {
|
||||
DataAccess.updateWithJson(MyModel.class, id, jsonRequest);
|
||||
return DataAccess.get(MyModel.class, id);
|
||||
}
|
||||
|
||||
@DELETE
|
||||
@Path("{id}")
|
||||
@PermitAll
|
||||
public void remove(@PathParam("id") final Long id) throws Exception {
|
||||
DataAccess.delete(MyModel.class, id);
|
||||
}
|
||||
}
|
||||
28
sample/archidata/basic/migration/Initialization.java
Normal file
28
sample/archidata/basic/migration/Initialization.java
Normal file
@@ -0,0 +1,28 @@
|
||||
package sample.archidata.basic.migration;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.kar.archidata.migration.MigrationSqlStep;
|
||||
import sample.archidata.basic.model.MyModel;
|
||||
|
||||
public class Initialization extends MigrationSqlStep {
|
||||
public static final List<Class<?>> CLASSES_BASE = List.of(MyModel.class);
|
||||
@Override
|
||||
public String getName() {
|
||||
return "Initialization";
|
||||
}
|
||||
|
||||
@Override
|
||||
public void generateStep() throws Exception {
|
||||
for(final Class<?> clazz : CLASSES_BASE) {
|
||||
addClass(clazz);
|
||||
}
|
||||
|
||||
addAction("""
|
||||
ALTER TABLE `MyModel` AUTO_INCREMENT = 1000;
|
||||
""",
|
||||
// Only MySql support this request (fail in SQLite)
|
||||
"mysql");
|
||||
}
|
||||
|
||||
}
|
||||
36
sample/archidata/basic/model/MyModel.java
Normal file
36
sample/archidata/basic/model/MyModel.java
Normal file
@@ -0,0 +1,36 @@
|
||||
package sample.archidata.basic.model;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.kar.archidata.annotation.DataJson;
|
||||
import org.kar.archidata.model.Data;
|
||||
import org.kar.archidata.model.GenericDataSoftDelete;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.Table;
|
||||
|
||||
// needed for Swagger interface
|
||||
@Entity
|
||||
// Do not generate Null in Json serialization ==> prefer undefined
|
||||
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||
public class MyModel extends GenericDataSoftDelete {
|
||||
// Can not be NULL and max length is 300 (note default is 255)
|
||||
@Column(nullable = false, length = 300)
|
||||
public String name;
|
||||
// Can be null and no max length
|
||||
@Column(length = 0)
|
||||
public String description;
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "MyModel [name=" + this.name + ", description=" + this.description + "]";
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -7,7 +7,9 @@ public class GlobalConfiguration {
|
||||
public static DBConfig dbConfig = null;
|
||||
|
||||
static {
|
||||
dbConfig = new DBConfig(ConfigBaseVariable.getDBType(), ConfigBaseVariable.getDBHost(), Integer.parseInt(ConfigBaseVariable.getDBPort()), ConfigBaseVariable.getDBLogin(),
|
||||
ConfigBaseVariable.getDBPassword(), ConfigBaseVariable.getDBName(), ConfigBaseVariable.getDBKeepConnected());
|
||||
dbConfig = new DBConfig(ConfigBaseVariable.getDBType(), ConfigBaseVariable.getDBHost(),
|
||||
Integer.parseInt(ConfigBaseVariable.getDBPort()), ConfigBaseVariable.getDBLogin(),
|
||||
ConfigBaseVariable.getDBPassword(), ConfigBaseVariable.getDBName(),
|
||||
ConfigBaseVariable.getDBKeepConnected());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,9 +5,9 @@ import java.sql.PreparedStatement;
|
||||
import java.sql.SQLException;
|
||||
|
||||
import org.kar.archidata.dataAccess.DataAccess;
|
||||
import org.kar.archidata.dataAccess.QueryOption;
|
||||
import org.kar.archidata.dataAccess.QueryOptions;
|
||||
import org.kar.archidata.dataAccess.options.DBInterfaceOption;
|
||||
import org.kar.archidata.dataAccess.options.QueryOption;
|
||||
import org.kar.archidata.db.DBEntry;
|
||||
import org.kar.archidata.model.User;
|
||||
|
||||
@@ -19,7 +19,8 @@ public class UserDB {
|
||||
return DataAccess.get(User.class, userId, option);
|
||||
}
|
||||
|
||||
public static User getUserOrCreate(final long userId, final String userLogin, QueryOption... option) throws Exception {
|
||||
public static User getUserOrCreate(final long userId, final String userLogin, QueryOption... option)
|
||||
throws Exception {
|
||||
final User user = getUsers(userId);
|
||||
if (user != null) {
|
||||
return user;
|
||||
@@ -28,7 +29,8 @@ public class UserDB {
|
||||
return getUsers(userId);
|
||||
}
|
||||
|
||||
private static void createUsersInfoFromOAuth(final long userId, final String login, QueryOption... option) throws IOException {
|
||||
private static void createUsersInfoFromOAuth(final long userId, final String login, QueryOption... option)
|
||||
throws IOException {
|
||||
QueryOptions options = new QueryOptions(option);
|
||||
final DBEntry entry = DBInterfaceOption.getAutoEntry(options);
|
||||
final String query = "INSERT INTO `user` (`id`, `login`, `lastConnection`, `admin`, `blocked`, `removed`) VALUE (?,?,now(3),'0','0','0')";
|
||||
|
||||
@@ -29,9 +29,9 @@ public class AnnotationTools {
|
||||
|
||||
public static String getTableName(final Class<?> clazz, final QueryOptions options) throws Exception {
|
||||
if (options != null) {
|
||||
final OverrideTableName data = options.get(OverrideTableName.class);
|
||||
if (data != null) {
|
||||
return data.getName();
|
||||
final List<OverrideTableName> data = options.get(OverrideTableName.class);
|
||||
if (data.size() == 1) {
|
||||
return data.get(0).getName();
|
||||
}
|
||||
}
|
||||
return AnnotationTools.getTableName(clazz);
|
||||
@@ -59,7 +59,8 @@ public class AnnotationTools {
|
||||
return false;
|
||||
}
|
||||
if (annotation.length > 1) {
|
||||
throw new Exception("Must not have more than 1 element @Schema on " + element.getClass().getCanonicalName());
|
||||
throw new Exception(
|
||||
"Must not have more than 1 element @Schema on " + element.getClass().getCanonicalName());
|
||||
}
|
||||
return ((Schema) annotation[0]).readOnly();
|
||||
}
|
||||
@@ -70,7 +71,8 @@ public class AnnotationTools {
|
||||
return null;
|
||||
}
|
||||
if (annotation.length > 1) {
|
||||
throw new Exception("Must not have more than 1 element @Schema on " + element.getClass().getCanonicalName());
|
||||
throw new Exception(
|
||||
"Must not have more than 1 element @Schema on " + element.getClass().getCanonicalName());
|
||||
}
|
||||
return ((Schema) annotation[0]).example();
|
||||
}
|
||||
@@ -81,7 +83,8 @@ public class AnnotationTools {
|
||||
return null;
|
||||
}
|
||||
if (annotation.length > 1) {
|
||||
throw new Exception("Must not have more than 1 element @Schema on " + element.getClass().getCanonicalName());
|
||||
throw new Exception(
|
||||
"Must not have more than 1 element @Schema on " + element.getClass().getCanonicalName());
|
||||
}
|
||||
return ((Schema) annotation[0]).description();
|
||||
}
|
||||
@@ -92,7 +95,8 @@ public class AnnotationTools {
|
||||
return null;
|
||||
}
|
||||
if (annotation.length > 1) {
|
||||
throw new Exception("Must not have more than 1 element @Schema on " + element.getClass().getCanonicalName());
|
||||
throw new Exception(
|
||||
"Must not have more than 1 element @Schema on " + element.getClass().getCanonicalName());
|
||||
}
|
||||
return ((Schema) annotation[0]).description();
|
||||
}
|
||||
@@ -103,7 +107,8 @@ public class AnnotationTools {
|
||||
return getSchemaDescription(element);
|
||||
}
|
||||
if (annotation.length > 1) {
|
||||
throw new Exception("Must not have more than 1 element @DataComment on " + element.getClass().getCanonicalName());
|
||||
throw new Exception(
|
||||
"Must not have more than 1 element @DataComment on " + element.getClass().getCanonicalName());
|
||||
}
|
||||
return ((DataComment) annotation[0]).value();
|
||||
}
|
||||
@@ -114,7 +119,8 @@ public class AnnotationTools {
|
||||
return null;
|
||||
}
|
||||
if (annotation.length > 1) {
|
||||
throw new Exception("Must not have more than 1 element @DataDefault on " + element.getClass().getCanonicalName());
|
||||
throw new Exception(
|
||||
"Must not have more than 1 element @DataDefault on " + element.getClass().getCanonicalName());
|
||||
}
|
||||
return ((DefaultValue) annotation[0]).value();
|
||||
}
|
||||
@@ -125,7 +131,8 @@ public class AnnotationTools {
|
||||
return null;
|
||||
}
|
||||
if (annotation.length > 1) {
|
||||
throw new Exception("Must not have more than 1 element @ManyToOne on " + element.getClass().getCanonicalName());
|
||||
throw new Exception(
|
||||
"Must not have more than 1 element @ManyToOne on " + element.getClass().getCanonicalName());
|
||||
}
|
||||
return (ManyToOne) annotation[0];
|
||||
}
|
||||
@@ -136,7 +143,8 @@ public class AnnotationTools {
|
||||
return null;
|
||||
}
|
||||
if (annotation.length > 1) {
|
||||
throw new Exception("Must not have more than 1 element @ManyToOne on " + element.getClass().getCanonicalName());
|
||||
throw new Exception(
|
||||
"Must not have more than 1 element @ManyToOne on " + element.getClass().getCanonicalName());
|
||||
}
|
||||
return (DataJson) annotation[0];
|
||||
}
|
||||
@@ -169,7 +177,8 @@ public class AnnotationTools {
|
||||
return 255;
|
||||
}
|
||||
if (annotation.length > 1) {
|
||||
throw new Exception("Must not have more than 1 element @Column on " + element.getClass().getCanonicalName());
|
||||
throw new Exception(
|
||||
"Must not have more than 1 element @Column on " + element.getClass().getCanonicalName());
|
||||
}
|
||||
final int length = ((Column) annotation[0]).length();
|
||||
return length <= 0 ? 0 : length;
|
||||
@@ -192,7 +201,8 @@ public class AnnotationTools {
|
||||
return null;
|
||||
}
|
||||
if (annotation.length > 1) {
|
||||
throw new Exception("Must not have more than 1 element @Pattern on " + element.getClass().getCanonicalName());
|
||||
throw new Exception(
|
||||
"Must not have more than 1 element @Pattern on " + element.getClass().getCanonicalName());
|
||||
}
|
||||
return ((Pattern) annotation[0]).regexp();
|
||||
}
|
||||
@@ -226,7 +236,8 @@ public class AnnotationTools {
|
||||
return element.getName();
|
||||
}
|
||||
if (annotation.length > 1) {
|
||||
throw new Exception("Must not have more than 1 element @Column on " + element.getClass().getCanonicalName());
|
||||
throw new Exception(
|
||||
"Must not have more than 1 element @Column on " + element.getClass().getCanonicalName());
|
||||
}
|
||||
final String name = ((Column) annotation[0]).name();
|
||||
if (name.isBlank()) {
|
||||
@@ -241,7 +252,8 @@ public class AnnotationTools {
|
||||
return false;
|
||||
}
|
||||
if (annotation.length > 1) {
|
||||
throw new Exception("Must not have more than 1 element @Column on " + element.getClass().getCanonicalName());
|
||||
throw new Exception(
|
||||
"Must not have more than 1 element @Column on " + element.getClass().getCanonicalName());
|
||||
}
|
||||
return !((Column) annotation[0]).nullable();
|
||||
}
|
||||
@@ -252,11 +264,25 @@ public class AnnotationTools {
|
||||
return false;
|
||||
}
|
||||
if (annotation.length > 1) {
|
||||
throw new Exception("Must not have more than 1 element @NotNull on " + element.getClass().getCanonicalName());
|
||||
throw new Exception(
|
||||
"Must not have more than 1 element @NotNull on " + element.getClass().getCanonicalName());
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public static Field getPrimaryKeyField(final Class<?> clazz) throws Exception {
|
||||
for (final Field field : clazz.getFields()) {
|
||||
// static field is only for internal global declaration ==> remove it ..
|
||||
if (java.lang.reflect.Modifier.isStatic(field.getModifiers())) {
|
||||
continue;
|
||||
}
|
||||
if (AnnotationTools.isPrimaryKey(field)) {
|
||||
return field;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public static boolean isPrimaryKey(final Field element) throws Exception {
|
||||
final Annotation[] annotation = element.getDeclaredAnnotationsByType(Id.class);
|
||||
if (annotation.length == 0) {
|
||||
@@ -271,7 +297,8 @@ public class AnnotationTools {
|
||||
return false;
|
||||
}
|
||||
if (annotation.length > 1) {
|
||||
throw new Exception("Must not have more than 1 element @Column on " + element.getClass().getCanonicalName());
|
||||
throw new Exception(
|
||||
"Must not have more than 1 element @Column on " + element.getClass().getCanonicalName());
|
||||
}
|
||||
return ((Column) annotation[0]).unique();
|
||||
}
|
||||
@@ -282,7 +309,8 @@ public class AnnotationTools {
|
||||
return null;
|
||||
}
|
||||
if (annotation.length > 1) {
|
||||
throw new Exception("Must not have more than 1 element @Column on " + element.getClass().getCanonicalName());
|
||||
throw new Exception(
|
||||
"Must not have more than 1 element @Column on " + element.getClass().getCanonicalName());
|
||||
}
|
||||
return ((GeneratedValue) annotation[0]).strategy();
|
||||
}
|
||||
@@ -382,7 +410,8 @@ public class AnnotationTools {
|
||||
}
|
||||
|
||||
public static boolean isGenericField(final Field elem) throws Exception {
|
||||
return AnnotationTools.isPrimaryKey(elem) || AnnotationTools.isCreatedAtField(elem) || AnnotationTools.isUpdateAtField(elem) || AnnotationTools.isDeletedField(elem);
|
||||
return AnnotationTools.isPrimaryKey(elem) || AnnotationTools.isCreatedAtField(elem)
|
||||
|| AnnotationTools.isUpdateAtField(elem) || AnnotationTools.isDeletedField(elem);
|
||||
}
|
||||
|
||||
public static Field getFieldOfId(final Class<?> clazz) throws Exception {
|
||||
|
||||
@@ -9,5 +9,9 @@ import java.lang.annotation.Target;
|
||||
@Target({ ElementType.PARAMETER, ElementType.METHOD })
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
public @interface AsyncType {
|
||||
Class<?> value();
|
||||
// Possible class values.
|
||||
Class<?>[] value();
|
||||
|
||||
// direct copy value in the TypeScript (separate with type by a |
|
||||
String[] tsComplement() default {};
|
||||
}
|
||||
|
||||
11
src/org/kar/archidata/annotation/TypeScriptProgress.java
Normal file
11
src/org/kar/archidata/annotation/TypeScriptProgress.java
Normal file
@@ -0,0 +1,11 @@
|
||||
package org.kar.archidata.annotation;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
import java.lang.annotation.Target;
|
||||
|
||||
/** In case of the update parameter with String input to detect null element. */
|
||||
@Target({ ElementType.PARAMETER, ElementType.METHOD })
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
public @interface TypeScriptProgress {}
|
||||
@@ -85,7 +85,8 @@ public class DataResource {
|
||||
}
|
||||
|
||||
public static String getFileDataOld(final long tmpFolderId) {
|
||||
final String filePath = ConfigBaseVariable.getMediaDataFolder() + File.separator + tmpFolderId + File.separator + "data";
|
||||
final String filePath = ConfigBaseVariable.getMediaDataFolder() + File.separator + tmpFolderId + File.separator
|
||||
+ "data";
|
||||
try {
|
||||
createFolder(ConfigBaseVariable.getMediaDataFolder() + File.separator + tmpFolderId + File.separator);
|
||||
} catch (final IOException e) {
|
||||
@@ -93,13 +94,15 @@ public class DataResource {
|
||||
}
|
||||
return filePath;
|
||||
}
|
||||
|
||||
public static String getFileData(final UUID uuid) {
|
||||
final String stringUUID = uuid.toString();
|
||||
final String part1 = stringUUID.substring(0, 2);
|
||||
final String part2 = stringUUID.substring(2, 4);
|
||||
final String part3 = stringUUID.substring(4);
|
||||
final String finalPath = part1 + File.separator + part2;
|
||||
String filePath = ConfigBaseVariable.getMediaDataFolder() + "_uuid" + File.separator + finalPath + File.separator;
|
||||
String filePath = ConfigBaseVariable.getMediaDataFolder() + "_uuid" + File.separator + finalPath
|
||||
+ File.separator;
|
||||
try {
|
||||
createFolder(filePath);
|
||||
} catch (final IOException e) {
|
||||
@@ -108,6 +111,7 @@ public class DataResource {
|
||||
filePath += part3;
|
||||
return filePath;
|
||||
}
|
||||
|
||||
public static String getFileMetaData(final UUID uuid) {
|
||||
return getFileData(uuid) + ".json";
|
||||
}
|
||||
@@ -134,7 +138,8 @@ public class DataResource {
|
||||
return null;
|
||||
}
|
||||
|
||||
public static Data createNewData(final long tmpUID, final String originalFileName, final String sha512) throws IOException {
|
||||
public static Data createNewData(final long tmpUID, final String originalFileName, final String sha512)
|
||||
throws IOException {
|
||||
// determine mime type:
|
||||
Data injectedData = new Data();
|
||||
String mimeType = "";
|
||||
@@ -159,7 +164,7 @@ public class DataResource {
|
||||
e.printStackTrace();
|
||||
return null;
|
||||
}
|
||||
final String mediaPath = getFileData(injectedData.id);
|
||||
final String mediaPath = getFileData(injectedData.uuid);
|
||||
LOGGER.info("src = {}", tmpPath);
|
||||
LOGGER.info("dst = {}", mediaPath);
|
||||
Files.move(Paths.get(tmpPath), Paths.get(mediaPath), StandardCopyOption.ATOMIC_MOVE);
|
||||
@@ -259,7 +264,10 @@ public class DataResource {
|
||||
@Consumes({ MediaType.MULTIPART_FORM_DATA })
|
||||
@RolesAllowed("ADMIN")
|
||||
@Operation(description = "Insert a new data in the data environment", tags = "SYSTEM")
|
||||
public void uploadFile(@Context final SecurityContext sc, @FormDataParam("file") final InputStream fileInputStream, @FormDataParam("file") final FormDataContentDisposition fileMetaData) {
|
||||
public void uploadFile(
|
||||
@Context final SecurityContext sc,
|
||||
@FormDataParam("file") final InputStream fileInputStream,
|
||||
@FormDataParam("file") final FormDataContentDisposition fileMetaData) {
|
||||
final GenericContext gc = (GenericContext) sc.getUserPrincipal();
|
||||
LOGGER.info("===================================================");
|
||||
LOGGER.info("== DATA uploadFile {}", (gc == null ? "null" : gc.userByToken));
|
||||
@@ -276,45 +284,52 @@ public class DataResource {
|
||||
}
|
||||
|
||||
@GET
|
||||
@Path("{id}")
|
||||
@Path("{uuid}")
|
||||
@PermitTokenInURI
|
||||
@RolesAllowed("USER")
|
||||
@Produces(MediaType.APPLICATION_OCTET_STREAM)
|
||||
@Operation(description = "Get back some data from the data environment", tags = "SYSTEM")
|
||||
public Response retrieveDataId(@Context final SecurityContext sc, @QueryParam(HttpHeaders.AUTHORIZATION) final String token, @HeaderParam("Range") final String range,
|
||||
@PathParam("id") final UUID id) throws Exception {
|
||||
public Response retrieveDataId(
|
||||
@Context final SecurityContext sc,
|
||||
@QueryParam(HttpHeaders.AUTHORIZATION) final String token,
|
||||
@HeaderParam("Range") final String range,
|
||||
@PathParam("uuid") final UUID uuid) throws Exception {
|
||||
final GenericContext gc = (GenericContext) sc.getUserPrincipal();
|
||||
// logger.info("===================================================");
|
||||
LOGGER.info("== DATA retrieveDataId ? id={} user={}", id, (gc == null ? "null" : gc.userByToken));
|
||||
LOGGER.info("== DATA retrieveDataId ? id={} user={}", uuid, (gc == null ? "null" : gc.userByToken));
|
||||
// logger.info("===================================================");
|
||||
final Data value = getSmall(id);
|
||||
final Data value = getSmall(uuid);
|
||||
if (value == null) {
|
||||
Response.status(404).entity("media NOT FOUND: " + id).type("text/plain").build();
|
||||
Response.status(404).entity("media NOT FOUND: " + uuid).type("text/plain").build();
|
||||
}
|
||||
return buildStream(getFileData(id), range, value.mimeType);
|
||||
return buildStream(getFileData(uuid), range, value.mimeType);
|
||||
}
|
||||
|
||||
@GET
|
||||
@Path("thumbnail/{id}")
|
||||
@Path("thumbnail/{uuid}")
|
||||
@RolesAllowed("USER")
|
||||
@PermitTokenInURI
|
||||
@Produces(MediaType.APPLICATION_OCTET_STREAM)
|
||||
@Operation(description = "Get a thumbnail of from the data environment (if resize is possible)", tags = "SYSTEM")
|
||||
// @CacheMaxAge(time = 10, unit = TimeUnit.DAYS)
|
||||
public Response retrieveDataThumbnailId(@Context final SecurityContext sc, @QueryParam(HttpHeaders.AUTHORIZATION) final String token, @HeaderParam("Range") final String range,
|
||||
@PathParam("id") final UUID id) throws Exception {
|
||||
public Response retrieveDataThumbnailId(
|
||||
@Context final SecurityContext sc,
|
||||
@QueryParam(HttpHeaders.AUTHORIZATION) final String token,
|
||||
@HeaderParam("Range") final String range,
|
||||
@PathParam("uuid") final UUID uuid) throws Exception {
|
||||
// GenericContext gc = (GenericContext) sc.getUserPrincipal();
|
||||
// logger.info("===================================================");
|
||||
// logger.info("== DATA retrieveDataThumbnailId ? {}", (gc==null?"null":gc.user));
|
||||
// logger.info("===================================================");
|
||||
final Data value = getSmall(id);
|
||||
final Data value = getSmall(uuid);
|
||||
if (value == null) {
|
||||
return Response.status(404).entity("media NOT FOUND: " + id).type("text/plain").build();
|
||||
return Response.status(404).entity("media NOT FOUND: " + uuid).type("text/plain").build();
|
||||
}
|
||||
final String filePathName = getFileData(id);
|
||||
final String filePathName = getFileData(uuid);
|
||||
final File inputFile = new File(filePathName);
|
||||
if (!inputFile.exists()) {
|
||||
return Response.status(404).entity("{\"error\":\"media Does not exist: " + id + "\"}").type("application/json").build();
|
||||
return Response.status(404).entity("{\"error\":\"media Does not exist: " + uuid + "\"}")
|
||||
.type("application/json").build();
|
||||
}
|
||||
if (value.mimeType.contentEquals("image/jpeg") || value.mimeType.contentEquals("image/png")
|
||||
// || value.mimeType.contentEquals("image/webp")
|
||||
@@ -322,7 +337,8 @@ public class DataResource {
|
||||
// reads input image
|
||||
final BufferedImage inputImage = ImageIO.read(inputFile);
|
||||
final int scaledWidth = 250;
|
||||
final int scaledHeight = (int) ((float) inputImage.getHeight() / (float) inputImage.getWidth() * scaledWidth);
|
||||
final int scaledHeight = (int) ((float) inputImage.getHeight() / (float) inputImage.getWidth()
|
||||
* scaledWidth);
|
||||
// creates output image
|
||||
final BufferedImage outputImage = new BufferedImage(scaledWidth, scaledHeight, inputImage.getType());
|
||||
|
||||
@@ -337,11 +353,13 @@ public class DataResource {
|
||||
ImageIO.write(outputImage, "JPG", baos);
|
||||
} catch (final IOException e) {
|
||||
e.printStackTrace();
|
||||
return Response.status(500).entity("Internal Error: resize fail: " + e.getMessage()).type("text/plain").build();
|
||||
return Response.status(500).entity("Internal Error: resize fail: " + e.getMessage()).type("text/plain")
|
||||
.build();
|
||||
}
|
||||
final byte[] imageData = baos.toByteArray();
|
||||
// Response.ok(new ByteArrayInputStream(imageData)).build();
|
||||
final Response.ResponseBuilder out = Response.ok(imageData).header(HttpHeaders.CONTENT_LENGTH, imageData.length);
|
||||
final Response.ResponseBuilder out = Response.ok(imageData).header(HttpHeaders.CONTENT_LENGTH,
|
||||
imageData.length);
|
||||
out.type("image/jpeg");
|
||||
// TODO: move this in a decorator !!!
|
||||
final CacheControl cc = new CacheControl();
|
||||
@@ -353,24 +371,27 @@ public class DataResource {
|
||||
return buildStream(filePathName, range, value.mimeType);
|
||||
}
|
||||
|
||||
// @Secured
|
||||
@GET
|
||||
@Path("{id}/{name}")
|
||||
@Path("{uuid}/{name}")
|
||||
@PermitTokenInURI
|
||||
@RolesAllowed("USER")
|
||||
@Produces(MediaType.APPLICATION_OCTET_STREAM)
|
||||
@Operation(description = "Get back some data from the data environment (with a beautifull name (permit download with basic name)", tags = "SYSTEM")
|
||||
public Response retrieveDataFull(@Context final SecurityContext sc, @QueryParam(HttpHeaders.AUTHORIZATION) final String token, @HeaderParam("Range") final String range,
|
||||
@PathParam("id") final UUID id, @PathParam("name") final String name) throws Exception {
|
||||
@Operation(description = "Get back some data from the data environment (with a beautiful name (permit download with basic name)", tags = "SYSTEM")
|
||||
public Response retrieveDataFull(
|
||||
@Context final SecurityContext sc,
|
||||
@QueryParam(HttpHeaders.AUTHORIZATION) final String token,
|
||||
@HeaderParam("Range") final String range,
|
||||
@PathParam("uuid") final UUID uuid,
|
||||
@PathParam("name") final String name) throws Exception {
|
||||
final GenericContext gc = (GenericContext) sc.getUserPrincipal();
|
||||
// logger.info("===================================================");
|
||||
LOGGER.info("== DATA retrieveDataFull ? id={} user={}", id, (gc == null ? "null" : gc.userByToken));
|
||||
LOGGER.info("== DATA retrieveDataFull ? id={} user={}", uuid, (gc == null ? "null" : gc.userByToken));
|
||||
// logger.info("===================================================");
|
||||
final Data value = getSmall(id);
|
||||
final Data value = getSmall(uuid);
|
||||
if (value == null) {
|
||||
Response.status(404).entity("media NOT FOUND: " + id).type("text/plain").build();
|
||||
Response.status(404).entity("media NOT FOUND: " + uuid).type("text/plain").build();
|
||||
}
|
||||
return buildStream(getFileData(id), range, value.mimeType);
|
||||
return buildStream(getFileData(uuid), range, value.mimeType);
|
||||
}
|
||||
|
||||
/** Adapted from http://stackoverflow.com/questions/12768812/video-streaming-to-ipad-does-not-work-with-tapestry5/12829541#12829541
|
||||
@@ -430,8 +451,10 @@ public class DataResource {
|
||||
|
||||
final long len = to - from + 1;
|
||||
final MediaStreamer streamer = new MediaStreamer(len, raf);
|
||||
final Response.ResponseBuilder out = Response.ok(streamer).status(Response.Status.PARTIAL_CONTENT).header("Accept-Ranges", "bytes").header("Content-Range", responseRange)
|
||||
.header(HttpHeaders.CONTENT_LENGTH, streamer.getLenth()).header(HttpHeaders.LAST_MODIFIED, new Date(file.lastModified()));
|
||||
final Response.ResponseBuilder out = Response.ok(streamer).status(Response.Status.PARTIAL_CONTENT)
|
||||
.header("Accept-Ranges", "bytes").header("Content-Range", responseRange)
|
||||
.header(HttpHeaders.CONTENT_LENGTH, streamer.getLenth())
|
||||
.header(HttpHeaders.LAST_MODIFIED, new Date(file.lastModified()));
|
||||
if (mimeType != null) {
|
||||
out.type(mimeType);
|
||||
}
|
||||
|
||||
@@ -31,7 +31,8 @@ public class MediaStreamer implements StreamingOutput {
|
||||
public void write(final OutputStream outputStream) {
|
||||
try {
|
||||
while (this.length != 0) {
|
||||
final int read = this.raf.read(this.buf, 0, this.buf.length > this.length ? (int) this.length : this.buf.length);
|
||||
final int read = this.raf.read(this.buf, 0,
|
||||
this.buf.length > this.length ? (int) this.length : this.buf.length);
|
||||
try {
|
||||
outputStream.write(this.buf, 0, read);
|
||||
} catch (final IOException ex) {
|
||||
|
||||
@@ -27,7 +27,8 @@ public class openApiResource extends BaseOpenApiResource {
|
||||
@Produces({ MediaType.APPLICATION_JSON })
|
||||
@PermitAll
|
||||
@Operation(hidden = true, description = "Get the OPEN-API description", tags = "SYSTEM")
|
||||
public Response getDescription(@Context final HttpHeaders headers, @Context final UriInfo uriInfo) throws Exception {
|
||||
public Response getDescription(@Context final HttpHeaders headers, @Context final UriInfo uriInfo)
|
||||
throws Exception {
|
||||
return getOpenApi(headers, this.config, this.app, uriInfo, "json");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,11 +16,13 @@ public class ExceptionCatcher implements ExceptionMapper<Exception> {
|
||||
final RestErrorResponse ret = build(exception);
|
||||
LOGGER.error("Error UUID={}", ret.uuid);
|
||||
exception.printStackTrace();
|
||||
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(ret).type(MediaType.APPLICATION_JSON).build();
|
||||
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(ret).type(MediaType.APPLICATION_JSON)
|
||||
.build();
|
||||
}
|
||||
|
||||
private RestErrorResponse build(final Exception exception) {
|
||||
return new RestErrorResponse(Response.Status.INTERNAL_SERVER_ERROR, "Catch Unknown Exception", exception.getMessage());
|
||||
return new RestErrorResponse(Response.Status.INTERNAL_SERVER_ERROR, "Catch Unknown Exception",
|
||||
exception.getMessage());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -15,11 +15,13 @@ public class FailException404API implements ExceptionMapper<ClientErrorException
|
||||
public Response toResponse(final ClientErrorException exception) {
|
||||
final RestErrorResponse ret = build(exception);
|
||||
LOGGER.error("Error UUID={}", ret.uuid);
|
||||
return Response.status(exception.getResponse().getStatusInfo().toEnum()).entity(ret).type(MediaType.APPLICATION_JSON).build();
|
||||
return Response.status(exception.getResponse().getStatusInfo().toEnum()).entity(ret)
|
||||
.type(MediaType.APPLICATION_JSON).build();
|
||||
}
|
||||
|
||||
private RestErrorResponse build(final ClientErrorException exception) {
|
||||
return new RestErrorResponse(exception.getResponse().getStatusInfo().toEnum(), "Catch system exception", exception.getMessage());
|
||||
return new RestErrorResponse(exception.getResponse().getStatusInfo().toEnum(), "Catch system exception",
|
||||
exception.getMessage());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -15,13 +15,15 @@ public class InputExceptionCatcher implements ExceptionMapper<InputException> {
|
||||
public Response toResponse(final InputException exception) {
|
||||
LOGGER.warn("Catch InputException:");
|
||||
final RestErrorResponse ret = build(exception);
|
||||
LOGGER.error("Error UUID={} ==> '{}'=>'{}'", ret.uuid, exception.missingVariable, exception.getLocalizedMessage());
|
||||
LOGGER.error("Error UUID={} ==> '{}'=>'{}'", ret.uuid, exception.missingVariable,
|
||||
exception.getLocalizedMessage());
|
||||
// exception.printStackTrace();
|
||||
return Response.status(exception.status).entity(ret).type(MediaType.APPLICATION_JSON).build();
|
||||
}
|
||||
|
||||
private RestErrorResponse build(final InputException exception) {
|
||||
return new RestErrorResponse(exception.status, "Error on input='" + exception.missingVariable + "'", exception.getMessage());
|
||||
return new RestErrorResponse(exception.status, "Error on input='" + exception.missingVariable + "'",
|
||||
exception.getMessage());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -18,11 +18,13 @@ public class JacksonCatcher implements ExceptionMapper<JsonProcessingException>
|
||||
final RestErrorResponse ret = build(exception);
|
||||
LOGGER.error("Error UUID={}", ret.uuid);
|
||||
exception.printStackTrace();
|
||||
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(ret).type(MediaType.APPLICATION_JSON).build();
|
||||
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(ret).type(MediaType.APPLICATION_JSON)
|
||||
.build();
|
||||
}
|
||||
|
||||
private RestErrorResponse build(final Exception exception) {
|
||||
return new RestErrorResponse(Response.Status.INTERNAL_SERVER_ERROR, "Catch JSON Exception", exception.getMessage());
|
||||
return new RestErrorResponse(Response.Status.INTERNAL_SERVER_ERROR, "Catch JSON Exception",
|
||||
exception.getMessage());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -3,19 +3,22 @@ package org.kar.archidata.catcher;
|
||||
import java.time.Instant;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.kar.archidata.tools.UuidUtils;
|
||||
|
||||
import jakarta.ws.rs.core.Response;
|
||||
|
||||
public class RestErrorResponse {
|
||||
public UUID uuid = UUID.randomUUID();
|
||||
public UUID uuid = UuidUtils.nextUUID();
|
||||
public String name; // Mandatory for TS generic error
|
||||
public String message; // Mandatory for TS generic error
|
||||
public String time;
|
||||
public String error;
|
||||
public String message;
|
||||
final public int status;
|
||||
final public String statusMessage;
|
||||
|
||||
public RestErrorResponse(final Response.Status status, final String time, final String error, final String message) {
|
||||
public RestErrorResponse(final Response.Status status, final String time, final String error,
|
||||
final String message) {
|
||||
this.time = time;
|
||||
this.error = error;
|
||||
this.name = error;
|
||||
this.message = message;
|
||||
this.status = status.getStatusCode();
|
||||
this.statusMessage = status.getReasonPhrase();
|
||||
@@ -23,13 +26,15 @@ public class RestErrorResponse {
|
||||
|
||||
public RestErrorResponse(final Response.Status status, final String error, final String message) {
|
||||
this.time = Instant.now().toString();
|
||||
this.error = error;
|
||||
this.name = error;
|
||||
this.message = message;
|
||||
this.status = status.getStatusCode();
|
||||
this.statusMessage = status.getReasonPhrase();
|
||||
}
|
||||
|
||||
public RestErrorResponse(final Response.Status status) {
|
||||
this.name = "generic";
|
||||
this.message = "";
|
||||
this.time = Instant.now().toString();
|
||||
this.status = status.getStatusCode();
|
||||
this.statusMessage = status.getReasonPhrase();
|
||||
|
||||
@@ -14,6 +14,7 @@ import java.time.Instant;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
@@ -30,6 +31,10 @@ import org.kar.archidata.dataAccess.options.Condition;
|
||||
import org.kar.archidata.dataAccess.options.DBInterfaceOption;
|
||||
import org.kar.archidata.dataAccess.options.DBInterfaceRoot;
|
||||
import org.kar.archidata.dataAccess.options.FilterValue;
|
||||
import org.kar.archidata.dataAccess.options.GroupBy;
|
||||
import org.kar.archidata.dataAccess.options.Limit;
|
||||
import org.kar.archidata.dataAccess.options.OrderBy;
|
||||
import org.kar.archidata.dataAccess.options.QueryOption;
|
||||
import org.kar.archidata.dataAccess.options.TransmitKey;
|
||||
import org.kar.archidata.db.DBEntry;
|
||||
import org.kar.archidata.exception.DataAccessException;
|
||||
@@ -73,7 +78,8 @@ public class DataAccess {
|
||||
|
||||
}
|
||||
|
||||
public static boolean isDBExist(final String name, final QueryOption... option) throws InternalServerErrorException {
|
||||
public static boolean isDBExist(final String name, final QueryOption... option)
|
||||
throws InternalServerErrorException {
|
||||
final QueryOptions options = new QueryOptions(option);
|
||||
if ("sqlite".equals(ConfigBaseVariable.getDBType())) {
|
||||
// no base manage in sqLite ...
|
||||
@@ -125,7 +131,7 @@ public class DataAccess {
|
||||
return true;
|
||||
}
|
||||
try {
|
||||
return 1 == DataAccess.executeSimpleQuerry("CREATE DATABASE `" + name + "`;", new DBInterfaceRoot(true));
|
||||
return 1 == DataAccess.executeSimpleQuery("CREATE DATABASE `" + name + "`;", new DBInterfaceRoot(true));
|
||||
} catch (final SQLException | IOException ex) {
|
||||
ex.printStackTrace();
|
||||
LOGGER.error("Can not check if the DB exist!!! {}", ex.getMessage());
|
||||
@@ -133,7 +139,8 @@ public class DataAccess {
|
||||
}
|
||||
}
|
||||
|
||||
public static boolean isTableExist(final String name, final QueryOption... option) throws InternalServerErrorException {
|
||||
public static boolean isTableExist(final String name, final QueryOption... option)
|
||||
throws InternalServerErrorException {
|
||||
final QueryOptions options = new QueryOptions(option);
|
||||
try {
|
||||
String request = "";
|
||||
@@ -174,18 +181,19 @@ public class DataAccess {
|
||||
throw new InternalServerErrorException("Can Not manage the DB-access");
|
||||
}
|
||||
|
||||
/** extract a list of "-" separated element from a SQL input data.
|
||||
/** Extract a list of Long with "-" separated element from a SQL input data.
|
||||
* @param rs Result Set of the BDD
|
||||
* @param iii Id in the result set
|
||||
* @return The list of Long value
|
||||
* @throws SQLException if an error is generated in the SQL request. */
|
||||
public static List<Long> getListOfIds(final ResultSet rs, final int iii, final String separator) throws SQLException {
|
||||
public static List<Long> getListOfIds(final ResultSet rs, final int iii, final String separator)
|
||||
throws SQLException {
|
||||
final String trackString = rs.getString(iii);
|
||||
if (rs.wasNull()) {
|
||||
return null;
|
||||
}
|
||||
final List<Long> out = new ArrayList<>();
|
||||
final String[] elements = trackString.split("-");
|
||||
final String[] elements = trackString.split(separator);
|
||||
for (final String elem : elements) {
|
||||
final Long tmp = Long.parseLong(elem);
|
||||
out.add(tmp);
|
||||
@@ -193,7 +201,61 @@ public class DataAccess {
|
||||
return out;
|
||||
}
|
||||
|
||||
protected static <T> void setValuedb(final Class<?> type, final T data, final CountInOut iii, final Field field, final PreparedStatement ps) throws Exception {
|
||||
/** Extract a list of UUID with "-" separated element from a SQL input data.
|
||||
* @param rs Result Set of the BDD
|
||||
* @param iii Id in the result set
|
||||
* @return The list of Long value
|
||||
* @throws SQLException if an error is generated in the SQL request. */
|
||||
public static List<UUID> getListOfUUIDs(final ResultSet rs, final int iii, final String separator)
|
||||
throws SQLException {
|
||||
final String trackString = rs.getString(iii);
|
||||
if (rs.wasNull()) {
|
||||
return null;
|
||||
}
|
||||
final List<UUID> out = new ArrayList<>();
|
||||
final String[] elements = trackString.split(separator);
|
||||
for (final String elem : elements) {
|
||||
final UUID tmp = UUID.fromString(elem);
|
||||
out.add(tmp);
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
public static byte[][] splitIntoGroupsOf16Bytes(final byte[] input) {
|
||||
final int inputLength = input.length;
|
||||
final int numOfGroups = (inputLength + 15) / 16; // Calculate the number of groups needed
|
||||
final byte[][] groups = new byte[numOfGroups][16];
|
||||
|
||||
for (int i = 0; i < numOfGroups; i++) {
|
||||
final int startIndex = i * 16;
|
||||
final int endIndex = Math.min(startIndex + 16, inputLength);
|
||||
groups[i] = Arrays.copyOfRange(input, startIndex, endIndex);
|
||||
}
|
||||
|
||||
return groups;
|
||||
}
|
||||
|
||||
public static List<UUID> getListOfRawUUIDs(final ResultSet rs, final int iii)
|
||||
throws SQLException, DataAccessException {
|
||||
final byte[] trackString = rs.getBytes(iii);
|
||||
if (rs.wasNull()) {
|
||||
return null;
|
||||
}
|
||||
final byte[][] elements = splitIntoGroupsOf16Bytes(trackString);
|
||||
final List<UUID> out = new ArrayList<>();
|
||||
for (final byte[] elem : elements) {
|
||||
final UUID tmp = UuidUtils.asUuid(elem);
|
||||
out.add(tmp);
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
protected static <T> void setValuedb(
|
||||
final Class<?> type,
|
||||
final T data,
|
||||
final CountInOut iii,
|
||||
final Field field,
|
||||
final PreparedStatement ps) throws Exception {
|
||||
if (type == UUID.class) {
|
||||
final Object tmp = field.get(data);
|
||||
if (tmp == null) {
|
||||
@@ -306,7 +368,13 @@ public class DataAccess {
|
||||
iii.inc();
|
||||
}
|
||||
|
||||
protected static <T> void setValueFromDb(final Class<?> type, final Object data, final CountInOut count, final Field field, final ResultSet rs, final CountInOut countNotNull) throws Exception {
|
||||
protected static <T> void setValueFromDb(
|
||||
final Class<?> type,
|
||||
final Object data,
|
||||
final CountInOut count,
|
||||
final Field field,
|
||||
final ResultSet rs,
|
||||
final CountInOut countNotNull) throws Exception {
|
||||
if (type == UUID.class) {
|
||||
final byte[] tmp = rs.getBytes(count.value);
|
||||
// final UUID tmp = rs.getObject(count.value, UUID.class);
|
||||
@@ -726,8 +794,8 @@ public class DataAccess {
|
||||
final QueryOptions options = new QueryOptions(option);
|
||||
|
||||
// External checker of data:
|
||||
final CheckFunction check = options.get(CheckFunction.class);
|
||||
if (check != null) {
|
||||
final List<CheckFunction> checks = options.get(CheckFunction.class);
|
||||
for (final CheckFunction check : checks) {
|
||||
check.getChecker().check("", data, AnnotationTools.getFieldsNames(clazz));
|
||||
}
|
||||
|
||||
@@ -823,19 +891,21 @@ public class DataAccess {
|
||||
query.append("?");
|
||||
}
|
||||
query.append(")");
|
||||
final OrderBy orders = options.get(OrderBy.class);
|
||||
if (orders != null) {
|
||||
orders.generateQuerry(query, tableName);
|
||||
final List<OrderBy> orders = options.get(OrderBy.class);
|
||||
for (final OrderBy order : orders) {
|
||||
order.generateQuery(query, tableName);
|
||||
}
|
||||
LOGGER.warn("generate the query: '{}'", query.toString());
|
||||
// prepare the request:
|
||||
final PreparedStatement ps = entry.connection.prepareStatement(query.toString(), Statement.RETURN_GENERATED_KEYS);
|
||||
final PreparedStatement ps = entry.connection.prepareStatement(query.toString(),
|
||||
Statement.RETURN_GENERATED_KEYS);
|
||||
|
||||
final CountInOut iii = new CountInOut(1);
|
||||
UUID uuid = null;
|
||||
if (generateUUID) {
|
||||
firstField = false;
|
||||
uuid = UUID.randomUUID();
|
||||
// uuid = UUID.randomUUID();
|
||||
uuid = UuidUtils.nextUUID();
|
||||
addElement(ps, uuid, iii);
|
||||
iii.inc();
|
||||
}
|
||||
@@ -889,13 +959,8 @@ public class DataAccess {
|
||||
if (generatedKeys.next()) {
|
||||
if (primaryKeyField.getType() == UUID.class) {
|
||||
// uniqueSQLUUID = generatedKeys.getObject(1, UUID.class);
|
||||
/*
|
||||
final Object obj = generatedKeys.getObject(1);
|
||||
final BigInteger bigint = (BigInteger) generatedKeys.getObject(1);
|
||||
uniqueSQLUUID = UuidUtils.asUuid(bigint);
|
||||
final UUID generatedUUID = (UUID) generatedKeys.getObject(1);
|
||||
System.out.println("UUID généré: " + generatedUUID);
|
||||
*/
|
||||
/* final Object obj = generatedKeys.getObject(1); final BigInteger bigint = (BigInteger) generatedKeys.getObject(1); uniqueSQLUUID = UuidUtils.asUuid(bigint); final UUID
|
||||
* generatedUUID = (UUID) generatedKeys.getObject(1); System.out.println("UUID généré: " + generatedUUID); */
|
||||
final Object obj = generatedKeys.getObject(1);
|
||||
final byte[] tmpid = generatedKeys.getBytes(1);
|
||||
uniqueSQLUUID = UuidUtils.asUuid(tmpid);
|
||||
@@ -925,14 +990,20 @@ public class DataAccess {
|
||||
}
|
||||
// ps.execute();
|
||||
} catch (final SQLException ex) {
|
||||
LOGGER.error("Fail SQL request: {}", ex.getMessage());
|
||||
ex.printStackTrace();
|
||||
throw new DataAccessException("Fail to Insert data in DB : " + ex.getMessage());
|
||||
} finally {
|
||||
entry.close();
|
||||
}
|
||||
final List<LazyGetter> asyncActions = new ArrayList<>();
|
||||
for (final Field field : asyncFieldUpdate) {
|
||||
final DataAccessAddOn addOn = findAddOnforField(field);
|
||||
if (uniqueSQLID != null) {
|
||||
addOn.asyncInsert(tableName, uniqueSQLID, field, field.get(data), asyncActions);
|
||||
} else if (uniqueSQLUUID != null) {
|
||||
addOn.asyncInsert(tableName, uniqueSQLUUID, field, field.get(data), asyncActions);
|
||||
}
|
||||
}
|
||||
for (final LazyGetter action : asyncActions) {
|
||||
action.doRequest();
|
||||
@@ -948,11 +1019,13 @@ public class DataAccess {
|
||||
return insert(data);
|
||||
}
|
||||
|
||||
public static <ID_TYPE> QueryCondition getTableIdCondition(final Class<?> clazz, final ID_TYPE idKey) throws Exception {
|
||||
public static <ID_TYPE> QueryCondition getTableIdCondition(final Class<?> clazz, final ID_TYPE idKey)
|
||||
throws Exception {
|
||||
// Find the ID field type ....
|
||||
final Field idField = AnnotationTools.getIdField(clazz);
|
||||
if (idField == null) {
|
||||
throw new DataAccessException("The class have no annotation @Id ==> can not determine the default type searching");
|
||||
throw new DataAccessException(
|
||||
"The class have no annotation @Id ==> can not determine the default type searching");
|
||||
}
|
||||
// check the compatibility of the id and the declared ID
|
||||
final Class<?> typeClass = idField.getType();
|
||||
@@ -961,7 +1034,8 @@ public class DataAccess {
|
||||
}
|
||||
if (idKey.getClass() != typeClass) {
|
||||
if (idKey.getClass() == Condition.class) {
|
||||
throw new DataAccessException("Try to identify the ID type on a condition 'close' internal API error use xxxWhere(...) instead.");
|
||||
throw new DataAccessException(
|
||||
"Try to identify the ID type on a condition 'close' internal API error use xxxWhere(...) instead.");
|
||||
}
|
||||
throw new DataAccessException("Request update with the wrong type ...");
|
||||
}
|
||||
@@ -977,21 +1051,21 @@ public class DataAccess {
|
||||
* @param jsonData Json data (partial) values to update
|
||||
* @return the number of object updated
|
||||
* @throws Exception */
|
||||
public static <T, ID_TYPE> int updateWithJson(final Class<T> clazz, final ID_TYPE id, final String jsonData, final QueryOption... option) throws Exception {
|
||||
public static <T, ID_TYPE> int updateWithJson(
|
||||
final Class<T> clazz,
|
||||
final ID_TYPE id,
|
||||
final String jsonData,
|
||||
final QueryOption... option) throws Exception {
|
||||
final QueryOptions options = new QueryOptions(option);
|
||||
final Condition condition = options.get(Condition.class);
|
||||
if (condition != null) {
|
||||
throw new DataAccessException("request a updateWithJson with a condition");
|
||||
}
|
||||
options.add(new Condition(getTableIdCondition(clazz, id)));
|
||||
options.add(new TransmitKey(id));
|
||||
return updateWhereWithJson(clazz, jsonData, options.getAllArray());
|
||||
}
|
||||
|
||||
public static <T> int updateWhereWithJson(final Class<T> clazz, final String jsonData, final QueryOption... option) throws Exception {
|
||||
public static <T> int updateWhereWithJson(final Class<T> clazz, final String jsonData, final QueryOption... option)
|
||||
throws Exception {
|
||||
final QueryOptions options = new QueryOptions(option);
|
||||
final Condition condition = options.get(Condition.class);
|
||||
if (condition == null) {
|
||||
if (options.get(Condition.class).size() == 0) {
|
||||
throw new DataAccessException("request a updateWhereWithJson without any condition");
|
||||
}
|
||||
final ObjectMapper mapper = new ObjectMapper();
|
||||
@@ -1016,7 +1090,11 @@ public class DataAccess {
|
||||
* @param filterValue
|
||||
* @return the affected rows.
|
||||
* @throws Exception */
|
||||
public static <T, ID_TYPE> int update(final T data, final ID_TYPE id, final List<String> updateColomn, final QueryOption... option) throws Exception {
|
||||
public static <T, ID_TYPE> int update(
|
||||
final T data,
|
||||
final ID_TYPE id,
|
||||
final List<String> updateColomn,
|
||||
final QueryOption... option) throws Exception {
|
||||
final QueryOptions options = new QueryOptions(option);
|
||||
options.add(new Condition(getTableIdCondition(data.getClass(), id)));
|
||||
options.add(new FilterValue(updateColomn));
|
||||
@@ -1031,18 +1109,16 @@ public class DataAccess {
|
||||
|
||||
public static <T> int updateWhere(final T data, final QueryOptions options) throws Exception {
|
||||
final Class<?> clazz = data.getClass();
|
||||
final Condition condition = options.get(Condition.class);
|
||||
if (condition == null) {
|
||||
throw new DataAccessException("request a gets without any condition");
|
||||
}
|
||||
final FilterValue filter = options.get(FilterValue.class);
|
||||
if (filter == null) {
|
||||
throw new DataAccessException("request a gets without any filter values");
|
||||
final Condition condition = conditionFusionOrEmpty(options, true);
|
||||
final List<FilterValue> filters = options.get(FilterValue.class);
|
||||
if (filters.size() != 1) {
|
||||
throw new DataAccessException("request a gets without/or with more 1 filter of values");
|
||||
}
|
||||
final FilterValue filter = filters.get(0);
|
||||
// External checker of data:
|
||||
if (options != null) {
|
||||
final CheckFunction check = options.get(CheckFunction.class);
|
||||
if (check != null) {
|
||||
final List<CheckFunction> checks = options.get(CheckFunction.class);
|
||||
for (final CheckFunction check : checks) {
|
||||
check.getChecker().check("", data, filter.getValues());
|
||||
}
|
||||
}
|
||||
@@ -1072,11 +1148,12 @@ public class DataAccess {
|
||||
final DataAccessAddOn addOn = findAddOnforField(field);
|
||||
if (addOn != null && !addOn.canInsert(field)) {
|
||||
if (addOn.isInsertAsync(field)) {
|
||||
final TransmitKey transmitKey = options.get(TransmitKey.class);
|
||||
if (transmitKey == null) {
|
||||
throw new DataAccessException("Fail to transmit Key to update the async update...");
|
||||
final List<TransmitKey> transmitKey = options.get(TransmitKey.class);
|
||||
if (transmitKey.size() != 1) {
|
||||
throw new DataAccessException(
|
||||
"Fail to transmit Key to update the async update... (must have only 1)");
|
||||
}
|
||||
addOn.asyncUpdate(tableName, transmitKey.getKey(), field, field.get(data), asyncActions);
|
||||
addOn.asyncUpdate(tableName, transmitKey.get(0).getKey(), field, field.get(data), asyncActions);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
@@ -1096,9 +1173,9 @@ public class DataAccess {
|
||||
query.append("` = ? ");
|
||||
}
|
||||
query.append(" ");
|
||||
final OrderBy orders = options.get(OrderBy.class);
|
||||
if (orders != null) {
|
||||
orders.generateQuerry(query, tableName);
|
||||
final List<OrderBy> orders = options.get(OrderBy.class);
|
||||
for (final OrderBy order : orders) {
|
||||
order.generateQuery(query, tableName);
|
||||
}
|
||||
query.append(" ");
|
||||
final String deletedFieldName = AnnotationTools.getDeletedFieldName(clazz);
|
||||
@@ -1106,9 +1183,10 @@ public class DataAccess {
|
||||
|
||||
// If the first field is not set, then nothing to update n the main base:
|
||||
if (!firstField) {
|
||||
LOGGER.debug("generate the query: '{}'", query.toString());
|
||||
LOGGER.debug("generate update query: '{}'", query.toString());
|
||||
// prepare the request:
|
||||
final PreparedStatement ps = entry.connection.prepareStatement(query.toString(), Statement.RETURN_GENERATED_KEYS);
|
||||
final PreparedStatement ps = entry.connection.prepareStatement(query.toString(),
|
||||
Statement.RETURN_GENERATED_KEYS);
|
||||
final CountInOut iii = new CountInOut(1);
|
||||
for (final Field field : clazz.getFields()) {
|
||||
// static field is only for internal global declaration ==> remove it ..
|
||||
@@ -1138,7 +1216,7 @@ public class DataAccess {
|
||||
addOn.insertData(ps, field, data, iii);
|
||||
}
|
||||
}
|
||||
condition.injectQuerry(ps, iii);
|
||||
condition.injectQuery(ps, iii);
|
||||
return ps.executeUpdate();
|
||||
}
|
||||
} catch (final SQLException ex) {
|
||||
@@ -1150,7 +1228,8 @@ public class DataAccess {
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void addElement(final PreparedStatement ps, final Object value, final CountInOut iii) throws Exception {
|
||||
public static void addElement(final PreparedStatement ps, final Object value, final CountInOut iii)
|
||||
throws Exception {
|
||||
if (value instanceof final UUID tmp) {
|
||||
final byte[] dataByte = UuidUtils.asBytes(tmp);
|
||||
ps.setBytes(iii.value, dataByte);
|
||||
@@ -1198,14 +1277,16 @@ public class DataAccess {
|
||||
}
|
||||
}
|
||||
|
||||
public static int executeSimpleQuerry(final String query, final QueryOption... option) throws SQLException, IOException {
|
||||
public static int executeSimpleQuery(final String query, final QueryOption... option)
|
||||
throws SQLException, IOException {
|
||||
final QueryOptions options = new QueryOptions(option);
|
||||
final DBEntry entry = DBInterfaceOption.getAutoEntry(options);
|
||||
final Statement stmt = entry.connection.createStatement();
|
||||
return stmt.executeUpdate(query);
|
||||
}
|
||||
|
||||
public static boolean executeQuerry(final String query, final QueryOption... option) throws SQLException, IOException {
|
||||
public static boolean executeQuery(final String query, final QueryOption... option)
|
||||
throws SQLException, IOException {
|
||||
final QueryOptions options = new QueryOptions(option);
|
||||
final DBEntry entry = DBInterfaceOption.getAutoEntry(options);
|
||||
final Statement stmt = entry.connection.createStatement();
|
||||
@@ -1222,9 +1303,16 @@ public class DataAccess {
|
||||
return values.get(0);
|
||||
}
|
||||
|
||||
public static void generateSelectField(final StringBuilder querySelect, final StringBuilder query, final Class<?> clazz, final QueryOptions options, final CountInOut count) throws Exception {
|
||||
public static void generateSelectField(//
|
||||
final StringBuilder querySelect, //
|
||||
final StringBuilder query, //
|
||||
final Class<?> clazz, //
|
||||
final QueryOptions options, //
|
||||
final CountInOut count//
|
||||
) throws Exception {
|
||||
final boolean readAllfields = QueryOptions.readAllColomn(options);
|
||||
final String tableName = AnnotationTools.getTableName(clazz, options);
|
||||
final String primaryKey = AnnotationTools.getPrimaryKeyField(clazz).getName();
|
||||
boolean firstField = true;
|
||||
|
||||
for (final Field elem : clazz.getFields()) {
|
||||
@@ -1248,7 +1336,7 @@ public class DataAccess {
|
||||
}
|
||||
querySelect.append(" ");
|
||||
if (addOn != null) {
|
||||
addOn.generateQuerry(tableName, elem, querySelect, query, name, count, options);
|
||||
addOn.generateQuery(tableName, primaryKey, elem, querySelect, query, name, count, options);
|
||||
} else {
|
||||
querySelect.append(tableName);
|
||||
querySelect.append(".");
|
||||
@@ -1263,12 +1351,32 @@ public class DataAccess {
|
||||
return getsWhere(clazz, options);
|
||||
}
|
||||
|
||||
public static Condition conditionFusionOrEmpty(final QueryOptions options, final boolean throwIfEmpty)
|
||||
throws DataAccessException {
|
||||
final List<Condition> conditions = options.get(Condition.class);
|
||||
if (conditions.size() == 0) {
|
||||
if (throwIfEmpty) {
|
||||
throw new DataAccessException("request a gets without any condition");
|
||||
} else {
|
||||
return new Condition();
|
||||
}
|
||||
}
|
||||
Condition condition = null;
|
||||
if (conditions.size() == 1) {
|
||||
condition = conditions.get(0);
|
||||
} else {
|
||||
final QueryAnd andCondition = new QueryAnd();
|
||||
for (final Condition cond : conditions) {
|
||||
andCondition.add(cond.condition);
|
||||
}
|
||||
condition = new Condition(andCondition);
|
||||
}
|
||||
return condition;
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public static <T> List<T> getsWhere(final Class<T> clazz, final QueryOptions options) throws Exception {
|
||||
Condition condition = options.get(Condition.class);
|
||||
if (condition == null) {
|
||||
condition = new Condition();
|
||||
}
|
||||
final Condition condition = conditionFusionOrEmpty(options, false);
|
||||
final List<LazyGetter> lazyCall = new ArrayList<>();
|
||||
final String deletedFieldName = AnnotationTools.getDeletedFieldName(clazz);
|
||||
final DBEntry entry = DBInterfaceOption.getAutoEntry(options);
|
||||
@@ -1288,25 +1396,28 @@ public class DataAccess {
|
||||
querySelect.append(query.toString());
|
||||
query = querySelect;
|
||||
condition.whereAppendQuery(query, tableName, options, deletedFieldName);
|
||||
final GroupBy groups = options.get(GroupBy.class);
|
||||
if (groups != null) {
|
||||
groups.generateQuerry(query, null);
|
||||
final List<GroupBy> groups = options.get(GroupBy.class);
|
||||
for (final GroupBy group : groups) {
|
||||
group.generateQuery(query, tableName);
|
||||
}
|
||||
final OrderBy orders = options.get(OrderBy.class);
|
||||
if (orders != null) {
|
||||
orders.generateQuerry(query, tableName);
|
||||
final List<OrderBy> orders = options.get(OrderBy.class);
|
||||
for (final OrderBy order : orders) {
|
||||
order.generateQuery(query, tableName);
|
||||
}
|
||||
final Limit limit = options.get(Limit.class);
|
||||
if (limit != null) {
|
||||
limit.generateQuerry(query, tableName);
|
||||
final List<Limit> limits = options.get(Limit.class);
|
||||
if (limits.size() == 1) {
|
||||
limits.get(0).generateQuery(query, tableName);
|
||||
} else if (limits.size() > 1) {
|
||||
throw new DataAccessException("Request with multiple 'limit'...");
|
||||
}
|
||||
LOGGER.warn("generate the query: '{}'", query.toString());
|
||||
// prepare the request:
|
||||
final PreparedStatement ps = entry.connection.prepareStatement(query.toString(), Statement.RETURN_GENERATED_KEYS);
|
||||
final PreparedStatement ps = entry.connection.prepareStatement(query.toString(),
|
||||
Statement.RETURN_GENERATED_KEYS);
|
||||
final CountInOut iii = new CountInOut(1);
|
||||
condition.injectQuerry(ps, iii);
|
||||
if (limit != null) {
|
||||
limit.injectQuerry(ps, iii);
|
||||
condition.injectQuery(ps, iii);
|
||||
if (limits.size() == 1) {
|
||||
limits.get(0).injectQuery(ps, iii);
|
||||
}
|
||||
// execute the request
|
||||
final ResultSet rs = ps.executeQuery();
|
||||
@@ -1332,7 +1443,12 @@ public class DataAccess {
|
||||
return outs;
|
||||
}
|
||||
|
||||
public static Object createObjectFromSQLRequest(final ResultSet rs, final Class<?> clazz, final CountInOut count, final CountInOut countNotNull, final QueryOptions options,
|
||||
public static Object createObjectFromSQLRequest(
|
||||
final ResultSet rs,
|
||||
final Class<?> clazz,
|
||||
final CountInOut count,
|
||||
final CountInOut countNotNull,
|
||||
final QueryOptions options,
|
||||
final List<LazyGetter> lazyCall) throws Exception {
|
||||
final boolean readAllfields = QueryOptions.readAllColomn(options);
|
||||
// TODO: manage class that is defined inside a class ==> Not manage for now...
|
||||
@@ -1343,7 +1459,8 @@ public class DataAccess {
|
||||
}
|
||||
}
|
||||
if (data == null) {
|
||||
throw new DataAccessException("Can not find the default constructor for the class: " + clazz.getCanonicalName());
|
||||
throw new DataAccessException(
|
||||
"Can not find the default constructor for the class: " + clazz.getCanonicalName());
|
||||
}
|
||||
for (final Field elem : clazz.getFields()) {
|
||||
// static field is only for internal global declaration ==> remove it ..
|
||||
@@ -1359,7 +1476,7 @@ public class DataAccess {
|
||||
continue;
|
||||
}
|
||||
if (addOn != null) {
|
||||
addOn.fillFromQuerry(rs, elem, data, count, options, lazyCall);
|
||||
addOn.fillFromQuery(rs, elem, data, count, options, lazyCall);
|
||||
} else {
|
||||
setValueFromDb(elem.getType(), data, count, elem, rs, countNotNull);
|
||||
}
|
||||
@@ -1373,10 +1490,7 @@ public class DataAccess {
|
||||
|
||||
public static long countWhere(final Class<?> clazz, final QueryOption... option) throws Exception {
|
||||
final QueryOptions options = new QueryOptions(option);
|
||||
Condition condition = options.get(Condition.class);
|
||||
if (condition == null) {
|
||||
condition = new Condition();
|
||||
}
|
||||
final Condition condition = conditionFusionOrEmpty(options, false);
|
||||
final String deletedFieldName = AnnotationTools.getDeletedFieldName(clazz);
|
||||
DBEntry entry = DBInterfaceOption.getAutoEntry(options);
|
||||
long count = 0;
|
||||
@@ -1388,17 +1502,20 @@ public class DataAccess {
|
||||
query.append(tableName);
|
||||
query.append("` ");
|
||||
condition.whereAppendQuery(query, tableName, options, deletedFieldName);
|
||||
final Limit limit = options.get(Limit.class);
|
||||
if (limit != null) {
|
||||
limit.generateQuerry(query, tableName);
|
||||
final List<Limit> limits = options.get(Limit.class);
|
||||
if (limits.size() == 1) {
|
||||
limits.get(0).generateQuery(query, tableName);
|
||||
} else if (limits.size() > 1) {
|
||||
throw new DataAccessException("Request with multiple 'limit'...");
|
||||
}
|
||||
LOGGER.warn("generate the query: '{}'", query.toString());
|
||||
// prepare the request:
|
||||
final PreparedStatement ps = entry.connection.prepareStatement(query.toString(), Statement.RETURN_GENERATED_KEYS);
|
||||
final PreparedStatement ps = entry.connection.prepareStatement(query.toString(),
|
||||
Statement.RETURN_GENERATED_KEYS);
|
||||
final CountInOut iii = new CountInOut(1);
|
||||
condition.injectQuerry(ps, iii);
|
||||
if (limit != null) {
|
||||
limit.injectQuerry(ps, iii);
|
||||
condition.injectQuery(ps, iii);
|
||||
if (limits.size() == 1) {
|
||||
limits.get(0).injectQuery(ps, iii);
|
||||
}
|
||||
// execute the request
|
||||
final ResultSet rs = ps.executeQuery();
|
||||
@@ -1417,7 +1534,8 @@ public class DataAccess {
|
||||
return count;
|
||||
}
|
||||
|
||||
public static <T, ID_TYPE> T get(final Class<T> clazz, final ID_TYPE id, final QueryOption... option) throws Exception {
|
||||
public static <T, ID_TYPE> T get(final Class<T> clazz, final ID_TYPE id, final QueryOption... option)
|
||||
throws Exception {
|
||||
final QueryOptions options = new QueryOptions(option);
|
||||
options.add(new Condition(getTableIdCondition(clazz, id)));
|
||||
return DataAccess.getWhere(clazz, options.getAllArray());
|
||||
@@ -1441,7 +1559,8 @@ public class DataAccess {
|
||||
* @param id Unique Id of the model
|
||||
* @param options (Optional) Options of the request
|
||||
* @return Number of element that is removed. */
|
||||
public static <ID_TYPE> int delete(final Class<?> clazz, final ID_TYPE id, final QueryOption... options) throws Exception {
|
||||
public static <ID_TYPE> int delete(final Class<?> clazz, final ID_TYPE id, final QueryOption... options)
|
||||
throws Exception {
|
||||
final String hasDeletedFieldName = AnnotationTools.getDeletedFieldName(clazz);
|
||||
if (hasDeletedFieldName != null) {
|
||||
return deleteSoft(clazz, id, options);
|
||||
@@ -1465,7 +1584,8 @@ public class DataAccess {
|
||||
}
|
||||
}
|
||||
|
||||
public static <ID_TYPE> int deleteHard(final Class<?> clazz, final ID_TYPE id, final QueryOption... option) throws Exception {
|
||||
public static <ID_TYPE> int deleteHard(final Class<?> clazz, final ID_TYPE id, final QueryOption... option)
|
||||
throws Exception {
|
||||
final QueryOptions options = new QueryOptions(option);
|
||||
options.add(new Condition(getTableIdCondition(clazz, id)));
|
||||
return deleteHardWhere(clazz, options.getAllArray());
|
||||
@@ -1473,10 +1593,7 @@ public class DataAccess {
|
||||
|
||||
public static int deleteHardWhere(final Class<?> clazz, final QueryOption... option) throws Exception {
|
||||
final QueryOptions options = new QueryOptions(option);
|
||||
final Condition condition = options.get(Condition.class);
|
||||
if (condition == null) {
|
||||
throw new DataAccessException("request a gets without any condition");
|
||||
}
|
||||
final Condition condition = conditionFusionOrEmpty(options, true);
|
||||
final String tableName = AnnotationTools.getTableName(clazz, options);
|
||||
final String deletedFieldName = AnnotationTools.getDeletedFieldName(clazz);
|
||||
// find the deleted field
|
||||
@@ -1490,14 +1607,15 @@ public class DataAccess {
|
||||
LOGGER.debug("APPLY: {}", query.toString());
|
||||
final PreparedStatement ps = entry.connection.prepareStatement(query.toString());
|
||||
final CountInOut iii = new CountInOut(1);
|
||||
condition.injectQuerry(ps, iii);
|
||||
condition.injectQuery(ps, iii);
|
||||
return ps.executeUpdate();
|
||||
} finally {
|
||||
entry.close();
|
||||
}
|
||||
}
|
||||
|
||||
private static <ID_TYPE> int deleteSoft(final Class<?> clazz, final ID_TYPE id, final QueryOption... option) throws Exception {
|
||||
private static <ID_TYPE> int deleteSoft(final Class<?> clazz, final ID_TYPE id, final QueryOption... option)
|
||||
throws Exception {
|
||||
final QueryOptions options = new QueryOptions(option);
|
||||
options.add(new Condition(getTableIdCondition(clazz, id)));
|
||||
return deleteSoftWhere(clazz, options.getAllArray());
|
||||
@@ -1505,10 +1623,7 @@ public class DataAccess {
|
||||
|
||||
public static int deleteSoftWhere(final Class<?> clazz, final QueryOption... option) throws Exception {
|
||||
final QueryOptions options = new QueryOptions(option);
|
||||
final Condition condition = options.get(Condition.class);
|
||||
if (condition == null) {
|
||||
throw new DataAccessException("request a gets without any condition");
|
||||
}
|
||||
final Condition condition = conditionFusionOrEmpty(options, true);
|
||||
final String tableName = AnnotationTools.getTableName(clazz, options);
|
||||
final String deletedFieldName = AnnotationTools.getDeletedFieldName(clazz);
|
||||
/* String updateFieldName = null; if ("sqlite".equalsIgnoreCase(ConfigBaseVariable.getDBType())) { updateFieldName = AnnotationTools.getUpdatedFieldName(clazz); } */
|
||||
@@ -1527,7 +1642,7 @@ public class DataAccess {
|
||||
LOGGER.debug("APPLY UPDATE: {}", query.toString());
|
||||
final PreparedStatement ps = entry.connection.prepareStatement(query.toString());
|
||||
final CountInOut iii = new CountInOut(1);
|
||||
condition.injectQuerry(ps, iii);
|
||||
condition.injectQuery(ps, iii);
|
||||
return ps.executeUpdate();
|
||||
} finally {
|
||||
entry.close();
|
||||
@@ -1538,7 +1653,8 @@ public class DataAccess {
|
||||
return unsetDeleteWhere(clazz, new Condition(getTableIdCondition(clazz, id)));
|
||||
}
|
||||
|
||||
public static <ID_TYPE> int unsetDelete(final Class<?> clazz, final ID_TYPE id, final QueryOption... option) throws Exception {
|
||||
public static <ID_TYPE> int unsetDelete(final Class<?> clazz, final ID_TYPE id, final QueryOption... option)
|
||||
throws Exception {
|
||||
final QueryOptions options = new QueryOptions(option);
|
||||
options.add(new Condition(getTableIdCondition(clazz, id)));
|
||||
return unsetDeleteWhere(clazz, options.getAllArray());
|
||||
@@ -1546,10 +1662,7 @@ public class DataAccess {
|
||||
|
||||
public static int unsetDeleteWhere(final Class<?> clazz, final QueryOption... option) throws Exception {
|
||||
final QueryOptions options = new QueryOptions(option);
|
||||
final Condition condition = options.get(Condition.class);
|
||||
if (condition == null) {
|
||||
throw new DataAccessException("request a gets without any condition");
|
||||
}
|
||||
final Condition condition = conditionFusionOrEmpty(options, true);
|
||||
final String tableName = AnnotationTools.getTableName(clazz, options);
|
||||
final String deletedFieldName = AnnotationTools.getDeletedFieldName(clazz);
|
||||
if (deletedFieldName == null) {
|
||||
@@ -1568,7 +1681,7 @@ public class DataAccess {
|
||||
try {
|
||||
final PreparedStatement ps = entry.connection.prepareStatement(query.toString());
|
||||
final CountInOut iii = new CountInOut(1);
|
||||
condition.injectQuerry(ps, iii);
|
||||
condition.injectQuery(ps, iii);
|
||||
return ps.executeUpdate();
|
||||
} finally {
|
||||
entry.close();
|
||||
@@ -1584,7 +1697,7 @@ public class DataAccess {
|
||||
query.append(tableName);
|
||||
query.append("`");
|
||||
try {
|
||||
LOGGER.trace("Execute Querry: {}", query.toString());
|
||||
LOGGER.trace("Execute Query: {}", query.toString());
|
||||
// Remove main table
|
||||
final PreparedStatement ps = entry.connection.prepareStatement(query.toString());
|
||||
ps.executeUpdate();
|
||||
@@ -1616,7 +1729,7 @@ public class DataAccess {
|
||||
query.append(tableName);
|
||||
query.append("`");
|
||||
try {
|
||||
LOGGER.trace("Execute Querry: {}", query.toString());
|
||||
LOGGER.trace("Execute Query: {}", query.toString());
|
||||
// Remove main table
|
||||
final PreparedStatement ps = entry.connection.prepareStatement(query.toString());
|
||||
ps.executeUpdate();
|
||||
@@ -1648,20 +1761,25 @@ public class DataAccess {
|
||||
* @param option Optional parameters
|
||||
* @return The list of element requested
|
||||
* @throws Exception */
|
||||
public static <TYPE> List<TYPE> query(final Class<TYPE> clazz, final String query, final List<Object> parameters, final QueryOption... option) throws Exception {
|
||||
public static <TYPE> List<TYPE> query(
|
||||
final Class<TYPE> clazz,
|
||||
final String query,
|
||||
final List<Object> parameters,
|
||||
final QueryOption... option) throws Exception {
|
||||
final QueryOptions options = new QueryOptions(option);
|
||||
return query(clazz, query, parameters, options);
|
||||
}
|
||||
|
||||
public static <TYPE> List<TYPE> query(final Class<TYPE> clazz, final String queryBase, final List<Object> parameters, final QueryOptions options) throws Exception {
|
||||
public static <TYPE> List<TYPE> query(
|
||||
final Class<TYPE> clazz,
|
||||
final String queryBase,
|
||||
final List<Object> parameters,
|
||||
final QueryOptions options) throws Exception {
|
||||
final List<LazyGetter> lazyCall = new ArrayList<>();
|
||||
// TODO ... final String deletedFieldName = AnnotationTools.getDeletedFieldName(clazz);
|
||||
final DBEntry entry = DBInterfaceOption.getAutoEntry(options);
|
||||
|
||||
Condition condition = options.get(Condition.class);
|
||||
if (condition == null) {
|
||||
condition = new Condition();
|
||||
}
|
||||
final Condition condition = conditionFusionOrEmpty(options, false);
|
||||
final StringBuilder query = new StringBuilder(queryBase);
|
||||
final List<TYPE> outs = new ArrayList<>();
|
||||
// real add in the BDD:
|
||||
@@ -1669,21 +1787,24 @@ public class DataAccess {
|
||||
final CountInOut count = new CountInOut();
|
||||
condition.whereAppendQuery(query, null, options, null);
|
||||
|
||||
final GroupBy groups = options.get(GroupBy.class);
|
||||
if (groups != null) {
|
||||
groups.generateQuerry(query, null);
|
||||
final List<GroupBy> groups = options.get(GroupBy.class);
|
||||
for (final GroupBy group : groups) {
|
||||
group.generateQuery(query, null);
|
||||
}
|
||||
final OrderBy orders = options.get(OrderBy.class);
|
||||
if (orders != null) {
|
||||
orders.generateQuerry(query, null);
|
||||
final List<OrderBy> orders = options.get(OrderBy.class);
|
||||
for (final OrderBy order : orders) {
|
||||
order.generateQuery(query, null);
|
||||
}
|
||||
final Limit limit = options.get(Limit.class);
|
||||
if (limit != null) {
|
||||
limit.generateQuerry(query, null);
|
||||
final List<Limit> limits = options.get(Limit.class);
|
||||
if (limits.size() == 1) {
|
||||
limits.get(0).generateQuery(query, null);
|
||||
} else if (limits.size() > 1) {
|
||||
throw new DataAccessException("Request with multiple 'limit'...");
|
||||
}
|
||||
LOGGER.warn("generate the query: '{}'", query.toString());
|
||||
// prepare the request:
|
||||
final PreparedStatement ps = entry.connection.prepareStatement(query.toString(), Statement.RETURN_GENERATED_KEYS);
|
||||
final PreparedStatement ps = entry.connection.prepareStatement(query.toString(),
|
||||
Statement.RETURN_GENERATED_KEYS);
|
||||
final CountInOut iii = new CountInOut(1);
|
||||
if (parameters != null) {
|
||||
for (final Object elem : parameters) {
|
||||
@@ -1691,9 +1812,9 @@ public class DataAccess {
|
||||
}
|
||||
iii.inc();
|
||||
}
|
||||
condition.injectQuerry(ps, iii);
|
||||
if (limit != null) {
|
||||
limit.injectQuerry(ps, iii);
|
||||
condition.injectQuery(ps, iii);
|
||||
if (limits.size() == 1) {
|
||||
limits.get(0).injectQuery(ps, iii);
|
||||
}
|
||||
// execute the request
|
||||
final ResultSet rs = ps.executeQuery();
|
||||
@@ -1706,7 +1827,7 @@ public class DataAccess {
|
||||
// find field name ...
|
||||
final Field field = AnnotationTools.getFieldNamed(clazz, label);
|
||||
if (field == null) {
|
||||
throw new DataAccessException("Querry with unknown field: '" + label + "'");
|
||||
throw new DataAccessException("Query with unknown field: '" + label + "'");
|
||||
}
|
||||
// create the callback...
|
||||
final RetreiveFromDB element = createSetValueFromDbCallback(jjj + 1, field);
|
||||
|
||||
@@ -29,7 +29,8 @@ public interface DataAccessAddOn {
|
||||
* @param iii The index of injection
|
||||
* @return the new index of injection in case of multiple value management
|
||||
* @throws SQLException */
|
||||
void insertData(PreparedStatement ps, final Field field, Object data, CountInOut iii) throws Exception, SQLException, IllegalArgumentException, IllegalAccessException;
|
||||
void insertData(PreparedStatement ps, final Field field, Object data, CountInOut iii)
|
||||
throws Exception, SQLException, IllegalArgumentException, IllegalAccessException;
|
||||
|
||||
/** Element can insert in the single request
|
||||
* @param field
|
||||
@@ -45,11 +46,24 @@ public interface DataAccessAddOn {
|
||||
return false;
|
||||
}
|
||||
|
||||
void generateQuerry(@NotNull String tableName, @NotNull Field field, @NotNull final StringBuilder querySelect, @NotNull final StringBuilder query, @NotNull String name, @NotNull CountInOut count,
|
||||
void generateQuery(
|
||||
@NotNull String tableName,
|
||||
@NotNull final String primaryKey,
|
||||
@NotNull Field field,
|
||||
@NotNull final StringBuilder querySelect,
|
||||
@NotNull final StringBuilder query,
|
||||
@NotNull String name,
|
||||
@NotNull CountInOut count,
|
||||
QueryOptions options) throws Exception;
|
||||
|
||||
// Return the number of colomn read
|
||||
void fillFromQuerry(ResultSet rs, Field field, Object data, CountInOut count, QueryOptions options, final List<LazyGetter> lazyCall)
|
||||
void fillFromQuery(
|
||||
ResultSet rs,
|
||||
Field field,
|
||||
Object data,
|
||||
CountInOut count,
|
||||
QueryOptions options,
|
||||
final List<LazyGetter> lazyCall)
|
||||
throws Exception, SQLException, IllegalArgumentException, IllegalAccessException;
|
||||
|
||||
/** Create associated table of the specific element.
|
||||
@@ -61,8 +75,16 @@ public interface DataAccessAddOn {
|
||||
* @param createDrop
|
||||
* @param fieldId
|
||||
* @throws Exception */
|
||||
void createTables(String tableName, Field field, StringBuilder mainTableBuilder, List<String> preActionList, List<String> postActionList, boolean createIfNotExist, boolean createDrop, int fieldId)
|
||||
throws Exception;
|
||||
void createTables(
|
||||
String tableName,
|
||||
final Field primaryField,
|
||||
Field field,
|
||||
StringBuilder mainTableBuilder,
|
||||
List<String> preActionList,
|
||||
List<String> postActionList,
|
||||
boolean createIfNotExist,
|
||||
boolean createDrop,
|
||||
int fieldId) throws Exception;
|
||||
|
||||
/** Some action must be done asynchronously for update or remove element
|
||||
* @param field
|
||||
@@ -77,7 +99,12 @@ public interface DataAccessAddOn {
|
||||
* @param field Field that is updated.
|
||||
* @param data Data that might be inserted.
|
||||
* @param actions Asynchronous action to do after main request. */
|
||||
default void asyncInsert(final String tableName, final Object localId, final Field field, final Object data, final List<LazyGetter> actions) throws Exception {
|
||||
default void asyncInsert(
|
||||
final String tableName,
|
||||
final Object localId,
|
||||
final Field field,
|
||||
final Object data,
|
||||
final List<LazyGetter> actions) throws Exception {
|
||||
|
||||
}
|
||||
|
||||
@@ -94,7 +121,12 @@ public interface DataAccessAddOn {
|
||||
* @param field Field that is updated.
|
||||
* @param data Data that might be inserted.
|
||||
* @param actions Asynchronous action to do after main request. */
|
||||
default void asyncUpdate(final String tableName, final Object localId, final Field field, final Object data, final List<LazyGetter> actions) throws Exception {
|
||||
default void asyncUpdate(
|
||||
final String tableName,
|
||||
final Object localId,
|
||||
final Field field,
|
||||
final Object data,
|
||||
final List<LazyGetter> actions) throws Exception {
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -20,6 +20,10 @@ import org.kar.archidata.dataAccess.exportTools.TableQuery;
|
||||
import org.kar.archidata.dataAccess.exportTools.TableQueryTypes;
|
||||
import org.kar.archidata.dataAccess.options.Condition;
|
||||
import org.kar.archidata.dataAccess.options.DBInterfaceOption;
|
||||
import org.kar.archidata.dataAccess.options.GroupBy;
|
||||
import org.kar.archidata.dataAccess.options.Limit;
|
||||
import org.kar.archidata.dataAccess.options.OrderBy;
|
||||
import org.kar.archidata.dataAccess.options.QueryOption;
|
||||
import org.kar.archidata.db.DBEntry;
|
||||
import org.kar.archidata.exception.DataAccessException;
|
||||
import org.kar.archidata.tools.DateTools;
|
||||
@@ -37,7 +41,10 @@ public class DataExport {
|
||||
public static final String CSV_TYPE = "text/csv";
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
protected static RetreiveFromDB createSetValueFromDbCallbackTable(final int count, final Class<?> type, final int id) throws Exception {
|
||||
protected static RetreiveFromDB createSetValueFromDbCallbackTable(
|
||||
final int count,
|
||||
final Class<?> type,
|
||||
final int id) throws Exception {
|
||||
if (type == UUID.class) {
|
||||
return (final ResultSet rs, final Object obj) -> {
|
||||
final UUID tmp = rs.getObject(count, UUID.class);
|
||||
@@ -228,51 +235,59 @@ public class DataExport {
|
||||
|
||||
}
|
||||
|
||||
private static int getQueryPropertyId(final List<TableQueryTypes> properties, final String name) throws DataAccessException {
|
||||
private static int getQueryPropertyId(final List<TableQueryTypes> properties, final String name)
|
||||
throws DataAccessException {
|
||||
for (int iii = 0; iii < properties.size(); iii++) {
|
||||
if (properties.get(iii).name.equals(name)) {
|
||||
return iii;
|
||||
}
|
||||
}
|
||||
throw new DataAccessException("Querry with unknown field: '" + name + "'");
|
||||
throw new DataAccessException("Query with unknown field: '" + name + "'");
|
||||
}
|
||||
|
||||
public static TableQuery queryTable(final List<TableQueryTypes> headers, final String query, final List<Object> parameters, final QueryOption... option) throws Exception {
|
||||
public static TableQuery queryTable(
|
||||
final List<TableQueryTypes> headers,
|
||||
final String query,
|
||||
final List<Object> parameters,
|
||||
final QueryOption... option) throws Exception {
|
||||
final QueryOptions options = new QueryOptions(option);
|
||||
return queryTable(headers, query, parameters, options);
|
||||
}
|
||||
|
||||
public static TableQuery queryTable(final List<TableQueryTypes> headers, final String queryBase, final List<Object> parameters, final QueryOptions options) throws Exception {
|
||||
public static TableQuery queryTable(
|
||||
final List<TableQueryTypes> headers,
|
||||
final String queryBase,
|
||||
final List<Object> parameters,
|
||||
final QueryOptions options) throws Exception {
|
||||
final List<LazyGetter> lazyCall = new ArrayList<>();
|
||||
// TODO ... final String deletedFieldName = AnnotationTools.getDeletedFieldName(clazz);
|
||||
final DBEntry entry = DBInterfaceOption.getAutoEntry(options);
|
||||
|
||||
Condition condition = options.get(Condition.class);
|
||||
if (condition == null) {
|
||||
condition = new Condition();
|
||||
}
|
||||
final Condition condition = DataAccess.conditionFusionOrEmpty(options, false);
|
||||
final StringBuilder query = new StringBuilder(queryBase);
|
||||
final TableQuery out = new TableQuery(headers);
|
||||
// real add in the BDD:
|
||||
try {
|
||||
final CountInOut count = new CountInOut();
|
||||
condition.whereAppendQuery(query, null, options, null);
|
||||
|
||||
final GroupBy groups = options.get(GroupBy.class);
|
||||
if (groups != null) {
|
||||
groups.generateQuerry(query, null);
|
||||
final List<GroupBy> groups = options.get(GroupBy.class);
|
||||
for (final GroupBy group : groups) {
|
||||
group.generateQuery(query, null);
|
||||
}
|
||||
final OrderBy orders = options.get(OrderBy.class);
|
||||
if (orders != null) {
|
||||
orders.generateQuerry(query, null);
|
||||
final List<OrderBy> orders = options.get(OrderBy.class);
|
||||
for (final OrderBy order : orders) {
|
||||
order.generateQuery(query, null);
|
||||
}
|
||||
final Limit limit = options.get(Limit.class);
|
||||
if (limit != null) {
|
||||
limit.generateQuerry(query, null);
|
||||
final List<Limit> limits = options.get(Limit.class);
|
||||
if (limits.size() == 1) {
|
||||
limits.get(0).generateQuery(query, null);
|
||||
} else if (limits.size() > 1) {
|
||||
throw new DataAccessException("Request with multiple 'limit'...");
|
||||
}
|
||||
LOGGER.warn("generate the query: '{}'", query.toString());
|
||||
// prepare the request:
|
||||
final PreparedStatement ps = entry.connection.prepareStatement(query.toString(), Statement.RETURN_GENERATED_KEYS);
|
||||
final PreparedStatement ps = entry.connection.prepareStatement(query.toString(),
|
||||
Statement.RETURN_GENERATED_KEYS);
|
||||
final CountInOut iii = new CountInOut(1);
|
||||
if (parameters != null) {
|
||||
for (final Object elem : parameters) {
|
||||
@@ -280,9 +295,9 @@ public class DataExport {
|
||||
}
|
||||
iii.inc();
|
||||
}
|
||||
condition.injectQuerry(ps, iii);
|
||||
if (limit != null) {
|
||||
limit.injectQuerry(ps, iii);
|
||||
condition.injectQuery(ps, iii);
|
||||
if (limits.size() == 1) {
|
||||
limits.get(0).injectQuery(ps, iii);
|
||||
}
|
||||
// execute the request
|
||||
final ResultSet rs = ps.executeQuery();
|
||||
@@ -294,7 +309,8 @@ public class DataExport {
|
||||
final String typeName = rsmd.getColumnTypeName(jjj + 1);
|
||||
final int typeId = rsmd.getColumnType(jjj + 1);
|
||||
final int id = getQueryPropertyId(headers, label);
|
||||
LOGGER.info(" - {}:{} type=[{}] {} REQUEST={}", jjj, label, typeId, typeName, headers.get(id).type.getCanonicalName());
|
||||
LOGGER.info(" - {}:{} type=[{}] {} REQUEST={}", jjj, label, typeId, typeName,
|
||||
headers.get(id).type.getCanonicalName());
|
||||
// create the callback...
|
||||
final RetreiveFromDB element = createSetValueFromDbCallbackTable(jjj + 1, headers.get(id).type, id);
|
||||
actionToRetreive.add(element);
|
||||
@@ -363,7 +379,8 @@ public class DataExport {
|
||||
return out.toString();
|
||||
}
|
||||
|
||||
public static Response convertInResponse(final TableQuery dataOut, final String accept) throws DataAccessException, IOException {
|
||||
public static Response convertInResponse(final TableQuery dataOut, final String accept)
|
||||
throws DataAccessException, IOException {
|
||||
if (CSV_TYPE.equals(accept)) {
|
||||
// CSV serialization
|
||||
String out = null;
|
||||
|
||||
@@ -142,8 +142,17 @@ public class DataFactory {
|
||||
throw new DataAccessException("Imcompatible type of element in object for: " + type.getCanonicalName());
|
||||
}
|
||||
|
||||
public static void createTablesSpecificType(final String tableName, final Field elem, final StringBuilder mainTableBuilder, final List<String> preOtherTables, final List<String> postOtherTables,
|
||||
final boolean createIfNotExist, final boolean createDrop, final int fieldId, final Class<?> classModel) throws Exception {
|
||||
public static void createTablesSpecificType(
|
||||
final String tableName,
|
||||
final Field primaryField,
|
||||
final Field elem,
|
||||
final StringBuilder mainTableBuilder,
|
||||
final List<String> preOtherTables,
|
||||
final List<String> postOtherTables,
|
||||
final boolean createIfNotExist,
|
||||
final boolean createDrop,
|
||||
final int fieldId,
|
||||
final Class<?> classModel) throws Exception {
|
||||
final String name = AnnotationTools.getFieldName(elem);
|
||||
final int limitSize = AnnotationTools.getLimitSize(elem);
|
||||
final boolean notNull = AnnotationTools.getColumnNotNull(elem);
|
||||
@@ -217,10 +226,13 @@ public class DataFactory {
|
||||
triggerBuilder.append(" SET ");
|
||||
triggerBuilder.append(name);
|
||||
// triggerBuilder.append(" = datetime('now') WHERE id = NEW.id; \n");
|
||||
final String tablePrimaryKey = primaryField.getName();
|
||||
if ("varchar(33)".equals(typeValue)) {
|
||||
triggerBuilder.append(" = strftime('%Y-%m-%dT%H:%M:%fZ', 'now') WHERE id = NEW.id; \n");
|
||||
triggerBuilder.append(" = strftime('%Y-%m-%dT%H:%M:%fZ', 'now') WHERE " + tablePrimaryKey
|
||||
+ " = NEW." + tablePrimaryKey + "; \n");
|
||||
} else {
|
||||
triggerBuilder.append(" = strftime('%Y-%m-%d %H:%M:%f', 'now') WHERE id = NEW.id; \n");
|
||||
triggerBuilder.append(" = strftime('%Y-%m-%d %H:%M:%f', 'now') WHERE " + tablePrimaryKey
|
||||
+ " = NEW." + tablePrimaryKey + "; \n");
|
||||
}
|
||||
triggerBuilder.append("END;");
|
||||
|
||||
@@ -339,6 +351,7 @@ public class DataFactory {
|
||||
LOGGER.debug("===> TABLE `{}`", tableName);
|
||||
final List<String> primaryKeys = new ArrayList<>();
|
||||
|
||||
final Field primaryField = AnnotationTools.getPrimaryKeyField(clazz);
|
||||
for (final Field elem : clazz.getFields()) {
|
||||
// DEtect the primary key (support only one primary key right now...
|
||||
if (AnnotationTools.isPrimaryKey(elem)) {
|
||||
@@ -350,6 +363,7 @@ public class DataFactory {
|
||||
StringBuilder reverseOut = new StringBuilder();
|
||||
final List<String> alreadyAdded = new ArrayList<>();
|
||||
Class<?> currentClazz = clazz;
|
||||
final Field tablePrimaryKeyField = AnnotationTools.getPrimaryKeyField(clazz);
|
||||
while (currentClazz != null) {
|
||||
fieldId = 0;
|
||||
LOGGER.trace("parse class: '{}'", currentClazz.getCanonicalName());
|
||||
@@ -371,16 +385,20 @@ public class DataFactory {
|
||||
LOGGER.trace(" + '{}'", elem.getName());
|
||||
if (DataAccess.isAddOnField(elem)) {
|
||||
final DataAccessAddOn addOn = DataAccess.findAddOnforField(elem);
|
||||
LOGGER.trace("Create type for: {} ==> {} (ADD-ON)", AnnotationTools.getFieldName(elem), elem.getType());
|
||||
LOGGER.trace("Create type for: {} ==> {} (ADD-ON)", AnnotationTools.getFieldName(elem),
|
||||
elem.getType());
|
||||
if (addOn != null) {
|
||||
addOn.createTables(tableName, elem, tmpOut, preActionList, postActionList, createIfNotExist, createDrop, fieldId);
|
||||
addOn.createTables(tableName, primaryField, elem, tmpOut, preActionList, postActionList,
|
||||
createIfNotExist, createDrop, fieldId);
|
||||
} else {
|
||||
throw new DataAccessException(
|
||||
"Element matked as add-on but add-on does not loaded: table:" + tableName + " field name=" + AnnotationTools.getFieldName(elem) + " type=" + elem.getType());
|
||||
throw new DataAccessException("Element matked as add-on but add-on does not loaded: table:"
|
||||
+ tableName + " field name=" + AnnotationTools.getFieldName(elem) + " type="
|
||||
+ elem.getType());
|
||||
}
|
||||
} else {
|
||||
LOGGER.trace("Create type for: {} ==> {}", AnnotationTools.getFieldName(elem), elem.getType());
|
||||
DataFactory.createTablesSpecificType(tableName, elem, tmpOut, preActionList, postActionList, createIfNotExist, createDrop, fieldId, elem.getType());
|
||||
DataFactory.createTablesSpecificType(tableName, tablePrimaryKeyField, elem, tmpOut, preActionList,
|
||||
postActionList, createIfNotExist, createDrop, fieldId, elem.getType());
|
||||
}
|
||||
fieldId++;
|
||||
}
|
||||
|
||||
@@ -11,6 +11,8 @@ import java.lang.reflect.Parameter;
|
||||
import java.lang.reflect.ParameterizedType;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
@@ -20,6 +22,7 @@ import java.util.Set;
|
||||
|
||||
import org.glassfish.jersey.media.multipart.FormDataParam;
|
||||
import org.kar.archidata.annotation.AsyncType;
|
||||
import org.kar.archidata.annotation.TypeScriptProgress;
|
||||
import org.kar.archidata.catcher.RestErrorResponse;
|
||||
import org.kar.archidata.dataAccess.DataFactoryZod.ClassElement;
|
||||
import org.kar.archidata.dataAccess.DataFactoryZod.GeneratedTypes;
|
||||
@@ -44,19 +47,32 @@ import jakarta.ws.rs.core.Response;
|
||||
public class DataFactoryTsApi {
|
||||
static final Logger LOGGER = LoggerFactory.getLogger(DataFactoryTsApi.class);
|
||||
|
||||
record APIModel(String data, String className) {
|
||||
}
|
||||
record APIModel(
|
||||
String data,
|
||||
String className) {}
|
||||
|
||||
/** Request the generation of the TypeScript file for the "Zod" export model
|
||||
* @param classs List of class used in the model
|
||||
* @throws Exception */
|
||||
public static List<String> createApi(final List<Class<?>> classs, final GeneratedTypes previous, final String pathPackage) throws Exception {
|
||||
public static List<String> createApi(
|
||||
final List<Class<?>> classs,
|
||||
final GeneratedTypes previous,
|
||||
final String pathPackage) throws Exception {
|
||||
final List<String> apis = new ArrayList<>();
|
||||
final String globalheader = """
|
||||
/**
|
||||
* API of the server (auto-generated code)
|
||||
*/
|
||||
import { HTTPMimeType, HTTPRequestModel, ModelResponseHttp, RESTConfig, RESTRequestJson, RESTRequestJsonArray, RESTRequestVoid } from "./rest-tools"
|
||||
import {
|
||||
HTTPMimeType,
|
||||
HTTPRequestModel,
|
||||
ModelResponseHttp,
|
||||
RESTCallbacks,
|
||||
RESTConfig,
|
||||
RESTRequestJson,
|
||||
RESTRequestJsonArray,
|
||||
RESTRequestVoid
|
||||
} from "./rest-tools"
|
||||
import {""";
|
||||
|
||||
for (final Class<?> clazz : classs) {
|
||||
@@ -65,6 +81,7 @@ public class DataFactoryTsApi {
|
||||
final APIModel api = createSingleApi(clazz, includeModel, includeCheckerModel, previous);
|
||||
final StringBuilder generatedData = new StringBuilder();
|
||||
generatedData.append(globalheader);
|
||||
final List<String> includedElements = new ArrayList<>();
|
||||
for (final Class<?> elem : includeModel) {
|
||||
if (elem == null) {
|
||||
continue;
|
||||
@@ -73,7 +90,12 @@ public class DataFactoryTsApi {
|
||||
if (classElement.nativeType) {
|
||||
continue;
|
||||
}
|
||||
generatedData.append(classElement.tsTypeName);
|
||||
includedElements.add(classElement.tsTypeName);
|
||||
}
|
||||
Collections.sort(includedElements);
|
||||
for (final String elem : includedElements) {
|
||||
generatedData.append("\n ");
|
||||
generatedData.append(elem);
|
||||
generatedData.append(",");
|
||||
}
|
||||
for (final Class<?> elem : includeCheckerModel) {
|
||||
@@ -84,10 +106,11 @@ public class DataFactoryTsApi {
|
||||
if (classElement.nativeType) {
|
||||
continue;
|
||||
}
|
||||
generatedData.append("\n ");
|
||||
generatedData.append(classElement.tsCheckType);
|
||||
generatedData.append(",");
|
||||
}
|
||||
generatedData.append("} from \"./model\"\n");
|
||||
generatedData.append("\n} from \"./model\"\n");
|
||||
generatedData.append(api.data());
|
||||
|
||||
String fileName = api.className();
|
||||
@@ -125,6 +148,14 @@ public class DataFactoryTsApi {
|
||||
return Arrays.asList(((Produces) annotation[0]).value());
|
||||
}
|
||||
|
||||
public static boolean apiAnnotationTypeScriptProgress(final Method element) throws Exception {
|
||||
final Annotation[] annotation = element.getDeclaredAnnotationsByType(TypeScriptProgress.class);
|
||||
if (annotation.length == 0) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public static List<String> apiAnnotationProduces(final Class<?> clazz, final Method method) throws Exception {
|
||||
final List<String> data = apiAnnotationProduces(method);
|
||||
if (data != null) {
|
||||
@@ -192,14 +223,15 @@ public class DataFactoryTsApi {
|
||||
return ((FormDataParam) annotation[0]).value();
|
||||
}
|
||||
|
||||
public static Class<?> apiAnnotationGetAsyncType(final Parameter element) throws Exception {
|
||||
public static Class<?>[] apiAnnotationGetAsyncType(final Parameter element) throws Exception {
|
||||
final Annotation[] annotation = element.getDeclaredAnnotationsByType(AsyncType.class);
|
||||
if (annotation.length == 0) {
|
||||
return null;
|
||||
}
|
||||
return ((AsyncType) annotation[0]).value();
|
||||
}
|
||||
public static Class<?> apiAnnotationGetAsyncType(final Method element) throws Exception {
|
||||
|
||||
public static Class<?>[] apiAnnotationGetAsyncType(final Method element) throws Exception {
|
||||
final Annotation[] annotation = element.getDeclaredAnnotationsByType(AsyncType.class);
|
||||
if (annotation.length == 0) {
|
||||
return null;
|
||||
@@ -235,7 +267,40 @@ public class DataFactoryTsApi {
|
||||
return element.getDeclaredAnnotationsByType(Context.class).length != 0;
|
||||
}
|
||||
|
||||
public static APIModel createSingleApi(final Class<?> clazz, final Set<Class<?>> includeModel, final Set<Class<?>> includeCheckerModel, final GeneratedTypes previous) throws Exception {
|
||||
public static String convertInTypeScriptType(final List<ClassElement> tmp, final boolean isList) {
|
||||
String out = "";
|
||||
for (final ClassElement elem : tmp) {
|
||||
if (out.length() != 0) {
|
||||
out += " | ";
|
||||
}
|
||||
out += elem.tsTypeName;
|
||||
if (isList) {
|
||||
out += "[]";
|
||||
}
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
public static String convertInTypeScriptCheckType(final List<ClassElement> tmp) {
|
||||
String out = "";
|
||||
for (final ClassElement elem : tmp) {
|
||||
if (out.length() != 0) {
|
||||
out += " | ";
|
||||
}
|
||||
out += elem.tsCheckType;
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
record OrderedElement(
|
||||
String methodName,
|
||||
Method method) {}
|
||||
|
||||
public static APIModel createSingleApi(
|
||||
final Class<?> clazz,
|
||||
final Set<Class<?>> includeModel,
|
||||
final Set<Class<?>> includeCheckerModel,
|
||||
final GeneratedTypes previous) throws Exception {
|
||||
final StringBuilder builder = new StringBuilder();
|
||||
// the basic path has no specific elements...
|
||||
final String basicPath = apiAnnotationGetPath(clazz);
|
||||
@@ -245,45 +310,88 @@ public class DataFactoryTsApi {
|
||||
builder.append(classSimpleName);
|
||||
builder.append(" {\n");
|
||||
LOGGER.info("Parse Class for path: {} => {}", classSimpleName, basicPath);
|
||||
|
||||
final List<OrderedElement> orderedElements = new ArrayList<>();
|
||||
for (final Method method : clazz.getDeclaredMethods()) {
|
||||
final String methodName = method.getName();
|
||||
orderedElements.add(new OrderedElement(methodName, method));
|
||||
}
|
||||
final Comparator<OrderedElement> comparator = Comparator.comparing(OrderedElement::methodName);
|
||||
Collections.sort(orderedElements, comparator);
|
||||
|
||||
for (final OrderedElement orderedElement : orderedElements) {
|
||||
final Method method = orderedElement.method();
|
||||
final String methodName = orderedElement.methodName();
|
||||
final String methodPath = apiAnnotationGetPath(method);
|
||||
final String methodType = apiAnnotationGetTypeRequest(method);
|
||||
if (methodType == null) {
|
||||
LOGGER.error(" [{}] {} => {}/{} ==> No methode type @PATH, @GET ...", methodType, methodName, basicPath, methodPath);
|
||||
LOGGER.error(" [{}] {} => {}/{} ==> No methode type @PATH, @GET ...", methodType, methodName,
|
||||
basicPath, methodPath);
|
||||
continue;
|
||||
}
|
||||
final String methodDescription = apiAnnotationGetOperationDescription(method);
|
||||
final List<String> consumes = apiAnnotationGetConsumes(clazz, method);
|
||||
final List<String> produces = apiAnnotationProduces(clazz, method);
|
||||
List<String> produces = apiAnnotationProduces(clazz, method);
|
||||
LOGGER.trace(" [{}] {} => {}/{}", methodType, methodName, basicPath, methodPath);
|
||||
if (methodDescription != null) {
|
||||
LOGGER.trace(" description: {}", methodDescription);
|
||||
}
|
||||
Class<?> returnTypeModel = apiAnnotationGetAsyncType(method);
|
||||
if (returnTypeModel == null) {
|
||||
returnTypeModel = method.getReturnType();
|
||||
}
|
||||
final boolean needGenerateProgress = apiAnnotationTypeScriptProgress(method);
|
||||
Class<?>[] returnTypeModel = apiAnnotationGetAsyncType(method);
|
||||
boolean isUnmanagedReturnType = false;
|
||||
if (returnTypeModel == Response.class ) {
|
||||
isUnmanagedReturnType = true;
|
||||
returnTypeModel = Void.class;
|
||||
}
|
||||
boolean returnModelIsArray = false;
|
||||
ClassElement tmpReturn;
|
||||
if (returnTypeModel == List.class) {
|
||||
final ParameterizedType listType = (ParameterizedType) method.getGenericReturnType();
|
||||
returnTypeModel = (Class<?>) listType.getActualTypeArguments()[0];
|
||||
tmpReturn = DataFactoryZod.createTable(returnTypeModel, previous);
|
||||
returnModelIsArray = true;
|
||||
includeModel.add(tmpReturn.model[0]);
|
||||
} else {
|
||||
tmpReturn = DataFactoryZod.createTable(returnTypeModel, previous);
|
||||
|
||||
List<ClassElement> tmpReturn;
|
||||
if (returnTypeModel == null) {
|
||||
Class<?> returnTypeModelRaw = method.getReturnType();
|
||||
LOGGER.info("Get type: {}", returnTypeModelRaw);
|
||||
if (returnTypeModelRaw == Response.class) {
|
||||
LOGGER.info("Get type: {}", returnTypeModelRaw);
|
||||
}
|
||||
if (returnTypeModelRaw == Response.class || returnTypeModelRaw == void.class
|
||||
|| returnTypeModelRaw == Void.class) {
|
||||
if (returnTypeModelRaw == Response.class) {
|
||||
isUnmanagedReturnType = true;
|
||||
}
|
||||
returnTypeModel = new Class<?>[] { Void.class };
|
||||
tmpReturn = new ArrayList<>();
|
||||
produces = null;
|
||||
} else if (returnTypeModelRaw == Map.class) {
|
||||
LOGGER.warn("Not manage the Map Model ... set any");
|
||||
returnTypeModel = new Class<?>[] { Map.class };
|
||||
tmpReturn = DataFactoryZod.createTables(returnTypeModel, previous);
|
||||
} else if (returnTypeModelRaw == List.class) {
|
||||
final ParameterizedType listType = (ParameterizedType) method.getGenericReturnType();
|
||||
returnTypeModelRaw = (Class<?>) listType.getActualTypeArguments()[0];
|
||||
returnModelIsArray = true;
|
||||
returnTypeModel = new Class<?>[] { returnTypeModelRaw };
|
||||
tmpReturn = DataFactoryZod.createTables(returnTypeModel, previous);
|
||||
} else {
|
||||
returnTypeModel = new Class<?>[] { returnTypeModelRaw };
|
||||
tmpReturn = DataFactoryZod.createTables(returnTypeModel, previous);
|
||||
}
|
||||
} else if (returnTypeModel.length >= 0 && (returnTypeModel[0] == Response.class
|
||||
|| returnTypeModel[0] == Void.class || returnTypeModel[0] == void.class)) {
|
||||
if (returnTypeModel[0] == Response.class) {
|
||||
isUnmanagedReturnType = true;
|
||||
}
|
||||
returnTypeModel = new Class<?>[] { Void.class };
|
||||
tmpReturn = new ArrayList<>();
|
||||
produces = null;
|
||||
} else if (returnTypeModel.length > 0 && returnTypeModel[0] == Map.class) {
|
||||
LOGGER.warn("Not manage the Map Model ...");
|
||||
returnTypeModel = new Class<?>[] { Map.class };
|
||||
tmpReturn = DataFactoryZod.createTables(returnTypeModel, previous);
|
||||
} else {
|
||||
tmpReturn = DataFactoryZod.createTables(returnTypeModel, previous);
|
||||
}
|
||||
for (final ClassElement elem : tmpReturn) {
|
||||
includeModel.add(elem.model[0]);
|
||||
includeCheckerModel.add(elem.model[0]);
|
||||
}
|
||||
LOGGER.trace(" return: {}", tmpReturn.size());
|
||||
for (final ClassElement elem : tmpReturn) {
|
||||
LOGGER.trace(" - {}", elem.tsTypeName);
|
||||
}
|
||||
includeModel.add(tmpReturn.model[0]);
|
||||
includeCheckerModel.add(tmpReturn.model[0]);
|
||||
LOGGER.trace(" return: {}", tmpReturn.tsTypeName);
|
||||
final Map<String, String> queryParams = new HashMap<>();
|
||||
final Map<String, String> pathParams = new HashMap<>();
|
||||
final Map<String, String> formDataParams = new HashMap<>();
|
||||
@@ -296,24 +404,28 @@ public class DataFactoryTsApi {
|
||||
}
|
||||
final Class<?> parameterType = parameter.getType();
|
||||
String parameterTypeString;
|
||||
final Class<?> asyncType = apiAnnotationGetAsyncType(parameter);
|
||||
final Class<?>[] asyncType = apiAnnotationGetAsyncType(parameter);
|
||||
if (parameterType == List.class) {
|
||||
if (asyncType == null) {
|
||||
LOGGER.warn("Detext List param ==> not managed type ==> any[] !!!");
|
||||
LOGGER.warn("Detect List param ==> not managed type ==> any[] !!!");
|
||||
parameterTypeString = "any[]";
|
||||
} else {
|
||||
final ClassElement tmp = DataFactoryZod.createTable(asyncType, previous);
|
||||
includeModel.add(tmp.model[0]);
|
||||
parameterTypeString = tmp.tsTypeName + "[]";
|
||||
final List<ClassElement> tmp = DataFactoryZod.createTables(asyncType, previous);
|
||||
for (final ClassElement elem : tmp) {
|
||||
includeModel.add(elem.model[0]);
|
||||
}
|
||||
parameterTypeString = convertInTypeScriptType(tmp, true);
|
||||
}
|
||||
} else if (asyncType == null) {
|
||||
final ClassElement tmp = DataFactoryZod.createTable(parameterType, previous);
|
||||
includeModel.add(tmp.model[0]);
|
||||
parameterTypeString = tmp.tsTypeName;
|
||||
} else {
|
||||
final ClassElement tmp = DataFactoryZod.createTable(asyncType, previous);
|
||||
includeModel.add(tmp.model[0]);
|
||||
parameterTypeString = tmp.tsTypeName;
|
||||
final List<ClassElement> tmp = DataFactoryZod.createTables(asyncType, previous);
|
||||
for (final ClassElement elem : tmp) {
|
||||
includeModel.add(elem.model[0]);
|
||||
}
|
||||
parameterTypeString = convertInTypeScriptType(tmp, true);
|
||||
}
|
||||
final String pathParam = apiAnnotationGetPathParam(parameter);
|
||||
final String queryParam = apiAnnotationGetQueryParam(parameter);
|
||||
@@ -325,13 +437,21 @@ public class DataFactoryTsApi {
|
||||
} else if (formDataParam != null) {
|
||||
formDataParams.put(formDataParam, parameterTypeString);
|
||||
} else if (asyncType != null) {
|
||||
final ClassElement tmp = DataFactoryZod.createTable(asyncType, previous);
|
||||
includeModel.add(tmp.model[0]);
|
||||
emptyElement.add(tmp.tsTypeName);
|
||||
final List<ClassElement> tmp = DataFactoryZod.createTables(asyncType, previous);
|
||||
parameterTypeString = "";
|
||||
for (final ClassElement elem : tmp) {
|
||||
includeModel.add(elem.model[0]);
|
||||
if (parameterTypeString.length() != 0) {
|
||||
parameterTypeString += " | ";
|
||||
}
|
||||
parameterTypeString += elem.tsTypeName;
|
||||
}
|
||||
emptyElement.add(parameterTypeString);
|
||||
} else if (parameterType == List.class) {
|
||||
parameterTypeString = "any[]";
|
||||
final Class<?> plop = parameterType.arrayType();
|
||||
LOGGER.info("ArrayType = {}", plop);
|
||||
emptyElement.add(parameterTypeString);
|
||||
} else {
|
||||
final ClassElement tmp = DataFactoryZod.createTable(parameterType, previous);
|
||||
includeModel.add(tmp.model[0]);
|
||||
@@ -367,33 +487,35 @@ public class DataFactoryTsApi {
|
||||
builder.append("\n\t */");
|
||||
}
|
||||
if (isUnmanagedReturnType) {
|
||||
builder.append("\n\t// TODO: unmanaged \"Response\" type: please specify @AsyncType or considered as 'void'.");
|
||||
builder.append(
|
||||
"\n\t// TODO: unmanaged \"Response\" type: please specify @AsyncType or considered as 'void'.");
|
||||
}
|
||||
builder.append("\n\texport function ");
|
||||
builder.append(methodName);
|
||||
builder.append("({ restConfig,");
|
||||
builder.append("({\n\t\t\trestConfig,");
|
||||
if (!queryParams.isEmpty()) {
|
||||
builder.append(" queries,");
|
||||
builder.append("\n\t\t\tqueries,");
|
||||
}
|
||||
if (!pathParams.isEmpty()) {
|
||||
builder.append(" params,");
|
||||
builder.append("\n\t\t\tparams,");
|
||||
}
|
||||
if (produces.size() > 1) {
|
||||
builder.append(" produce,");
|
||||
if (produces != null && produces.size() > 1) {
|
||||
builder.append("\n\t\t\tproduce,");
|
||||
}
|
||||
if (emptyElement.size() == 1) {
|
||||
builder.append(" data,");
|
||||
} else if (formDataParams.size() != 0) {
|
||||
builder.append(" data,");
|
||||
if (emptyElement.size() == 1 || formDataParams.size() != 0) {
|
||||
builder.append("\n\t\t\tdata,");
|
||||
}
|
||||
builder.append(" }: {");
|
||||
if (needGenerateProgress) {
|
||||
builder.append("\n\t\t\tcallback,");
|
||||
}
|
||||
builder.append("\n\t\t}: {");
|
||||
builder.append("\n\t\trestConfig: RESTConfig,");
|
||||
if (!queryParams.isEmpty()) {
|
||||
builder.append("\n\t\tqueries: {");
|
||||
for (final Entry<String, String> queryEntry : queryParams.entrySet()) {
|
||||
builder.append("\n\t\t\t");
|
||||
builder.append(queryEntry.getKey());
|
||||
builder.append(": ");
|
||||
builder.append("?: ");
|
||||
builder.append(queryEntry.getValue());
|
||||
builder.append(",");
|
||||
}
|
||||
@@ -425,7 +547,7 @@ public class DataFactoryTsApi {
|
||||
}
|
||||
builder.append("\n\t\t},");
|
||||
}
|
||||
if (produces.size() > 1) {
|
||||
if (produces != null && produces.size() > 1) {
|
||||
builder.append("\n\t\tproduce: ");
|
||||
String isFist = null;
|
||||
for (final String elem : produces) {
|
||||
@@ -453,13 +575,21 @@ public class DataFactoryTsApi {
|
||||
}
|
||||
builder.append(",");
|
||||
}
|
||||
if (needGenerateProgress) {
|
||||
builder.append("\n\t\tcallback?: RESTCallbacks,");
|
||||
}
|
||||
builder.append("\n\t}): Promise<");
|
||||
builder.append(tmpReturn.tsTypeName);
|
||||
if (returnModelIsArray) {
|
||||
builder.append("[]");
|
||||
if (tmpReturn.size() == 0 //
|
||||
|| tmpReturn.get(0).tsTypeName == null //
|
||||
|| tmpReturn.get(0).tsTypeName.equals("void")) {
|
||||
builder.append("void");
|
||||
} else {
|
||||
builder.append(convertInTypeScriptType(tmpReturn, returnModelIsArray));
|
||||
}
|
||||
builder.append("> {");
|
||||
if (tmpReturn.tsTypeName.equals("void")) {
|
||||
if (tmpReturn.size() == 0 //
|
||||
|| tmpReturn.get(0).tsTypeName == null //
|
||||
|| tmpReturn.get(0).tsTypeName.equals("void")) {
|
||||
builder.append("\n\t\treturn RESTRequestVoid({");
|
||||
} else if (returnModelIsArray) {
|
||||
builder.append("\n\t\treturn RESTRequestJsonArray({");
|
||||
@@ -518,10 +648,15 @@ public class DataFactoryTsApi {
|
||||
} else if (formDataParams.size() != 0) {
|
||||
builder.append("\n\t\t\tdata,");
|
||||
}
|
||||
if (needGenerateProgress) {
|
||||
builder.append("\n\t\t\tcallback,");
|
||||
}
|
||||
builder.append("\n\t\t}");
|
||||
if (tmpReturn.tsCheckType != null) {
|
||||
if (tmpReturn.size() != 0 && tmpReturn.get(0).tsTypeName != null
|
||||
&& !tmpReturn.get(0).tsTypeName.equals("void")) {
|
||||
builder.append(", ");
|
||||
builder.append(tmpReturn.tsCheckType);
|
||||
// TODO: correct this it is really bad ...
|
||||
builder.append(convertInTypeScriptCheckType(tmpReturn));
|
||||
}
|
||||
builder.append(");");
|
||||
builder.append("\n\t};");
|
||||
@@ -530,7 +665,10 @@ public class DataFactoryTsApi {
|
||||
return new APIModel(builder.toString(), classSimpleName);
|
||||
}
|
||||
|
||||
public static void generatePackage(final List<Class<?>> classApi, final List<Class<?>> classModel, final String pathPackage) throws Exception {
|
||||
public static void generatePackage(
|
||||
final List<Class<?>> classApi,
|
||||
final List<Class<?>> classModel,
|
||||
final String pathPackage) throws Exception {
|
||||
final GeneratedTypes previous = DataFactoryZod.createBasicType();
|
||||
DataFactoryZod.createTable(RestErrorResponse.class, previous);
|
||||
final List<String> listApi = createApi(classApi, previous, pathPackage);
|
||||
@@ -551,9 +689,7 @@ public class DataFactoryTsApi {
|
||||
myWriter = new FileWriter(pathPackage + File.separator + "index.ts");
|
||||
myWriter.write(index.toString());
|
||||
myWriter.close();
|
||||
final InputStream ioStream = DataFactoryTsApi.class
|
||||
.getClassLoader()
|
||||
.getResourceAsStream("rest-tools.ts");
|
||||
final InputStream ioStream = DataFactoryTsApi.class.getClassLoader().getResourceAsStream("rest-tools.ts");
|
||||
if (ioStream == null) {
|
||||
throw new IllegalArgumentException("rest-tools.ts is not found");
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ package org.kar.archidata.dataAccess;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileWriter;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.ParameterizedType;
|
||||
@@ -12,6 +13,7 @@ import java.time.LocalTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
|
||||
@@ -20,6 +22,8 @@ import org.kar.archidata.exception.DataAccessException;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import jakarta.ws.rs.core.Response;
|
||||
|
||||
public class DataFactoryZod {
|
||||
static final Logger LOGGER = LoggerFactory.getLogger(DataFactoryZod.class);
|
||||
|
||||
@@ -33,7 +37,8 @@ public class DataFactoryZod {
|
||||
public boolean isEnum = false;
|
||||
public boolean nativeType;
|
||||
|
||||
public ClassElement(final Class<?> model[], final String zodName, final String tsTypeName, final String tsCheckType, final String declaration, final boolean nativeType) {
|
||||
public ClassElement(final Class<?> model[], final String zodName, final String tsTypeName,
|
||||
final String tsCheckType, final String declaration, final boolean nativeType) {
|
||||
this.model = model;
|
||||
this.zodName = zodName;
|
||||
this.tsTypeName = tsTypeName;
|
||||
@@ -87,7 +92,8 @@ public class DataFactoryZod {
|
||||
}
|
||||
}
|
||||
|
||||
public static ClassElement convertTypeZodEnum(final Class<?> clazz, final GeneratedTypes previous) throws Exception {
|
||||
public static ClassElement convertTypeZodEnum(final Class<?> clazz, final GeneratedTypes previous)
|
||||
throws Exception {
|
||||
final ClassElement element = new ClassElement(clazz);
|
||||
previous.add(element);
|
||||
final Object[] arr = clazz.getEnumConstants();
|
||||
@@ -106,7 +112,11 @@ public class DataFactoryZod {
|
||||
out.append(elem.toString());
|
||||
out.append("'");
|
||||
}
|
||||
if (first) {
|
||||
out.append("]}");
|
||||
} else {
|
||||
out.append("\n\t])");
|
||||
}
|
||||
} else {
|
||||
element.isEnum = true;
|
||||
boolean first = true;
|
||||
@@ -123,7 +133,11 @@ public class DataFactoryZod {
|
||||
out.append(elem.toString());
|
||||
out.append("'");
|
||||
}
|
||||
if (first) {
|
||||
out.append("}");
|
||||
} else {
|
||||
out.append(",\n\t}");
|
||||
}
|
||||
}
|
||||
element.declaration = out.toString();
|
||||
previous.addOrder(element);
|
||||
@@ -139,7 +153,8 @@ public class DataFactoryZod {
|
||||
return convertTypeZodEnum(type, previous).zodName;
|
||||
}
|
||||
if (type == List.class) {
|
||||
throw new DataAccessException("Imcompatible type of element in object for: " + type.getCanonicalName() + " Unmanaged List of List ... ");
|
||||
throw new DataAccessException("Imcompatible type of element in object for: " + type.getCanonicalName()
|
||||
+ " Unmanaged List of List ... ");
|
||||
}
|
||||
final ClassElement elemCreated = createTable(type, previous);
|
||||
if (elemCreated != null) {
|
||||
@@ -177,7 +192,11 @@ public class DataFactoryZod {
|
||||
return ".optional()";
|
||||
}
|
||||
|
||||
public static void createTablesSpecificType(final Field elem, final int fieldId, final StringBuilder builder, final GeneratedTypes previous) throws Exception {
|
||||
public static void createTablesSpecificType(
|
||||
final Field elem,
|
||||
final int fieldId,
|
||||
final StringBuilder builder,
|
||||
final GeneratedTypes previous) throws Exception {
|
||||
final String name = elem.getName();
|
||||
final Class<?> classModel = elem.getType();
|
||||
final int limitSize = AnnotationTools.getLimitSize(elem);
|
||||
@@ -229,21 +248,35 @@ public class DataFactoryZod {
|
||||
public static GeneratedTypes createBasicType() throws Exception {
|
||||
final GeneratedTypes previous = new GeneratedTypes();
|
||||
previous.add(new ClassElement(new Class<?>[] { Void.class, void.class }, "void", "void", null, null, true));
|
||||
previous.add(new ClassElement(new Class<?>[] { String.class }, "zod.string()", "string", null, "zod.string()", true));
|
||||
previous.add(new ClassElement(new Class<?>[] { InputStream.class, FormDataContentDisposition.class }, "z.instanceof(File)", "File", null, "z.instanceof(File)", true));
|
||||
previous.add(new ClassElement(new Class<?>[] { Boolean.class, boolean.class }, "zod.boolean()", "boolean", null, "zod.boolean()", true));
|
||||
previous.add(new ClassElement(new Class<?>[] { UUID.class }, "ZodUUID", "UUID", "isUUID", "zod.string().uuid()", false), true);
|
||||
// Map is binded to any ==> can not determine this complex model for now
|
||||
previous.add(new ClassElement(new Class<?>[] { Map.class }, "any", "any", null, null, true));
|
||||
previous.add(new ClassElement(new Class<?>[] { String.class }, "zod.string()", "string", null, "zod.string()",
|
||||
true));
|
||||
previous.add(new ClassElement(new Class<?>[] { InputStream.class, FormDataContentDisposition.class },
|
||||
"z.instanceof(File)", "File", null, "z.instanceof(File)", true));
|
||||
previous.add(new ClassElement(new Class<?>[] { Boolean.class, boolean.class }, "zod.boolean()", "boolean", null,
|
||||
"zod.boolean()", true));
|
||||
previous.add(new ClassElement(new Class<?>[] { UUID.class }, "ZodUUID", "UUID", "isUUID", "zod.string().uuid()",
|
||||
false), true);
|
||||
previous.add(new ClassElement(new Class<?>[] { Long.class, long.class }, "ZodLong", "Long", "isLong",
|
||||
// "zod.bigint()",
|
||||
"zod.number()", false), true);
|
||||
previous.add(new ClassElement(new Class<?>[] { Integer.class, int.class }, "ZodInteger", "Integer", "isInteger", "zod.number().safe()", false), true);
|
||||
previous.add(new ClassElement(new Class<?>[] { Double.class, double.class }, "ZodDouble", "Double", "isDouble", "zod.number()", true), true);
|
||||
previous.add(new ClassElement(new Class<?>[] { Float.class, float.class }, "ZodFloat", "Float", "isFloat", "zod.number()", false), true);
|
||||
previous.add(new ClassElement(new Class<?>[] { Instant.class }, "ZodInstant", "Instant", "isInstant", "zod.string()", false), true);
|
||||
previous.add(new ClassElement(new Class<?>[] { Date.class }, "ZodDate", "Date", "isDate", "zod.date()", false), true);
|
||||
previous.add(new ClassElement(new Class<?>[] { Timestamp.class }, "ZodTimestamp", "Timestamp", "isTimestamp", "zod.date()", false), true);
|
||||
previous.add(new ClassElement(new Class<?>[] { LocalDate.class }, "ZodLocalDate", "LocalDate", "isLocalDate", "zod.date()", false), true);
|
||||
previous.add(new ClassElement(new Class<?>[] { LocalTime.class }, "ZodLocalTime", "LocalTime", "isLocalTime", "zod.date()", false), true);
|
||||
previous.add(new ClassElement(new Class<?>[] { Integer.class, int.class }, "ZodInteger", "Integer", "isInteger",
|
||||
"zod.number().safe()", false), true);
|
||||
previous.add(new ClassElement(new Class<?>[] { Double.class, double.class }, "ZodDouble", "Double", "isDouble",
|
||||
"zod.number()", true), true);
|
||||
previous.add(new ClassElement(new Class<?>[] { Float.class, float.class }, "ZodFloat", "Float", "isFloat",
|
||||
"zod.number()", false), true);
|
||||
previous.add(new ClassElement(new Class<?>[] { Instant.class }, "ZodInstant", "Instant", "isInstant",
|
||||
"zod.string()", false), true);
|
||||
previous.add(new ClassElement(new Class<?>[] { Date.class }, "ZodDate", "Date", "isDate",
|
||||
"zod.string().datetime({ precision: 3 })", false), true);
|
||||
previous.add(new ClassElement(new Class<?>[] { Timestamp.class }, "ZodTimestamp", "Timestamp", "isTimestamp",
|
||||
"zod.string().datetime({ precision: 3 })", false), true);
|
||||
previous.add(new ClassElement(new Class<?>[] { LocalDate.class }, "ZodLocalDate", "LocalDate", "isLocalDate",
|
||||
"zod.string().date()", false), true);
|
||||
previous.add(new ClassElement(new Class<?>[] { LocalTime.class }, "ZodLocalTime", "LocalTime", "isLocalTime",
|
||||
"zod.string().time()", false), true);
|
||||
return previous;
|
||||
}
|
||||
|
||||
@@ -282,10 +315,25 @@ public class DataFactoryZod {
|
||||
return generatedData.toString();
|
||||
}
|
||||
|
||||
public static List<ClassElement> createTables(final Class<?>[] classs, final GeneratedTypes previous)
|
||||
throws Exception {
|
||||
final List<ClassElement> out = new ArrayList<>();
|
||||
for (final Class<?> clazz : classs) {
|
||||
if (clazz == Response.class) {
|
||||
throw new IOException("Can not generate a Zod element for an unknow type Response");
|
||||
}
|
||||
out.add(createTable(clazz, previous));
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
public static ClassElement createTable(final Class<?> clazz, final GeneratedTypes previous) throws Exception {
|
||||
if (clazz == null) {
|
||||
return null;
|
||||
}
|
||||
if (clazz == Response.class) {
|
||||
throw new IOException("Can not generate a Zod element for an unknow type Response");
|
||||
}
|
||||
final ClassElement alreadyExist = previous.find(clazz);
|
||||
if (previous.find(clazz) != null) {
|
||||
return alreadyExist;
|
||||
@@ -319,7 +367,8 @@ public class DataFactoryZod {
|
||||
LOGGER.trace(" + '{}'", elem.getName());
|
||||
if (false && DataAccess.isAddOnField(elem)) {
|
||||
final DataAccessAddOn addOn = DataAccess.findAddOnforField(elem);
|
||||
LOGGER.error("Create type for: {} ==> {} (ADD-ON) ==> Not managed now ....", AnnotationTools.getFieldName(elem), elem.getType());
|
||||
LOGGER.error("Create type for: {} ==> {} (ADD-ON) ==> Not managed now ....",
|
||||
AnnotationTools.getFieldName(elem), elem.getType());
|
||||
/* LOGGER.trace("Create type for: {} ==> {} (ADD-ON)", AnnotationTools.getFieldName(elem), elem.getType()); if (addOn != null) { addOn.createTables(tableName, elem, tmpOut,
|
||||
* preActionList, postActionList, createIfNotExist, createDrop, fieldId); } else { throw new DataAccessException( "Element matked as add-on but add-on does not loaded: table:" +
|
||||
* tableName + " field name=" + AnnotationTools.getFieldName(elem) + " type=" + elem.getType()); } fieldId++; */
|
||||
@@ -425,7 +474,7 @@ public class DataFactoryZod {
|
||||
/**
|
||||
* Global import of the package
|
||||
*/
|
||||
export * from "./model.ts";
|
||||
export * from "./model";
|
||||
|
||||
""";
|
||||
myWriter = new FileWriter(pathPackage + File.separator + "index.ts");
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
package org.kar.archidata.dataAccess;
|
||||
|
||||
import java.sql.PreparedStatement;
|
||||
|
||||
public class Limit extends QueryOption {
|
||||
protected final long limit;
|
||||
|
||||
public Limit(final long limit) {
|
||||
this.limit = limit;
|
||||
}
|
||||
|
||||
public void generateQuerry(final StringBuilder query, final String tableName) {
|
||||
query.append(" LIMIT ? \n");
|
||||
}
|
||||
|
||||
public void injectQuerry(final PreparedStatement ps, final CountInOut iii) throws Exception {
|
||||
DataAccess.addElement(ps, this.limit, iii);
|
||||
iii.inc();
|
||||
}
|
||||
}
|
||||
@@ -8,21 +8,21 @@ import java.util.List;
|
||||
public class QueryAnd implements QueryItem {
|
||||
protected final List<QueryItem> childs;
|
||||
|
||||
public QueryAnd(final List<QueryItem> childs) {
|
||||
this.childs = childs;
|
||||
public QueryAnd(final List<QueryItem> child) {
|
||||
this.childs = child;
|
||||
}
|
||||
|
||||
public QueryAnd(final QueryItem... items) {
|
||||
public QueryAnd(final QueryItem... child) {
|
||||
this.childs = new ArrayList<>();
|
||||
Collections.addAll(this.childs, items);
|
||||
Collections.addAll(this.childs, child);
|
||||
}
|
||||
|
||||
public void add(final QueryItem... items) {
|
||||
Collections.addAll(this.childs, items);
|
||||
public void add(final QueryItem... child) {
|
||||
Collections.addAll(this.childs, child);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void generateQuerry(final StringBuilder query, final String tableName) {
|
||||
public void generateQuery(final StringBuilder query, final String tableName) {
|
||||
if (this.childs.size() >= 1) {
|
||||
query.append(" (");
|
||||
}
|
||||
@@ -33,7 +33,7 @@ public class QueryAnd implements QueryItem {
|
||||
} else {
|
||||
query.append(" AND ");
|
||||
}
|
||||
elem.generateQuerry(query, tableName);
|
||||
elem.generateQuery(query, tableName);
|
||||
}
|
||||
if (this.childs.size() >= 1) {
|
||||
query.append(")");
|
||||
@@ -41,10 +41,10 @@ public class QueryAnd implements QueryItem {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void injectQuerry(final PreparedStatement ps, final CountInOut iii) throws Exception {
|
||||
public void injectQuery(final PreparedStatement ps, final CountInOut iii) throws Exception {
|
||||
|
||||
for (final QueryItem elem : this.childs) {
|
||||
elem.injectQuerry(ps, iii);
|
||||
elem.injectQuery(ps, iii);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -7,6 +7,12 @@ public class QueryCondition implements QueryItem {
|
||||
private final String comparator;
|
||||
private final Object value;
|
||||
|
||||
/**
|
||||
* Simple DB comparison element. Note the injected object is injected in the statement and not in the query directly.
|
||||
* @param key Field to check (the Model property name)
|
||||
* @param comparator (simple comparator String)
|
||||
* @param value Value that the field must be equals.
|
||||
*/
|
||||
public QueryCondition(final String key, final String comparator, final Object value) {
|
||||
this.key = key;
|
||||
this.comparator = comparator;
|
||||
@@ -14,7 +20,7 @@ public class QueryCondition implements QueryItem {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void generateQuerry(final StringBuilder query, final String tableName) {
|
||||
public void generateQuery(final StringBuilder query, final String tableName) {
|
||||
if (tableName != null) {
|
||||
query.append(tableName);
|
||||
query.append(".");
|
||||
@@ -26,7 +32,7 @@ public class QueryCondition implements QueryItem {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void injectQuerry(final PreparedStatement ps, final CountInOut iii) throws Exception {
|
||||
public void injectQuery(final PreparedStatement ps, final CountInOut iii) throws Exception {
|
||||
DataAccess.addElement(ps, this.value, iii);
|
||||
iii.inc();
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@ public class QueryInList<T> implements QueryItem {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void generateQuerry(final StringBuilder query, final String tableName) {
|
||||
public void generateQuery(final StringBuilder query, final String tableName) {
|
||||
if (tableName != null) {
|
||||
query.append(tableName);
|
||||
query.append(".");
|
||||
@@ -44,7 +44,7 @@ public class QueryInList<T> implements QueryItem {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void injectQuerry(final PreparedStatement ps, final CountInOut iii) throws Exception {
|
||||
public void injectQuery(final PreparedStatement ps, final CountInOut iii) throws Exception {
|
||||
for (final Object elem : this.value) {
|
||||
DataAccess.addElement(ps, elem, iii);
|
||||
iii.inc();
|
||||
|
||||
@@ -3,7 +3,7 @@ package org.kar.archidata.dataAccess;
|
||||
import java.sql.PreparedStatement;
|
||||
|
||||
public interface QueryItem {
|
||||
void generateQuerry(StringBuilder query, String tableName);
|
||||
void generateQuery(StringBuilder query, String tableName);
|
||||
|
||||
void injectQuerry(PreparedStatement ps, CountInOut iii) throws Exception;
|
||||
void injectQuery(PreparedStatement ps, CountInOut iii) throws Exception;
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ public class QueryNotNull implements QueryItem {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void generateQuerry(final StringBuilder query, final String tableName) {
|
||||
public void generateQuery(final StringBuilder query, final String tableName) {
|
||||
if (tableName != null) {
|
||||
query.append(tableName);
|
||||
query.append(".");
|
||||
@@ -20,5 +20,5 @@ public class QueryNotNull implements QueryItem {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void injectQuerry(final PreparedStatement ps, final CountInOut iii) throws Exception {}
|
||||
public void injectQuery(final PreparedStatement ps, final CountInOut iii) throws Exception {}
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ public class QueryNull implements QueryItem {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void generateQuerry(final StringBuilder query, final String tableName) {
|
||||
public void generateQuery(final StringBuilder query, final String tableName) {
|
||||
if (tableName != null) {
|
||||
query.append(tableName);
|
||||
query.append(".");
|
||||
@@ -20,5 +20,5 @@ public class QueryNull implements QueryItem {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void injectQuerry(final PreparedStatement ps, final CountInOut iii) throws Exception {}
|
||||
public void injectQuery(final PreparedStatement ps, final CountInOut iii) throws Exception {}
|
||||
}
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
package org.kar.archidata.dataAccess;
|
||||
|
||||
public class QueryOption {}
|
||||
@@ -6,6 +6,7 @@ import java.util.List;
|
||||
|
||||
import org.kar.archidata.dataAccess.options.AccessDeletedItems;
|
||||
import org.kar.archidata.dataAccess.options.CreateDropTable;
|
||||
import org.kar.archidata.dataAccess.options.QueryOption;
|
||||
import org.kar.archidata.dataAccess.options.ReadAllColumn;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@@ -40,13 +41,14 @@ public class QueryOptions {
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public <T> T get(final Class<T> type) {
|
||||
public <T> List<T> get(final Class<T> type) {
|
||||
final List<T> out = new ArrayList<>();
|
||||
for (final QueryOption elem : this.options) {
|
||||
if (elem.getClass() == type) {
|
||||
return (T) elem;
|
||||
out.add((T) elem);
|
||||
}
|
||||
}
|
||||
return null;
|
||||
return out;
|
||||
}
|
||||
|
||||
public boolean exist(final Class<?> type) {
|
||||
|
||||
@@ -15,7 +15,7 @@ public class QueryOr implements QueryItem {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void generateQuerry(final StringBuilder query, final String tableName) {
|
||||
public void generateQuery(final StringBuilder query, final String tableName) {
|
||||
if (this.childs.size() >= 1) {
|
||||
query.append(" (");
|
||||
}
|
||||
@@ -26,7 +26,7 @@ public class QueryOr implements QueryItem {
|
||||
} else {
|
||||
query.append(" OR ");
|
||||
}
|
||||
elem.generateQuerry(query, tableName);
|
||||
elem.generateQuery(query, tableName);
|
||||
}
|
||||
if (this.childs.size() >= 1) {
|
||||
query.append(")");
|
||||
@@ -34,9 +34,9 @@ public class QueryOr implements QueryItem {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void injectQuerry(final PreparedStatement ps, final CountInOut iii) throws Exception {
|
||||
public void injectQuery(final PreparedStatement ps, final CountInOut iii) throws Exception {
|
||||
for (final QueryItem elem : this.childs) {
|
||||
elem.injectQuerry(ps, iii);
|
||||
elem.injectQuery(ps, iii);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -52,7 +52,8 @@ public class AddOnDataJson implements DataAccessAddOn {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void insertData(final PreparedStatement ps, final Field field, final Object rootObject, final CountInOut iii) throws Exception {
|
||||
public void insertData(final PreparedStatement ps, final Field field, final Object rootObject, final CountInOut iii)
|
||||
throws Exception {
|
||||
final Object data = field.get(rootObject);
|
||||
if (data == null) {
|
||||
ps.setNull(iii.value, Types.VARCHAR);
|
||||
@@ -79,18 +80,31 @@ public class AddOnDataJson implements DataAccessAddOn {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void generateQuerry(@NotNull final String tableName, @NotNull final Field field, @NotNull final StringBuilder querrySelect, @NotNull final StringBuilder querry, @NotNull final String name,
|
||||
@NotNull final CountInOut elemCount, final QueryOptions options) throws Exception {
|
||||
querrySelect.append(" ");
|
||||
querrySelect.append(tableName);
|
||||
querrySelect.append(".");
|
||||
querrySelect.append(name);
|
||||
elemCount.inc();
|
||||
public void generateQuery(
|
||||
@NotNull final String tableName,
|
||||
@NotNull final String primaryKey,
|
||||
@NotNull final Field field,
|
||||
@NotNull final StringBuilder querySelect,
|
||||
@NotNull final StringBuilder query,
|
||||
@NotNull final String name,
|
||||
@NotNull final CountInOut count,
|
||||
final QueryOptions options) throws Exception {
|
||||
querySelect.append(" ");
|
||||
querySelect.append(tableName);
|
||||
querySelect.append(".");
|
||||
querySelect.append(name);
|
||||
count.inc();
|
||||
return;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void fillFromQuerry(final ResultSet rs, final Field field, final Object data, final CountInOut count, final QueryOptions options, final List<LazyGetter> lazyCall) throws Exception {
|
||||
public void fillFromQuery(
|
||||
final ResultSet rs,
|
||||
final Field field,
|
||||
final Object data,
|
||||
final CountInOut count,
|
||||
final QueryOptions options,
|
||||
final List<LazyGetter> lazyCall) throws Exception {
|
||||
final String jsonData = rs.getString(count.value);
|
||||
count.inc();
|
||||
if (!rs.wasNull()) {
|
||||
@@ -141,13 +155,25 @@ public class AddOnDataJson implements DataAccessAddOn {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void createTables(final String tableName, final Field field, final StringBuilder mainTableBuilder, final List<String> preActionList, final List<String> postActionList,
|
||||
final boolean createIfNotExist, final boolean createDrop, final int fieldId) throws Exception {
|
||||
DataFactory.createTablesSpecificType(tableName, field, mainTableBuilder, preActionList, postActionList, createIfNotExist, createDrop, fieldId, JsonValue.class);
|
||||
public void createTables(
|
||||
final String tableName,
|
||||
final Field primaryField,
|
||||
final Field field,
|
||||
final StringBuilder mainTableBuilder,
|
||||
final List<String> preActionList,
|
||||
final List<String> postActionList,
|
||||
final boolean createIfNotExist,
|
||||
final boolean createDrop,
|
||||
final int fieldId) throws Exception {
|
||||
DataFactory.createTablesSpecificType(tableName, primaryField, field, mainTableBuilder, preActionList,
|
||||
postActionList, createIfNotExist, createDrop, fieldId, JsonValue.class);
|
||||
}
|
||||
public static void addLink(final Class<?> clazz, final Long id, final String column, final Long remoteKey) throws Exception {
|
||||
|
||||
public static void addLink(final Class<?> clazz, final Long id, final String column, final Long remoteKey)
|
||||
throws Exception {
|
||||
final String tableName = AnnotationTools.getTableName(clazz);
|
||||
final TableCoversLongLong data = DataAccess.get(TableCoversLongLong.class, id, new OverrideTableName(tableName));
|
||||
final TableCoversLongLong data = DataAccess.get(TableCoversLongLong.class, id,
|
||||
new OverrideTableName(tableName));
|
||||
if (data.covers == null) {
|
||||
data.covers = new ArrayList<>();
|
||||
}
|
||||
@@ -160,9 +186,11 @@ public class AddOnDataJson implements DataAccessAddOn {
|
||||
DataAccess.update(data, data.id, List.of("covers"), new OverrideTableName(tableName));
|
||||
}
|
||||
|
||||
public static void addLink(final Class<?> clazz, final Long id, final String column, final UUID remoteKey) throws Exception {
|
||||
public static void addLink(final Class<?> clazz, final Long id, final String column, final UUID remoteKey)
|
||||
throws Exception {
|
||||
final String tableName = AnnotationTools.getTableName(clazz);
|
||||
final TableCoversLongUUID data = DataAccess.get(TableCoversLongUUID.class, id, new OverrideTableName(tableName));
|
||||
final TableCoversLongUUID data = DataAccess.get(TableCoversLongUUID.class, id,
|
||||
new OverrideTableName(tableName));
|
||||
if (data.covers == null) {
|
||||
data.covers = new ArrayList<>();
|
||||
}
|
||||
@@ -174,9 +202,12 @@ public class AddOnDataJson implements DataAccessAddOn {
|
||||
data.covers.add(remoteKey);
|
||||
DataAccess.update(data, data.id, List.of("covers"), new OverrideTableName(tableName));
|
||||
}
|
||||
public static void addLink(final Class<?> clazz, final UUID id, final String column, final UUID remoteKey) throws Exception {
|
||||
|
||||
public static void addLink(final Class<?> clazz, final UUID id, final String column, final UUID remoteKey)
|
||||
throws Exception {
|
||||
final String tableName = AnnotationTools.getTableName(clazz);
|
||||
final TableCoversUUIDUUID data = DataAccess.get(TableCoversUUIDUUID.class, id, new OverrideTableName(tableName));
|
||||
final TableCoversUUIDUUID data = DataAccess.get(TableCoversUUIDUUID.class, id,
|
||||
new OverrideTableName(tableName));
|
||||
if (data.covers == null) {
|
||||
data.covers = new ArrayList<>();
|
||||
}
|
||||
@@ -188,9 +219,12 @@ public class AddOnDataJson implements DataAccessAddOn {
|
||||
data.covers.add(remoteKey);
|
||||
DataAccess.update(data, data.id, List.of("covers"), new OverrideTableName(tableName));
|
||||
}
|
||||
public static void addLink(final Class<?> clazz, final UUID id, final String column, final Long remoteKey) throws Exception {
|
||||
|
||||
public static void addLink(final Class<?> clazz, final UUID id, final String column, final Long remoteKey)
|
||||
throws Exception {
|
||||
final String tableName = AnnotationTools.getTableName(clazz);
|
||||
final TableCoversUUIDLong data = DataAccess.get(TableCoversUUIDLong.class, id, new OverrideTableName(tableName));
|
||||
final TableCoversUUIDLong data = DataAccess.get(TableCoversUUIDLong.class, id,
|
||||
new OverrideTableName(tableName));
|
||||
if (data.covers == null) {
|
||||
data.covers = new ArrayList<>();
|
||||
}
|
||||
@@ -202,9 +236,12 @@ public class AddOnDataJson implements DataAccessAddOn {
|
||||
data.covers.add(remoteKey);
|
||||
DataAccess.update(data, data.id, List.of("covers"), new OverrideTableName(tableName));
|
||||
}
|
||||
public static void removeLink(final Class<?> clazz, final UUID id, final String column, final Long remoteKey) throws Exception {
|
||||
|
||||
public static void removeLink(final Class<?> clazz, final UUID id, final String column, final Long remoteKey)
|
||||
throws Exception {
|
||||
final String tableName = AnnotationTools.getTableName(clazz);
|
||||
final TableCoversUUIDLong data = DataAccess.get(TableCoversUUIDLong.class, id, new OverrideTableName(tableName));
|
||||
final TableCoversUUIDLong data = DataAccess.get(TableCoversUUIDLong.class, id,
|
||||
new OverrideTableName(tableName));
|
||||
if (data.covers == null) {
|
||||
return;
|
||||
}
|
||||
@@ -218,9 +255,12 @@ public class AddOnDataJson implements DataAccessAddOn {
|
||||
data.covers = newList;
|
||||
DataAccess.update(data, data.id, List.of("covers"), new OverrideTableName(tableName));
|
||||
}
|
||||
public static void removeLink(final Class<?> clazz, final UUID id, final String column, final UUID remoteKey) throws Exception {
|
||||
|
||||
public static void removeLink(final Class<?> clazz, final UUID id, final String column, final UUID remoteKey)
|
||||
throws Exception {
|
||||
final String tableName = AnnotationTools.getTableName(clazz);
|
||||
final TableCoversUUIDUUID data = DataAccess.get(TableCoversUUIDUUID.class, id, new OverrideTableName(tableName));
|
||||
final TableCoversUUIDUUID data = DataAccess.get(TableCoversUUIDUUID.class, id,
|
||||
new OverrideTableName(tableName));
|
||||
if (data.covers == null) {
|
||||
return;
|
||||
}
|
||||
@@ -234,9 +274,12 @@ public class AddOnDataJson implements DataAccessAddOn {
|
||||
data.covers = newList;
|
||||
DataAccess.update(data, data.id, List.of("covers"), new OverrideTableName(tableName));
|
||||
}
|
||||
public static void removeLink(final Class<?> clazz, final Long id, final String column, final Long remoteKey) throws Exception {
|
||||
|
||||
public static void removeLink(final Class<?> clazz, final Long id, final String column, final Long remoteKey)
|
||||
throws Exception {
|
||||
final String tableName = AnnotationTools.getTableName(clazz);
|
||||
final TableCoversLongLong data = DataAccess.get(TableCoversLongLong.class, id, new OverrideTableName(tableName));
|
||||
final TableCoversLongLong data = DataAccess.get(TableCoversLongLong.class, id,
|
||||
new OverrideTableName(tableName));
|
||||
if (data.covers == null) {
|
||||
return;
|
||||
}
|
||||
@@ -250,9 +293,12 @@ public class AddOnDataJson implements DataAccessAddOn {
|
||||
data.covers = newList;
|
||||
DataAccess.update(data, data.id, List.of("covers"), new OverrideTableName(tableName));
|
||||
}
|
||||
public static void removeLink(final Class<?> clazz, final Long id, final String column, final UUID remoteKey) throws Exception {
|
||||
|
||||
public static void removeLink(final Class<?> clazz, final Long id, final String column, final UUID remoteKey)
|
||||
throws Exception {
|
||||
final String tableName = AnnotationTools.getTableName(clazz);
|
||||
final TableCoversLongUUID data = DataAccess.get(TableCoversLongUUID.class, id, new OverrideTableName(tableName));
|
||||
final TableCoversLongUUID data = DataAccess.get(TableCoversLongUUID.class, id,
|
||||
new OverrideTableName(tableName));
|
||||
if (data.covers == null) {
|
||||
return;
|
||||
}
|
||||
@@ -266,22 +312,9 @@ public class AddOnDataJson implements DataAccessAddOn {
|
||||
data.covers = newList;
|
||||
DataAccess.update(data, data.id, List.of("covers"), new OverrideTableName(tableName));
|
||||
}
|
||||
/*
|
||||
public static <TYPE> void addLink(final Class<TYPE> clazz, final Object localKey, final String column, final Object remoteKey) throws Exception {
|
||||
final String tableName = AnnotationTools.getTableName(clazz);
|
||||
final TYPE data = DataAccess.get(clazz, localKey); // TODO: add filter of the "column"
|
||||
|
||||
// find the field column:
|
||||
|
||||
// add the remoteKey in the list:
|
||||
|
||||
|
||||
// post new data in the DB
|
||||
|
||||
final String linkTableName = generateLinkTableName(this.tableName, this.column);
|
||||
final LinkTable insertElement = new LinkTable(this.localKey, this.remoteKey);
|
||||
DataAccess.insert(insertElement, new OverrideTableName(linkTableName));
|
||||
|
||||
}*/
|
||||
/* public static <TYPE> void addLink(final Class<TYPE> clazz, final Object localKey, final String column, final Object remoteKey) throws Exception { final String tableName =
|
||||
* AnnotationTools.getTableName(clazz); final TYPE data = DataAccess.get(clazz, localKey); // TODO: add filter of the "column" // find the field column: // add the remoteKey in the list: // post
|
||||
* new data in the DB final String linkTableName = generateLinkTableName(this.tableName, this.column); final LinkTable insertElement = new LinkTable(this.localKey, this.remoteKey);
|
||||
* DataAccess.insert(insertElement, new OverrideTableName(linkTableName)); } */
|
||||
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.kar.archidata.annotation.AnnotationTools;
|
||||
import org.kar.archidata.dataAccess.CountInOut;
|
||||
@@ -18,7 +19,10 @@ import org.kar.archidata.dataAccess.QueryAnd;
|
||||
import org.kar.archidata.dataAccess.QueryCondition;
|
||||
import org.kar.archidata.dataAccess.QueryInList;
|
||||
import org.kar.archidata.dataAccess.QueryOptions;
|
||||
import org.kar.archidata.dataAccess.addOn.model.LinkTable;
|
||||
import org.kar.archidata.dataAccess.addOn.model.LinkTableLongLong;
|
||||
import org.kar.archidata.dataAccess.addOn.model.LinkTableLongUUID;
|
||||
import org.kar.archidata.dataAccess.addOn.model.LinkTableUUIDLong;
|
||||
import org.kar.archidata.dataAccess.addOn.model.LinkTableUUIDUUID;
|
||||
import org.kar.archidata.dataAccess.options.Condition;
|
||||
import org.kar.archidata.dataAccess.options.OverrideTableName;
|
||||
import org.kar.archidata.exception.DataAccessException;
|
||||
@@ -32,7 +36,8 @@ import jakarta.validation.constraints.NotNull;
|
||||
|
||||
public class AddOnManyToMany implements DataAccessAddOn {
|
||||
static final Logger LOGGER = LoggerFactory.getLogger(AddOnManyToMany.class);
|
||||
static final String SEPARATOR = "-";
|
||||
static final String SEPARATOR_LONG = "-";
|
||||
static final String SEPARATOR_UUID = "_";
|
||||
|
||||
@Override
|
||||
public Class<?> getAnnotationClass() {
|
||||
@@ -51,7 +56,8 @@ public class AddOnManyToMany implements DataAccessAddOn {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void insertData(final PreparedStatement ps, final Field field, final Object rootObject, final CountInOut iii) throws SQLException, IllegalArgumentException, IllegalAccessException {
|
||||
public void insertData(final PreparedStatement ps, final Field field, final Object rootObject, final CountInOut iii)
|
||||
throws SQLException, IllegalArgumentException, IllegalAccessException {
|
||||
|
||||
}
|
||||
|
||||
@@ -62,8 +68,23 @@ public class AddOnManyToMany implements DataAccessAddOn {
|
||||
|
||||
@Override
|
||||
public boolean canRetrieve(final Field field) {
|
||||
if (field.getType() != List.class) {
|
||||
return false;
|
||||
}
|
||||
final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
|
||||
.getActualTypeArguments()[0];
|
||||
if (objectClass == Long.class || objectClass == UUID.class) {
|
||||
return true;
|
||||
}
|
||||
final ManyToMany decorators = field.getDeclaredAnnotation(ManyToMany.class);
|
||||
if (decorators == null) {
|
||||
return false;
|
||||
}
|
||||
if (decorators.targetEntity() == objectClass) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public static String generateLinkTableNameField(final String tableName, final Field field) throws Exception {
|
||||
final String name = AnnotationTools.getFieldName(field);
|
||||
@@ -78,54 +99,79 @@ public class AddOnManyToMany implements DataAccessAddOn {
|
||||
return tableName + "_link_" + localName;
|
||||
}
|
||||
|
||||
public void generateConcatQuerry(@NotNull final String tableName, @NotNull final Field field, @NotNull final StringBuilder querrySelect, @NotNull final StringBuilder querry,
|
||||
@NotNull final String name, @NotNull final CountInOut elemCount, final QueryOptions options) {
|
||||
|
||||
public void generateConcatQuery(
|
||||
@NotNull final String tableName,
|
||||
@NotNull final String primaryKey,
|
||||
@NotNull final Field field,
|
||||
@NotNull final StringBuilder querySelect,
|
||||
@NotNull final StringBuilder query,
|
||||
@NotNull final String name,
|
||||
@NotNull final CountInOut count,
|
||||
final QueryOptions options) throws Exception {
|
||||
final String linkTableName = generateLinkTableName(tableName, name);
|
||||
final String tmpVariable = "tmp_" + Integer.toString(elemCount.value);
|
||||
querrySelect.append(" (SELECT GROUP_CONCAT(");
|
||||
querrySelect.append(tmpVariable);
|
||||
querrySelect.append(".object2Id ");
|
||||
final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
|
||||
.getActualTypeArguments()[0];
|
||||
final String tmpVariable = "tmp_" + Integer.toString(count.value);
|
||||
querySelect.append(" (SELECT GROUP_CONCAT(");
|
||||
querySelect.append(tmpVariable);
|
||||
querySelect.append(".object2Id ");
|
||||
if ("sqlite".equals(ConfigBaseVariable.getDBType())) {
|
||||
querrySelect.append(", ");
|
||||
querySelect.append(", ");
|
||||
} else {
|
||||
querrySelect.append("SEPARATOR ");
|
||||
querySelect.append("SEPARATOR ");
|
||||
}
|
||||
querrySelect.append("'");
|
||||
querrySelect.append(SEPARATOR);
|
||||
querrySelect.append("') FROM ");
|
||||
querrySelect.append(linkTableName);
|
||||
querrySelect.append(" ");
|
||||
querrySelect.append(tmpVariable);
|
||||
querrySelect.append(" WHERE ");
|
||||
/* querrySelect.append(tmpVariable); querrySelect.append(".deleted = false AND "); */
|
||||
querrySelect.append(tableName);
|
||||
querrySelect.append(".id = ");
|
||||
querrySelect.append(tmpVariable);
|
||||
querrySelect.append(".");
|
||||
querrySelect.append("object1Id ");
|
||||
querySelect.append("'");
|
||||
if (objectClass == Long.class) {
|
||||
querySelect.append(SEPARATOR_LONG);
|
||||
} else if (objectClass == UUID.class) {} else {
|
||||
final Class<?> foreignKeyType = AnnotationTools.getPrimaryKeyField(objectClass).getType();
|
||||
if (foreignKeyType == Long.class) {
|
||||
querySelect.append(SEPARATOR_LONG);
|
||||
}
|
||||
}
|
||||
querySelect.append("') FROM ");
|
||||
querySelect.append(linkTableName);
|
||||
querySelect.append(" ");
|
||||
querySelect.append(tmpVariable);
|
||||
querySelect.append(" WHERE ");
|
||||
/* querySelect.append(tmpVariable); querySelect.append(".deleted = false AND "); */
|
||||
querySelect.append(tableName);
|
||||
querySelect.append(".");
|
||||
querySelect.append(primaryKey);
|
||||
querySelect.append(" = ");
|
||||
querySelect.append(tmpVariable);
|
||||
querySelect.append(".");
|
||||
querySelect.append("object1Id ");
|
||||
if (!"sqlite".equals(ConfigBaseVariable.getDBType())) {
|
||||
querrySelect.append(" GROUP BY ");
|
||||
querrySelect.append(tmpVariable);
|
||||
querrySelect.append(".object1Id");
|
||||
querySelect.append(" GROUP BY ");
|
||||
querySelect.append(tmpVariable);
|
||||
querySelect.append(".object1Id");
|
||||
}
|
||||
querrySelect.append(") AS ");
|
||||
querrySelect.append(name);
|
||||
querrySelect.append(" ");
|
||||
querySelect.append(") AS ");
|
||||
querySelect.append(name);
|
||||
querySelect.append(" ");
|
||||
/* " (SELECT GROUP_CONCAT(tmp.data_id SEPARATOR '-')" + " FROM cover_link_node tmp" + " WHERE tmp.deleted = false" +
|
||||
* " AND node.id = tmp.node_id" + " GROUP BY tmp.node_id) AS covers" + */
|
||||
elemCount.inc();
|
||||
count.inc();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void generateQuerry(@NotNull final String tableName, @NotNull final Field field, @NotNull final StringBuilder querrySelect, @NotNull final StringBuilder querry, @NotNull final String name,
|
||||
@NotNull final CountInOut elemCount, final QueryOptions options) throws Exception {
|
||||
public void generateQuery(
|
||||
@NotNull final String tableName,
|
||||
@NotNull final String primaryKey,
|
||||
@NotNull final Field field,
|
||||
@NotNull final StringBuilder querySelect,
|
||||
@NotNull final StringBuilder query,
|
||||
@NotNull final String name,
|
||||
@NotNull final CountInOut count,
|
||||
final QueryOptions options) throws Exception {
|
||||
if (field.getType() != List.class) {
|
||||
return;
|
||||
}
|
||||
final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[0];
|
||||
if (objectClass == Long.class) {
|
||||
generateConcatQuerry(tableName, field, querrySelect, querry, name, elemCount, options);
|
||||
final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
|
||||
.getActualTypeArguments()[0];
|
||||
if (objectClass == Long.class || objectClass == UUID.class) {
|
||||
generateConcatQuery(tableName, primaryKey, field, querySelect, query, name, count, options);
|
||||
}
|
||||
final ManyToMany decorators = field.getDeclaredAnnotation(ManyToMany.class);
|
||||
if (decorators == null) {
|
||||
@@ -135,36 +181,46 @@ public class AddOnManyToMany implements DataAccessAddOn {
|
||||
if (decorators.fetch() == FetchType.EAGER) {
|
||||
throw new DataAccessException("EAGER is not supported for list of element...");
|
||||
} else {
|
||||
generateConcatQuerry(tableName, field, querrySelect, querry, name, elemCount, options);
|
||||
generateConcatQuery(tableName, primaryKey, field, querySelect, query, name, count, options);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void fillFromQuerry(final ResultSet rs, final Field field, final Object data, final CountInOut count, final QueryOptions options, final List<LazyGetter> lazyCall) throws Exception {
|
||||
public void fillFromQuery(
|
||||
final ResultSet rs,
|
||||
final Field field,
|
||||
final Object data,
|
||||
final CountInOut count,
|
||||
final QueryOptions options,
|
||||
final List<LazyGetter> lazyCall) throws Exception {
|
||||
if (field.getType() != List.class) {
|
||||
LOGGER.error("Can not ManyToMany with other than List Model: {}", field.getType().getCanonicalName());
|
||||
return;
|
||||
}
|
||||
final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[0];
|
||||
final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
|
||||
.getActualTypeArguments()[0];
|
||||
if (objectClass == Long.class) {
|
||||
final List<Long> idList = DataAccess.getListOfIds(rs, count.value, SEPARATOR);
|
||||
final List<Long> idList = DataAccess.getListOfIds(rs, count.value, SEPARATOR_LONG);
|
||||
field.set(data, idList);
|
||||
count.inc();
|
||||
return;
|
||||
} else if (objectClass == UUID.class) {
|
||||
final List<UUID> idList = DataAccess.getListOfRawUUIDs(rs, count.value);
|
||||
field.set(data, idList);
|
||||
count.inc();
|
||||
return;
|
||||
// } else {
|
||||
// LOGGER.error("Can not ManyToMany with other than List<Long> Model: List<{}>", objectClass.getCanonicalName());
|
||||
// return;
|
||||
}
|
||||
final ManyToMany decorators = field.getDeclaredAnnotation(ManyToMany.class);
|
||||
if (decorators == null) {
|
||||
return;
|
||||
}
|
||||
if (objectClass == decorators.targetEntity()) {
|
||||
final Class<?> foreignKeyType = AnnotationTools.getPrimaryKeyField(objectClass).getType();
|
||||
if (decorators.fetch() == FetchType.EAGER) {
|
||||
throw new DataAccessException("EAGER is not supported for list of element...");
|
||||
} else {
|
||||
final List<Long> idList = DataAccess.getListOfIds(rs, count.value, SEPARATOR);
|
||||
} else if (foreignKeyType == Long.class) {
|
||||
final List<Long> idList = DataAccess.getListOfIds(rs, count.value, SEPARATOR_LONG);
|
||||
// field.set(data, idList);
|
||||
count.inc();
|
||||
if (idList != null && idList.size() > 0) {
|
||||
@@ -174,7 +230,28 @@ public class AddOnManyToMany implements DataAccessAddOn {
|
||||
final List<Long> childs = new ArrayList<>(idList);
|
||||
// TODO: update to have get with abstract types ....
|
||||
@SuppressWarnings("unchecked")
|
||||
final Object foreignData = DataAccess.getsWhere(decorators.targetEntity(), new Condition(new QueryInList<>(idField, childs)));
|
||||
final Object foreignData = DataAccess.getsWhere(decorators.targetEntity(),
|
||||
new Condition(new QueryInList<>(idField, childs)));
|
||||
if (foreignData == null) {
|
||||
return;
|
||||
}
|
||||
field.set(data, foreignData);
|
||||
};
|
||||
lazyCall.add(lambda);
|
||||
}
|
||||
} else if (foreignKeyType == UUID.class) {
|
||||
final List<UUID> idList = DataAccess.getListOfRawUUIDs(rs, count.value);
|
||||
// field.set(data, idList);
|
||||
count.inc();
|
||||
if (idList != null && idList.size() > 0) {
|
||||
final String idField = AnnotationTools.getFieldName(AnnotationTools.getIdField(objectClass));
|
||||
// In the lazy mode, the request is done in asynchronous mode, they will be done after...
|
||||
final LazyGetter lambda = () -> {
|
||||
final List<UUID> childs = new ArrayList<>(idList);
|
||||
// TODO: update to have get with abstract types ....
|
||||
@SuppressWarnings("unchecked")
|
||||
final Object foreignData = DataAccess.getsWhere(decorators.targetEntity(),
|
||||
new Condition(new QueryInList<>(idField, childs)));
|
||||
if (foreignData == null) {
|
||||
return;
|
||||
}
|
||||
@@ -192,17 +269,54 @@ public class AddOnManyToMany implements DataAccessAddOn {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void asyncUpdate(final String tableName, final Object localKey, final Field field, final Object data, final List<LazyGetter> actions) throws Exception {
|
||||
public void asyncUpdate(
|
||||
final String tableName,
|
||||
final Object localKey,
|
||||
final Field field,
|
||||
final Object data,
|
||||
final List<LazyGetter> actions) throws Exception {
|
||||
if (field.getType() != List.class) {
|
||||
LOGGER.error("Can not ManyToMany with other than List Model: {}", field.getType().getCanonicalName());
|
||||
return;
|
||||
}
|
||||
final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
|
||||
.getActualTypeArguments()[0];
|
||||
if (objectClass != Long.class && objectClass != UUID.class) {
|
||||
throw new DataAccessException("Can not ManyToMany with other than List<Long> or List<UUID> Model: List<"
|
||||
+ objectClass.getCanonicalName() + ">");
|
||||
}
|
||||
final String columnName = AnnotationTools.getFieldName(field);
|
||||
final String linkTableName = generateLinkTableName(tableName, columnName);
|
||||
|
||||
if (localKey instanceof final Long localKeyLong) {
|
||||
if (objectClass == Long.class) {
|
||||
actions.add(() -> {
|
||||
DataAccess.deleteWhere(LinkTable.class, new OverrideTableName(linkTableName), new Condition(new QueryCondition("object1Id", "=", localKey)));
|
||||
DataAccess.deleteWhere(LinkTableLongLong.class, new OverrideTableName(linkTableName),
|
||||
new Condition(new QueryCondition("object1Id", "=", localKeyLong)));
|
||||
});
|
||||
asyncInsert(tableName, localKey, field, data, actions);
|
||||
} else {
|
||||
actions.add(() -> {
|
||||
DataAccess.deleteWhere(LinkTableLongUUID.class, new OverrideTableName(linkTableName),
|
||||
new Condition(new QueryCondition("object1Id", "=", localKeyLong)));
|
||||
});
|
||||
asyncInsert(tableName, localKey, field, data, actions);
|
||||
}
|
||||
} else if (localKey instanceof final UUID localKeyUUID) {
|
||||
if (objectClass == Long.class) {
|
||||
actions.add(() -> {
|
||||
DataAccess.deleteWhere(LinkTableUUIDLong.class, new OverrideTableName(linkTableName),
|
||||
new Condition(new QueryCondition("object1Id", "=", localKeyUUID)));
|
||||
});
|
||||
asyncInsert(tableName, localKey, field, data, actions);
|
||||
} else {
|
||||
actions.add(() -> {
|
||||
DataAccess.deleteWhere(LinkTableUUIDUUID.class, new OverrideTableName(linkTableName),
|
||||
new Condition(new QueryCondition("object1Id", "=", localKeyUUID)));
|
||||
});
|
||||
asyncInsert(tableName, localKey, field, data, actions);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -211,7 +325,12 @@ public class AddOnManyToMany implements DataAccessAddOn {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void asyncInsert(final String tableName, final Object localKey, final Field field, final Object data, final List<LazyGetter> actions) throws Exception {
|
||||
public void asyncInsert(
|
||||
final String tableName,
|
||||
final Object localKey,
|
||||
final Field field,
|
||||
final Object data,
|
||||
final List<LazyGetter> actions) throws Exception {
|
||||
if (data == null) {
|
||||
return;
|
||||
}
|
||||
@@ -219,28 +338,53 @@ public class AddOnManyToMany implements DataAccessAddOn {
|
||||
LOGGER.error("Can not ManyToMany with other than List Model: {}", field.getType().getCanonicalName());
|
||||
return;
|
||||
}
|
||||
final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
|
||||
.getActualTypeArguments()[0];
|
||||
if (objectClass != Long.class && objectClass != UUID.class) {
|
||||
throw new DataAccessException("Can not ManyToMany with other than List<Long> or List<UUID> Model: List<"
|
||||
+ objectClass.getCanonicalName() + ">");
|
||||
}
|
||||
final String columnName = AnnotationTools.getFieldName(field);
|
||||
final String linkTableName = generateLinkTableName(tableName, columnName);
|
||||
final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[0];
|
||||
if (objectClass != Long.class) {
|
||||
LOGGER.error("Can not ManyToMany with other than List<Long> Model: List<{}>", objectClass.getCanonicalName());
|
||||
return;
|
||||
}
|
||||
if (localKey instanceof final Long localKeyLong) {
|
||||
if (objectClass == Long.class) {
|
||||
// ========================================================
|
||||
// == Link a "Long" primary Key with List<Long>
|
||||
// ========================================================
|
||||
@SuppressWarnings("unchecked")
|
||||
final List<Long> dataCasted = (List<Long>) data;
|
||||
if (dataCasted.size() == 0) {
|
||||
return;
|
||||
}
|
||||
final List<LinkTable> insertElements = new ArrayList<>();
|
||||
final List<LinkTableLongLong> insertElements = new ArrayList<>();
|
||||
for (final Long remoteKey : dataCasted) {
|
||||
if (remoteKey == null) {
|
||||
throw new DataAccessException("Try to insert remote key with null value");
|
||||
}
|
||||
if (localKey instanceof final Long localKeyLong) {
|
||||
insertElements.add(new LinkTable(localKeyLong, remoteKey));
|
||||
} else {
|
||||
throw new DataAccessException("Not manage access of remte key like ManyToMany other than Long: " + localKey.getClass().getCanonicalName());
|
||||
insertElements.add(new LinkTableLongLong(localKeyLong, remoteKey));
|
||||
}
|
||||
if (insertElements.size() == 0) {
|
||||
LOGGER.warn("Insert multiple link without any value (may have null in the list): {}", dataCasted);
|
||||
return;
|
||||
}
|
||||
actions.add(() -> {
|
||||
DataAccess.insertMultiple(insertElements, new OverrideTableName(linkTableName));
|
||||
});
|
||||
} else {
|
||||
// ========================================================
|
||||
// == Link a "Long" primary Key with List<UUID>
|
||||
// ========================================================
|
||||
@SuppressWarnings("unchecked")
|
||||
final List<UUID> dataCasted = (List<UUID>) data;
|
||||
if (dataCasted.size() == 0) {
|
||||
return;
|
||||
}
|
||||
final List<LinkTableLongUUID> insertElements = new ArrayList<>();
|
||||
for (final UUID remoteKey : dataCasted) {
|
||||
if (remoteKey == null) {
|
||||
throw new DataAccessException("Try to insert remote key with null value");
|
||||
}
|
||||
insertElements.add(new LinkTableLongUUID(localKeyLong, remoteKey));
|
||||
}
|
||||
if (insertElements.size() == 0) {
|
||||
LOGGER.warn("Insert multiple link without any value (may have null in the list): {}", dataCasted);
|
||||
@@ -250,42 +394,147 @@ public class AddOnManyToMany implements DataAccessAddOn {
|
||||
DataAccess.insertMultiple(insertElements, new OverrideTableName(linkTableName));
|
||||
});
|
||||
}
|
||||
} else if (localKey instanceof final UUID localKeyUUID) {
|
||||
if (objectClass == Long.class) {
|
||||
// ========================================================
|
||||
// == Link a "UUID" primary Key with List<Long>
|
||||
// ========================================================
|
||||
@SuppressWarnings("unchecked")
|
||||
final List<Long> dataCasted = (List<Long>) data;
|
||||
if (dataCasted.size() == 0) {
|
||||
return;
|
||||
}
|
||||
final List<LinkTableUUIDLong> insertElements = new ArrayList<>();
|
||||
for (final Long remoteKey : dataCasted) {
|
||||
if (remoteKey == null) {
|
||||
throw new DataAccessException("Try to insert remote key with null value");
|
||||
}
|
||||
insertElements.add(new LinkTableUUIDLong(localKeyUUID, remoteKey));
|
||||
}
|
||||
if (insertElements.size() == 0) {
|
||||
LOGGER.warn("Insert multiple link without any value (may have null in the list): {}", dataCasted);
|
||||
return;
|
||||
}
|
||||
actions.add(() -> {
|
||||
DataAccess.insertMultiple(insertElements, new OverrideTableName(linkTableName));
|
||||
});
|
||||
} else {
|
||||
// ========================================================
|
||||
// == Link a "UUID" primary Key with List<UUID>
|
||||
// ========================================================
|
||||
@SuppressWarnings("unchecked")
|
||||
final List<UUID> dataCasted = (List<UUID>) data;
|
||||
if (dataCasted.size() == 0) {
|
||||
return;
|
||||
}
|
||||
final List<LinkTableUUIDUUID> insertElements = new ArrayList<>();
|
||||
for (final UUID remoteKey : dataCasted) {
|
||||
if (remoteKey == null) {
|
||||
throw new DataAccessException("Try to insert remote key with null value");
|
||||
}
|
||||
insertElements.add(new LinkTableUUIDUUID(localKeyUUID, remoteKey));
|
||||
}
|
||||
if (insertElements.size() == 0) {
|
||||
LOGGER.warn("Insert multiple link without any value (may have null in the list): {}", dataCasted);
|
||||
return;
|
||||
}
|
||||
actions.add(() -> {
|
||||
DataAccess.insertMultiple(insertElements, new OverrideTableName(linkTableName));
|
||||
});
|
||||
}
|
||||
} else {
|
||||
throw new DataAccessException("Not manage access of remte key like ManyToMany other than Long or UUID: "
|
||||
+ localKey.getClass().getCanonicalName());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drop(final String tableName, final Field field) throws Exception {
|
||||
final String columnName = AnnotationTools.getFieldName(field);
|
||||
final String linkTableName = generateLinkTableName(tableName, columnName);
|
||||
DataAccess.drop(LinkTable.class, new OverrideTableName(linkTableName));
|
||||
final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
|
||||
.getActualTypeArguments()[0];
|
||||
if (objectClass != Long.class && objectClass != UUID.class) {
|
||||
throw new DataAccessException("Can not ManyToMany with other than List<Long> or List<UUID> Model: List<"
|
||||
+ objectClass.getCanonicalName() + ">");
|
||||
}
|
||||
DataAccess.drop(LinkTableLongLong.class, new OverrideTableName(linkTableName));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void cleanAll(final String tableName, final Field field) throws Exception {
|
||||
final String columnName = AnnotationTools.getFieldName(field);
|
||||
final String linkTableName = generateLinkTableName(tableName, columnName);
|
||||
DataAccess.cleanAll(LinkTable.class, new OverrideTableName(linkTableName));
|
||||
final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
|
||||
.getActualTypeArguments()[0];
|
||||
if (objectClass != Long.class && objectClass != UUID.class) {
|
||||
throw new DataAccessException("Can not ManyToMany with other than List<Long> or List<UUID> Model: List<"
|
||||
+ objectClass.getCanonicalName() + ">");
|
||||
}
|
||||
DataAccess.cleanAll(LinkTableLongLong.class, new OverrideTableName(linkTableName));
|
||||
}
|
||||
|
||||
public static void addLink(final Class<?> clazz, final long localKey, final String column, final long remoteKey) throws Exception {
|
||||
public static void addLink(final Class<?> clazz, final long localKey, final String column, final long remoteKey)
|
||||
throws Exception {
|
||||
final String tableName = AnnotationTools.getTableName(clazz);
|
||||
final String linkTableName = generateLinkTableName(tableName, column);
|
||||
final LinkTable insertElement = new LinkTable(localKey, remoteKey);
|
||||
/* final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[0]; if (objectClass != Long.class && objectClass != UUID.class) { throw new
|
||||
* DataAccessException("Can not ManyToMany with other than List<Long> or List<UUID> Model: List<" + objectClass.getCanonicalName() + ">"); } */
|
||||
final LinkTableLongLong insertElement = new LinkTableLongLong(localKey, remoteKey);
|
||||
DataAccess.insert(insertElement, new OverrideTableName(linkTableName));
|
||||
|
||||
}
|
||||
|
||||
public static int removeLink(final Class<?> clazz, final long localKey, final String column, final long remoteKey) throws Exception {
|
||||
public static int removeLink(final Class<?> clazz, final long localKey, final String column, final long remoteKey)
|
||||
throws Exception {
|
||||
final String tableName = AnnotationTools.getTableName(clazz);
|
||||
final String linkTableName = generateLinkTableName(tableName, column);
|
||||
return DataAccess.deleteWhere(LinkTable.class, new OverrideTableName(linkTableName),
|
||||
new Condition(new QueryAnd(new QueryCondition("object1Id", "=", localKey), new QueryCondition("object2Id", "=", remoteKey))));
|
||||
return DataAccess.deleteWhere(LinkTableLongLong.class, new OverrideTableName(linkTableName),
|
||||
new Condition(new QueryAnd(new QueryCondition("object1Id", "=", localKey),
|
||||
new QueryCondition("object2Id", "=", remoteKey))));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void createTables(final String tableName, final Field field, final StringBuilder mainTableBuilder, final List<String> preActionList, final List<String> postActionList,
|
||||
final boolean createIfNotExist, final boolean createDrop, final int fieldId) throws Exception {
|
||||
public void createTables(
|
||||
final String tableName,
|
||||
final Field primaryField,
|
||||
final Field field,
|
||||
final StringBuilder mainTableBuilder,
|
||||
final List<String> preActionList,
|
||||
final List<String> postActionList,
|
||||
final boolean createIfNotExist,
|
||||
final boolean createDrop,
|
||||
final int fieldId) throws Exception {
|
||||
final String linkTableName = generateLinkTableNameField(tableName, field);
|
||||
final QueryOptions options = new QueryOptions(new OverrideTableName(linkTableName));
|
||||
final List<String> sqlCommand = DataFactory.createTable(LinkTable.class, options);
|
||||
final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
|
||||
.getActualTypeArguments()[0];
|
||||
if (objectClass != Long.class && objectClass != UUID.class) {
|
||||
throw new DataAccessException("Can not ManyToMany with other than List<Long> or List<UUID> Model: List<"
|
||||
+ objectClass.getCanonicalName() + ">");
|
||||
}
|
||||
final Class<?> primaryType = primaryField.getType();
|
||||
if (primaryType == Long.class) {
|
||||
if (objectClass == Long.class) {
|
||||
final List<String> sqlCommand = DataFactory.createTable(LinkTableLongLong.class, options);
|
||||
postActionList.addAll(sqlCommand);
|
||||
} else {
|
||||
final List<String> sqlCommand = DataFactory.createTable(LinkTableLongUUID.class, options);
|
||||
postActionList.addAll(sqlCommand);
|
||||
}
|
||||
} else if (primaryType == UUID.class) {
|
||||
|
||||
if (objectClass == Long.class) {
|
||||
final List<String> sqlCommand = DataFactory.createTable(LinkTableUUIDLong.class, options);
|
||||
postActionList.addAll(sqlCommand);
|
||||
} else {
|
||||
final List<String> sqlCommand = DataFactory.createTable(LinkTableUUIDUUID.class, options);
|
||||
postActionList.addAll(sqlCommand);
|
||||
}
|
||||
} else {
|
||||
throw new DataAccessException("Can not ManyToMany with other than primary key type Long or UUID Model: "
|
||||
+ primaryType.getCanonicalName());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ import java.sql.PreparedStatement;
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.Types;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.kar.archidata.annotation.AnnotationTools;
|
||||
import org.kar.archidata.dataAccess.CountInOut;
|
||||
@@ -14,6 +15,7 @@ import org.kar.archidata.dataAccess.DataFactory;
|
||||
import org.kar.archidata.dataAccess.LazyGetter;
|
||||
import org.kar.archidata.dataAccess.QueryOptions;
|
||||
import org.kar.archidata.exception.DataAccessException;
|
||||
import org.kar.archidata.tools.UuidUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@@ -30,12 +32,11 @@ public class AddOnManyToOne implements DataAccessAddOn {
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getSQLFieldType(final Field elem) throws Exception {
|
||||
final String fieldName = AnnotationTools.getFieldName(elem);
|
||||
public String getSQLFieldType(final Field field) throws Exception {
|
||||
final String fieldName = AnnotationTools.getFieldName(field);
|
||||
try {
|
||||
return DataFactory.convertTypeInSQL(Long.class, fieldName);
|
||||
return DataFactory.convertTypeInSQL(field.getType(), fieldName);
|
||||
} catch (final Exception e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
}
|
||||
return null;
|
||||
@@ -43,18 +44,42 @@ public class AddOnManyToOne implements DataAccessAddOn {
|
||||
|
||||
@Override
|
||||
public boolean isCompatibleField(final Field elem) {
|
||||
final ManyToOne decorators = elem.getDeclaredAnnotation(ManyToOne.class);
|
||||
return decorators != null;
|
||||
return elem.getDeclaredAnnotation(ManyToOne.class) != null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void insertData(final PreparedStatement ps, final Field field, final Object rootObject, final CountInOut iii) throws Exception {
|
||||
public void insertData(final PreparedStatement ps, final Field field, final Object rootObject, final CountInOut iii)
|
||||
throws Exception {
|
||||
final Object data = field.get(rootObject);
|
||||
if (data == null) {
|
||||
if (field.getType() == Long.class) {
|
||||
ps.setNull(iii.value, Types.BIGINT);
|
||||
} else if (field.getType() == Integer.class) {
|
||||
ps.setNull(iii.value, Types.INTEGER);
|
||||
} else if (field.getType() == Short.class) {
|
||||
ps.setNull(iii.value, Types.INTEGER);
|
||||
} else if (field.getType() == String.class) {
|
||||
ps.setNull(iii.value, Types.VARCHAR);
|
||||
} else if (field.getType() == UUID.class) {
|
||||
ps.setNull(iii.value, Types.BINARY);
|
||||
}
|
||||
} else if (field.getType() == Long.class) {
|
||||
final Long dataLong = (Long) data;
|
||||
ps.setLong(iii.value, dataLong);
|
||||
final Long dataTyped = (Long) data;
|
||||
ps.setLong(iii.value, dataTyped);
|
||||
} else if (field.getType() == Integer.class) {
|
||||
final Integer dataTyped = (Integer) data;
|
||||
ps.setInt(iii.value, dataTyped);
|
||||
} else if (field.getType() == Short.class) {
|
||||
final Short dataTyped = (Short) data;
|
||||
ps.setShort(iii.value, dataTyped);
|
||||
} else if (field.getType() == String.class) {
|
||||
final String dataTyped = (String) data;
|
||||
ps.setString(iii.value, dataTyped);
|
||||
} else if (field.getType() == UUID.class) {
|
||||
final UUID dataTyped = (UUID) data;
|
||||
LOGGER.info("Generate UUTD for DB: {}", dataTyped);
|
||||
final byte[] dataByte = UuidUtils.asBytes(dataTyped);
|
||||
ps.setBytes(iii.value, dataByte);
|
||||
} else {
|
||||
final Field idField = AnnotationTools.getFieldOfId(field.getType());
|
||||
final Object uid = idField.get(data);
|
||||
@@ -71,7 +96,8 @@ public class AddOnManyToOne implements DataAccessAddOn {
|
||||
|
||||
@Override
|
||||
public boolean canInsert(final Field field) {
|
||||
if (field.getType() == Long.class) {
|
||||
if (field.getType() == Long.class || field.getType() == Integer.class || field.getType() == Short.class
|
||||
|| field.getType() == String.class || field.getType() == UUID.class) {
|
||||
return true;
|
||||
}
|
||||
final ManyToOne decorators = field.getDeclaredAnnotation(ManyToOne.class);
|
||||
@@ -88,7 +114,9 @@ public class AddOnManyToOne implements DataAccessAddOn {
|
||||
|
||||
@Override
|
||||
public boolean canRetrieve(final Field field) {
|
||||
if (field.getType() == Long.class) {
|
||||
final Class<?> classType = field.getType();
|
||||
if (classType == Long.class || classType == Integer.class || classType == Short.class
|
||||
|| classType == String.class || classType == UUID.class) {
|
||||
return true;
|
||||
}
|
||||
final ManyToOne decorators = field.getDeclaredAnnotation(ManyToOne.class);
|
||||
@@ -99,40 +127,48 @@ public class AddOnManyToOne implements DataAccessAddOn {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void generateQuerry(@NotNull final String tableName, @NotNull final Field field, @NotNull final StringBuilder querrySelect, @NotNull final StringBuilder querry, @NotNull final String name,
|
||||
@NotNull final CountInOut elemCount, final QueryOptions options) throws Exception {
|
||||
if (field.getType() == Long.class) {
|
||||
querrySelect.append(" ");
|
||||
querrySelect.append(tableName);
|
||||
querrySelect.append(".");
|
||||
querrySelect.append(name);
|
||||
elemCount.inc();
|
||||
public void generateQuery(
|
||||
@NotNull final String tableName,
|
||||
@NotNull final String primaryKey,
|
||||
@NotNull final Field field,
|
||||
@NotNull final StringBuilder querySelect,
|
||||
@NotNull final StringBuilder query,
|
||||
@NotNull final String name,
|
||||
@NotNull final CountInOut count,
|
||||
final QueryOptions options) throws Exception {
|
||||
if (field.getType() == Long.class || field.getType() == Integer.class || field.getType() == Short.class
|
||||
|| field.getType() == String.class || field.getType() == UUID.class) {
|
||||
querySelect.append(" ");
|
||||
querySelect.append(tableName);
|
||||
querySelect.append(".");
|
||||
querySelect.append(name);
|
||||
count.inc();
|
||||
return;
|
||||
}
|
||||
final ManyToOne decorators = field.getDeclaredAnnotation(ManyToOne.class);
|
||||
if (field.getType() == decorators.targetEntity()) {
|
||||
if (decorators.fetch() == FetchType.EAGER) {
|
||||
// TODO: rework this to have a lazy mode ...
|
||||
DataAccess.generateSelectField(querrySelect, querry, field.getType(), options, elemCount);
|
||||
DataAccess.generateSelectField(querySelect, query, field.getType(), options, count);
|
||||
final Class<?> subType = field.getType();
|
||||
final String subTableName = AnnotationTools.getTableName(subType);
|
||||
final Field idField = AnnotationTools.getFieldOfId(subType);
|
||||
querry.append("LEFT OUTER JOIN `");
|
||||
querry.append(subTableName);
|
||||
querry.append("` ON ");
|
||||
querry.append(subTableName);
|
||||
querry.append(".");
|
||||
querry.append(AnnotationTools.getFieldName(idField));
|
||||
querry.append(" = ");
|
||||
querry.append(tableName);
|
||||
querry.append(".");
|
||||
querry.append(AnnotationTools.getFieldName(field));
|
||||
query.append("LEFT OUTER JOIN `");
|
||||
query.append(subTableName);
|
||||
query.append("` ON ");
|
||||
query.append(subTableName);
|
||||
query.append(".");
|
||||
query.append(AnnotationTools.getFieldName(idField));
|
||||
query.append(" = ");
|
||||
query.append(tableName);
|
||||
query.append(".");
|
||||
query.append(AnnotationTools.getFieldName(field));
|
||||
} else {
|
||||
querrySelect.append(" ");
|
||||
querrySelect.append(tableName);
|
||||
querrySelect.append(".");
|
||||
querrySelect.append(name);
|
||||
elemCount.inc();
|
||||
querySelect.append(" ");
|
||||
querySelect.append(tableName);
|
||||
querySelect.append(".");
|
||||
querySelect.append(name);
|
||||
count.inc();
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -141,7 +177,13 @@ public class AddOnManyToOne implements DataAccessAddOn {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void fillFromQuerry(final ResultSet rs, final Field field, final Object data, final CountInOut count, final QueryOptions options, final List<LazyGetter> lazyCall) throws Exception {
|
||||
public void fillFromQuery(
|
||||
final ResultSet rs,
|
||||
final Field field,
|
||||
final Object data,
|
||||
final CountInOut count,
|
||||
final QueryOptions options,
|
||||
final List<LazyGetter> lazyCall) throws Exception {
|
||||
if (field.getType() == Long.class) {
|
||||
final Long foreignKey = rs.getLong(count.value);
|
||||
count.inc();
|
||||
@@ -150,6 +192,39 @@ public class AddOnManyToOne implements DataAccessAddOn {
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (field.getType() == Integer.class) {
|
||||
final Integer foreignKey = rs.getInt(count.value);
|
||||
count.inc();
|
||||
if (!rs.wasNull()) {
|
||||
field.set(data, foreignKey);
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (field.getType() == Short.class) {
|
||||
final Short foreignKey = rs.getShort(count.value);
|
||||
count.inc();
|
||||
if (!rs.wasNull()) {
|
||||
field.set(data, foreignKey);
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (field.getType() == String.class) {
|
||||
final String foreignKey = rs.getString(count.value);
|
||||
count.inc();
|
||||
if (!rs.wasNull()) {
|
||||
field.set(data, foreignKey);
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (field.getType() == UUID.class) {
|
||||
final byte[] tmp = rs.getBytes(count.value);
|
||||
count.inc();
|
||||
if (!rs.wasNull()) {
|
||||
final UUID foreignKey = UuidUtils.asUuid(tmp);
|
||||
field.set(data, foreignKey);
|
||||
}
|
||||
return;
|
||||
}
|
||||
final Class<?> objectClass = field.getType();
|
||||
final ManyToOne decorators = field.getDeclaredAnnotation(ManyToOne.class);
|
||||
if (decorators == null) {
|
||||
@@ -158,7 +233,8 @@ public class AddOnManyToOne implements DataAccessAddOn {
|
||||
if (objectClass == decorators.targetEntity()) {
|
||||
if (decorators.fetch() == FetchType.EAGER) {
|
||||
final CountInOut countNotNull = new CountInOut(0);
|
||||
final Object dataNew = DataAccess.createObjectFromSQLRequest(rs, objectClass, count, countNotNull, options, lazyCall);
|
||||
final Object dataNew = DataAccess.createObjectFromSQLRequest(rs, objectClass, count, countNotNull,
|
||||
options, lazyCall);
|
||||
if (dataNew != null && countNotNull.value != 0) {
|
||||
field.set(data, dataNew);
|
||||
}
|
||||
@@ -184,8 +260,25 @@ public class AddOnManyToOne implements DataAccessAddOn {
|
||||
|
||||
// TODO : refacto this table to manage a generic table with dynamic name to be serialisable with the default system
|
||||
@Override
|
||||
public void createTables(final String tableName, final Field field, final StringBuilder mainTableBuilder, final List<String> preActionList, final List<String> postActionList,
|
||||
final boolean createIfNotExist, final boolean createDrop, final int fieldId) throws Exception {
|
||||
DataFactory.createTablesSpecificType(tableName, field, mainTableBuilder, preActionList, postActionList, createIfNotExist, createDrop, fieldId, Long.class);
|
||||
public void createTables(
|
||||
final String tableName,
|
||||
final Field primaryField,
|
||||
final Field field,
|
||||
final StringBuilder mainTableBuilder,
|
||||
final List<String> preActionList,
|
||||
final List<String> postActionList,
|
||||
final boolean createIfNotExist,
|
||||
final boolean createDrop,
|
||||
final int fieldId) throws Exception {
|
||||
final Class<?> classType = field.getType();
|
||||
if (classType == Long.class || classType == Integer.class || classType == Short.class
|
||||
|| classType == String.class || classType == UUID.class) {
|
||||
DataFactory.createTablesSpecificType(tableName, primaryField, field, mainTableBuilder, preActionList,
|
||||
postActionList, createIfNotExist, createDrop, fieldId, classType);
|
||||
} else {
|
||||
LOGGER.error("Support only the Long remote field of ecternal primary keys...");
|
||||
DataFactory.createTablesSpecificType(tableName, primaryField, field, mainTableBuilder, preActionList,
|
||||
postActionList, createIfNotExist, createDrop, fieldId, Long.class);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -75,7 +75,8 @@ public class AddOnOneToMany implements DataAccessAddOn {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void insertData(final PreparedStatement ps, final Field field, final Object rootObject, final CountInOut iii) throws SQLException, IllegalArgumentException, IllegalAccessException {
|
||||
public void insertData(final PreparedStatement ps, final Field field, final Object rootObject, final CountInOut iii)
|
||||
throws SQLException, IllegalArgumentException, IllegalAccessException {
|
||||
final Object data = field.get(rootObject);
|
||||
iii.inc();
|
||||
if (data == null) {
|
||||
@@ -103,18 +104,30 @@ public class AddOnOneToMany implements DataAccessAddOn {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void generateQuerry(@NotNull final String tableName, @NotNull final Field field, @NotNull final StringBuilder querrySelect, @NotNull final StringBuilder querry, @NotNull final String name,
|
||||
@NotNull final CountInOut elemCount, final QueryOptions options) {
|
||||
querrySelect.append(" ");
|
||||
querrySelect.append(tableName);
|
||||
querrySelect.append(".");
|
||||
querrySelect.append(name);
|
||||
elemCount.inc();
|
||||
public void generateQuery(
|
||||
@NotNull final String tableName,
|
||||
@NotNull final String primaryKey,
|
||||
@NotNull final Field field,
|
||||
@NotNull final StringBuilder querySelect,
|
||||
@NotNull final StringBuilder query,
|
||||
@NotNull final String name,
|
||||
@NotNull final CountInOut count,
|
||||
final QueryOptions options) {
|
||||
querySelect.append(" ");
|
||||
querySelect.append(tableName);
|
||||
querySelect.append(".");
|
||||
querySelect.append(name);
|
||||
count.inc();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void fillFromQuerry(final ResultSet rs, final Field field, final Object data, final CountInOut count, final QueryOptions options, final List<LazyGetter> lazyCall)
|
||||
throws SQLException, IllegalArgumentException, IllegalAccessException {
|
||||
public void fillFromQuery(
|
||||
final ResultSet rs,
|
||||
final Field field,
|
||||
final Object data,
|
||||
final CountInOut count,
|
||||
final QueryOptions options,
|
||||
final List<LazyGetter> lazyCall) throws SQLException, IllegalArgumentException, IllegalAccessException {
|
||||
final Long foreignKey = rs.getLong(count.value);
|
||||
count.inc();
|
||||
if (!rs.wasNull()) {
|
||||
@@ -125,8 +138,17 @@ public class AddOnOneToMany implements DataAccessAddOn {
|
||||
|
||||
// TODO : refacto this table to manage a generic table with dynamic name to be serializable with the default system
|
||||
@Override
|
||||
public void createTables(final String tableName, final Field field, final StringBuilder mainTableBuilder, final List<String> preActionList, final List<String> postActionList,
|
||||
final boolean createIfNotExist, final boolean createDrop, final int fieldId) throws Exception {
|
||||
DataFactory.createTablesSpecificType(tableName, field, mainTableBuilder, preActionList, postActionList, createIfNotExist, createDrop, fieldId, Long.class);
|
||||
public void createTables(
|
||||
final String tableName,
|
||||
final Field primaryField,
|
||||
final Field field,
|
||||
final StringBuilder mainTableBuilder,
|
||||
final List<String> preActionList,
|
||||
final List<String> postActionList,
|
||||
final boolean createIfNotExist,
|
||||
final boolean createDrop,
|
||||
final int fieldId) throws Exception {
|
||||
DataFactory.createTablesSpecificType(tableName, primaryField, field, mainTableBuilder, preActionList,
|
||||
postActionList, createIfNotExist, createDrop, fieldId, Long.class);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,6 +23,7 @@ import org.slf4j.LoggerFactory;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
|
||||
// TODO: maybe deprecated ==> use DataJson instead...
|
||||
@Deprecated
|
||||
public class AddOnSQLTableExternalForeinKeyAsList implements DataAccessAddOn {
|
||||
static final Logger LOGGER = LoggerFactory.getLogger(AddOnManyToMany.class);
|
||||
static final String SEPARATOR = "-";
|
||||
@@ -54,12 +55,14 @@ public class AddOnSQLTableExternalForeinKeyAsList implements DataAccessAddOn {
|
||||
|
||||
@Override
|
||||
public boolean isCompatibleField(final Field field) {
|
||||
final SQLTableExternalForeinKeyAsList decorators = field.getDeclaredAnnotation(SQLTableExternalForeinKeyAsList.class);
|
||||
final SQLTableExternalForeinKeyAsList decorators = field
|
||||
.getDeclaredAnnotation(SQLTableExternalForeinKeyAsList.class);
|
||||
return decorators != null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void insertData(final PreparedStatement ps, final Field field, final Object rootObject, final CountInOut iii) throws SQLException, IllegalArgumentException, IllegalAccessException {
|
||||
public void insertData(final PreparedStatement ps, final Field field, final Object rootObject, final CountInOut iii)
|
||||
throws SQLException, IllegalArgumentException, IllegalAccessException {
|
||||
final Object data = field.get(rootObject);
|
||||
iii.inc();
|
||||
if (data == null) {
|
||||
@@ -87,28 +90,47 @@ public class AddOnSQLTableExternalForeinKeyAsList implements DataAccessAddOn {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void generateQuerry(@NotNull final String tableName, @NotNull final Field field, @NotNull final StringBuilder querrySelect, @NotNull final StringBuilder querry, @NotNull final String name,
|
||||
@NotNull final CountInOut elemCount, final QueryOptions options) {
|
||||
elemCount.inc();
|
||||
querrySelect.append(" ");
|
||||
querrySelect.append(tableName);
|
||||
querrySelect.append(".");
|
||||
querrySelect.append(name);
|
||||
public void generateQuery(
|
||||
@NotNull final String tableName,
|
||||
@NotNull final String primaryKey,
|
||||
@NotNull final Field field,
|
||||
@NotNull final StringBuilder querySelect,
|
||||
@NotNull final StringBuilder query,
|
||||
@NotNull final String name,
|
||||
@NotNull final CountInOut count,
|
||||
final QueryOptions options) {
|
||||
count.inc();
|
||||
querySelect.append(" ");
|
||||
querySelect.append(tableName);
|
||||
querySelect.append(".");
|
||||
querySelect.append(name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void fillFromQuerry(final ResultSet rs, final Field field, final Object data, final CountInOut count, final QueryOptions options, final List<LazyGetter> lazyCall)
|
||||
throws SQLException, IllegalArgumentException, IllegalAccessException {
|
||||
public void fillFromQuery(
|
||||
final ResultSet rs,
|
||||
final Field field,
|
||||
final Object data,
|
||||
final CountInOut count,
|
||||
final QueryOptions options,
|
||||
final List<LazyGetter> lazyCall) throws SQLException, IllegalArgumentException, IllegalAccessException {
|
||||
final List<Long> idList = DataAccess.getListOfIds(rs, count.value, SEPARATOR);
|
||||
field.set(data, idList);
|
||||
count.inc();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void createTables(final String tableName, final Field field, final StringBuilder mainTableBuilder, final List<String> preActionList, final List<String> postActionList,
|
||||
final boolean createIfNotExist, final boolean createDrop, final int fieldId) throws Exception {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
DataFactory.createTablesSpecificType(tableName, field, mainTableBuilder, preActionList, postActionList, createIfNotExist, createDrop, fieldId, String.class);
|
||||
public void createTables(
|
||||
final String tableName,
|
||||
final Field primaryField,
|
||||
final Field field,
|
||||
final StringBuilder mainTableBuilder,
|
||||
final List<String> preActionList,
|
||||
final List<String> postActionList,
|
||||
final boolean createIfNotExist,
|
||||
final boolean createDrop,
|
||||
final int fieldId) throws Exception {
|
||||
DataFactory.createTablesSpecificType(tableName, primaryField, field, mainTableBuilder, preActionList,
|
||||
postActionList, createIfNotExist, createDrop, fieldId, String.class);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,12 +5,12 @@ import org.kar.archidata.model.GenericData;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.persistence.Column;
|
||||
|
||||
public class LinkTable extends GenericData {
|
||||
public LinkTable() {
|
||||
public class LinkTableLongLong extends GenericData {
|
||||
public LinkTableLongLong() {
|
||||
// nothing to do...
|
||||
}
|
||||
|
||||
public LinkTable(final long object1Id, final long object2Id) {
|
||||
public LinkTableLongLong(final long object1Id, final long object2Id) {
|
||||
this.object1Id = object1Id;
|
||||
this.object2Id = object2Id;
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package org.kar.archidata.dataAccess.addOn.model;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
import org.kar.archidata.model.GenericData;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.persistence.Column;
|
||||
|
||||
public class LinkTableLongUUID extends GenericData {
|
||||
public LinkTableLongUUID() {
|
||||
// nothing to do...
|
||||
}
|
||||
|
||||
public LinkTableLongUUID(final long object1Id, final UUID object2Id) {
|
||||
this.object1Id = object1Id;
|
||||
this.object2Id = object2Id;
|
||||
}
|
||||
|
||||
@Schema(description = "Object reference 1")
|
||||
@Column(nullable = false)
|
||||
public Long object1Id;
|
||||
@Schema(description = "Object reference 2")
|
||||
@Column(nullable = false)
|
||||
public UUID object2Id;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package org.kar.archidata.dataAccess.addOn.model;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
import org.kar.archidata.model.GenericData;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.persistence.Column;
|
||||
|
||||
public class LinkTableUUIDLong extends GenericData {
|
||||
public LinkTableUUIDLong() {
|
||||
// nothing to do...
|
||||
}
|
||||
|
||||
public LinkTableUUIDLong(final UUID object1Id, final long object2Id) {
|
||||
this.object1Id = object1Id;
|
||||
this.object2Id = object2Id;
|
||||
}
|
||||
|
||||
@Schema(description = "Object reference 1")
|
||||
@Column(nullable = false)
|
||||
public UUID object1Id;
|
||||
@Schema(description = "Object reference 2")
|
||||
@Column(nullable = false)
|
||||
public Long object2Id;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package org.kar.archidata.dataAccess.addOn.model;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
import org.kar.archidata.model.GenericData;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.persistence.Column;
|
||||
|
||||
public class LinkTableUUIDUUID extends GenericData {
|
||||
public LinkTableUUIDUUID() {
|
||||
// nothing to do...
|
||||
}
|
||||
|
||||
public LinkTableUUIDUUID(final UUID object1Id, final UUID object2Id) {
|
||||
this.object1Id = object1Id;
|
||||
this.object2Id = object2Id;
|
||||
}
|
||||
|
||||
@Schema(description = "Object reference 1")
|
||||
@Column(nullable = false)
|
||||
public UUID object1Id;
|
||||
@Schema(description = "Object reference 2")
|
||||
@Column(nullable = false)
|
||||
public UUID object2Id;
|
||||
|
||||
}
|
||||
137
src/org/kar/archidata/dataAccess/exportTools/README.md
Normal file
137
src/org/kar/archidata/dataAccess/exportTools/README.md
Normal file
@@ -0,0 +1,137 @@
|
||||
Archi-data
|
||||
==========
|
||||
|
||||
Archi-data is a framework that simplify:
|
||||
- Creating a REST server with:
|
||||
- Right control
|
||||
- Swagger display interface
|
||||
- Normalize error generate by the server
|
||||
- Access to the DB:
|
||||
- introspect Object and insert in the TD (SQLITE & MY-SQL)
|
||||
- Manage migration
|
||||
- JPA checker for many generic request
|
||||
- simplify the request of the Test-service
|
||||
|
||||
|
||||
Documentation:
|
||||
--------------
|
||||
|
||||
The documentation is available [here](doc/index.md)
|
||||
|
||||
Develop in cmd-line:
|
||||
--------------------
|
||||
|
||||
The first step is configuring your JAVA version (or select the JVM with the OS)
|
||||
|
||||
```bash
|
||||
export PATH=$(ls -d --color=never /usr/lib/jvm/java-2*-openjdk)/bin:$PATH
|
||||
```
|
||||
|
||||
Install the dependency:
|
||||
|
||||
```bash
|
||||
mvn install
|
||||
```
|
||||
|
||||
Run the test
|
||||
```bash
|
||||
mvn test
|
||||
```
|
||||
|
||||
Install it for external use
|
||||
```bash
|
||||
mvn install
|
||||
```
|
||||
|
||||
Develop With Eclipse:
|
||||
--------------------
|
||||
|
||||
Import the project:
|
||||
- Open a (new) project on eclipse
|
||||
- `File` -> `Import`
|
||||
- `Maven` -> `Existing Maven project`
|
||||
- Select the `pom.xml` file and click on import
|
||||
|
||||
Run the Test:
|
||||
- Open the package `test.kar.archidata`
|
||||
- Click right on it
|
||||
- Select `Debug As` -> `JUnit Test`
|
||||
|
||||
Install in the local maven repository:
|
||||
- Click right on the `pom.xml` file
|
||||
- Select `Run As` -> `Maven install`
|
||||
|
||||
|
||||
Some tools:
|
||||
============
|
||||
|
||||
Auto-update dependency:
|
||||
-----------------------
|
||||
|
||||
Auto-update to the last version dependency:
|
||||
|
||||
```bash
|
||||
mvn versions:use-latest-versions
|
||||
```
|
||||
|
||||
Format the code
|
||||
---------------
|
||||
|
||||
Simply run the cmd-line:
|
||||
|
||||
```bash
|
||||
mvn formatter:format
|
||||
```
|
||||
|
||||
Reformat XML file like the pom.xml
|
||||
|
||||
```bash
|
||||
XMLLINT_INDENT=" " xmllint --format "back/pom.xml" -o "back/pom.xml"
|
||||
```
|
||||
|
||||
Enable the pre-commit checker
|
||||
-----------------------------
|
||||
|
||||
```bash
|
||||
./tools/configure_precommit.bash
|
||||
```
|
||||
|
||||
> **_Note_**: You can change the code in `.git/hooks/pre-commit` by replacing `formatter:verify` with `formatter:format` to auto format the code @ every commit
|
||||
|
||||
|
||||
|
||||
Add Gitea in the dependency for the registry:
|
||||
=============================================
|
||||
|
||||
Read instruction for tocken in ~/.m2/setting.xml
|
||||
|
||||
edit file: ```~/.m2/settings.xml```
|
||||
|
||||
```xml
|
||||
<settings>
|
||||
<servers>
|
||||
<server>
|
||||
<id>gitea</id>
|
||||
<configuration>
|
||||
<httpHeaders>
|
||||
<property>
|
||||
<name>Authorization</name>
|
||||
<value>token xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx</value>
|
||||
</property>
|
||||
</httpHeaders>
|
||||
</configuration>
|
||||
</server>
|
||||
</servers>
|
||||
</settings>
|
||||
```
|
||||
|
||||
release:
|
||||
========
|
||||
|
||||
```bash
|
||||
export PATH=$(ls -d --color=never /usr/lib/jvm/java-2*-openjdk)/bin:$PATH
|
||||
mvn install
|
||||
mvn deploy
|
||||
```
|
||||
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
package org.kar.archidata.dataAccess.options;
|
||||
|
||||
import org.kar.archidata.dataAccess.QueryOption;
|
||||
|
||||
/** This option permit to access on deleted items of a table */
|
||||
public class AccessDeletedItems extends QueryOption {
|
||||
public AccessDeletedItems() {}
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
package org.kar.archidata.dataAccess.options;
|
||||
|
||||
import org.kar.archidata.dataAccess.QueryOption;
|
||||
|
||||
/** By default some element are not read like createAt and UpdatedAt. This option permit to read it. */
|
||||
public class CheckFunction extends QueryOption {
|
||||
private final CheckFunctionInterface checker;
|
||||
|
||||
@@ -9,6 +9,7 @@ import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import org.kar.archidata.annotation.AnnotationTools;
|
||||
@@ -66,7 +67,8 @@ public class CheckJPA<T> implements CheckFunctionInterface {
|
||||
final String fieldName = field.getName(); // AnnotationTools.getFieldName(field);
|
||||
if (AnnotationTools.isPrimaryKey(field)) {
|
||||
add(fieldName, (final String baseName, final T data) -> {
|
||||
throw new InputException(baseName + fieldName, "This is a '@Id' (primaryKey) ==> can not be change");
|
||||
throw new InputException(baseName + fieldName,
|
||||
"This is a '@Id' (primaryKey) ==> can not be change");
|
||||
});
|
||||
}
|
||||
if (AnnotationTools.getConstraintsNotNull(field)) {
|
||||
@@ -119,13 +121,13 @@ public class CheckJPA<T> implements CheckFunctionInterface {
|
||||
}
|
||||
final long count = DataAccess.count(annotationManyToOne.targetEntity(), elem);
|
||||
if (count == 0) {
|
||||
throw new InputException(baseName + fieldName, "Foreign element does not exist in the DB:" + elem);
|
||||
throw new InputException(baseName + fieldName,
|
||||
"Foreign element does not exist in the DB:" + elem);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
} else if (type == Integer.class || type == int.class) {
|
||||
|
||||
final Long maxValueRoot = AnnotationTools.getConstraintsMax(field);
|
||||
if (maxValueRoot != null) {
|
||||
final int maxValue = maxValueRoot.intValue();
|
||||
@@ -163,7 +165,23 @@ public class CheckJPA<T> implements CheckFunctionInterface {
|
||||
}
|
||||
final long count = DataAccess.count(annotationManyToOne.targetEntity(), elem);
|
||||
if (count == 0) {
|
||||
throw new InputException(baseName + fieldName, "Foreign element does not exist in the DB:" + elem);
|
||||
throw new InputException(baseName + fieldName,
|
||||
"Foreign element does not exist in the DB:" + elem);
|
||||
}
|
||||
});
|
||||
}
|
||||
} else if (type == UUID.class) {
|
||||
final ManyToOne annotationManyToOne = AnnotationTools.getManyToOne(field);
|
||||
if (annotationManyToOne != null && annotationManyToOne.targetEntity() != null) {
|
||||
add(fieldName, (final String baseName, final T data) -> {
|
||||
final Object elem = field.get(data);
|
||||
if (elem == null) {
|
||||
return;
|
||||
}
|
||||
final long count = DataAccess.count(annotationManyToOne.targetEntity(), elem);
|
||||
if (count == 0) {
|
||||
throw new InputException(baseName + fieldName,
|
||||
"Foreign element does not exist in the DB:" + elem);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -243,7 +261,8 @@ public class CheckJPA<T> implements CheckFunctionInterface {
|
||||
}
|
||||
final String elemTyped = (String) elem;
|
||||
if (elemTyped.length() > maxSizeString) {
|
||||
throw new InputException(baseName + fieldName, "Too long size must be <= " + maxSizeString);
|
||||
throw new InputException(baseName + fieldName,
|
||||
"Too long size must be <= " + maxSizeString);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -256,10 +275,12 @@ public class CheckJPA<T> implements CheckFunctionInterface {
|
||||
}
|
||||
final String elemTyped = (String) elem;
|
||||
if (elemTyped.length() > limitSize.max()) {
|
||||
throw new InputException(baseName + fieldName, "Too long size (constraints) must be <= " + limitSize.max());
|
||||
throw new InputException(baseName + fieldName,
|
||||
"Too long size (constraints) must be <= " + limitSize.max());
|
||||
}
|
||||
if (elemTyped.length() < limitSize.min()) {
|
||||
throw new InputException(baseName + fieldName, "Too small size (constraints) must be >= " + limitSize.max());
|
||||
throw new InputException(baseName + fieldName,
|
||||
"Too small size (constraints) must be >= " + limitSize.max());
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -273,7 +294,9 @@ public class CheckJPA<T> implements CheckFunctionInterface {
|
||||
}
|
||||
final String elemTyped = (String) elem;
|
||||
if (!pattern.matcher(elemTyped).find()) {
|
||||
throw new InputException(baseName + fieldName, "does not match the required pattern (constraints) must be '" + patternString + "'");
|
||||
throw new InputException(baseName + fieldName,
|
||||
"does not match the required pattern (constraints) must be '" + patternString
|
||||
+ "'");
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -281,7 +304,8 @@ public class CheckJPA<T> implements CheckFunctionInterface {
|
||||
final DataJson jsonAnnotation = AnnotationTools.getDataJson(field);
|
||||
if (jsonAnnotation != null && jsonAnnotation.checker() != CheckFunctionVoid.class) {
|
||||
// Here if we have an error it crash at start and no new instance after creation...
|
||||
final CheckFunctionInterface instance = jsonAnnotation.checker().getDeclaredConstructor().newInstance();
|
||||
final CheckFunctionInterface instance = jsonAnnotation.checker().getDeclaredConstructor()
|
||||
.newInstance();
|
||||
add(fieldName, (final String baseName, final T data) -> {
|
||||
instance.checkAll(baseName + fieldName + ".", field.get(data));
|
||||
});
|
||||
@@ -293,7 +317,8 @@ public class CheckJPA<T> implements CheckFunctionInterface {
|
||||
if (AnnotationTools.isUnique(field)) {
|
||||
// Create the request ...
|
||||
add(fieldName, (final String baseName, final T data) -> {
|
||||
final Object other = DataAccess.getWhere(this.clazz, new Condition(new QueryCondition(fieldName, "==", field.get(data))));
|
||||
final Object other = DataAccess.getWhere(this.clazz,
|
||||
new Condition(new QueryCondition(fieldName, "==", field.get(data))));
|
||||
if (other != null) {
|
||||
throw new InputException(baseName + fieldName, "Name already exist in the DB");
|
||||
}
|
||||
|
||||
@@ -4,7 +4,6 @@ import java.sql.PreparedStatement;
|
||||
|
||||
import org.kar.archidata.dataAccess.CountInOut;
|
||||
import org.kar.archidata.dataAccess.QueryItem;
|
||||
import org.kar.archidata.dataAccess.QueryOption;
|
||||
import org.kar.archidata.dataAccess.QueryOptions;
|
||||
|
||||
/** By default some element are not read like createAt and UpdatedAt. This option permit to read it. */
|
||||
@@ -19,19 +18,23 @@ public class Condition extends QueryOption {
|
||||
this.condition = null;
|
||||
}
|
||||
|
||||
public void generateQuerry(final StringBuilder query, final String tableName) {
|
||||
public void generateQuery(final StringBuilder query, final String tableName) {
|
||||
if (this.condition != null) {
|
||||
this.condition.generateQuerry(query, tableName);
|
||||
this.condition.generateQuery(query, tableName);
|
||||
}
|
||||
}
|
||||
|
||||
public void injectQuerry(final PreparedStatement ps, final CountInOut iii) throws Exception {
|
||||
public void injectQuery(final PreparedStatement ps, final CountInOut iii) throws Exception {
|
||||
if (this.condition != null) {
|
||||
this.condition.injectQuerry(ps, iii);
|
||||
this.condition.injectQuery(ps, iii);
|
||||
}
|
||||
}
|
||||
|
||||
public void whereAppendQuery(final StringBuilder query, final String tableName, final QueryOptions options, final String deletedFieldName) {
|
||||
public void whereAppendQuery(
|
||||
final StringBuilder query,
|
||||
final String tableName,
|
||||
final QueryOptions options,
|
||||
final String deletedFieldName) {
|
||||
boolean exclude_deleted = true;
|
||||
if (options != null) {
|
||||
exclude_deleted = !options.exist(AccessDeletedItems.class);
|
||||
@@ -48,7 +51,7 @@ public class Condition extends QueryOption {
|
||||
return;
|
||||
}
|
||||
query.append(" WHERE (");
|
||||
this.condition.generateQuerry(query, tableName);
|
||||
this.condition.generateQuery(query, tableName);
|
||||
query.append(") ");
|
||||
if (exclude_deleted && deletedFieldName != null) {
|
||||
query.append("AND ");
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
package org.kar.archidata.dataAccess.options;
|
||||
|
||||
import org.kar.archidata.dataAccess.QueryOption;
|
||||
|
||||
/** This option permit to create the DROP `Table` IF EXIST in the generation of structure. */
|
||||
public class CreateDropTable extends QueryOption {
|
||||
public CreateDropTable() {}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package org.kar.archidata.dataAccess.options;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
|
||||
import org.kar.archidata.GlobalConfiguration;
|
||||
import org.kar.archidata.dataAccess.QueryOption;
|
||||
import org.kar.archidata.dataAccess.QueryOptions;
|
||||
import org.kar.archidata.db.DBConfig;
|
||||
import org.kar.archidata.db.DBEntry;
|
||||
@@ -18,15 +18,15 @@ public class DBInterfaceOption extends QueryOption {
|
||||
this.root = false;
|
||||
}
|
||||
|
||||
public DBInterfaceOption(final DBConfig config, boolean root) {
|
||||
public DBInterfaceOption(final DBConfig config, final boolean root) {
|
||||
this.config = config;
|
||||
this.root = root;
|
||||
}
|
||||
|
||||
public DBEntry getEntry(QueryOptions options) throws IOException {
|
||||
public DBEntry getEntry(final QueryOptions options) throws IOException {
|
||||
if (this.entry == null) {
|
||||
final DBInterfaceRoot isRoot = options.get(DBInterfaceRoot.class);
|
||||
this.entry = DBEntry.createInterface(this.config, isRoot != null && isRoot.getRoot());
|
||||
final List<DBInterfaceRoot> isRoot = options.get(DBInterfaceRoot.class);
|
||||
this.entry = DBEntry.createInterface(this.config, isRoot.size() == 1 && isRoot.get(0).getRoot());
|
||||
}
|
||||
return this.entry;
|
||||
}
|
||||
@@ -35,13 +35,13 @@ public class DBInterfaceOption extends QueryOption {
|
||||
return this.root;
|
||||
}
|
||||
|
||||
public static DBEntry getAutoEntry(QueryOptions options) throws IOException {
|
||||
final DBInterfaceOption dbOption = options.get(DBInterfaceOption.class);
|
||||
if (dbOption == null) {
|
||||
final DBInterfaceRoot isRoot = options.get(DBInterfaceRoot.class);
|
||||
return DBEntry.createInterface(GlobalConfiguration.dbConfig, isRoot != null && isRoot.getRoot());
|
||||
public static DBEntry getAutoEntry(final QueryOptions options) throws IOException {
|
||||
final List<DBInterfaceOption> dbOption = options.get(DBInterfaceOption.class);
|
||||
if (dbOption.size() == 0) {
|
||||
final List<DBInterfaceRoot> isRoot = options.get(DBInterfaceRoot.class);
|
||||
return DBEntry.createInterface(GlobalConfiguration.dbConfig, isRoot.size() == 1 && isRoot.get(0).getRoot());
|
||||
} else {
|
||||
return dbOption.getEntry(options);
|
||||
return dbOption.get(0).getEntry(options);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
package org.kar.archidata.dataAccess.options;
|
||||
|
||||
import org.kar.archidata.dataAccess.QueryOption;
|
||||
|
||||
public class DBInterfaceRoot extends QueryOption {
|
||||
private final boolean root;
|
||||
|
||||
|
||||
@@ -2,8 +2,6 @@ package org.kar.archidata.dataAccess.options;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.kar.archidata.dataAccess.QueryOption;
|
||||
|
||||
/** By default some element are not read like createAt and UpdatedAt. This option permit to read it. */
|
||||
public class FilterValue extends QueryOption {
|
||||
public final List<String> filterValue;
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
package org.kar.archidata.dataAccess;
|
||||
package org.kar.archidata.dataAccess.options;
|
||||
|
||||
import java.sql.PreparedStatement;
|
||||
import java.util.List;
|
||||
|
||||
import org.kar.archidata.dataAccess.CountInOut;
|
||||
|
||||
public class GroupBy extends QueryOption {
|
||||
protected final List<String> childs;
|
||||
|
||||
@@ -14,7 +16,7 @@ public class GroupBy extends QueryOption {
|
||||
this.childs = List.of(childs);
|
||||
}
|
||||
|
||||
public void generateQuerry(final StringBuilder query, final String tableName) {
|
||||
public void generateQuery(final StringBuilder query, final String tableName) {
|
||||
if (this.childs.size() == 0) {
|
||||
return;
|
||||
}
|
||||
@@ -33,7 +35,7 @@ public class GroupBy extends QueryOption {
|
||||
query.append("\n");
|
||||
}
|
||||
|
||||
public void injectQuerry(final PreparedStatement ps, final CountInOut iii) throws Exception {
|
||||
public void injectQuery(final PreparedStatement ps, final CountInOut iii) throws Exception {
|
||||
// nothing to add.
|
||||
}
|
||||
}
|
||||
23
src/org/kar/archidata/dataAccess/options/Limit.java
Normal file
23
src/org/kar/archidata/dataAccess/options/Limit.java
Normal file
@@ -0,0 +1,23 @@
|
||||
package org.kar.archidata.dataAccess.options;
|
||||
|
||||
import java.sql.PreparedStatement;
|
||||
|
||||
import org.kar.archidata.dataAccess.CountInOut;
|
||||
import org.kar.archidata.dataAccess.DataAccess;
|
||||
|
||||
public class Limit extends QueryOption {
|
||||
protected final long limit;
|
||||
|
||||
public Limit(final long limit) {
|
||||
this.limit = limit;
|
||||
}
|
||||
|
||||
public void generateQuery(final StringBuilder query, final String tableName) {
|
||||
query.append(" LIMIT ? \n");
|
||||
}
|
||||
|
||||
public void injectQuery(final PreparedStatement ps, final CountInOut iii) throws Exception {
|
||||
DataAccess.addElement(ps, this.limit, iii);
|
||||
iii.inc();
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,10 @@
|
||||
package org.kar.archidata.dataAccess;
|
||||
package org.kar.archidata.dataAccess.options;
|
||||
|
||||
import java.sql.PreparedStatement;
|
||||
import java.util.List;
|
||||
|
||||
import org.kar.archidata.dataAccess.CountInOut;
|
||||
|
||||
public class OrderBy extends QueryOption {
|
||||
protected final List<OrderItem> childs;
|
||||
|
||||
@@ -14,7 +16,7 @@ public class OrderBy extends QueryOption {
|
||||
this.childs = List.of(childs);
|
||||
}
|
||||
|
||||
public void generateQuerry(final StringBuilder query, final String tableName) {
|
||||
public void generateQuery(final StringBuilder query, final String tableName) {
|
||||
if (this.childs.size() == 0) {
|
||||
return;
|
||||
}
|
||||
@@ -35,7 +37,7 @@ public class OrderBy extends QueryOption {
|
||||
query.append("\n");
|
||||
}
|
||||
|
||||
public void injectQuerry(final PreparedStatement ps, final CountInOut iii) throws Exception {
|
||||
public void injectQuery(final PreparedStatement ps, final CountInOut iii) throws Exception {
|
||||
// nothing to add.
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
package org.kar.archidata.dataAccess;
|
||||
package org.kar.archidata.dataAccess.options;
|
||||
|
||||
public class OrderItem {
|
||||
public enum Order {
|
||||
@@ -1,7 +1,5 @@
|
||||
package org.kar.archidata.dataAccess.options;
|
||||
|
||||
import org.kar.archidata.dataAccess.QueryOption;
|
||||
|
||||
/** Option that permit to access to a table structure with an other name that is define in the structure. Note: Internal use for link tables (see:
|
||||
* org.kar.archidata.dataAccess.addOn.model.LinkTable). */
|
||||
public class OverrideTableName extends QueryOption {
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
package org.kar.archidata.dataAccess.options;
|
||||
|
||||
public class QueryOption {}
|
||||
@@ -1,7 +1,5 @@
|
||||
package org.kar.archidata.dataAccess.options;
|
||||
|
||||
import org.kar.archidata.dataAccess.QueryOption;
|
||||
|
||||
/** By default some element are not read like createAt and UpdatedAt. This option permit to read it. */
|
||||
public class ReadAllColumn extends QueryOption {
|
||||
public ReadAllColumn() {}
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
package org.kar.archidata.dataAccess.options;
|
||||
|
||||
import org.kar.archidata.dataAccess.QueryOption;
|
||||
|
||||
/** Internal option that permit to transmit the Key when updating the ManyToMany values (first step). */
|
||||
public class TransmitKey extends QueryOption {
|
||||
private final Object key;
|
||||
|
||||
@@ -14,7 +14,8 @@ public class DBConfig {
|
||||
private final String dbName;
|
||||
private final boolean keepConnected;
|
||||
|
||||
public DBConfig(final String type, final String hostname, final Integer port, final String login, final String password, final String dbName, final boolean keepConnected) {
|
||||
public DBConfig(final String type, final String hostname, final Integer port, final String login,
|
||||
final String password, final String dbName, final boolean keepConnected) {
|
||||
if (type == null) {
|
||||
this.type = "mysql";
|
||||
} else {
|
||||
@@ -38,8 +39,9 @@ public class DBConfig {
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "DBConfig{type='" + this.type + '\'' + ", hostname='" + this.hostname + '\'' + ", port=" + this.port + ", login='" + this.login + '\'' + ", password='" + this.password + '\''
|
||||
+ ", dbName='" + this.dbName + "' }";
|
||||
return "DBConfig{type='" + this.type + '\'' + ", hostname='" + this.hostname + '\'' + ", port=" + this.port
|
||||
+ ", login='" + this.login + '\'' + ", password='" + this.password + '\'' + ", dbName='" + this.dbName
|
||||
+ "' }";
|
||||
}
|
||||
|
||||
public String getHostname() {
|
||||
@@ -81,8 +83,10 @@ public class DBConfig {
|
||||
return "jdbc:sqlite:" + this.hostname + ".db";
|
||||
}
|
||||
if (isRoot) {
|
||||
return "jdbc:" + this.type + "://" + this.hostname + ":" + this.port + "/?allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=UTC";
|
||||
return "jdbc:" + this.type + "://" + this.hostname + ":" + this.port
|
||||
+ "/?allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=UTC";
|
||||
}
|
||||
return "jdbc:" + this.type + "://" + this.hostname + ":" + this.port + "/" + this.dbName + "?allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=UTC";
|
||||
return "jdbc:" + this.type + "://" + this.hostname + ":" + this.port + "/" + this.dbName
|
||||
+ "?allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=UTC";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -50,7 +50,8 @@ public class DBEntry implements Closeable {
|
||||
|
||||
public void connectRoot() throws IOException {
|
||||
try {
|
||||
this.connection = DriverManager.getConnection(this.config.getUrl(true), this.config.getLogin(), this.config.getPassword());
|
||||
this.connection = DriverManager.getConnection(this.config.getUrl(true), this.config.getLogin(),
|
||||
this.config.getPassword());
|
||||
} catch (final SQLException ex) {
|
||||
throw new IOException("Connection db fail: " + ex.getMessage() + " On URL: " + this.config.getUrl(true));
|
||||
}
|
||||
@@ -59,7 +60,8 @@ public class DBEntry implements Closeable {
|
||||
|
||||
public void connect() throws IOException {
|
||||
try {
|
||||
this.connection = DriverManager.getConnection(this.config.getUrl(), this.config.getLogin(), this.config.getPassword());
|
||||
this.connection = DriverManager.getConnection(this.config.getUrl(), this.config.getLogin(),
|
||||
this.config.getPassword());
|
||||
} catch (final SQLException ex) {
|
||||
throw new IOException("Connection db fail: " + ex.getMessage() + " On URL: " + this.config.getUrl(true));
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@ import java.util.UUID;
|
||||
public class RESTErrorResponseExeption extends Exception {
|
||||
public UUID uuid;
|
||||
public String time;
|
||||
public String error;
|
||||
public String name;
|
||||
public String message;
|
||||
public int status;
|
||||
public String statusMessage;
|
||||
@@ -13,16 +13,17 @@ public class RESTErrorResponseExeption extends Exception {
|
||||
public RESTErrorResponseExeption() {
|
||||
this.uuid = null;
|
||||
this.time = null;
|
||||
this.error = null;
|
||||
this.name = null;
|
||||
this.message = null;
|
||||
this.status = 0;
|
||||
this.statusMessage = null;
|
||||
}
|
||||
|
||||
public RESTErrorResponseExeption(final UUID uuid, final String time, final String error, final String message, final int status, final String statusMessage) {
|
||||
public RESTErrorResponseExeption(final UUID uuid, final String time, final String name, final String message,
|
||||
final int status, final String statusMessage) {
|
||||
this.uuid = uuid;
|
||||
this.time = time;
|
||||
this.error = error;
|
||||
this.name = name;
|
||||
this.message = message;
|
||||
this.status = status;
|
||||
this.statusMessage = statusMessage;
|
||||
@@ -30,8 +31,9 @@ public class RESTErrorResponseExeption extends Exception {
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "RESTErrorResponseExeption [uuid=" + this.uuid + ", time=" + this.time + ", error=" + this.error + ", message=" + this.message + ", status=" + this.status + ", statusMessage="
|
||||
+ this.statusMessage + "]";
|
||||
return "RESTErrorResponseExeption [uuid=" + this.uuid + ", time=" + this.time + ", name=" + this.name
|
||||
+ ", message=" + this.message + ", status=" + this.status + ", statusMessage=" + this.statusMessage
|
||||
+ "]";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -82,7 +82,8 @@ public class AuthenticationFilter implements ContainerRequestFilter {
|
||||
if (authorizationHeader == null && apikeyHeader == null && method.isAnnotationPresent(PermitTokenInURI.class)) {
|
||||
final MultivaluedMap<String, String> quaryparam = requestContext.getUriInfo().getQueryParameters();
|
||||
for (final Entry<String, List<String>> item : quaryparam.entrySet()) {
|
||||
if ((authorizationHeader == null && HttpHeaders.AUTHORIZATION.equals(item.getKey())) && !item.getValue().isEmpty()) {
|
||||
if ((authorizationHeader == null && HttpHeaders.AUTHORIZATION.equals(item.getKey()))
|
||||
&& !item.getValue().isEmpty()) {
|
||||
authorizationHeader = item.getValue().get(0);
|
||||
}
|
||||
if ((apikeyHeader == null && APIKEY.equals(item.getKey())) && !item.getValue().isEmpty()) {
|
||||
@@ -148,7 +149,8 @@ public class AuthenticationFilter implements ContainerRequestFilter {
|
||||
// Is user valid?
|
||||
if (!haveRight) {
|
||||
LOGGER.error("REJECTED not enought right : {} require: {}", requestContext.getUriInfo().getPath(), roles);
|
||||
requestContext.abortWith(Response.status(Response.Status.UNAUTHORIZED).entity("Not enought RIGHT !!!").build());
|
||||
requestContext
|
||||
.abortWith(Response.status(Response.Status.UNAUTHORIZED).entity("Not enought RIGHT !!!").build());
|
||||
return;
|
||||
}
|
||||
requestContext.setSecurityContext(userContext);
|
||||
@@ -159,7 +161,8 @@ public class AuthenticationFilter implements ContainerRequestFilter {
|
||||
// Check if the Authorization header is valid
|
||||
// It must not be null and must be prefixed with "Bearer" plus a whitespace
|
||||
// The authentication scheme comparison must be case-insensitive
|
||||
return authorizationHeader != null && authorizationHeader.toLowerCase().startsWith(AUTHENTICATION_SCHEME.toLowerCase() + " ");
|
||||
return authorizationHeader != null
|
||||
&& authorizationHeader.toLowerCase().startsWith(AUTHENTICATION_SCHEME.toLowerCase() + " ");
|
||||
}
|
||||
|
||||
private void abortWithUnauthorized(final ContainerRequestContext requestContext, final String message) {
|
||||
@@ -169,14 +172,17 @@ public class AuthenticationFilter implements ContainerRequestFilter {
|
||||
LOGGER.warn("abortWithUnauthorized:");
|
||||
final RestErrorResponse ret = new RestErrorResponse(Response.Status.UNAUTHORIZED, "Unauthorized", message);
|
||||
LOGGER.error("Error UUID={}", ret.uuid);
|
||||
requestContext.abortWith(Response.status(ret.status).header(HttpHeaders.WWW_AUTHENTICATE, AUTHENTICATION_SCHEME + " base64(HEADER).base64(CONTENT).base64(KEY)").entity(ret)
|
||||
.type(MediaType.APPLICATION_JSON).build());
|
||||
requestContext.abortWith(Response.status(ret.status)
|
||||
.header(HttpHeaders.WWW_AUTHENTICATE,
|
||||
AUTHENTICATION_SCHEME + " base64(HEADER).base64(CONTENT).base64(KEY)")
|
||||
.entity(ret).type(MediaType.APPLICATION_JSON).build());
|
||||
}
|
||||
|
||||
private void abortWithForbidden(final ContainerRequestContext requestContext, final String message) {
|
||||
final RestErrorResponse ret = new RestErrorResponse(Response.Status.FORBIDDEN, "FORBIDDEN", message);
|
||||
LOGGER.error("Error UUID={}", ret.uuid);
|
||||
requestContext.abortWith(Response.status(ret.status).header(HttpHeaders.WWW_AUTHENTICATE, message).entity(ret).type(MediaType.APPLICATION_JSON).build());
|
||||
requestContext.abortWith(Response.status(ret.status).header(HttpHeaders.WWW_AUTHENTICATE, message).entity(ret)
|
||||
.type(MediaType.APPLICATION_JSON).build());
|
||||
}
|
||||
|
||||
protected UserByToken validateToken(final String authorization) throws Exception {
|
||||
@@ -206,7 +212,8 @@ public class AuthenticationFilter implements ContainerRequestFilter {
|
||||
if (rights.containsKey(this.applicationName)) {
|
||||
user.right = rights.get(this.applicationName);
|
||||
} else {
|
||||
LOGGER.error("Connect with no right for this application='{}' full Right='{}'", this.applicationName, rights);
|
||||
LOGGER.error("Connect with no right for this application='{}' full Right='{}'", this.applicationName,
|
||||
rights);
|
||||
}
|
||||
}
|
||||
// logger.debug("request user: '{}' right: '{}' row='{}'", userUID, user.right, rowRight);
|
||||
|
||||
@@ -11,11 +11,13 @@ import jakarta.ws.rs.ext.Provider;
|
||||
public class CORSFilter implements ContainerResponseFilter {
|
||||
|
||||
@Override
|
||||
public void filter(final ContainerRequestContext request, final ContainerResponseContext response) throws IOException {
|
||||
public void filter(final ContainerRequestContext request, final ContainerResponseContext response)
|
||||
throws IOException {
|
||||
// System.err.println("filter cors ..." + request.toString());
|
||||
|
||||
response.getHeaders().add("Access-Control-Allow-Origin", "*");
|
||||
response.getHeaders().add("Access-Control-Allow-Headers", "Origin, content-type, Content-type, Accept, Authorization, mime-type, filename");
|
||||
response.getHeaders().add("Access-Control-Allow-Headers",
|
||||
"Origin, content-type, Content-type, Accept, Authorization, mime-type, filename");
|
||||
response.getHeaders().add("Access-Control-Allow-Credentials", "true");
|
||||
response.getHeaders().add("Access-Control-Allow-Methods", "GET, POST, PUT, PATCH, DELETE, OPTIONS, HEAD");
|
||||
}
|
||||
|
||||
@@ -162,14 +162,16 @@ public class MigrationEngine {
|
||||
sqlQuery = DataFactory.createTable(Migration.class);
|
||||
} catch (final Exception ex) {
|
||||
ex.printStackTrace();
|
||||
throw new MigrationException("Fail to create the local DB SQL model for migaration ==> wait administrator interventions");
|
||||
throw new MigrationException(
|
||||
"Fail to create the local DB SQL model for migaration ==> wait administrator interventions");
|
||||
}
|
||||
LOGGER.info("Create Table with : {}", sqlQuery.get(0));
|
||||
try {
|
||||
DataAccess.executeQuerry(sqlQuery.get(0));
|
||||
DataAccess.executeQuery(sqlQuery.get(0));
|
||||
} catch (SQLException | IOException ex) {
|
||||
ex.printStackTrace();
|
||||
throw new MigrationException("Fail to create the local DB model for migaration ==> wait administrator interventions");
|
||||
throw new MigrationException(
|
||||
"Fail to create the local DB model for migaration ==> wait administrator interventions");
|
||||
}
|
||||
}
|
||||
final Migration currentVersion = getCurrentVersion();
|
||||
@@ -188,7 +190,8 @@ public class MigrationEngine {
|
||||
}
|
||||
} else {
|
||||
if (!currentVersion.terminated) {
|
||||
throw new MigrationException("An error occured in the last migration: '" + currentVersion.name + "' defect @" + currentVersion.stepId + "/" + currentVersion.count);
|
||||
throw new MigrationException("An error occured in the last migration: '" + currentVersion.name
|
||||
+ "' defect @" + currentVersion.stepId + "/" + currentVersion.count);
|
||||
}
|
||||
LOGGER.info("Upgrade the system Current version: {}", currentVersion.name);
|
||||
boolean find = this.init != null && this.init.getName().equals(currentVersion.name);
|
||||
@@ -220,7 +223,8 @@ public class MigrationEngine {
|
||||
}
|
||||
} catch (final IOException e) {
|
||||
e.printStackTrace();
|
||||
throw new MigrationException("An error occured in the migration (can not access to the DB): '" + currentVersion.name + "' defect @" + currentVersion.stepId + "/" + currentVersion.count);
|
||||
throw new MigrationException("An error occured in the migration (can not access to the DB): '"
|
||||
+ currentVersion.name + "' defect @" + currentVersion.stepId + "/" + currentVersion.count);
|
||||
}
|
||||
if (needPlaceholder) {
|
||||
if (this.datas.size() == 0) {
|
||||
@@ -246,7 +250,8 @@ public class MigrationEngine {
|
||||
LOGGER.info("Execute migration ... [ END ]");
|
||||
}
|
||||
|
||||
public void migrateSingle(final DBEntry entry, final MigrationInterface elem, final int id, final int count) throws MigrationException {
|
||||
public void migrateSingle(final DBEntry entry, final MigrationInterface elem, final int id, final int count)
|
||||
throws MigrationException {
|
||||
LOGGER.info("---------------------------------------------------------");
|
||||
LOGGER.info("-- Migrate: [{}/{}] {} [BEGIN]", id, count, elem.getName());
|
||||
LOGGER.info("---------------------------------------------------------");
|
||||
@@ -260,14 +265,16 @@ public class MigrationEngine {
|
||||
migrationResult.count = elem.getNumberOfStep();
|
||||
} catch (final Exception e) {
|
||||
e.printStackTrace();
|
||||
throw new MigrationException("Fail to get number of migration step (maybe generation fail): " + e.getLocalizedMessage());
|
||||
throw new MigrationException(
|
||||
"Fail to get number of migration step (maybe generation fail): " + e.getLocalizedMessage());
|
||||
}
|
||||
migrationResult.log = log.toString();
|
||||
try {
|
||||
migrationResult = DataAccess.insert(migrationResult);
|
||||
} catch (final Exception e) {
|
||||
e.printStackTrace();
|
||||
throw new MigrationException("Fail to insert migration Log in the migration table: " + e.getLocalizedMessage());
|
||||
throw new MigrationException(
|
||||
"Fail to insert migration Log in the migration table: " + e.getLocalizedMessage());
|
||||
}
|
||||
boolean ret = true;
|
||||
try {
|
||||
@@ -276,7 +283,8 @@ public class MigrationEngine {
|
||||
log.append("\nFail in the migration apply ");
|
||||
log.append(e.getLocalizedMessage());
|
||||
e.printStackTrace();
|
||||
throw new MigrationException("Migration fail: '" + migrationResult.name + "' defect @" + migrationResult.stepId + "/" + migrationResult.count);
|
||||
throw new MigrationException("Migration fail: '" + migrationResult.name + "' defect @"
|
||||
+ migrationResult.stepId + "/" + migrationResult.count);
|
||||
}
|
||||
if (ret) {
|
||||
migrationResult.terminated = true;
|
||||
@@ -284,7 +292,8 @@ public class MigrationEngine {
|
||||
DataAccess.update(migrationResult, migrationResult.id, List.of("terminated"));
|
||||
} catch (final Exception e) {
|
||||
e.printStackTrace();
|
||||
throw new MigrationException("Fail to update migration Log in the migration table: " + e.getLocalizedMessage());
|
||||
throw new MigrationException(
|
||||
"Fail to update migration Log in the migration table: " + e.getLocalizedMessage());
|
||||
}
|
||||
} else {
|
||||
try {
|
||||
@@ -293,10 +302,12 @@ public class MigrationEngine {
|
||||
DataAccess.update(migrationResult, migrationResult.id, List.of("log"));
|
||||
} catch (final Exception e) {
|
||||
e.printStackTrace();
|
||||
throw new MigrationException("Fail to update migration Log in the migration table: " + e.getLocalizedMessage() + " WITH: An error occured in the migration (OUTSIDE detection): '"
|
||||
throw new MigrationException("Fail to update migration Log in the migration table: "
|
||||
+ e.getLocalizedMessage() + " WITH: An error occured in the migration (OUTSIDE detection): '"
|
||||
+ migrationResult.name + "' defect @" + migrationResult.stepId + "/" + migrationResult.count);
|
||||
}
|
||||
throw new MigrationException("An error occured in the migration (OUTSIDE detection): '" + migrationResult.name + "' defect @" + migrationResult.stepId + "/" + migrationResult.count);
|
||||
throw new MigrationException("An error occured in the migration (OUTSIDE detection): '"
|
||||
+ migrationResult.name + "' defect @" + migrationResult.stepId + "/" + migrationResult.count);
|
||||
}
|
||||
LOGGER.info("Migrate: [{}/{}] {} [ END ]", id, count, elem.getName());
|
||||
}
|
||||
|
||||
@@ -13,7 +13,10 @@ import org.kar.archidata.tools.ConfigBaseVariable;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
record Action(String action, AsyncCall async, List<String> filterDB) {
|
||||
record Action(
|
||||
String action,
|
||||
AsyncCall async,
|
||||
List<String> filterDB) {
|
||||
public Action(final String action) {
|
||||
this(action, null, List.of());
|
||||
}
|
||||
@@ -49,9 +52,11 @@ public class MigrationSqlStep implements MigrationInterface {
|
||||
for (int iii = 0; iii < this.actions.size(); iii++) {
|
||||
final Action action = this.actions.get(iii);
|
||||
if (action.action() != null) {
|
||||
LOGGER.info(" >>>> SQL ACTION : {}/{} ==> filter='{}'\n{}", iii, this.actions.size(), action.filterDB(), action.action());
|
||||
LOGGER.info(" >>>> SQL ACTION : {}/{} ==> filter='{}'\n{}", iii, this.actions.size(), action.filterDB(),
|
||||
action.action());
|
||||
} else {
|
||||
LOGGER.info(" >>>> SQL ACTION : {}/{} ==> filter='{}'\nAsync lambda", iii, this.actions.size(), action.filterDB());
|
||||
LOGGER.info(" >>>> SQL ACTION : {}/{} ==> filter='{}'\nAsync lambda", iii, this.actions.size(),
|
||||
action.filterDB());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -65,7 +70,8 @@ public class MigrationSqlStep implements MigrationInterface {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean applyMigration(final DBEntry entry, final StringBuilder log, final Migration model) throws Exception {
|
||||
public boolean applyMigration(final DBEntry entry, final StringBuilder log, final Migration model)
|
||||
throws Exception {
|
||||
if (!this.isGenerated) {
|
||||
this.isGenerated = true;
|
||||
generateStep();
|
||||
@@ -76,10 +82,12 @@ public class MigrationSqlStep implements MigrationInterface {
|
||||
final Action action = this.actions.get(iii);
|
||||
|
||||
if (action.action() != null) {
|
||||
LOGGER.info("SQL request: ```{}``` on '{}' current={}", action.action(), action.filterDB(), ConfigBaseVariable.getDBType());
|
||||
LOGGER.info("SQL request: ```{}``` on '{}' current={}", action.action(), action.filterDB(),
|
||||
ConfigBaseVariable.getDBType());
|
||||
log.append("SQL: " + action.action() + " on " + action.filterDB() + "\n");
|
||||
} else {
|
||||
LOGGER.info("SQL request: <Lambda> on '{}' current={}", action.filterDB(), ConfigBaseVariable.getDBType());
|
||||
LOGGER.info("SQL request: <Lambda> on '{}' current={}", action.filterDB(),
|
||||
ConfigBaseVariable.getDBType());
|
||||
log.append("SQL: <Lambda> on " + action.filterDB() + "\n");
|
||||
}
|
||||
boolean isValid = true;
|
||||
@@ -98,7 +106,7 @@ public class MigrationSqlStep implements MigrationInterface {
|
||||
}
|
||||
try {
|
||||
if (action.action() != null) {
|
||||
DataAccess.executeQuerry(action.action());
|
||||
DataAccess.executeQuery(action.action());
|
||||
} else {
|
||||
action.async().doRequest();
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ import java.sql.Timestamp;
|
||||
|
||||
import org.kar.archidata.annotation.DataIfNotExists;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
@@ -18,6 +19,7 @@ public class GenericToken extends GenericDataSoftDelete {
|
||||
@Column(nullable = false, length = 0)
|
||||
public String name;
|
||||
@Column(nullable = false)
|
||||
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
|
||||
public Timestamp endValidityTime = null;
|
||||
@Column(nullable = false, length = 0)
|
||||
public String token;
|
||||
|
||||
@@ -2,6 +2,19 @@ package org.kar.archidata.model;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
|
||||
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||
public record GetToken(String jwt) {
|
||||
public class GetToken {
|
||||
@Column(length = -1, nullable = false)
|
||||
public String jwt;
|
||||
|
||||
public GetToken() {
|
||||
|
||||
}
|
||||
|
||||
public GetToken(final String jwt) {
|
||||
this.jwt = jwt;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -12,7 +12,8 @@ public class Token {
|
||||
|
||||
public Token() {}
|
||||
|
||||
public Token(final long id, final long userId, final String token, final String createTime, final String endValidityTime) {
|
||||
public Token(final long id, final long userId, final String token, final String createTime,
|
||||
final String endValidityTime) {
|
||||
this.id = id;
|
||||
this.userId = userId;
|
||||
this.token = token;
|
||||
@@ -35,6 +36,7 @@ public class Token {
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "Token{" + "id=" + this.id + ", userId=" + this.userId + ", token='" + this.token + '\'' + ", createTime=" + this.createTime + ", endValidityTime=" + this.endValidityTime + '}';
|
||||
return "Token{" + "id=" + this.id + ", userId=" + this.userId + ", token='" + this.token + '\''
|
||||
+ ", createTime=" + this.createTime + ", endValidityTime=" + this.endValidityTime + '}';
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,5 +12,5 @@ public class UUIDGenericData extends GenericTiming {
|
||||
@DefaultValue("(UUID_TO_BIN(UUID(), TRUE))")
|
||||
@Column(nullable = false, unique = true)
|
||||
@Schema(description = "Unique UUID of the object", required = false, readOnly = true, example = "e6b33c1c-d24d-11ee-b616-02420a030102")
|
||||
public UUID id = null;
|
||||
public UUID uuid = null;
|
||||
}
|
||||
|
||||
@@ -19,6 +19,7 @@ import java.util.List;
|
||||
|
||||
import org.kar.archidata.annotation.DataIfNotExists;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
@@ -34,6 +35,7 @@ public class User extends GenericDataSoftDelete {
|
||||
@Column(length = 128)
|
||||
public String login = null;
|
||||
|
||||
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
|
||||
public Timestamp lastConnection = null;
|
||||
@DefaultValue("'0'")
|
||||
@Column(nullable = false)
|
||||
|
||||
@@ -127,8 +127,10 @@ public class ConfigBaseVariable {
|
||||
return Boolean.parseBoolean(testMode);
|
||||
}
|
||||
|
||||
public record EMailConfig(String from, String login, String password) {
|
||||
};
|
||||
public record EMailConfig(
|
||||
String from,
|
||||
String login,
|
||||
String password) {};
|
||||
|
||||
public static EMailConfig getEMailConfig() {
|
||||
if (eMailFrom == null || eMailLogin == null || eMailPassword == null) {
|
||||
|
||||
@@ -69,7 +69,8 @@ public class DataTools {
|
||||
|
||||
public static Data getWithSha512(final String sha512) {
|
||||
try {
|
||||
return DataAccess.getWhere(Data.class, new Condition(new QueryCondition("sha512", "=", sha512)), new ReadAllColumn());
|
||||
return DataAccess.getWhere(Data.class, new Condition(new QueryCondition("sha512", "=", sha512)),
|
||||
new ReadAllColumn());
|
||||
} catch (final Exception e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
@@ -79,7 +80,8 @@ public class DataTools {
|
||||
|
||||
public static Data getWithId(final long id) {
|
||||
try {
|
||||
return DataAccess.getWhere(Data.class, new Condition(new QueryAnd(List.of(new QueryCondition("deleted", "=", false), new QueryCondition("id", "=", id)))));
|
||||
return DataAccess.getWhere(Data.class, new Condition(new QueryAnd(
|
||||
List.of(new QueryCondition("deleted", "=", false), new QueryCondition("id", "=", id)))));
|
||||
} catch (final Exception e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
@@ -87,7 +89,8 @@ public class DataTools {
|
||||
return null;
|
||||
}
|
||||
|
||||
public static Data createNewData(final long tmpUID, final String originalFileName, final String sha512) throws IOException, SQLException {
|
||||
public static Data createNewData(final long tmpUID, final String originalFileName, final String sha512)
|
||||
throws IOException, SQLException {
|
||||
// determine mime type:
|
||||
String mimeType = "";
|
||||
final String extension = originalFileName.substring(originalFileName.lastIndexOf('.') + 1);
|
||||
@@ -115,7 +118,7 @@ public class DataTools {
|
||||
return null;
|
||||
}
|
||||
|
||||
final String mediaPath = DataResource.getFileData(out.id);
|
||||
final String mediaPath = DataResource.getFileData(out.uuid);
|
||||
LOGGER.info("src = {}", tmpPath);
|
||||
LOGGER.info("dst = {}", mediaPath);
|
||||
Files.move(Paths.get(tmpPath), Paths.get(mediaPath), StandardCopyOption.ATOMIC_MOVE);
|
||||
@@ -211,7 +214,12 @@ public class DataTools {
|
||||
return data;
|
||||
}
|
||||
|
||||
public static <CLASS_TYPE, ID_TYPE> Response uploadCover(final Class<CLASS_TYPE> clazz, final ID_TYPE id, String fileName, final InputStream fileInputStream, final FormDataContentDisposition fileMetaData) {
|
||||
public static <CLASS_TYPE, ID_TYPE> Response uploadCover(
|
||||
final Class<CLASS_TYPE> clazz,
|
||||
final ID_TYPE id,
|
||||
String fileName,
|
||||
final InputStream fileInputStream,
|
||||
final FormDataContentDisposition fileMetaData) {
|
||||
try {
|
||||
// correct input string stream :
|
||||
fileName = multipartCorrection(fileName);
|
||||
@@ -245,7 +253,7 @@ public class DataTools {
|
||||
}
|
||||
} else if (data.deleted) {
|
||||
LOGGER.error("Data already exist but deleted");
|
||||
undelete(data.id);
|
||||
undelete(data.uuid);
|
||||
data.deleted = false;
|
||||
} else {
|
||||
LOGGER.error("Data already exist ... all good");
|
||||
@@ -253,9 +261,9 @@ public class DataTools {
|
||||
// Fist step: retrieve all the Id of each parents:...
|
||||
LOGGER.info("Find typeNode");
|
||||
if (id instanceof final Long idLong) {
|
||||
AddOnDataJson.addLink(clazz, idLong, "covers", data.id);
|
||||
AddOnDataJson.addLink(clazz, idLong, "covers", data.uuid);
|
||||
} else if (id instanceof final UUID idUUID) {
|
||||
AddOnDataJson.addLink(clazz, idUUID, "covers", data.id);
|
||||
AddOnDataJson.addLink(clazz, idUUID, "covers", data.uuid);
|
||||
} else {
|
||||
throw new IOException("Fail to add Cover can not detect type...");
|
||||
}
|
||||
|
||||
@@ -78,7 +78,8 @@ public class JWTWrapper {
|
||||
public PublicKey() {}
|
||||
}
|
||||
|
||||
public static void initLocalTokenRemote(final String ssoUri, final String application) throws IOException, ParseException {
|
||||
public static void initLocalTokenRemote(final String ssoUri, final String application)
|
||||
throws IOException, ParseException {
|
||||
// check Token:
|
||||
final URL obj = new URL(ssoUri + "public_key");
|
||||
// LOGGER.debug("Request token from: {}", obj);
|
||||
@@ -169,7 +170,13 @@ public class JWTWrapper {
|
||||
* @param isuer The one who provide the Token
|
||||
* @param timeOutInMunites Expiration of the token.
|
||||
* @return the encoded token */
|
||||
public static String generateJWToken(final long userID, final String userLogin, final String isuer, final String application, final Map<String, Object> rights, final int timeOutInMunites) {
|
||||
public static String generateJWToken(
|
||||
final long userID,
|
||||
final String userLogin,
|
||||
final String isuer,
|
||||
final String application,
|
||||
final Map<String, Object> rights,
|
||||
final int timeOutInMunites) {
|
||||
if (rsaJWK == null) {
|
||||
LOGGER.warn("JWT private key is not present !!!");
|
||||
return null;
|
||||
@@ -186,7 +193,8 @@ public class JWTWrapper {
|
||||
final Date expiration = new Date(new Date().getTime() - 60 * timeOutInMunites * 1000 /* millisecond */);
|
||||
|
||||
LOGGER.warn("expiration= {}", expiration);
|
||||
final JWTClaimsSet.Builder builder = new JWTClaimsSet.Builder().subject(Long.toString(userID)).claim("login", userLogin).claim("application", application).issuer(isuer).issueTime(now)
|
||||
final JWTClaimsSet.Builder builder = new JWTClaimsSet.Builder().subject(Long.toString(userID))
|
||||
.claim("login", userLogin).claim("application", application).issuer(isuer).issueTime(now)
|
||||
.expirationTime(expiration); // Do not ask why we need a "-" here ... this have no meaning
|
||||
// add right if needed:
|
||||
if (rights != null && !rights.isEmpty()) {
|
||||
@@ -194,7 +202,8 @@ public class JWTWrapper {
|
||||
}
|
||||
// Prepare JWT with claims set
|
||||
final JWTClaimsSet claimsSet = builder.build();
|
||||
final SignedJWT signedJWT = new SignedJWT(new JWSHeader.Builder(JWSAlgorithm.RS256).type(JOSEObjectType.JWT)/* .keyID(rsaJWK.getKeyID()) */.build(), claimsSet);
|
||||
final SignedJWT signedJWT = new SignedJWT(new JWSHeader.Builder(JWSAlgorithm.RS256).type(JOSEObjectType.JWT)
|
||||
/* .keyID(rsaJWK.getKeyID()) */.build(), claimsSet);
|
||||
|
||||
// Compute the RSA signature
|
||||
signedJWT.sign(signer);
|
||||
@@ -230,12 +239,15 @@ public class JWTWrapper {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
if (!ConfigBaseVariable.getTestMode() && !new Date().before(signedJWT.getJWTClaimsSet().getExpirationTime())) {
|
||||
LOGGER.error("JWT token is expired now = " + new Date() + " with=" + signedJWT.getJWTClaimsSet().getExpirationTime());
|
||||
if (!ConfigBaseVariable.getTestMode()
|
||||
&& !new Date().before(signedJWT.getJWTClaimsSet().getExpirationTime())) {
|
||||
LOGGER.error("JWT token is expired now = " + new Date() + " with="
|
||||
+ signedJWT.getJWTClaimsSet().getExpirationTime());
|
||||
return null;
|
||||
}
|
||||
if (!isuer.equals(signedJWT.getJWTClaimsSet().getIssuer())) {
|
||||
LOGGER.error("JWT issuer is wong: '" + isuer + "' != '" + signedJWT.getJWTClaimsSet().getIssuer() + "'");
|
||||
LOGGER.error(
|
||||
"JWT issuer is wong: '" + isuer + "' != '" + signedJWT.getJWTClaimsSet().getIssuer() + "'");
|
||||
return null;
|
||||
}
|
||||
if (application != null) {
|
||||
@@ -251,7 +263,12 @@ public class JWTWrapper {
|
||||
return null;
|
||||
}
|
||||
|
||||
public static String createJwtTestToken(final long userID, final String userLogin, final String isuer, final String application, final Map<String, Map<String, Object>> rights) {
|
||||
public static String createJwtTestToken(
|
||||
final long userID,
|
||||
final String userLogin,
|
||||
final String isuer,
|
||||
final String application,
|
||||
final Map<String, Map<String, Object>> rights) {
|
||||
if (!ConfigBaseVariable.getTestMode()) {
|
||||
LOGGER.error("Test mode disable !!!!!");
|
||||
return null;
|
||||
@@ -262,7 +279,8 @@ public class JWTWrapper {
|
||||
final Date now = new Date();
|
||||
final Date expiration = new Date(new Date().getTime() + timeOutInMunites * 1000 /* ms */);
|
||||
|
||||
final JWTClaimsSet.Builder builder = new JWTClaimsSet.Builder().subject(Long.toString(userID)).claim("login", userLogin).claim("application", application).issuer(isuer).issueTime(now)
|
||||
final JWTClaimsSet.Builder builder = new JWTClaimsSet.Builder().subject(Long.toString(userID))
|
||||
.claim("login", userLogin).claim("application", application).issuer(isuer).issueTime(now)
|
||||
.expirationTime(expiration); // Do not ask why we need a "-" here ... this have no meaning
|
||||
// add right if needed:
|
||||
if (rights != null && !rights.isEmpty()) {
|
||||
@@ -270,7 +288,8 @@ public class JWTWrapper {
|
||||
}
|
||||
// Prepare JWT with claims set
|
||||
final JWTClaimsSet claimsSet = builder.build();
|
||||
final SignedJWT signedJWT = new SignedJWT(new JWSHeader.Builder(JWSAlgorithm.RS256).type(JOSEObjectType.JWT)/* .keyID(rsaJWK.getKeyID()) */.build(), claimsSet);
|
||||
final SignedJWT signedJWT = new SignedJWT(new JWSHeader.Builder(JWSAlgorithm.RS256).type(JOSEObjectType.JWT)
|
||||
/* .keyID(rsaJWK.getKeyID()) */.build(), claimsSet);
|
||||
|
||||
// Compute the RSA signature
|
||||
signedJWT.sign(new TestSigner());
|
||||
|
||||
@@ -36,9 +36,11 @@ public class RESTApi {
|
||||
this.token = token;
|
||||
}
|
||||
|
||||
public <T> List<T> gets(final Class<T> clazz, final String urlOffset) throws RESTErrorResponseExeption, IOException, InterruptedException {
|
||||
public <T> List<T> gets(final Class<T> clazz, final String urlOffset)
|
||||
throws RESTErrorResponseExeption, IOException, InterruptedException {
|
||||
final HttpClient client = HttpClient.newHttpClient();
|
||||
Builder requestBuilding = HttpRequest.newBuilder().version(Version.HTTP_1_1).uri(URI.create(this.baseUrl + urlOffset));
|
||||
Builder requestBuilding = HttpRequest.newBuilder().version(Version.HTTP_1_1)
|
||||
.uri(URI.create(this.baseUrl + urlOffset));
|
||||
if (this.token != null) {
|
||||
requestBuilding = requestBuilding.header(HttpHeaders.AUTHORIZATION, "Bearer " + this.token);
|
||||
}
|
||||
@@ -46,56 +48,69 @@ public class RESTApi {
|
||||
final HttpResponse<String> httpResponse = client.send(request, HttpResponse.BodyHandlers.ofString());
|
||||
if (httpResponse.statusCode() < 200 || httpResponse.statusCode() >= 300) {
|
||||
try {
|
||||
final RESTErrorResponseExeption out = this.mapper.readValue(httpResponse.body(), RESTErrorResponseExeption.class);
|
||||
throw new RESTErrorResponseExeption(out.uuid, out.time, out.error, out.message, out.status, out.statusMessage);
|
||||
final RESTErrorResponseExeption out = this.mapper.readValue(httpResponse.body(),
|
||||
RESTErrorResponseExeption.class);
|
||||
throw out;
|
||||
} catch (final MismatchedInputException ex) {
|
||||
throw new IOException("Fail to get the data [" + httpResponse.statusCode() + "] " + httpResponse.body());
|
||||
throw new IOException(
|
||||
"Fail to get the data [" + httpResponse.statusCode() + "] " + httpResponse.body());
|
||||
}
|
||||
}
|
||||
return this.mapper.readValue(httpResponse.body(), new TypeReference<List<T>>() {});
|
||||
}
|
||||
|
||||
public <T> T get(final Class<T> clazz, final String urlOffset) throws RESTErrorResponseExeption, IOException, InterruptedException {
|
||||
public <T> T get(final Class<T> clazz, final String urlOffset)
|
||||
throws RESTErrorResponseExeption, IOException, InterruptedException {
|
||||
return modelSendJson("GET", clazz, urlOffset, null);
|
||||
}
|
||||
|
||||
public <T, U> T post(final Class<T> clazz, final String urlOffset, final U data) throws RESTErrorResponseExeption, IOException, InterruptedException {
|
||||
public <T, U> T post(final Class<T> clazz, final String urlOffset, final U data)
|
||||
throws RESTErrorResponseExeption, IOException, InterruptedException {
|
||||
return modelSend("POST", clazz, urlOffset, data);
|
||||
}
|
||||
|
||||
public <T, U> T postJson(final Class<T> clazz, final String urlOffset, final String body) throws RESTErrorResponseExeption, IOException, InterruptedException {
|
||||
public <T, U> T postJson(final Class<T> clazz, final String urlOffset, final String body)
|
||||
throws RESTErrorResponseExeption, IOException, InterruptedException {
|
||||
return modelSendJson("POST", clazz, urlOffset, body);
|
||||
}
|
||||
|
||||
public <T> T postMap(final Class<T> clazz, final String urlOffset, final Map<String, Object> data) throws RESTErrorResponseExeption, IOException, InterruptedException {
|
||||
public <T> T postMap(final Class<T> clazz, final String urlOffset, final Map<String, Object> data)
|
||||
throws RESTErrorResponseExeption, IOException, InterruptedException {
|
||||
return modelSendMap("POST", clazz, urlOffset, data);
|
||||
}
|
||||
|
||||
public <T, U> T put(final Class<T> clazz, final String urlOffset, final U data) throws RESTErrorResponseExeption, IOException, InterruptedException {
|
||||
public <T, U> T put(final Class<T> clazz, final String urlOffset, final U data)
|
||||
throws RESTErrorResponseExeption, IOException, InterruptedException {
|
||||
return modelSend("PUT", clazz, urlOffset, data);
|
||||
}
|
||||
|
||||
public <T, U> T putJson(final Class<T> clazz, final String urlOffset, final String body) throws RESTErrorResponseExeption, IOException, InterruptedException {
|
||||
public <T, U> T putJson(final Class<T> clazz, final String urlOffset, final String body)
|
||||
throws RESTErrorResponseExeption, IOException, InterruptedException {
|
||||
return modelSendJson("PUT", clazz, urlOffset, body);
|
||||
}
|
||||
|
||||
public <T> T putMap(final Class<T> clazz, final String urlOffset, final Map<String, Object> data) throws RESTErrorResponseExeption, IOException, InterruptedException {
|
||||
public <T> T putMap(final Class<T> clazz, final String urlOffset, final Map<String, Object> data)
|
||||
throws RESTErrorResponseExeption, IOException, InterruptedException {
|
||||
return modelSendMap("PUT", clazz, urlOffset, data);
|
||||
}
|
||||
|
||||
public <T, U> T patch(final Class<T> clazz, final String urlOffset, final U data) throws RESTErrorResponseExeption, IOException, InterruptedException {
|
||||
public <T, U> T patch(final Class<T> clazz, final String urlOffset, final U data)
|
||||
throws RESTErrorResponseExeption, IOException, InterruptedException {
|
||||
return modelSend("PATCH", clazz, urlOffset, data);
|
||||
}
|
||||
|
||||
public <T, U> T patchJson(final Class<T> clazz, final String urlOffset, final String body) throws RESTErrorResponseExeption, IOException, InterruptedException {
|
||||
public <T, U> T patchJson(final Class<T> clazz, final String urlOffset, final String body)
|
||||
throws RESTErrorResponseExeption, IOException, InterruptedException {
|
||||
return modelSendJson("PATCH", clazz, urlOffset, body);
|
||||
}
|
||||
|
||||
public <T> T patchMap(final Class<T> clazz, final String urlOffset, final Map<String, Object> data) throws RESTErrorResponseExeption, IOException, InterruptedException {
|
||||
public <T> T patchMap(final Class<T> clazz, final String urlOffset, final Map<String, Object> data)
|
||||
throws RESTErrorResponseExeption, IOException, InterruptedException {
|
||||
return modelSendMap("PATCH", clazz, urlOffset, data);
|
||||
}
|
||||
|
||||
protected <T, U> T modelSend(final String model, final Class<T> clazz, final String urlOffset, final U data) throws RESTErrorResponseExeption, IOException, InterruptedException {
|
||||
protected <T, U> T modelSend(final String model, final Class<T> clazz, final String urlOffset, final U data)
|
||||
throws RESTErrorResponseExeption, IOException, InterruptedException {
|
||||
if (data == null) {
|
||||
return modelSendJson(model, clazz, urlOffset, null);
|
||||
} else {
|
||||
@@ -104,10 +119,12 @@ public class RESTApi {
|
||||
}
|
||||
}
|
||||
|
||||
protected <T, U> T modelSendJson(final String model, final Class<T> clazz, final String urlOffset, String body) throws RESTErrorResponseExeption, IOException, InterruptedException {
|
||||
protected <T, U> T modelSendJson(final String model, final Class<T> clazz, final String urlOffset, String body)
|
||||
throws RESTErrorResponseExeption, IOException, InterruptedException {
|
||||
final HttpClient client = HttpClient.newHttpClient();
|
||||
// client.property(HttpUrlConnectorProvider.SET_METHOD_WORKAROUND, true);
|
||||
Builder requestBuilding = HttpRequest.newBuilder().version(Version.HTTP_1_1).uri(URI.create(this.baseUrl + urlOffset));
|
||||
Builder requestBuilding = HttpRequest.newBuilder().version(Version.HTTP_1_1)
|
||||
.uri(URI.create(this.baseUrl + urlOffset));
|
||||
LOGGER.trace("call {}: {}", model, URI.create(this.baseUrl + urlOffset));
|
||||
LOGGER.trace("DATA: {}", body);
|
||||
if (this.token != null) {
|
||||
@@ -121,27 +138,37 @@ public class RESTApi {
|
||||
final HttpRequest request = requestBuilding.method(model, BodyPublishers.ofString(body)).build();
|
||||
final HttpResponse<String> httpResponse = client.send(request, HttpResponse.BodyHandlers.ofString());
|
||||
if (httpResponse.statusCode() < 200 || httpResponse.statusCode() >= 300) {
|
||||
LOGGER.trace("Receive Error: {}", httpResponse.body());
|
||||
try {
|
||||
final RESTErrorResponseExeption out = this.mapper.readValue(httpResponse.body(), RESTErrorResponseExeption.class);
|
||||
throw new RESTErrorResponseExeption(out.uuid, out.time, out.error, out.message, out.status, out.statusMessage);
|
||||
final RESTErrorResponseExeption out = this.mapper.readValue(httpResponse.body(),
|
||||
RESTErrorResponseExeption.class);
|
||||
throw out;
|
||||
} catch (final MismatchedInputException ex) {
|
||||
throw new IOException("Fail to get the data [" + httpResponse.statusCode() + "] " + httpResponse.body());
|
||||
throw new IOException(
|
||||
"Fail to get the data [" + httpResponse.statusCode() + "] " + httpResponse.body());
|
||||
} catch (final JsonParseException ex) {
|
||||
ex.printStackTrace();
|
||||
LOGGER.error("body: {}", httpResponse.body());
|
||||
throw new IOException("Fail to get the ERROR data [" + httpResponse.statusCode() + "] " + httpResponse.body());
|
||||
throw new IOException(
|
||||
"Fail to get the ERROR data [" + httpResponse.statusCode() + "] " + httpResponse.body());
|
||||
}
|
||||
}
|
||||
if (clazz.equals(String.class)) {
|
||||
return (T) httpResponse.body();
|
||||
}
|
||||
LOGGER.trace("Receive model: {} with data: '{}'", clazz.getCanonicalName(), httpResponse.body());
|
||||
return this.mapper.readValue(httpResponse.body(), clazz);
|
||||
}
|
||||
|
||||
protected <T> T modelSendMap(final String model, final Class<T> clazz, final String urlOffset, final Map<String, Object> data) throws RESTErrorResponseExeption, IOException, InterruptedException {
|
||||
protected <T> T modelSendMap(
|
||||
final String model,
|
||||
final Class<T> clazz,
|
||||
final String urlOffset,
|
||||
final Map<String, Object> data) throws RESTErrorResponseExeption, IOException, InterruptedException {
|
||||
final HttpClient client = HttpClient.newHttpClient();
|
||||
String body = null;
|
||||
Builder requestBuilding = HttpRequest.newBuilder().version(Version.HTTP_1_1).uri(URI.create(this.baseUrl + urlOffset));
|
||||
Builder requestBuilding = HttpRequest.newBuilder().version(Version.HTTP_1_1)
|
||||
.uri(URI.create(this.baseUrl + urlOffset));
|
||||
if (this.token != null) {
|
||||
requestBuilding = requestBuilding.header(HttpHeaders.AUTHORIZATION, "Bearer " + this.token);
|
||||
}
|
||||
@@ -155,10 +182,12 @@ public class RESTApi {
|
||||
final HttpResponse<String> httpResponse = client.send(request, HttpResponse.BodyHandlers.ofString());
|
||||
if (httpResponse.statusCode() < 200 || httpResponse.statusCode() >= 300) {
|
||||
try {
|
||||
final RESTErrorResponseExeption out = this.mapper.readValue(httpResponse.body(), RESTErrorResponseExeption.class);
|
||||
throw new RESTErrorResponseExeption(out.uuid, out.time, out.error, out.message, out.status, out.statusMessage);
|
||||
final RESTErrorResponseExeption out = this.mapper.readValue(httpResponse.body(),
|
||||
RESTErrorResponseExeption.class);
|
||||
throw out;
|
||||
} catch (final MismatchedInputException ex) {
|
||||
throw new IOException("Fail to get the data [" + httpResponse.statusCode() + "] " + httpResponse.body());
|
||||
throw new IOException(
|
||||
"Fail to get the data [" + httpResponse.statusCode() + "] " + httpResponse.body());
|
||||
}
|
||||
}
|
||||
if (clazz.equals(String.class)) {
|
||||
@@ -167,9 +196,11 @@ public class RESTApi {
|
||||
return this.mapper.readValue(httpResponse.body(), clazz);
|
||||
}
|
||||
|
||||
public <T, U> void delete(final Class<T> clazz, final String urlOffset) throws RESTErrorResponseExeption, IOException, InterruptedException {
|
||||
public <T, U> void delete(final Class<T> clazz, final String urlOffset)
|
||||
throws RESTErrorResponseExeption, IOException, InterruptedException {
|
||||
final HttpClient client = HttpClient.newHttpClient();
|
||||
Builder requestBuilding = HttpRequest.newBuilder().version(Version.HTTP_1_1).uri(URI.create(this.baseUrl + urlOffset));
|
||||
Builder requestBuilding = HttpRequest.newBuilder().version(Version.HTTP_1_1)
|
||||
.uri(URI.create(this.baseUrl + urlOffset));
|
||||
if (this.token != null) {
|
||||
requestBuilding = requestBuilding.header(HttpHeaders.AUTHORIZATION, "Bearer " + this.token);
|
||||
}
|
||||
@@ -177,10 +208,12 @@ public class RESTApi {
|
||||
final HttpResponse<String> httpResponse = client.send(request, HttpResponse.BodyHandlers.ofString());
|
||||
if (httpResponse.statusCode() < 200 || httpResponse.statusCode() >= 300) {
|
||||
try {
|
||||
final RESTErrorResponseExeption out = this.mapper.readValue(httpResponse.body(), RESTErrorResponseExeption.class);
|
||||
throw new RESTErrorResponseExeption(out.uuid, out.time, out.error, out.message, out.status, out.statusMessage);
|
||||
final RESTErrorResponseExeption out = this.mapper.readValue(httpResponse.body(),
|
||||
RESTErrorResponseExeption.class);
|
||||
throw out;
|
||||
} catch (final MismatchedInputException ex) {
|
||||
throw new IOException("Fail to get the data [" + httpResponse.statusCode() + "] " + httpResponse.body());
|
||||
throw new IOException(
|
||||
"Fail to get the data [" + httpResponse.statusCode() + "] " + httpResponse.body());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,8 +2,14 @@ package org.kar.archidata.tools;
|
||||
|
||||
import java.math.BigInteger;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.time.Instant;
|
||||
import java.time.LocalDate;
|
||||
import java.time.ZoneOffset;
|
||||
import java.time.temporal.ChronoUnit;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.kar.archidata.exception.DataAccessException;
|
||||
|
||||
public class UuidUtils {
|
||||
|
||||
public static UUID asUuid(final BigInteger bigInteger) {
|
||||
@@ -12,7 +18,10 @@ public class UuidUtils {
|
||||
return new UUID(mostSignificantBits, leastSignificantBits);
|
||||
}
|
||||
|
||||
public static UUID asUuid(final byte[] bytes) {
|
||||
public static UUID asUuid(final byte[] bytes) throws DataAccessException {
|
||||
if (bytes.length != 16) {
|
||||
throw new DataAccessException("Try to convert wrong size of UUID: " + bytes.length + " expected 16.");
|
||||
}
|
||||
final ByteBuffer bb = ByteBuffer.wrap(bytes);
|
||||
final long firstLong = bb.getLong();
|
||||
final long secondLong = bb.getLong();
|
||||
@@ -25,4 +34,41 @@ public class UuidUtils {
|
||||
bb.putLong(uuid.getLeastSignificantBits());
|
||||
return bb.array();
|
||||
}
|
||||
|
||||
private static class Generator {
|
||||
private long base;
|
||||
private final long offset;
|
||||
private long previous;
|
||||
|
||||
public Generator() {
|
||||
this.offset = System.currentTimeMillis();
|
||||
// The local method never generate new UUID in the past, then we use the creation function time to prevent 2038 error
|
||||
final Instant startingUUID = LocalDate.of(2024, 03, 19).atStartOfDay(ZoneOffset.UTC).toInstant();
|
||||
this.base = startingUUID.until(Instant.now(), ChronoUnit.SECONDS);
|
||||
final String serveurBaseUUID = System.getenv("UUID_SERVER_ID");
|
||||
if (serveurBaseUUID != null) {
|
||||
long serverId = Long.valueOf(serveurBaseUUID);
|
||||
serverId %= 0xFFFF;
|
||||
this.base += (serverId << (64 - 16));
|
||||
} else {
|
||||
this.base += (1L << (64 - 16));
|
||||
}
|
||||
}
|
||||
|
||||
public synchronized UUID next() {
|
||||
long tmp = System.currentTimeMillis();
|
||||
if (this.previous >= tmp) {
|
||||
tmp = this.previous + 1;
|
||||
}
|
||||
this.previous = tmp;
|
||||
tmp -= this.offset;
|
||||
return new UUID(Long.reverseBytes(tmp), this.base);
|
||||
}
|
||||
}
|
||||
|
||||
private static Generator generator = new Generator();
|
||||
|
||||
public static UUID nextUUID() {
|
||||
return generator.next();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -41,7 +41,7 @@ export interface RESTModel {
|
||||
accept?: HTTPMimeType;
|
||||
// Content of the local data.
|
||||
contentType?: HTTPMimeType;
|
||||
// Mode of the TOKEN in urk or Header
|
||||
// Mode of the TOKEN in URL or Header (?token:${tokenInUrl})
|
||||
tokenInUrl?: boolean;
|
||||
}
|
||||
|
||||
@@ -67,27 +67,57 @@ export function isArrayOf<TYPE>(
|
||||
return true;
|
||||
}
|
||||
|
||||
export type RESTRequestType = {
|
||||
function isNullOrUndefined(data: any): data is undefined | null {
|
||||
return data === undefined || data === null;
|
||||
}
|
||||
|
||||
// generic progression callback
|
||||
export type ProgressCallback = (count: number, total: number) => void;
|
||||
|
||||
export interface RESTAbort {
|
||||
abort?: () => boolean
|
||||
}
|
||||
|
||||
|
||||
// Rest generic callback have a basic model to upload and download advancement.
|
||||
export interface RESTCallbacks {
|
||||
progressUpload?: ProgressCallback,
|
||||
progressDownload?: ProgressCallback,
|
||||
abortHandle?: RESTAbort,
|
||||
};
|
||||
|
||||
export interface RESTRequestType {
|
||||
restModel: RESTModel,
|
||||
restConfig: RESTConfig,
|
||||
data?: any,
|
||||
params?: object,
|
||||
queries?: object,
|
||||
callback?: RESTCallbacks,
|
||||
};
|
||||
|
||||
function replaceAll(input, searchValue, replaceValue) {
|
||||
return input.split(searchValue).join(replaceValue);
|
||||
}
|
||||
|
||||
function removeTrailingSlashes(input: string): string {
|
||||
if (isNullOrUndefined(input)) {
|
||||
return "undefined";
|
||||
}
|
||||
return input.replace(/\/+$/, '');
|
||||
}
|
||||
function removeLeadingSlashes(input: string): string {
|
||||
if (isNullOrUndefined(input)) {
|
||||
return "";
|
||||
}
|
||||
return input.replace(/^\/+/, '');
|
||||
}
|
||||
|
||||
export function RESTUrl({ restModel, restConfig, data, params, queries }: RESTRequestType): string {
|
||||
export function RESTUrl({ restModel, restConfig, params, queries }: RESTRequestType): string {
|
||||
// Create the URL PATH:
|
||||
let generateUrl = `${removeTrailingSlashes(restConfig.server)}/${removeLeadingSlashes(restModel.endPoint)}`;
|
||||
if (params !== undefined) {
|
||||
for (let key of Object.keys(params)) {
|
||||
generateUrl = generateUrl.replaceAll(`{${key}}`, `${params[key]}`);
|
||||
generateUrl = replaceAll(generateUrl, `{${key}}`, `${params[key]}`);
|
||||
}
|
||||
}
|
||||
if (queries === undefined && (restConfig.token === undefined || restModel.tokenInUrl !== true)) {
|
||||
@@ -112,7 +142,92 @@ export function RESTUrl({ restModel, restConfig, data, params, queries }: RESTRe
|
||||
return generateUrl + "?" + searchParams.toString();
|
||||
}
|
||||
|
||||
export function RESTRequest({ restModel, restConfig, data, params, queries }: RESTRequestType): Promise<ModelResponseHttp> {
|
||||
|
||||
export function fetchProgress(generateUrl: string, { method, headers, body }: {
|
||||
method: HTTPRequestModel,
|
||||
headers: any,
|
||||
body: any,
|
||||
}, { progressUpload, progressDownload, abortHandle }: RESTCallbacks): Promise<Response> {
|
||||
const xhr = {
|
||||
io: new XMLHttpRequest()
|
||||
}
|
||||
return new Promise((resolve, reject) => {
|
||||
// Stream the upload progress
|
||||
if (progressUpload) {
|
||||
xhr.io.upload.addEventListener("progress", (dataEvent) => {
|
||||
if (dataEvent.lengthComputable) {
|
||||
//console.log(` ==> has a progress event: ${dataEvent.loaded} / ${dataEvent.total}`);
|
||||
progressUpload(dataEvent.loaded, dataEvent.total);
|
||||
}
|
||||
});
|
||||
}
|
||||
// Stream the download progress
|
||||
if (progressDownload) {
|
||||
xhr.io.addEventListener("progress", (dataEvent) => {
|
||||
if (dataEvent.lengthComputable) {
|
||||
//console.log(` ==> download progress:: ${dataEvent.loaded} / ${dataEvent.total}`);
|
||||
progressUpload(dataEvent.loaded, dataEvent.total);
|
||||
}
|
||||
});
|
||||
}
|
||||
if (abortHandle) {
|
||||
abortHandle.abort = () => {
|
||||
if (xhr.io) {
|
||||
console.log(`Request abort on the XMLHttpRequest: ${generateUrl}`);
|
||||
xhr.io.abort();
|
||||
return true;
|
||||
}
|
||||
console.log(`Request abort (FAIL) on the XMLHttpRequest: ${generateUrl}`);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
// Check if we have an internal Fail:
|
||||
xhr.io.addEventListener('error', () => {
|
||||
xhr.io = undefined;
|
||||
reject(new TypeError('Failed to fetch'))
|
||||
});
|
||||
|
||||
// Capture the end of the stream
|
||||
xhr.io.addEventListener("loadend", () => {
|
||||
if (xhr.io.readyState !== XMLHttpRequest.DONE) {
|
||||
//console.log(` ==> READY state`);
|
||||
return;
|
||||
}
|
||||
if (xhr.io.status === 0) {
|
||||
//the stream has been aborted
|
||||
reject(new TypeError('Fetch has been aborted'));
|
||||
return;
|
||||
}
|
||||
// Stream is ended, transform in a generic response:
|
||||
const response = new Response(xhr.io.response, {
|
||||
status: xhr.io.status,
|
||||
statusText: xhr.io.statusText
|
||||
});
|
||||
const headersArray = replaceAll(xhr.io.getAllResponseHeaders().trim(), "\r\n", "\n").split('\n');
|
||||
headersArray.forEach(function (header) {
|
||||
const firstColonIndex = header.indexOf(':');
|
||||
if (firstColonIndex !== -1) {
|
||||
var key = header.substring(0, firstColonIndex).trim();
|
||||
var value = header.substring(firstColonIndex + 1).trim();
|
||||
response.headers.set(key, value);
|
||||
} else {
|
||||
response.headers.set(header, "");
|
||||
}
|
||||
});
|
||||
xhr.io = undefined;
|
||||
resolve(response);
|
||||
});
|
||||
xhr.io.open(method, generateUrl, true);
|
||||
if (!isNullOrUndefined(headers)) {
|
||||
for (const [key, value] of Object.entries(headers)) {
|
||||
xhr.io.setRequestHeader(key, value as string);
|
||||
}
|
||||
}
|
||||
xhr.io.send(body);
|
||||
});
|
||||
}
|
||||
|
||||
export function RESTRequest({ restModel, restConfig, data, params, queries, callback }: RESTRequestType): Promise<ModelResponseHttp> {
|
||||
// Create the URL PATH:
|
||||
let generateUrl = RESTUrl({ restModel, restConfig, data, params, queries });
|
||||
let headers: any = {};
|
||||
@@ -139,16 +254,30 @@ export function RESTRequest({ restModel, restConfig, data, params, queries }: RE
|
||||
}
|
||||
body = formData
|
||||
}
|
||||
console.log(`Call ${generateUrl}`)
|
||||
return new Promise((resolve, reject) => {
|
||||
fetch(generateUrl, {
|
||||
let action: undefined | Promise<Response> = undefined;
|
||||
if (isNullOrUndefined(callback)
|
||||
|| (isNullOrUndefined(callback.progressDownload)
|
||||
&& isNullOrUndefined(callback.progressUpload)
|
||||
&& isNullOrUndefined(callback.abortHandle))) {
|
||||
// No information needed: call the generic fetch interface
|
||||
action = fetch(generateUrl, {
|
||||
method: restModel.requestType,
|
||||
headers,
|
||||
body,
|
||||
}).then((response: Response) => {
|
||||
});
|
||||
} else {
|
||||
// need progression information: call old fetch model (XMLHttpRequest) that permit to keep % upload and % download for HTTP1.x
|
||||
action = fetchProgress(generateUrl, {
|
||||
method: restModel.requestType ?? HTTPRequestModel.GET,
|
||||
headers,
|
||||
body,
|
||||
}, callback);
|
||||
}
|
||||
action.then((response: Response) => {
|
||||
if (response.status >= 200 && response.status <= 299) {
|
||||
const contentType = response.headers.get('Content-Type');
|
||||
if (restModel.accept !== contentType) {
|
||||
if (!isNullOrUndefined(restModel.accept) && restModel.accept !== contentType) {
|
||||
reject({
|
||||
time: Date().toString(),
|
||||
status: 901,
|
||||
@@ -190,16 +319,21 @@ export function RESTRequest({ restModel, restConfig, data, params, queries }: RE
|
||||
status: 999,
|
||||
error: error,
|
||||
statusMessage: "Fetch catch error",
|
||||
message: "http-wrapper.ts detect an error in the fetch request"
|
||||
message: "rest-tools.ts detect an error in the fetch request"
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
||||
export function RESTRequestJson<TYPE>(request: RESTRequestType, checker: (data: any) => data is TYPE): Promise<TYPE> {
|
||||
return new Promise((resolve, reject) => {
|
||||
RESTRequest(request).then((value: ModelResponseHttp) => {
|
||||
if (checker(value.data)) {
|
||||
if (isNullOrUndefined(checker)) {
|
||||
console.log(`Have no check of MODEL in API: ${RESTUrl(request)}`);
|
||||
resolve(value.data);
|
||||
} else if (checker(value.data)) {
|
||||
resolve(value.data);
|
||||
} else {
|
||||
reject({
|
||||
|
||||
@@ -12,11 +12,13 @@ public class StepwiseExtension implements ExecutionCondition, TestExecutionExcep
|
||||
final ExtensionContext.Store store = storeFor(extensionContext, namespace);
|
||||
final String value = store.get(StepwiseExtension.class, String.class);
|
||||
return value == null ? ConditionEvaluationResult.enabled("No test failures in stepwise tests")
|
||||
: ConditionEvaluationResult.disabled(String.format("Stepwise test disabled due to previous failure in '%s'", value));
|
||||
: ConditionEvaluationResult
|
||||
.disabled(String.format("Stepwise test disabled due to previous failure in '%s'", value));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void handleTestExecutionException(final ExtensionContext extensionContext, final Throwable throwable) throws Throwable {
|
||||
public void handleTestExecutionException(final ExtensionContext extensionContext, final Throwable throwable)
|
||||
throws Throwable {
|
||||
final ExtensionContext.Namespace namespace = namespaceFor(extensionContext);
|
||||
final ExtensionContext.Store store = storeFor(extensionContext, namespace);
|
||||
store.put(StepwiseExtension.class, extensionContext.getDisplayName());
|
||||
@@ -27,7 +29,9 @@ public class StepwiseExtension implements ExecutionCondition, TestExecutionExcep
|
||||
return ExtensionContext.Namespace.create(StepwiseExtension.class, extensionContext.getParent());
|
||||
}
|
||||
|
||||
private ExtensionContext.Store storeFor(final ExtensionContext extensionContext, final ExtensionContext.Namespace namespace) {
|
||||
private ExtensionContext.Store storeFor(
|
||||
final ExtensionContext extensionContext,
|
||||
final ExtensionContext.Namespace namespace) {
|
||||
return extensionContext.getParent().get().getStore(namespace);
|
||||
}
|
||||
}
|
||||
@@ -53,7 +53,7 @@ public class TestJson {
|
||||
final List<String> sqlCommand = DataFactory.createTable(SerializeAsJson.class);
|
||||
for (final String elem : sqlCommand) {
|
||||
LOGGER.debug("request: '{}'", elem);
|
||||
DataAccess.executeSimpleQuerry(elem);
|
||||
DataAccess.executeSimpleQuery(elem);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -53,7 +53,7 @@ public class TestListJson {
|
||||
final List<String> sqlCommand = DataFactory.createTable(SerializeListAsJson.class);
|
||||
for (final String elem : sqlCommand) {
|
||||
LOGGER.debug("request: '{}'", elem);
|
||||
DataAccess.executeSimpleQuerry(elem);
|
||||
DataAccess.executeSimpleQuery(elem);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -57,7 +57,7 @@ public class TestManyToMany {
|
||||
sqlCommand.addAll(sqlCommand2);
|
||||
for (final String elem : sqlCommand) {
|
||||
LOGGER.debug("request: '{}'", elem);
|
||||
DataAccess.executeSimpleQuerry(elem);
|
||||
DataAccess.executeSimpleQuery(elem);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -56,7 +56,7 @@ public class TestManyToOne {
|
||||
sqlCommand.addAll(sqlCommand2);
|
||||
for (final String elem : sqlCommand) {
|
||||
LOGGER.debug("request: '{}'", elem);
|
||||
DataAccess.executeSimpleQuerry(elem);
|
||||
DataAccess.executeSimpleQuery(elem);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -51,7 +51,7 @@ public class TestOneToMany {
|
||||
final List<String> sqlCommand = DataFactory.createTable(TypesTable.class);
|
||||
for (final String elem : sqlCommand) {
|
||||
LOGGER.debug("request: '{}'", elem);
|
||||
DataAccess.executeSimpleQuerry(elem);
|
||||
DataAccess.executeSimpleQuery(elem);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -52,7 +52,7 @@ public class TestRawQuery {
|
||||
final List<String> sqlCommand = DataFactory.createTable(TypesTable.class);
|
||||
for (final String elem : sqlCommand) {
|
||||
LOGGER.debug("request: '{}'", elem);
|
||||
DataAccess.executeSimpleQuerry(elem);
|
||||
DataAccess.executeSimpleQuery(elem);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -83,7 +83,7 @@ public class TestRawQuery {
|
||||
test.floatData = 7.0F;
|
||||
DataAccess.insert(test);
|
||||
{
|
||||
String querry = """
|
||||
String query = """
|
||||
SELECT *
|
||||
FROM TypesTable
|
||||
WHERE `intData` = ?
|
||||
@@ -91,7 +91,7 @@ public class TestRawQuery {
|
||||
""";
|
||||
List<Object> parameters = List.of(Integer.valueOf(99));
|
||||
// Try to retrieve all the data:
|
||||
final List<TypesTable> retrieve = DataAccess.query(TypesTable.class, querry, parameters);
|
||||
final List<TypesTable> retrieve = DataAccess.query(TypesTable.class, query, parameters);
|
||||
|
||||
Assertions.assertNotNull(retrieve);
|
||||
Assertions.assertEquals(3, retrieve.size());
|
||||
@@ -102,7 +102,7 @@ public class TestRawQuery {
|
||||
}
|
||||
{
|
||||
|
||||
String querry = """
|
||||
String query = """
|
||||
SELECT DISTINCT intData
|
||||
FROM TypesTable
|
||||
WHERE `intData` = ?
|
||||
@@ -110,7 +110,7 @@ public class TestRawQuery {
|
||||
""";
|
||||
List<Object> parameters = List.of(Integer.valueOf(99));
|
||||
// Try to retrieve all the data:
|
||||
final List<TypesTable> retrieve = DataAccess.query(TypesTable.class, querry, parameters);
|
||||
final List<TypesTable> retrieve = DataAccess.query(TypesTable.class, query, parameters);
|
||||
|
||||
Assertions.assertNotNull(retrieve);
|
||||
Assertions.assertEquals(1, retrieve.size());
|
||||
|
||||
@@ -65,7 +65,7 @@ public class TestSimpleTable {
|
||||
final List<String> sqlCommand = DataFactory.createTable(SimpleTable.class);
|
||||
for (final String elem : sqlCommand) {
|
||||
LOGGER.debug("request: '{}'", elem);
|
||||
DataAccess.executeSimpleQuerry(elem);
|
||||
DataAccess.executeSimpleQuery(elem);
|
||||
}
|
||||
final SimpleTable test = new SimpleTable();
|
||||
test.data = TestSimpleTable.DATA_INJECTED;
|
||||
@@ -91,7 +91,8 @@ public class TestSimpleTable {
|
||||
@Test
|
||||
public void testReadAllValuesUnreadable() throws Exception {
|
||||
// check the full values
|
||||
final SimpleTable retrieve = DataAccess.get(SimpleTable.class, TestSimpleTable.idOfTheObject, QueryOptions.READ_ALL_COLOMN);
|
||||
final SimpleTable retrieve = DataAccess.get(SimpleTable.class, TestSimpleTable.idOfTheObject,
|
||||
QueryOptions.READ_ALL_COLOMN);
|
||||
|
||||
Assertions.assertNotNull(retrieve);
|
||||
Assertions.assertNotNull(retrieve.id);
|
||||
@@ -114,7 +115,8 @@ public class TestSimpleTable {
|
||||
final SimpleTable test = new SimpleTable();
|
||||
test.data = TestSimpleTable.DATA_INJECTED_2;
|
||||
DataAccess.update(test, TestSimpleTable.idOfTheObject, List.of("data"));
|
||||
final SimpleTable retrieve = DataAccess.get(SimpleTable.class, TestSimpleTable.idOfTheObject, QueryOptions.READ_ALL_COLOMN);
|
||||
final SimpleTable retrieve = DataAccess.get(SimpleTable.class, TestSimpleTable.idOfTheObject,
|
||||
QueryOptions.READ_ALL_COLOMN);
|
||||
Assertions.assertNotNull(retrieve);
|
||||
Assertions.assertNotNull(retrieve.id);
|
||||
Assertions.assertEquals(TestSimpleTable.idOfTheObject, retrieve.id);
|
||||
@@ -139,7 +141,8 @@ public class TestSimpleTable {
|
||||
public void testReadDeletedObject() throws Exception {
|
||||
|
||||
// check if we set get deleted element
|
||||
final SimpleTable retrieve = DataAccess.get(SimpleTable.class, TestSimpleTable.idOfTheObject, QueryOptions.ACCESS_DELETED_ITEMS);
|
||||
final SimpleTable retrieve = DataAccess.get(SimpleTable.class, TestSimpleTable.idOfTheObject,
|
||||
QueryOptions.ACCESS_DELETED_ITEMS);
|
||||
Assertions.assertNull(retrieve);
|
||||
|
||||
}
|
||||
@@ -148,7 +151,8 @@ public class TestSimpleTable {
|
||||
@Test
|
||||
public void testReadAllValuesUnreadableOfDeletedObject() throws Exception {
|
||||
// check if we set get deleted element with all data
|
||||
final SimpleTable retrieve = DataAccess.get(SimpleTable.class, TestSimpleTable.idOfTheObject, QueryOptions.ACCESS_DELETED_ITEMS, QueryOptions.READ_ALL_COLOMN);
|
||||
final SimpleTable retrieve = DataAccess.get(SimpleTable.class, TestSimpleTable.idOfTheObject,
|
||||
QueryOptions.ACCESS_DELETED_ITEMS, QueryOptions.READ_ALL_COLOMN);
|
||||
Assertions.assertNull(retrieve);
|
||||
|
||||
}
|
||||
|
||||
@@ -65,7 +65,7 @@ public class TestSimpleTableSoftDelete {
|
||||
final List<String> sqlCommand = DataFactory.createTable(SimpleTableSoftDelete.class);
|
||||
for (final String elem : sqlCommand) {
|
||||
LOGGER.debug("request: '{}'", elem);
|
||||
DataAccess.executeSimpleQuerry(elem);
|
||||
DataAccess.executeSimpleQuery(elem);
|
||||
}
|
||||
final SimpleTableSoftDelete test = new SimpleTableSoftDelete();
|
||||
test.data = TestSimpleTableSoftDelete.DATA_INJECTED;
|
||||
@@ -92,14 +92,16 @@ public class TestSimpleTableSoftDelete {
|
||||
@Test
|
||||
public void testReadAllValuesUnreadable() throws Exception {
|
||||
// check the full values
|
||||
final SimpleTableSoftDelete retrieve = DataAccess.get(SimpleTableSoftDelete.class, TestSimpleTableSoftDelete.idOfTheObject, QueryOptions.READ_ALL_COLOMN);
|
||||
final SimpleTableSoftDelete retrieve = DataAccess.get(SimpleTableSoftDelete.class,
|
||||
TestSimpleTableSoftDelete.idOfTheObject, QueryOptions.READ_ALL_COLOMN);
|
||||
|
||||
Assertions.assertNotNull(retrieve);
|
||||
Assertions.assertNotNull(retrieve.id);
|
||||
Assertions.assertEquals(TestSimpleTableSoftDelete.idOfTheObject, retrieve.id);
|
||||
Assertions.assertEquals(TestSimpleTableSoftDelete.DATA_INJECTED, retrieve.data);
|
||||
Assertions.assertNotNull(retrieve.createdAt);
|
||||
LOGGER.info("start @ {} create @ {}", retrieve.createdAt.toInstant(), TestSimpleTableSoftDelete.startAction.toInstant());
|
||||
LOGGER.info("start @ {} create @ {}", retrieve.createdAt.toInstant(),
|
||||
TestSimpleTableSoftDelete.startAction.toInstant());
|
||||
// Gros travail sur les timestamp a faire pour que ce soit correct ...
|
||||
// Assertions.assertTrue(retrieve.createdAt.after(this.startAction));
|
||||
Assertions.assertNotNull(retrieve.updatedAt);
|
||||
@@ -118,7 +120,9 @@ public class TestSimpleTableSoftDelete {
|
||||
final SimpleTableSoftDelete test = new SimpleTableSoftDelete();
|
||||
test.data = TestSimpleTableSoftDelete.DATA_INJECTED_2;
|
||||
DataAccess.update(test, TestSimpleTableSoftDelete.idOfTheObject, List.of("data"));
|
||||
final SimpleTableSoftDelete retrieve = DataAccess.get(SimpleTableSoftDelete.class, TestSimpleTableSoftDelete.idOfTheObject, QueryOptions.ACCESS_DELETED_ITEMS, QueryOptions.READ_ALL_COLOMN);
|
||||
final SimpleTableSoftDelete retrieve = DataAccess.get(SimpleTableSoftDelete.class,
|
||||
TestSimpleTableSoftDelete.idOfTheObject, QueryOptions.ACCESS_DELETED_ITEMS,
|
||||
QueryOptions.READ_ALL_COLOMN);
|
||||
Assertions.assertNotNull(retrieve);
|
||||
Assertions.assertNotNull(retrieve.id);
|
||||
Assertions.assertEquals(TestSimpleTableSoftDelete.idOfTheObject, retrieve.id);
|
||||
@@ -141,7 +145,8 @@ public class TestSimpleTableSoftDelete {
|
||||
}
|
||||
// Delete the entry:
|
||||
DataAccess.delete(SimpleTableSoftDelete.class, TestSimpleTableSoftDelete.idOfTheObject);
|
||||
final SimpleTableSoftDelete retrieve = DataAccess.get(SimpleTableSoftDelete.class, TestSimpleTableSoftDelete.idOfTheObject);
|
||||
final SimpleTableSoftDelete retrieve = DataAccess.get(SimpleTableSoftDelete.class,
|
||||
TestSimpleTableSoftDelete.idOfTheObject);
|
||||
Assertions.assertNull(retrieve);
|
||||
}
|
||||
|
||||
@@ -150,7 +155,8 @@ public class TestSimpleTableSoftDelete {
|
||||
public void testReadDeletedObject() throws Exception {
|
||||
|
||||
// check if we set get deleted element
|
||||
final SimpleTableSoftDelete retrieve = DataAccess.get(SimpleTableSoftDelete.class, TestSimpleTableSoftDelete.idOfTheObject, QueryOptions.ACCESS_DELETED_ITEMS);
|
||||
final SimpleTableSoftDelete retrieve = DataAccess.get(SimpleTableSoftDelete.class,
|
||||
TestSimpleTableSoftDelete.idOfTheObject, QueryOptions.ACCESS_DELETED_ITEMS);
|
||||
Assertions.assertNotNull(retrieve);
|
||||
Assertions.assertNotNull(retrieve.id);
|
||||
Assertions.assertEquals(TestSimpleTableSoftDelete.idOfTheObject, retrieve.id);
|
||||
@@ -165,7 +171,9 @@ public class TestSimpleTableSoftDelete {
|
||||
@Test
|
||||
public void testReadAllValuesUnreadableOfDeletedObject() throws Exception {
|
||||
// check if we set get deleted element with all data
|
||||
final SimpleTableSoftDelete retrieve = DataAccess.get(SimpleTableSoftDelete.class, TestSimpleTableSoftDelete.idOfTheObject, QueryOptions.ACCESS_DELETED_ITEMS, QueryOptions.READ_ALL_COLOMN);
|
||||
final SimpleTableSoftDelete retrieve = DataAccess.get(SimpleTableSoftDelete.class,
|
||||
TestSimpleTableSoftDelete.idOfTheObject, QueryOptions.ACCESS_DELETED_ITEMS,
|
||||
QueryOptions.READ_ALL_COLOMN);
|
||||
Assertions.assertNotNull(retrieve);
|
||||
Assertions.assertNotNull(retrieve.id);
|
||||
Assertions.assertEquals(TestSimpleTableSoftDelete.idOfTheObject, retrieve.id);
|
||||
|
||||
@@ -53,7 +53,7 @@ public class TestTypeEnum1 {
|
||||
final List<String> sqlCommand = DataFactory.createTable(TypesEnum1.class);
|
||||
for (final String elem : sqlCommand) {
|
||||
LOGGER.debug("request: '{}'", elem);
|
||||
DataAccess.executeSimpleQuerry(elem);
|
||||
DataAccess.executeSimpleQuery(elem);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -53,7 +53,7 @@ public class TestTypeEnum2 {
|
||||
final List<String> sqlCommand = DataFactory.createTable(TypesEnum2.class);
|
||||
for (final String elem : sqlCommand) {
|
||||
LOGGER.debug("request: '{}'", elem);
|
||||
DataAccess.executeSimpleQuerry(elem);
|
||||
DataAccess.executeSimpleQuery(elem);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -57,7 +57,7 @@ public class TestTypes {
|
||||
final List<String> sqlCommand = DataFactory.createTable(TypesTable.class);
|
||||
for (final String elem : sqlCommand) {
|
||||
LOGGER.debug("request: '{}'", elem);
|
||||
DataAccess.executeSimpleQuerry(elem);
|
||||
DataAccess.executeSimpleQuery(elem);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -267,7 +267,8 @@ public class TestTypes {
|
||||
Assertions.assertNotNull(retrieve.timeStampData);
|
||||
// Can not compare the exact timestamp due to aproximation and model of storing data :
|
||||
// Assertions.assertEquals(insertedData.timeStampData, retrieve.timeStampData);
|
||||
Assertions.assertEquals(insertedData.timeStampData.toInstant().toEpochMilli(), retrieve.timeStampData.toInstant().toEpochMilli());
|
||||
Assertions.assertEquals(insertedData.timeStampData.toInstant().toEpochMilli(),
|
||||
retrieve.timeStampData.toInstant().toEpochMilli());
|
||||
|
||||
DataAccess.delete(TypesTable.class, insertedData.id);
|
||||
}
|
||||
@@ -449,7 +450,7 @@ public class TestTypes {
|
||||
"varcharData": null
|
||||
}
|
||||
""";
|
||||
final int nbUpdate = DataAccess.updateWithJson(TypesTable.class, insertedData.id, jsonData, null);
|
||||
final int nbUpdate = DataAccess.updateWithJson(TypesTable.class, insertedData.id, jsonData);
|
||||
Assertions.assertEquals(1, nbUpdate);
|
||||
|
||||
// Get new data
|
||||
|
||||
@@ -1 +1 @@
|
||||
0.7.0
|
||||
0.8.9
|
||||
|
||||
Reference in New Issue
Block a user