[RELEASE] create version v0.13.0

[FEAT] add link of List<UUID> that is decorate with @ManyToOne, or @ManyToMany or @OneToMany
[FEAT] add generation of dot files
2024-06-25 15:47:53 +02:00 · 2024-06-20 00:10:22 +02:00 · 2024-06-20 00:10:22 +02:00 · 2024-06-13 08:27:33 +02:00 · 2024-06-12 20:08:26 +02:00 · 2024-06-12 00:55:51 +02:00
172 changed files with 10513 additions and 1414 deletions
--- a/.classpath
+++ b/.classpath
@@ -30,5 +30,16 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" path="target/generated-sources/annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
+		<attributes>
+			<attribute name="test" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
--- a/.island/release.bash
+++ b/.island/release.bash
@@ -1,4 +1,14 @@
 #!/bin/bash
+version_file="version.txt"

-mvn versions:set -DnewVersion=$(cat version.txt)
-
+# update the Maven version number
+mvn versions:set -DnewVersion=$(sed 's/dev/SNAPSHOT/g' $version_file)
+if grep -q "DEV" "$version_file"; then
+    # update all versions release of dependency
+    mvn versions:use-latest-releases
+    # update our manage dependency as snapshoot
+    mvn versions:use-latest-versions -Dincludes=kangaroo-and-rabbit
+else
+    # update our manage dependency as release (must be done before)
+    mvn versions:use-latest-releases -Dincludes=kangaroo-and-rabbit
+fi
--- a/.project
+++ b/.project
@@ -10,6 +10,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
@@ -19,6 +24,7 @@
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature>
 	</natures>
 	<filteredResources>
 		<filter>
--- a/Formatter.xml
+++ b/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>
--- a/README.md
+++ b/README.md
@@ -93,7 +93,12 @@ Enable the pre-commit checker

 > **_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

+Run Spot-bug:
+------------

+```bash
+mvn spotbugs:check
+```

 Add Gitea in the dependency for the registry:
 =============================================
--- a/doc/SQL_wrapper.md
+++ b/doc/SQL_wrapper.md
@@ -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);
+                )
+            )
+        )
+    );
+```
+
+
--- a/doc/TUTORIAL_01_first_install.md
+++ b/doc/TUTORIAL_01_first_install.md
@@ -0,0 +1,3 @@
+Basic tutorial
+==============
+
--- a/doc/data_model.md
+++ b/doc/data_model.md
@@ -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
+====================
+
--- a/doc/index.md
+++ b/doc/index.md
@@ -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)
--- a/doc/migration.md
+++ b/doc/migration.md
@@ -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).
+
--- a/doc/typescript_api_generation.md
+++ b/doc/typescript_api_generation.md
@@ -0,0 +1,5 @@
+TypeScript Api generation
+=========================
+
+
+
--- a/pom.xml
+++ b/pom.xml
@@ -3,8 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>kangaroo-and-rabbit</groupId>
 	<artifactId>archidata</artifactId>
-	<version>0.6.1</version>
+	<version>0.13.0</version>
 	<properties>
+		<java.version>21</java.version>
 		<maven.compiler.version>3.1</maven.compiler.version>
 		<maven.compiler.source>21</maven.compiler.source>
 		<maven.compiler.target>21</maven.compiler.target>
@@ -45,12 +46,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 +79,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,41 +108,58 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.16.0</version>
+			<version>2.17.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.dataformat</groupId>
+			<artifactId>jackson-dataformat-csv</artifactId>
+			<version>2.17.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.datatype</groupId>
+			<artifactId>jackson-datatype-jsr310</artifactId>
+			<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>
 			<artifactId>sqlite-jdbc</artifactId>
-			<version>3.40.0.0</version>
+			<version>3.46.0.0</version>
 		</dependency>
 		<!-- Interface for JWT token -->
 		<dependency>
 			<groupId>com.nimbusds</groupId>
 			<artifactId>nimbus-jose-jwt</artifactId>
-			<version>9.37.1</version>
+			<version>9.39.3</version>
 		</dependency>
 		<dependency>
 			<groupId>jakarta.persistence</groupId>
 			<artifactId>jakarta.persistence-api</artifactId>
-			<version>3.2.0-M1</version>
+			<version>3.2.0</version>
 		</dependency>
 		<!-- Swagger dependencies -->
 		<dependency>
 			<groupId>io.swagger.core.v3</groupId>
 			<artifactId>swagger-jaxrs2-jakarta</artifactId>
-			<version>2.1.10</version>
+			<version>2.2.22</version>
+		</dependency>
+		<!-- spotbug tooling -->
+		<dependency>
+			<groupId>com.github.spotbugs</groupId>
+			<artifactId>spotbugs-annotations</artifactId>
+			<version>4.8.5</version>
+			<scope>compile</scope>
 		</dependency>
 		<!--
 		************************************************************ 
@@ -151,29 +169,33 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
-			<version>5.10.1</version>
+			<version>5.11.0-M2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>
-			<version>5.10.1</version>
-	        <scope>test</scope>
-	    </dependency>
-	    <dependency>
-		    <groupId>net.revelc.code.formatter</groupId>
-		    <artifactId>formatter-maven-plugin</artifactId>
-		    <version>2.23.0</version>
+			<version>5.11.0-M2</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
-		    <groupId>org.apache.maven.plugins</groupId>
-		    <artifactId>maven-checkstyle-plugin</artifactId>
-		    <version>3.3.1</version>
+			<groupId>net.revelc.code.formatter</groupId>
+			<artifactId>formatter-maven-plugin</artifactId>
+			<version>2.24.0</version>
 		</dependency>
-    </dependencies>
-
+		<dependency>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-checkstyle-plugin</artifactId>
+			<version>3.3.1</version>
+		</dependency>
+	</dependencies>
 	<build>
 		<sourceDirectory>src</sourceDirectory>
+		<resources>
+			<resource>
+				<directory>${basedir}/src/resources</directory>
+			</resource>
+		</resources>
 		<testSourceDirectory>test/src</testSourceDirectory>
 		<testResources>
 			<testResource>
@@ -252,7 +274,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>
-		    	<version>3.3.1</version>
+				<version>3.3.1</version>
 				<configuration>
 					<configLocation>CheckStyle.xml</configLocation>
 					<consoleOutput>true</consoleOutput>
@@ -264,7 +286,7 @@
 			<plugin>
 				<groupId>net.revelc.code.formatter</groupId>
 				<artifactId>formatter-maven-plugin</artifactId>
-		    	<version>2.23.0</version>
+				<version>2.23.0</version>
 				<configuration>
 					<encoding>UTF-8</encoding>
 					<lineEnding>LF</lineEnding>
@@ -288,6 +310,23 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>com.github.spotbugs</groupId>
+				<artifactId>spotbugs-maven-plugin</artifactId>
+				<version>4.8.5.0</version>
+				<configuration>
+					<includeFilterFile>spotbugs-security-include.xml</includeFilterFile>
+					<excludeFilterFile>spotbugs-security-exclude.xml</excludeFilterFile>
+					<!--<plugins>
+						<plugin>
+							<groupId>com.h3xstream.findsecbugs</groupId>
+							<artifactId>findsecbugs-plugin</artifactId>
+							<version>1.12.0</version>
+						</plugin>
+					</plugins>
+					-->
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 	<!-- Generate Java-docs As Part Of Project Reports -->
--- a/sample/archidata/basic/WebLauncher.java
+++ b/sample/archidata/basic/WebLauncher.java
@@ -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;
+		}
+	}
+}
--- a/sample/archidata/basic/WebLauncherLocal.java
+++ b/sample/archidata/basic/WebLauncherLocal.java
@@ -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();
+	}
+}
--- a/sample/archidata/basic/api/MyModelResource.java
+++ b/sample/archidata/basic/api/MyModelResource.java
@@ -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);
+	}
+}
--- a/sample/archidata/basic/migration/Initialization.java
+++ b/sample/archidata/basic/migration/Initialization.java
@@ -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");
+	}
+
+}
--- a/sample/archidata/basic/model/MyModel.java
+++ b/sample/archidata/basic/model/MyModel.java
@@ -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 + "]";
+	}
+
+
+}
--- a/spotbugs-security-exclude.xml
+++ b/spotbugs-security-exclude.xml
@@ -0,0 +1,5 @@
+<FindBugsFilter>
+    <Match>
+        <Bug category="SECURITY"/>
+    </Match>
+</FindBugsFilter>
--- a/spotbugs-security-include.xml
+++ b/spotbugs-security-include.xml
@@ -0,0 +1,2 @@
+<FindBugsFilter>
+</FindBugsFilter>
--- a/src/org/kar/archidata/GlobalConfiguration.java
+++ b/src/org/kar/archidata/GlobalConfiguration.java
@@ -4,10 +4,12 @@ import org.kar.archidata.db.DBConfig;
 import org.kar.archidata.tools.ConfigBaseVariable;

 public class GlobalConfiguration {
-	public static DBConfig dbConfig = null;
+	public static final DBConfig dbConfig;

 	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());
 	}
 }
--- a/src/org/kar/archidata/UserDB.java
+++ b/src/org/kar/archidata/UserDB.java
@@ -5,6 +5,9 @@ import java.sql.PreparedStatement;
 import java.sql.SQLException;

 import org.kar.archidata.dataAccess.DataAccess;
+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;

@@ -12,21 +15,24 @@ public class UserDB {

 	public UserDB() {}

-	public static User getUsers(final long userId) throws Exception {
-		return DataAccess.get(User.class, userId);
+	public static User getUsers(final long userId, QueryOption... option) throws Exception {
+		return DataAccess.get(User.class, userId, option);
 	}

-	public static User getUserOrCreate(final long userId, final String userLogin) 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;
 		}
-		createUsersInfoFromOAuth(userId, userLogin);
+		createUsersInfoFromOAuth(userId, userLogin, option);
 		return getUsers(userId);
 	}

-	private static void createUsersInfoFromOAuth(final long userId, final String login) throws IOException {
-		final DBEntry entry = DBEntry.createInterface(GlobalConfiguration.dbConfig);
+	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')";
 		try {
 			final PreparedStatement ps = entry.connection.prepareStatement(query);
--- a/src/org/kar/archidata/annotation/AnnotationTools.java
+++ b/src/org/kar/archidata/annotation/AnnotationTools.java
@@ -7,43 +7,49 @@ import java.util.List;

 import org.kar.archidata.dataAccess.QueryOptions;
 import org.kar.archidata.dataAccess.options.OverrideTableName;
+import org.kar.archidata.exception.DataAccessException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.annotation.Nullable;
 import jakarta.persistence.Column;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
 import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
 import jakarta.validation.constraints.Size;
+import jakarta.ws.rs.DefaultValue;

 public class AnnotationTools {
 	static final Logger LOGGER = LoggerFactory.getLogger(AnnotationTools.class);

-	public static String getTableName(final Class<?> clazz, final QueryOptions options) throws Exception {
+	public static String getTableName(final Class<?> clazz, final QueryOptions options) throws DataAccessException {
 		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);
 	}

-	public static String getTableName(final Class<?> element) throws Exception {
+	public static String getTableName(final Class<?> element) throws DataAccessException {
 		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Table.class);
 		if (annotation.length == 0) {
 			// when no annotation is detected, then the table name is the class name
 			return element.getSimpleName();
 		}
 		if (annotation.length > 1) {
-			throw new Exception("Must not have more than 1 element @Table on " + element.getClass().getCanonicalName());
+			throw new DataAccessException(
+					"Must not have more than 1 element @Table on " + element.getClass().getCanonicalName());
 		}
 		final String tmp = ((Table) annotation[0]).name();
 		if (tmp == null) {
@@ -52,113 +58,179 @@ public class AnnotationTools {
 		return tmp;
 	}

-	public static String getSchemedescription(final Field element) throws Exception {
+	public static boolean getSchemaReadOnly(final Field element) throws DataAccessException {
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Schema.class);
+		if (annotation.length == 0) {
+			return false;
+		}
+		if (annotation.length > 1) {
+			throw new DataAccessException(
+					"Must not have more than 1 element @Schema on " + element.getClass().getCanonicalName());
+		}
+		return ((Schema) annotation[0]).readOnly();
+	}
+
+	public static String getSchemaExample(final Class<?> element) throws DataAccessException {
 		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Schema.class);
 		if (annotation.length == 0) {
 			return null;
 		}
 		if (annotation.length > 1) {
-			throw new Exception("Must not have more than 1 element @Schema on " + element.getClass().getCanonicalName());
+			throw new DataAccessException(
+					"Must not have more than 1 element @Schema on " + element.getClass().getCanonicalName());
+		}
+		return ((Schema) annotation[0]).example();
+	}
+
+	public static boolean getNoWriteSpecificMode(final Class<?> element) {
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(NoWriteSpecificMode.class);
+		if (annotation.length == 0) {
+			return false;
+		}
+		return true;
+	}
+
+	public static String getSchemaDescription(final Class<?> element) throws DataAccessException {
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Schema.class);
+		if (annotation.length == 0) {
+			return null;
+		}
+		if (annotation.length > 1) {
+			throw new DataAccessException(
+					"Must not have more than 1 element @Schema on " + element.getClass().getCanonicalName());
 		}
 		return ((Schema) annotation[0]).description();
 	}

-	public static String getComment(final Field element) throws Exception {
-		final Annotation[] annotation = element.getDeclaredAnnotationsByType(DataComment.class);
+	public static String getSchemaDescription(final Field element) throws DataAccessException {
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Schema.class);
 		if (annotation.length == 0) {
-			return getSchemedescription(element);
+			return null;
 		}
 		if (annotation.length > 1) {
-			throw new Exception("Must not have more than 1 element @DataComment on " + element.getClass().getCanonicalName());
+			throw new DataAccessException(
+					"Must not have more than 1 element @Schema on " + element.getClass().getCanonicalName());
+		}
+		return ((Schema) annotation[0]).description();
+	}
+
+	public static String getComment(final Field element) throws DataAccessException {
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(DataComment.class);
+		if (annotation.length == 0) {
+			return getSchemaDescription(element);
+		}
+		if (annotation.length > 1) {
+			throw new DataAccessException(
+					"Must not have more than 1 element @DataComment on " + element.getClass().getCanonicalName());
 		}
 		return ((DataComment) annotation[0]).value();
 	}

-	public static String getDefault(final Field element) throws Exception {
-		final Annotation[] annotation = element.getDeclaredAnnotationsByType(DataDefault.class);
+	public static String getDefault(final Field element) throws DataAccessException {
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(DefaultValue.class);
 		if (annotation.length == 0) {
 			return null;
 		}
 		if (annotation.length > 1) {
-			throw new Exception("Must not have more than 1 element @DataDefault on " + element.getClass().getCanonicalName());
+			throw new DataAccessException(
+					"Must not have more than 1 element @DataDefault on " + element.getClass().getCanonicalName());
 		}
-		return ((DataDefault) annotation[0]).value();
+		return ((DefaultValue) annotation[0]).value();
 	}

-	public static ManyToOne getManyToOne(final Field element) throws Exception {
+	public static ManyToOne getManyToOne(final Field element) {
 		final Annotation[] annotation = element.getDeclaredAnnotationsByType(ManyToOne.class);
 		if (annotation.length == 0) {
 			return null;
 		}
-		if (annotation.length > 1) {
-			throw new Exception("Must not have more than 1 element @ManyToOne on " + element.getClass().getCanonicalName());
-		}
 		return (ManyToOne) annotation[0];
 	}

-	public static DataJson getDataJson(final Field element) throws Exception {
+	public static ManyToMany getManyToMany(final Field element) {
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(ManyToMany.class);
+		if (annotation.length == 0) {
+			return null;
+		}
+		return (ManyToMany) annotation[0];
+	}
+
+	public static OneToMany getOneToMany(final Field element) {
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(OneToMany.class);
+		if (annotation.length == 0) {
+			return null;
+		}
+		return (OneToMany) annotation[0];
+	}
+
+	public static DataJson getDataJson(final Field element) throws DataAccessException {
 		final Annotation[] annotation = element.getDeclaredAnnotationsByType(DataJson.class);
 		if (annotation.length == 0) {
 			return null;
 		}
 		if (annotation.length > 1) {
-			throw new Exception("Must not have more than 1 element @ManyToOne on " + element.getClass().getCanonicalName());
+			throw new DataAccessException(
+					"Must not have more than 1 element @ManyToOne on " + element.getClass().getCanonicalName());
 		}
 		return (DataJson) annotation[0];
 	}

-	public static Long getConstraintsMax(final Field element) throws Exception {
+	public static Long getConstraintsMax(final Field element) throws DataAccessException {
 		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Max.class);
 		if (annotation.length == 0) {
 			return null;
 		}
 		if (annotation.length > 1) {
-			throw new Exception("Must not have more than 1 element @Size on " + element.getClass().getCanonicalName());
+			throw new DataAccessException(
+					"Must not have more than 1 element @Size on " + element.getClass().getCanonicalName());
 		}
 		return ((Max) annotation[0]).value();
 	}

-	public static Long getConstraintsMin(final Field element) throws Exception {
+	public static Long getConstraintsMin(final Field element) throws DataAccessException {
 		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Min.class);
 		if (annotation.length == 0) {
 			return null;
 		}
 		if (annotation.length > 1) {
-			throw new Exception("Must not have more than 1 element @Size on " + element.getClass().getCanonicalName());
+			throw new DataAccessException(
+					"Must not have more than 1 element @Size on " + element.getClass().getCanonicalName());
 		}
 		return ((Min) annotation[0]).value();
 	}

-	public static int getLimitSize(final Field element) throws Exception {
+	public static int getLimitSize(final Field element) throws DataAccessException {
 		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Column.class);
 		if (annotation.length == 0) {
 			return 255;
 		}
 		if (annotation.length > 1) {
-			throw new Exception("Must not have more than 1 element @Column on " + element.getClass().getCanonicalName());
+			throw new DataAccessException(
+					"Must not have more than 1 element @Column on " + element.getClass().getCanonicalName());
 		}
 		final int length = ((Column) annotation[0]).length();
 		return length <= 0 ? 0 : length;
 	}

-	public static Size getConstraintsSize(final Field element) throws Exception {
+	public static Size getConstraintsSize(final Field element) throws DataAccessException {
 		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Size.class);
 		if (annotation.length == 0) {
 			return null;
 		}
 		if (annotation.length > 1) {
-			throw new Exception("Must not have more than 1 element @Size on " + element.getClass().getCanonicalName());
+			throw new DataAccessException(
+					"Must not have more than 1 element @Size on " + element.getClass().getCanonicalName());
 		}
 		return (Size) annotation[0];
 	}

-	public static String getConstraintsPattern(final Field element) throws Exception {
+	public static String getConstraintsPattern(final Field element) throws DataAccessException {
 		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Pattern.class);
 		if (annotation.length == 0) {
 			return null;
 		}
 		if (annotation.length > 1) {
-			throw new Exception("Must not have more than 1 element @Pattern on " + element.getClass().getCanonicalName());
+			throw new DataAccessException(
+					"Must not have more than 1 element @Pattern on " + element.getClass().getCanonicalName());
 		}
 		return ((Pattern) annotation[0]).regexp();
 	}
@@ -186,13 +258,14 @@ public class AnnotationTools {
 		return false;
 	}

-	public static String getFieldName(final Field element) throws Exception {
+	public static String getFieldName(final Field element) throws DataAccessException {
 		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Column.class);
 		if (annotation.length == 0) {
 			return element.getName();
 		}
 		if (annotation.length > 1) {
-			throw new Exception("Must not have more than 1 element @Column on " + element.getClass().getCanonicalName());
+			throw new DataAccessException(
+					"Must not have more than 1 element @Column on " + element.getClass().getCanonicalName());
 		}
 		final String name = ((Column) annotation[0]).name();
 		if (name.isBlank()) {
@@ -201,29 +274,52 @@ public class AnnotationTools {
 		return name;
 	}

-	public static boolean getColumnNotNull(final Field element) throws Exception {
+	public static boolean getColumnNotNull(final Field element) throws DataAccessException {
 		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Column.class);
 		if (annotation.length == 0) {
 			return false;
 		}
 		if (annotation.length > 1) {
-			throw new Exception("Must not have more than 1 element @Column on " + element.getClass().getCanonicalName());
+			throw new DataAccessException(
+					"Must not have more than 1 element @Column on " + element.getClass().getCanonicalName());
 		}
 		return !((Column) annotation[0]).nullable();
 	}

-	public static boolean getConstraintsNotNull(final Field element) throws Exception {
+	public static boolean getNullable(final Field element) throws DataAccessException {
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Nullable.class);
+		if (annotation.length == 0) {
+			return false;
+		}
+		return true;
+	}
+
+	public static boolean getConstraintsNotNull(final Field element) throws DataAccessException {
 		final Annotation[] annotation = element.getDeclaredAnnotationsByType(NotNull.class);
 		if (annotation.length == 0) {
 			return false;
 		}
 		if (annotation.length > 1) {
-			throw new Exception("Must not have more than 1 element @NotNull on " + element.getClass().getCanonicalName());
+			throw new DataAccessException(
+					"Must not have more than 1 element @NotNull on " + element.getClass().getCanonicalName());
 		}
 		return true;
 	}

-	public static boolean isPrimaryKey(final Field element) throws Exception {
+	public static Field getPrimaryKeyField(final Class<?> clazz) throws DataAccessException {
+		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 DataAccessException {
 		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Id.class);
 		if (annotation.length == 0) {
 			return false;
@@ -231,49 +327,51 @@ public class AnnotationTools {
 		return true;
 	}

-	public static boolean isUnique(final Field element) throws Exception {
+	public static boolean isUnique(final Field element) throws DataAccessException {
 		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Column.class);
 		if (annotation.length == 0) {
 			return false;
 		}
 		if (annotation.length > 1) {
-			throw new Exception("Must not have more than 1 element @Column on " + element.getClass().getCanonicalName());
+			throw new DataAccessException(
+					"Must not have more than 1 element @Column on " + element.getClass().getCanonicalName());
 		}
 		return ((Column) annotation[0]).unique();
 	}

-	public static GenerationType getStrategy(final Field element) throws Exception {
+	public static GenerationType getStrategy(final Field element) throws DataAccessException {
 		final Annotation[] annotation = element.getDeclaredAnnotationsByType(GeneratedValue.class);
 		if (annotation.length == 0) {
 			return null;
 		}
 		if (annotation.length > 1) {
-			throw new Exception("Must not have more than 1 element @Column on " + element.getClass().getCanonicalName());
+			throw new DataAccessException(
+					"Must not have more than 1 element @Column on " + element.getClass().getCanonicalName());
 		}
 		return ((GeneratedValue) annotation[0]).strategy();
 	}

-	public static boolean isDeletedField(final Field element) throws Exception {
+	public static boolean isDeletedField(final Field element) throws DataAccessException {
 		return element.getDeclaredAnnotationsByType(DataDeleted.class).length != 0;
 	}

-	public static boolean isCreatedAtField(final Field element) throws Exception {
+	public static boolean isCreatedAtField(final Field element) throws DataAccessException {
 		return element.getDeclaredAnnotationsByType(CreationTimestamp.class).length != 0;
 	}

-	public static boolean isUpdateAtField(final Field element) throws Exception {
+	public static boolean isUpdateAtField(final Field element) throws DataAccessException {
 		return element.getDeclaredAnnotationsByType(UpdateTimestamp.class).length != 0;
 	}

-	public static boolean isdefaultNotRead(final Field element) throws Exception {
+	public static boolean isdefaultNotRead(final Field element) throws DataAccessException {
 		return element.getDeclaredAnnotationsByType(DataNotRead.class).length != 0;
 	}

-	public static boolean isIdField(final Field element) throws Exception {
+	public static boolean isIdField(final Field element) throws DataAccessException {
 		return element.getDeclaredAnnotationsByType(Id.class).length != 0;
 	}

-	public static String getDeletedFieldName(final Class<?> clazz) throws Exception {
+	public static String getDeletedFieldName(final Class<?> clazz) throws DataAccessException {
 		try {
 			for (final Field elem : clazz.getFields()) {
 				// static field is only for internal global declaration ==> remove it ..
@@ -290,7 +388,7 @@ public class AnnotationTools {
 		return null;
 	}

-	public static String getUpdatedFieldName(final Class<?> clazz) throws Exception {
+	public static String getUpdatedFieldName(final Class<?> clazz) throws DataAccessException {
 		try {
 			for (final Field elem : clazz.getFields()) {
 				// static field is only for internal global declaration ==> remove it ..
@@ -324,15 +422,16 @@ public class AnnotationTools {
 		return null;
 	}

-	public static List<String> getFieldsNames(final Class<?> clazz) throws Exception {
+	public static List<String> getFieldsNames(final Class<?> clazz) throws DataAccessException {
 		return getFieldsNamesFilter(clazz, false);
 	}

-	public static List<String> getAllFieldsNames(final Class<?> clazz) throws Exception {
+	public static List<String> getAllFieldsNames(final Class<?> clazz) throws DataAccessException {
 		return getFieldsNamesFilter(clazz, true);
 	}

-	private static List<String> getFieldsNamesFilter(final Class<?> clazz, final boolean full) throws Exception {
+	private static List<String> getFieldsNamesFilter(final Class<?> clazz, final boolean full)
+			throws DataAccessException {
 		final List<String> out = new ArrayList<>();
 		for (final Field field : clazz.getFields()) {
 			// static field is only for internal global declaration ==> remove it ..
@@ -347,11 +446,12 @@ public class AnnotationTools {
 		return out;
 	}

-	public static boolean isGenericField(final Field elem) throws Exception {
-		return AnnotationTools.isPrimaryKey(elem) || AnnotationTools.isCreatedAtField(elem) || AnnotationTools.isUpdateAtField(elem) || AnnotationTools.isDeletedField(elem);
+	public static boolean isGenericField(final Field elem) throws DataAccessException {
+		return AnnotationTools.isPrimaryKey(elem) || AnnotationTools.isCreatedAtField(elem)
+				|| AnnotationTools.isUpdateAtField(elem) || AnnotationTools.isDeletedField(elem);
 	}

-	public static Field getFieldOfId(final Class<?> clazz) throws Exception {
+	public static Field getFieldOfId(final Class<?> clazz) throws DataAccessException {
 		for (final Field field : clazz.getFields()) {
 			// static field is only for internal global declaration ==> remove it ..
 			if (java.lang.reflect.Modifier.isStatic(field.getModifiers())) {
@@ -364,4 +464,17 @@ public class AnnotationTools {
 		return null;
 	}

+	public static Field getFieldNamed(final Class<?> clazz, final String name) throws DataAccessException {
+		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.getFieldName(field).equals(name)) {
+				return field;
+			}
+		}
+		return null;
+	}
+
 }
--- a/src/org/kar/archidata/annotation/AsyncType.java
+++ b/src/org/kar/archidata/annotation/AsyncType.java
@@ -0,0 +1,17 @@
+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 AsyncType {
+	// Possible class values.
+	Class<?>[] value();
+
+	// direct copy value in the TypeScript (separate with type by a |
+	String[] tsComplement() default {};
+}
--- a/src/org/kar/archidata/annotation/DataJson.java
+++ b/src/org/kar/archidata/annotation/DataJson.java
@@ -12,4 +12,6 @@ import org.kar.archidata.dataAccess.options.CheckFunctionVoid;
@Retention(RetentionPolicy.RUNTIME)
 public @interface DataJson {
 	Class<? extends CheckFunctionInterface> checker() default CheckFunctionVoid.class;
+
+	Class<?> targetEntity() default Void.class;
 }
--- a/src/org/kar/archidata/annotation/NoWriteSpecificMode.java
+++ b/src/org/kar/archidata/annotation/NoWriteSpecificMode.java
@@ -5,8 +5,9 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;

+/** When we wend to have only One type for read and write mode (Wrapping API). */
@Target({ ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
-public @interface SQLWhere {
-	String clause();
+public @interface NoWriteSpecificMode {
+
 }
--- a/src/org/kar/archidata/annotation/TypeScriptProgress.java
+++ b/src/org/kar/archidata/annotation/TypeScriptProgress.java
@@ -5,10 +5,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;

-@Target({ ElementType.TYPE, ElementType.FIELD })
+/** In case of the update parameter with String input to detect null element. */
+@Target({ ElementType.PARAMETER, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
-public @interface DataDefault {
-
-	String value();
-
-}
+public @interface TypeScriptProgress {}
--- a/src/org/kar/archidata/api/DataResource.java
+++ b/src/org/kar/archidata/api/DataResource.java
@@ -5,6 +5,7 @@ import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -16,6 +17,7 @@ import java.nio.file.StandardCopyOption;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Date;
+import java.util.UUID;

 import javax.imageio.ImageIO;

@@ -25,6 +27,7 @@ import org.kar.archidata.annotation.security.PermitTokenInURI;
 import org.kar.archidata.dataAccess.DataAccess;
 import org.kar.archidata.dataAccess.QueryCondition;
 import org.kar.archidata.dataAccess.options.Condition;
+import org.kar.archidata.exception.FailException;
 import org.kar.archidata.filter.GenericContext;
 import org.kar.archidata.model.Data;
 import org.kar.archidata.tools.ConfigBaseVariable;
@@ -56,7 +59,7 @@ import jakarta.ws.rs.core.StreamingOutput;
@Path("/data")
@Produces(MediaType.APPLICATION_JSON)
 public class DataResource {
-	private static final Logger LOGGER = LoggerFactory.getLogger(MediaType.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(DataResource.class);
 	private final static int CHUNK_SIZE = 1024 * 1024; // 1MB chunks
 	private final static int CHUNK_SIZE_IN = 50 * 1024 * 1024; // 1MB chunks
 	/** Upload some datas */
@@ -83,8 +86,9 @@ public class DataResource {
 		return filePath;
 	}

-	public static String getFileData(final long tmpFolderId) {
-		final String filePath = ConfigBaseVariable.getMediaDataFolder() + File.separator + tmpFolderId + File.separator + "data";
+	public static String getFileDataOld(final long tmpFolderId) {
+		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,6 +97,27 @@ 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;
+		try {
+			createFolder(filePath);
+		} catch (final IOException e) {
+			e.printStackTrace();
+		}
+		filePath += part3;
+		return filePath;
+	}
+
+	public static String getFileMetaData(final UUID uuid) {
+		return getFileData(uuid) + ".json";
+	}
+
 	public static Data getWithSha512(final String sha512) {
 		LOGGER.info("find sha512 = {}", sha512);
 		try {
@@ -115,19 +140,20 @@ 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 = "";
 		final String extension = originalFileName.substring(originalFileName.lastIndexOf('.') + 1);
 		mimeType = switch (extension.toLowerCase()) {
-		case "jpg", "jpeg" -> "image/jpeg";
-		case "png" -> "image/png";
-		case "webp" -> "image/webp";
-		case "mka" -> "audio/x-matroska";
-		case "mkv" -> "video/x-matroska";
-		case "webm" -> "video/webm";
-		default -> throw new IOException("Can not find the mime type of data input: '" + extension + "'");
+			case "jpg", "jpeg" -> "image/jpeg";
+			case "png" -> "image/png";
+			case "webp" -> "image/webp";
+			case "mka" -> "audio/x-matroska";
+			case "mkv" -> "video/x-matroska";
+			case "webm" -> "video/webm";
+			default -> throw new IOException("Can not find the mime type of data input: '" + extension + "'");
 		};
 		injectedData.mimeType = mimeType;
 		injectedData.sha512 = sha512;
@@ -137,11 +163,10 @@ public class DataResource {
 		try {
 			injectedData = DataAccess.insert(injectedData);
 		} catch (final Exception e) {
-			// TODO Auto-generated catch block
 			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);
@@ -149,7 +174,27 @@ public class DataResource {
 		return injectedData;
 	}

-	public static String saveTemporaryFile(final InputStream uploadedInputStream, final long idData) {
+	public static void modeFileOldModelToNewModel(final long id, final UUID uuid) throws IOException {
+		String mediaCurentPath = getFileDataOld(id);
+		String mediaDestPath = getFileData(uuid);
+		LOGGER.info("src = {}", mediaCurentPath);
+		LOGGER.info("dst = {}", mediaDestPath);
+		if (Files.exists(Paths.get(mediaCurentPath))) {
+			LOGGER.info("move: {} ==> {}", mediaCurentPath, mediaDestPath);
+			Files.move(Paths.get(mediaCurentPath), Paths.get(mediaDestPath), StandardCopyOption.ATOMIC_MOVE);
+		}
+		// Move old meta-data...
+		mediaCurentPath = mediaCurentPath.substring(mediaCurentPath.length() - 4) + "meta.json";
+		mediaDestPath = mediaCurentPath.substring(mediaDestPath.length() - 4) + "meta.json";
+		if (Files.exists(Paths.get(mediaCurentPath))) {
+			LOGGER.info("moveM: {} ==> {}", mediaCurentPath, mediaDestPath);
+			Files.move(Paths.get(mediaCurentPath), Paths.get(mediaDestPath), StandardCopyOption.ATOMIC_MOVE);
+		}
+		LOGGER.info("Move done");
+	}
+
+	public static String saveTemporaryFile(final InputStream uploadedInputStream, final long idData)
+			throws FailException {
 		return saveFile(uploadedInputStream, DataResource.getTmpFileInData(idData));
 	}

@@ -166,35 +211,35 @@ public class DataResource {
 	}

 	// save uploaded file to a defined location on the server
-	static String saveFile(final InputStream uploadedInputStream, final String serverLocation) {
+	static String saveFile(final InputStream uploadedInputStream, final String serverLocation) throws FailException {
 		String out = "";
-		try {
-			OutputStream outpuStream = new FileOutputStream(new File(serverLocation));
-			int read = 0;
-			final byte[] bytes = new byte[CHUNK_SIZE_IN];
-			final MessageDigest md = MessageDigest.getInstance("SHA-512");
-
-			outpuStream = new FileOutputStream(new File(serverLocation));
-			while ((read = uploadedInputStream.read(bytes)) != -1) {
-				// logger.info("write {}", read);
-				md.update(bytes, 0, read);
-				outpuStream.write(bytes, 0, read);
-			}
-			LOGGER.info("Flush input stream ... {}", serverLocation);
-			System.out.flush();
-			outpuStream.flush();
-			outpuStream.close();
-			// create the end of sha512
-			final byte[] sha512Digest = md.digest();
-			// convert in hexadecimal
-			out = bytesToHex(sha512Digest);
-			uploadedInputStream.close();
+		MessageDigest md = null;
+		try (OutputStream outpuStream = new FileOutputStream(new File(serverLocation))) {
+			md = MessageDigest.getInstance("SHA-512");
 		} catch (final IOException ex) {
-			LOGGER.info("Can not write in temporary file ... ");
-			ex.printStackTrace();
+			throw new FailException(Response.Status.INTERNAL_SERVER_ERROR, "Can not write in temporary file", ex);
 		} catch (final NoSuchAlgorithmException ex) {
-			LOGGER.info("Can not find sha512 algorithms");
-			ex.printStackTrace();
+			throw new FailException(Response.Status.INTERNAL_SERVER_ERROR, "Can not find sha512 algorithms", ex);
+		}
+		if (md != null) {
+			try (OutputStream outpuStream = new FileOutputStream(new File(serverLocation))) {
+				int read = 0;
+				final byte[] bytes = new byte[CHUNK_SIZE_IN];
+				while ((read = uploadedInputStream.read(bytes)) != -1) {
+					// logger.info("write {}", read);
+					md.update(bytes, 0, read);
+					outpuStream.write(bytes, 0, read);
+				}
+				LOGGER.info("Flush input stream ... {}", serverLocation);
+				outpuStream.flush();
+				// create the end of sha512
+				final byte[] sha512Digest = md.digest();
+				// convert in hexadecimal
+				out = bytesToHex(sha512Digest);
+				uploadedInputStream.close();
+			} catch (final IOException ex) {
+				throw new FailException(Response.Status.INTERNAL_SERVER_ERROR, "Can not write in temporary file", ex);
+			}
 		}
 		return out;
 	}
@@ -207,7 +252,7 @@ public class DataResource {
 		return sb.toString();
 	}

-	public Data getSmall(final Long id) {
+	public Data getSmall(final UUID id) {
 		try {
 			return DataAccess.get(Data.class, id);
 		} catch (final Exception e) {
@@ -222,7 +267,10 @@ public class DataResource {
 	@Consumes({ MediaType.MULTIPART_FORM_DATA })
 	@RolesAllowed("ADMIN")
 	@Operation(description = "Insert a new data in the data environment", tags = "SYSTEM")
-	public Response 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) throws FailException {
 		final GenericContext gc = (GenericContext) sc.getUserPrincipal();
 		LOGGER.info("===================================================");
 		LOGGER.info("== DATA uploadFile {}", (gc == null ? "null" : gc.userByToken));
@@ -232,62 +280,79 @@ public class DataResource {
 		final String filePath = ConfigBaseVariable.getTmpDataFolder() + File.separator + tmpFolderId++;
 		try {
 			createFolder(ConfigBaseVariable.getTmpDataFolder() + File.separator);
-		} catch (final IOException e) {
-			e.printStackTrace();
+		} catch (final IOException ex) {
+			throw new FailException(Response.Status.INTERNAL_SERVER_ERROR,
+					"Impossible to create the folder in the server", ex);
 		}
 		saveFile(fileInputStream, filePath);
-		return Response.ok("Data uploaded successfully !!").build();
-		// return null;
 	}

 	@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 retriveDataId(@Context final SecurityContext sc, @QueryParam(HttpHeaders.AUTHORIZATION) final String token, @HeaderParam("Range") final String range,
-			@PathParam("id") final Long 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 FailException {
 		final GenericContext gc = (GenericContext) sc.getUserPrincipal();
 		// logger.info("===================================================");
-		LOGGER.info("== DATA retriveDataId ? 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();
+			return Response.status(404).entity("media NOT FOUND: " + uuid).type("text/plain").build();
+		}
+		try {
+			return buildStream(getFileData(uuid), range,
+					value.mimeType == null ? "application/octet-stream" : value.mimeType);
+		} catch (final Exception ex) {
+			throw new FailException(Response.Status.INTERNAL_SERVER_ERROR, "Fail to build output stream", ex);
 		}
-		return buildStream(ConfigBaseVariable.getMediaDataFolder() + File.separator + id + File.separator + "data", 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 retriveDataThumbnailId(@Context final SecurityContext sc, @QueryParam(HttpHeaders.AUTHORIZATION) final String token, @HeaderParam("Range") final String range,
-			@PathParam("id") final Long 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 FailException {
 		// GenericContext gc = (GenericContext) sc.getUserPrincipal();
 		// logger.info("===================================================");
-		// logger.info("== DATA retriveDataThumbnailId ? {}", (gc==null?"null":gc.user));
+		// 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 = ConfigBaseVariable.getMediaDataFolder() + File.separator + id + File.separator + "data";
+		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")
 		) {
 			// reads input image
-			final BufferedImage inputImage = ImageIO.read(inputFile);
+			BufferedImage inputImage;
+			try {
+				inputImage = ImageIO.read(inputFile);
+			} catch (final IOException ex) {
+				throw new FailException(Response.Status.INTERNAL_SERVER_ERROR, "Fail to READ the image", ex);
+			}
 			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());

@@ -302,11 +367,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();
@@ -315,35 +382,45 @@ public class DataResource {
 			out.cacheControl(cc);
 			return out.build();
 		}
-		return buildStream(filePathName, range, value.mimeType);
+		try {
+			return buildStream(filePathName, range, value.mimeType);
+		} catch (final Exception ex) {
+			throw new FailException(Response.Status.INTERNAL_SERVER_ERROR, "Fail to build output stream", ex);
+		}
 	}

-	// @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 retriveDataFull(@Context final SecurityContext sc, @QueryParam(HttpHeaders.AUTHORIZATION) final String token, @HeaderParam("Range") final String range,
-			@PathParam("id") final Long 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 retriveDataFull ? 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();
+			return Response.status(404).entity("media NOT FOUND: " + uuid).type("text/plain").build();
 		}
-		return buildStream(ConfigBaseVariable.getMediaDataFolder() + File.separator + id + File.separator + "data", range, value.mimeType);
+		return buildStream(getFileData(uuid), range,
+				value.mimeType == null ? "application/octet-stream" : value.mimeType);
 	}

 	/** Adapted from http://stackoverflow.com/questions/12768812/video-streaming-to-ipad-does-not-work-with-tapestry5/12829541#12829541
 	 *
 	 * @param range range header
 	 * @return Streaming output
+	 * @throws FileNotFoundException
 	 * @throws Exception IOException if an error occurs in streaming. */
-	private Response buildStream(final String filename, final String range, final String mimeType) throws Exception {
+	private Response buildStream(final String filename, final String range, final String mimeType)
+			throws FailException {
 		final File file = new File(filename);
 		// logger.info("request range : {}", range);
 		// range not requested : Firefox does not send range headers
@@ -390,17 +467,24 @@ public class DataResource {
 		}
 		final String responseRange = String.format("bytes %d-%d/%d", from, to, file.length());
 		// logger.info("responseRange: {}", responseRange);
-		final RandomAccessFile raf = new RandomAccessFile(file, "r");
-		raf.seek(from);
+		try (final RandomAccessFile raf = new RandomAccessFile(file, "r")) {
+			raf.seek(from);

-		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()));
-		if (mimeType != null) {
-			out.type(mimeType);
+			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()));
+			if (mimeType != null) {
+				out.type(mimeType);
+			}
+			return out.build();
+		} catch (final FileNotFoundException ex) {
+			throw new FailException(Response.Status.INTERNAL_SERVER_ERROR, "Fail to find the required file.", ex);
+		} catch (final IOException ex) {
+			throw new FailException(Response.Status.INTERNAL_SERVER_ERROR, "Fail to access to the required file.", ex);
 		}
-		return out.build();
 	}

 	public static void undelete(final Long id) throws Exception {
--- a/src/org/kar/archidata/api/MediaStreamer.java
+++ b/src/org/kar/archidata/api/MediaStreamer.java
@@ -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) {
--- a/src/org/kar/archidata/api/openApiResource.java
+++ b/src/org/kar/archidata/api/openApiResource.java
@@ -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");
 	}
 }
--- a/src/org/kar/archidata/catcher/ExceptionCatcher.java
+++ b/src/org/kar/archidata/catcher/ExceptionCatcher.java
@@ -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.getClass().getCanonicalName(), exception.getMessage());
 	}

 }
--- a/src/org/kar/archidata/catcher/FailException404API.java
+++ b/src/org/kar/archidata/catcher/FailException404API.java
@@ -1,25 +0,0 @@
-package org.kar.archidata.catcher;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import jakarta.ws.rs.ClientErrorException;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.ext.ExceptionMapper;
-
-public class FailException404API implements ExceptionMapper<ClientErrorException> {
-	private static final Logger LOGGER = LoggerFactory.getLogger(FailException404API.class);
-
-	@Override
-	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();
-	}
-
-	private RestErrorResponse build(final ClientErrorException exception) {
-		return new RestErrorResponse(exception.getResponse().getStatusInfo().toEnum(), "Catch system exception", exception.getMessage());
-	}
-
-}
--- a/src/org/kar/archidata/catcher/FailExceptionCatcher.java
+++ b/src/org/kar/archidata/catcher/FailExceptionCatcher.java
@@ -13,10 +13,12 @@ public class FailExceptionCatcher implements ExceptionMapper<FailException> {

 	@Override
 	public Response toResponse(final FailException exception) {
+		LOGGER.warn("Catch FailException: {}", exception.getLocalizedMessage());
 		final RestErrorResponse ret = build(exception);
 		LOGGER.error("Error UUID={}", ret.uuid);
-		// Not display backtrace ==> this may be a normal case ...
-		// exception.printStackTrace();
+		if (exception.exception != null) {
+			exception.exception.printStackTrace();
+		}
 		return Response.status(exception.status).entity(ret).type(MediaType.APPLICATION_JSON).build();
 	}

--- a/src/org/kar/archidata/catcher/GenericCatcher.java
+++ b/src/org/kar/archidata/catcher/GenericCatcher.java
@@ -0,0 +1,24 @@
+package org.kar.archidata.catcher;
+
+import org.glassfish.jersey.server.ResourceConfig;
+
+public class GenericCatcher {
+
+	/**
+	 * Add All the the generic catcher to standardize returns.
+	 * @param rc Resource exception model.
+	 */
+	public static void addAll(final ResourceConfig rc) {
+		// Generic Json parsing error
+		rc.register(JacksonExceptionCatcher.class);
+		// Catch jakarta generic errors
+		rc.register(WebApplicationExceptionCatcher.class);
+		// Archidata exceptions
+		rc.register(InputExceptionCatcher.class);
+		rc.register(SystemExceptionCatcher.class);
+		rc.register(FailExceptionCatcher.class);
+		// generic Exception catcher
+		rc.register(ExceptionCatcher.class);
+	}
+
+}
--- a/src/org/kar/archidata/catcher/InputExceptionCatcher.java
+++ b/src/org/kar/archidata/catcher/InputExceptionCatcher.java
@@ -13,14 +13,17 @@ public class InputExceptionCatcher implements ExceptionMapper<InputException> {

 	@Override
 	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());
 	}

 }
--- a/src/org/kar/archidata/catcher/JacksonExceptionCatcher.java
+++ b/src/org/kar/archidata/catcher/JacksonExceptionCatcher.java
@@ -3,26 +3,28 @@ package org.kar.archidata.catcher;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

-import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.JacksonException;

 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.ext.ExceptionMapper;

-public class JacksonCatcher implements ExceptionMapper<JsonProcessingException> {
-	private static final Logger LOGGER = LoggerFactory.getLogger(JacksonCatcher.class);
+public class JacksonExceptionCatcher implements ExceptionMapper<JacksonException> {
+	private static final Logger LOGGER = LoggerFactory.getLogger(JacksonExceptionCatcher.class);

 	@Override
-	public Response toResponse(final JsonProcessingException exception) {
+	public Response toResponse(final JacksonException exception) {
 		LOGGER.warn("Catch exception Input data parsing:");
 		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());
 	}

 }
--- a/src/org/kar/archidata/catcher/RestErrorResponse.java
+++ b/src/org/kar/archidata/catcher/RestErrorResponse.java
@@ -3,19 +3,35 @@ package org.kar.archidata.catcher;
 import java.time.Instant;
 import java.util.UUID;

+import org.kar.archidata.annotation.NoWriteSpecificMode;
+import org.kar.archidata.tools.UuidUtils;
+
+import jakarta.persistence.Column;
+import jakarta.validation.constraints.NotNull;
 import jakarta.ws.rs.core.Response;

+@NoWriteSpecificMode
 public class RestErrorResponse {
-	public UUID uuid = UUID.randomUUID();
+	public UUID uuid = UuidUtils.nextUUID();
+	@NotNull
+	@Column(length = 0)
+	public String name; // Mandatory for TS generic error
+	@NotNull
+	@Column(length = 0)
+	public String message; // Mandatory for TS generic error
+	@NotNull
+	@Column(length = 0)
 	public String time;
-	public String error;
-	public String message;
+	@NotNull
 	final public int status;
+	@NotNull
+	@Column(length = 0)
 	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 +39,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();
--- a/src/org/kar/archidata/catcher/SystemExceptionCatcher.java
+++ b/src/org/kar/archidata/catcher/SystemExceptionCatcher.java
@@ -13,6 +13,7 @@ public class SystemExceptionCatcher implements ExceptionMapper<SystemException>

 	@Override
 	public Response toResponse(final SystemException exception) {
+		LOGGER.warn("Catch SystemException:");
 		final RestErrorResponse ret = build(exception);
 		LOGGER.error("Error UUID={}", ret.uuid);
 		exception.printStackTrace();
--- a/src/org/kar/archidata/catcher/WebApplicationExceptionCatcher.java
+++ b/src/org/kar/archidata/catcher/WebApplicationExceptionCatcher.java
@@ -0,0 +1,27 @@
+package org.kar.archidata.catcher;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+
+public class WebApplicationExceptionCatcher implements ExceptionMapper<WebApplicationException> {
+	private static final Logger LOGGER = LoggerFactory.getLogger(WebApplicationExceptionCatcher.class);
+
+	@Override
+	public Response toResponse(final WebApplicationException 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();
+	}
+
+	private RestErrorResponse build(final WebApplicationException exception) {
+		return new RestErrorResponse(exception.getResponse().getStatusInfo().toEnum(), "Catch system exception",
+				exception.getMessage());
+	}
+
+}
--- a/src/org/kar/archidata/dataAccess/DataAccess.java
+++ b/src/org/kar/archidata/dataAccess/DataAccess.java
--- a/src/org/kar/archidata/dataAccess/DataAccessAddOn.java
+++ b/src/org/kar/archidata/dataAccess/DataAccessAddOn.java
@@ -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 {

 	}

--- a/src/org/kar/archidata/dataAccess/DataExport.java
+++ b/src/org/kar/archidata/dataAccess/DataExport.java
@@ -0,0 +1,416 @@
+package org.kar.archidata.dataAccess;
+
+import java.io.IOException;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Timestamp;
+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;
+
+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;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+
+public class DataExport {
+	static final Logger LOGGER = LoggerFactory.getLogger(DataExport.class);
+	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 {
+		if (type == UUID.class) {
+			return (final ResultSet rs, final Object obj) -> {
+				final UUID tmp = rs.getObject(count, UUID.class);
+				if (!rs.wasNull()) {
+					final List<Object> data = (List<Object>) (obj);
+					data.set(id, tmp);
+				}
+			};
+		}
+		if (type == Long.class) {
+			return (final ResultSet rs, final Object obj) -> {
+				final Long tmp = rs.getLong(count);
+				if (!rs.wasNull()) {
+					final List<Object> data = (List<Object>) (obj);
+					data.set(id, tmp);
+				}
+			};
+		}
+		if (type == long.class) {
+			return (final ResultSet rs, final Object obj) -> {
+				final Long tmp = rs.getLong(count);
+				if (!rs.wasNull()) {
+					final List<Object> data = (List<Object>) (obj);
+					data.set(id, tmp);
+				}
+			};
+		}
+		if (type == Integer.class) {
+			return (final ResultSet rs, final Object obj) -> {
+				final Integer tmp = rs.getInt(count);
+				if (!rs.wasNull()) {
+					final List<Object> data = (List<Object>) (obj);
+					data.set(id, tmp);
+				}
+			};
+		}
+		if (type == int.class) {
+			return (final ResultSet rs, final Object obj) -> {
+				final Integer tmp = rs.getInt(count);
+				if (!rs.wasNull()) {
+					final List<Object> data = (List<Object>) (obj);
+					data.set(id, tmp);
+				}
+			};
+		}
+		if (type == Float.class) {
+			return (final ResultSet rs, final Object obj) -> {
+				final Float tmp = rs.getFloat(count);
+				if (!rs.wasNull()) {
+					final List<Object> data = (List<Object>) (obj);
+					data.set(id, tmp);
+				}
+			};
+		}
+		if (type == float.class) {
+			return (final ResultSet rs, final Object obj) -> {
+				final Float tmp = rs.getFloat(count);
+				if (!rs.wasNull()) {
+					final List<Object> data = (List<Object>) (obj);
+					data.set(id, tmp);
+				}
+			};
+		}
+		if (type == Double.class) {
+			return (final ResultSet rs, final Object obj) -> {
+				final Double tmp = rs.getDouble(count);
+				if (!rs.wasNull()) {
+					final List<Object> data = (List<Object>) (obj);
+					data.set(id, tmp);
+				}
+			};
+		}
+		if (type == double.class) {
+			return (final ResultSet rs, final Object obj) -> {
+				final Double tmp = rs.getDouble(count);
+				if (!rs.wasNull()) {
+					final List<Object> data = (List<Object>) (obj);
+					data.set(id, tmp);
+				}
+			};
+		}
+		if (type == Boolean.class) {
+			return (final ResultSet rs, final Object obj) -> {
+				final Boolean tmp = rs.getBoolean(count);
+				if (!rs.wasNull()) {
+					final List<Object> data = (List<Object>) (obj);
+					data.set(id, tmp);
+				}
+			};
+		}
+		if (type == boolean.class) {
+			return (final ResultSet rs, final Object obj) -> {
+				final Boolean tmp = rs.getBoolean(count);
+				if (!rs.wasNull()) {
+					final List<Object> data = (List<Object>) (obj);
+					data.set(id, tmp);
+				}
+			};
+		}
+		if (type == Timestamp.class) {
+			return (final ResultSet rs, final Object obj) -> {
+				final Timestamp tmp = rs.getTimestamp(count);
+				if (!rs.wasNull()) {
+					final List<Object> data = (List<Object>) (obj);
+					data.set(id, tmp);
+				}
+			};
+		}
+		if (type == Date.class) {
+			return (final ResultSet rs, final Object obj) -> {
+				try {
+					final Timestamp tmp = rs.getTimestamp(count);
+					if (!rs.wasNull()) {
+						final List<Object> data = (List<Object>) (obj);
+						data.set(id, Date.from(tmp.toInstant()));
+					}
+				} catch (final SQLException ex) {
+					final String tmp = rs.getString(count);
+					LOGGER.error("Fail to parse the SQL time !!! {}", tmp);
+					if (!rs.wasNull()) {
+						final Date date = DateTools.parseDate(tmp);
+						LOGGER.error("Fail to parse the SQL time !!! {}", date);
+						final List<Object> data = (List<Object>) (obj);
+						data.set(id, date);
+					}
+				}
+			};
+		}
+		if (type == Instant.class) {
+			return (final ResultSet rs, final Object obj) -> {
+				final String tmp = rs.getString(count);
+				if (!rs.wasNull()) {
+					final Instant date = Instant.parse(tmp);
+					LOGGER.error("Fail to parse the SQL time !!! {}", date);
+					final List<Object> data = (List<Object>) (obj);
+					data.set(id, date);
+				}
+			};
+		}
+		if (type == LocalDate.class) {
+			return (final ResultSet rs, final Object obj) -> {
+				final java.sql.Date tmp = rs.getDate(count);
+				if (!rs.wasNull()) {
+					final List<Object> data = (List<Object>) (obj);
+					data.set(id, tmp.toLocalDate());
+				}
+			};
+		}
+		if (type == LocalTime.class) {
+			return (final ResultSet rs, final Object obj) -> {
+				final java.sql.Time tmp = rs.getTime(count);
+				if (!rs.wasNull()) {
+					final List<Object> data = (List<Object>) (obj);
+					data.set(id, tmp.toLocalTime());
+				}
+			};
+		}
+		if (type == String.class) {
+			return (final ResultSet rs, final Object obj) -> {
+				final String tmp = rs.getString(count);
+				if (!rs.wasNull()) {
+					final List<Object> data = (List<Object>) (obj);
+					data.set(id, tmp);
+				}
+			};
+		}
+		if (type.isEnum()) {
+			return (final ResultSet rs, final Object obj) -> {
+				final String tmp = rs.getString(count);
+				if (!rs.wasNull()) {
+					boolean find = false;
+					final Object[] arr = type.getEnumConstants();
+					for (final Object elem : arr) {
+						if (elem.toString().equals(tmp)) {
+							final List<Object> data = (List<Object>) (obj);
+							data.set(id, elem);
+							find = true;
+							break;
+						}
+					}
+					if (!find) {
+						throw new DataAccessException("Enum value does not exist in the Model: '" + tmp + "'");
+					}
+				}
+			};
+		}
+		throw new DataAccessException("Unknown Field Type");
+
+	}
+
+	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("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 {
+		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 {
+		final List<LazyGetter> lazyCall = new ArrayList<>();
+		// TODO ... final String deletedFieldName = AnnotationTools.getDeletedFieldName(clazz);
+		final DBEntry entry = DBInterfaceOption.getAutoEntry(options);
+
+		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 List<GroupBy> groups = options.get(GroupBy.class);
+			for (final GroupBy group : groups) {
+				group.generateQuery(query, null);
+			}
+			final List<OrderBy> orders = options.get(OrderBy.class);
+			for (final OrderBy order : orders) {
+				order.generateQuery(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 CountInOut iii = new CountInOut(1);
+			if (parameters != null) {
+				for (final Object elem : parameters) {
+					DataAccess.addElement(ps, elem, iii);
+				}
+				iii.inc();
+			}
+			condition.injectQuery(ps, iii);
+			if (limits.size() == 1) {
+				limits.get(0).injectQuery(ps, iii);
+			}
+			// execute the request
+			final ResultSet rs = ps.executeQuery();
+			final ResultSetMetaData rsmd = rs.getMetaData();
+			final List<RetreiveFromDB> actionToRetreive = new ArrayList<>();
+			LOGGER.info("Field:");
+			for (int jjj = 0; jjj < rsmd.getColumnCount(); jjj++) {
+				final String label = rsmd.getColumnLabel(jjj + 1);
+				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());
+				// create the callback...
+				final RetreiveFromDB element = createSetValueFromDbCallbackTable(jjj + 1, headers.get(id).type, id);
+				actionToRetreive.add(element);
+			}
+			while (rs.next()) {
+				count.value = 1;
+				final List<Object> data = Arrays.asList(new Object[headers.size()]);
+				for (final RetreiveFromDB action : actionToRetreive) {
+					action.doRequest(rs, data);
+				}
+				out.values.add(data);
+			}
+			LOGGER.info("Async calls: {}", lazyCall.size());
+			for (final LazyGetter elem : lazyCall) {
+				elem.doRequest();
+			}
+		} catch (final SQLException ex) {
+			ex.printStackTrace();
+			throw ex;
+		} catch (final Exception ex) {
+			ex.printStackTrace();
+		} finally {
+			entry.close();
+		}
+		return out;
+	}
+
+	public static String CSVReplaceSeparator(final String data, final String separator) {
+		if (data == null) {
+			return "";
+		}
+		final String separatorLine = "\n";
+		final String separatorLineReplace = "\\n";
+		return data.replaceAll(separator, "__SEP__").replaceAll(separatorLine, separatorLineReplace);
+	}
+
+	public static String tableToCSV(final TableQuery data) {
+		final String separator = ";";
+		final StringBuilder out = new StringBuilder();
+		// generate header:
+		boolean first = true;
+		for (final TableQueryTypes elem : data.headers) {
+			if (!first) {
+				out.append(separator);
+			} else {
+				first = false;
+			}
+			out.append(CSVReplaceSeparator(elem.title, separator));
+		}
+		out.append("\n");
+		// generate body:
+		first = true;
+		for (final List<Object> line : data.values) {
+			for (final Object elem : line) {
+				if (!first) {
+					out.append(separator);
+				} else {
+					first = false;
+				}
+				if (elem != null) {
+					out.append(CSVReplaceSeparator(elem.toString(), separator));
+				}
+			}
+			out.append("\n");
+		}
+		return out.toString();
+	}
+
+	public static Response convertInResponse(final TableQuery dataOut, final String accept)
+			throws DataAccessException, IOException {
+		if (CSV_TYPE.equals(accept)) {
+			// CSV serialization
+			String out = null;
+			try {
+				out = DataExport.tableToCSV(dataOut);
+			} catch (final Exception e) {
+				LOGGER.error("Fail to generate CSV....");
+				e.printStackTrace();
+				throw new DataAccessException("Fail in CSV convertion data");
+			}
+			return Response.ok(out).header("Content-Type", CSV_TYPE).build();
+		}
+		if (MediaType.APPLICATION_JSON.equals(accept)) {
+			LOGGER.info("Start mapping josn");
+			final ObjectMapper objectMapper = new ObjectMapper();
+			LOGGER.info("Start find modules josn");
+			objectMapper.findAndRegisterModules();
+			LOGGER.info("Start map object");
+			String out;
+			try {
+				out = objectMapper.writeValueAsString(dataOut);
+			} catch (final JsonProcessingException e) {
+				LOGGER.error("Fail to generate JSON....");
+				e.printStackTrace();
+				throw new DataAccessException("Fail in JSON convertion data");
+			}
+			LOGGER.info("generate response");
+			return Response.ok(out).header("Content-Type", MediaType.APPLICATION_JSON).build();
+		}
+		throw new IOException("This type is not managed: '" + accept + "'");
+	}
+
+}
--- a/src/org/kar/archidata/dataAccess/DataFactory.java
+++ b/src/org/kar/archidata/dataAccess/DataFactory.java
@@ -2,11 +2,13 @@ package org.kar.archidata.dataAccess;

 import java.lang.reflect.Field;
 import java.sql.Timestamp;
+import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.UUID;

 import org.kar.archidata.annotation.AnnotationTools;
 import org.kar.archidata.annotation.CreationTimestamp;
@@ -27,6 +29,9 @@ public class DataFactory {

 	public static String convertTypeInSQL(final Class<?> type, final String fieldName) throws Exception {
 		if (!"sqlite".equals(ConfigBaseVariable.getDBType())) {
+			if (type == UUID.class) {
+				return "binary(16)";
+			}
 			if (type == Long.class || type == long.class) {
 				return "bigint";
 			}
@@ -42,6 +47,9 @@ public class DataFactory {
 			if (type == Double.class || type == double.class) {
 				return "double";
 			}
+			if (type == Instant.class) {
+				return "varchar(33)";
+			}
 			if (type == Date.class || type == Timestamp.class) {
 				return "timestamp(3)";
 			}
@@ -75,6 +83,9 @@ public class DataFactory {
 				return out.toString();
 			}
 		} else {
+			if (type == UUID.class) {
+				return "BINARY(16)";
+			}
 			if (type == Long.class || type == long.class) {
 				return "INTEGER";
 			}
@@ -90,6 +101,9 @@ public class DataFactory {
 			if (type == Double.class || type == double.class) {
 				return "REAL";
 			}
+			if (type == Instant.class) {
+				return "text";
+			}
 			if (type == Date.class || type == Timestamp.class) {
 				return "DATETIME";
 			}
@@ -128,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);
@@ -172,16 +195,24 @@ public class DataFactory {
 			}
 			if (defaultValue == null) {
 				if (updateTime || createTime) {
-					mainTableBuilder.append("DEFAULT CURRENT_TIMESTAMP");
-					if (!"sqlite".equals(ConfigBaseVariable.getDBType())) {
-						mainTableBuilder.append("(3)");
+					if ("varchar(33)".equals(typeValue)) {
+						mainTableBuilder.append("DEFAULT DATE_FORMAT(now(6), '%Y-%m-%dT%H:%m:%s.%fZ')");
+					} else {
+						mainTableBuilder.append("DEFAULT CURRENT_TIMESTAMP");
+						if (!"sqlite".equals(ConfigBaseVariable.getDBType())) {
+							mainTableBuilder.append("(3)");
+						}
 					}
 					mainTableBuilder.append(" ");
 				}
 				if (updateTime) {
 					if (!"sqlite".equals(ConfigBaseVariable.getDBType())) {
-						mainTableBuilder.append("ON UPDATE CURRENT_TIMESTAMP");
-						mainTableBuilder.append("(3)");
+						if ("varchar(33)".equals(typeValue)) {
+							mainTableBuilder.append("ON UPDATE DATE_FORMAT(now(6), '%Y-%m-%dT%H:%m:%s.%fZ')");
+						} else {
+							mainTableBuilder.append("ON UPDATE CURRENT_TIMESTAMP");
+							mainTableBuilder.append("(3)");
+						}
 					} else {
 						// TODO: add trigger:
 						/* CREATE TRIGGER your_table_trig AFTER UPDATE ON your_table BEGIN update your_table SET updated_on = datetime('now') WHERE user_id = NEW.user_id; END; */
@@ -195,7 +226,14 @@ public class DataFactory {
 						triggerBuilder.append(" SET ");
 						triggerBuilder.append(name);
 						// triggerBuilder.append(" = datetime('now') WHERE id = NEW.id; \n");
-						triggerBuilder.append(" = strftime('%Y-%m-%d %H:%M:%f', '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 " + tablePrimaryKey
+									+ " = NEW." + tablePrimaryKey + "; \n");
+						} else {
+							triggerBuilder.append(" = strftime('%Y-%m-%d %H:%M:%f', 'now') WHERE " + tablePrimaryKey
+									+ " = NEW." + tablePrimaryKey + "; \n");
+						}
 						triggerBuilder.append("END;");

 						postOtherTables.add(triggerBuilder.toString());
@@ -241,8 +279,11 @@ public class DataFactory {
 			mainTableBuilder.append("PRIMARY KEY ");

 		}
+
 		if (strategy == GenerationType.IDENTITY) {
-			if (!"sqlite".equals(ConfigBaseVariable.getDBType())) {
+			if ("binary(16)".equals(typeValue)) {
+
+			} else if (!"sqlite".equals(ConfigBaseVariable.getDBType())) {
 				mainTableBuilder.append("AUTO_INCREMENT ");
 			} else {
 				mainTableBuilder.append("AUTOINCREMENT ");
@@ -310,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)) {
@@ -321,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());
@@ -342,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++;
 			}
--- a/src/org/kar/archidata/dataAccess/Limit.java
+++ b/src/org/kar/archidata/dataAccess/Limit.java
@@ -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 ? ");
-	}
-
-	public void injectQuerry(final PreparedStatement ps, final CountInOut iii) throws Exception {
-		DataAccess.addElement(ps, this.limit, iii);
-		iii.inc();
-	}
-}
--- a/src/org/kar/archidata/dataAccess/QueryAnd.java
+++ b/src/org/kar/archidata/dataAccess/QueryAnd.java
@@ -8,17 +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... 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(" (");
 		}
@@ -29,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(")");
@@ -37,10 +41,14 @@ 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);
 		}
 	}
+
+	public int size() {
+		return this.childs.size();
+	}
 }
--- a/src/org/kar/archidata/dataAccess/QueryCondition.java
+++ b/src/org/kar/archidata/dataAccess/QueryCondition.java
@@ -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,9 +20,11 @@ public class QueryCondition implements QueryItem {
 	}

 	@Override
-	public void generateQuerry(final StringBuilder query, final String tableName) {
-		query.append(tableName);
-		query.append(".");
+	public void generateQuery(final StringBuilder query, final String tableName) {
+		if (tableName != null) {
+			query.append(tableName);
+			query.append(".");
+		}
 		query.append(this.key);
 		query.append(" ");
 		query.append(this.comparator);
@@ -24,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();
 	}
--- a/src/org/kar/archidata/dataAccess/QueryInList.java
+++ b/src/org/kar/archidata/dataAccess/QueryInList.java
@@ -23,9 +23,11 @@ public class QueryInList<T> implements QueryItem {
 	}

 	@Override
-	public void generateQuerry(final StringBuilder query, final String tableName) {
-		query.append(tableName);
-		query.append(".");
+	public void generateQuery(final StringBuilder query, final String tableName) {
+		if (tableName != null) {
+			query.append(tableName);
+			query.append(".");
+		}
 		query.append(this.key);
 		query.append(" ");
 		query.append(this.comparator);
@@ -42,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();
--- a/src/org/kar/archidata/dataAccess/QueryItem.java
+++ b/src/org/kar/archidata/dataAccess/QueryItem.java
@@ -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;
 }
--- a/src/org/kar/archidata/dataAccess/QueryNotNull.java
+++ b/src/org/kar/archidata/dataAccess/QueryNotNull.java
@@ -0,0 +1,24 @@
+package org.kar.archidata.dataAccess;
+
+import java.sql.PreparedStatement;
+
+public class QueryNotNull implements QueryItem {
+	private final String key;
+
+	public QueryNotNull(final String key) {
+		this.key = key;
+	}
+
+	@Override
+	public void generateQuery(final StringBuilder query, final String tableName) {
+		if (tableName != null) {
+			query.append(tableName);
+			query.append(".");
+		}
+		query.append(this.key);
+		query.append(" IS NOT NULL");
+	}
+
+	@Override
+	public void injectQuery(final PreparedStatement ps, final CountInOut iii) throws Exception {}
+}
--- a/src/org/kar/archidata/dataAccess/QueryNull.java
+++ b/src/org/kar/archidata/dataAccess/QueryNull.java
@@ -0,0 +1,24 @@
+package org.kar.archidata.dataAccess;
+
+import java.sql.PreparedStatement;
+
+public class QueryNull implements QueryItem {
+	private final String key;
+
+	public QueryNull(final String key) {
+		this.key = key;
+	}
+
+	@Override
+	public void generateQuery(final StringBuilder query, final String tableName) {
+		if (tableName != null) {
+			query.append(tableName);
+			query.append(".");
+		}
+		query.append(this.key);
+		query.append(" IS NULL");
+	}
+
+	@Override
+	public void injectQuery(final PreparedStatement ps, final CountInOut iii) throws Exception {}
+}
--- a/src/org/kar/archidata/dataAccess/QueryOption.java
+++ b/src/org/kar/archidata/dataAccess/QueryOption.java
@@ -1,3 +0,0 @@
-package org.kar.archidata.dataAccess;
-
-public class QueryOption {}
--- a/src/org/kar/archidata/dataAccess/QueryOptions.java
+++ b/src/org/kar/archidata/dataAccess/QueryOptions.java
@@ -1,11 +1,11 @@
 package org.kar.archidata.dataAccess;

 import java.util.ArrayList;
-import java.util.Collections;
 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;
@@ -24,10 +24,16 @@ public class QueryOptions {
 		if (elems == null || elems.length == 0) {
 			return;
 		}
-		Collections.addAll(this.options, elems);
+		for (final QueryOption elem : elems) {
+			add(elem);
+		}
+
 	}

 	public void add(final QueryOption option) {
+		if (option == null) {
+			return;
+		}
 		this.options.add(option);
 	}

@@ -40,13 +46,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) {
@@ -64,5 +71,4 @@ public class QueryOptions {
 		}
 		return false;
 	}
-
 }
--- a/src/org/kar/archidata/dataAccess/QueryOr.java
+++ b/src/org/kar/archidata/dataAccess/QueryOr.java
@@ -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);
 		}
 	}
 }
--- a/src/org/kar/archidata/dataAccess/RetreiveFromDB.java
+++ b/src/org/kar/archidata/dataAccess/RetreiveFromDB.java
@@ -0,0 +1,7 @@
+package org.kar.archidata.dataAccess;
+
+import java.sql.ResultSet;
+
+public interface RetreiveFromDB {
+	void doRequest(final ResultSet rs, Object obj) throws Exception;
+}
--- a/src/org/kar/archidata/dataAccess/addOn/AddOnDataJson.java
+++ b/src/org/kar/archidata/dataAccess/addOn/AddOnDataJson.java
@@ -1,22 +1,34 @@
 package org.kar.archidata.dataAccess.addOn;

 import java.lang.reflect.Field;
+import java.lang.reflect.ParameterizedType;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.sql.Types;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;

 import org.kar.archidata.annotation.AnnotationTools;
 import org.kar.archidata.annotation.DataJson;
 import org.kar.archidata.dataAccess.CountInOut;
+import org.kar.archidata.dataAccess.DataAccess;
 import org.kar.archidata.dataAccess.DataAccessAddOn;
 import org.kar.archidata.dataAccess.DataFactory;
 import org.kar.archidata.dataAccess.LazyGetter;
 import org.kar.archidata.dataAccess.QueryOptions;
+import org.kar.archidata.dataAccess.addOn.model.TableCoversLongLong;
+import org.kar.archidata.dataAccess.addOn.model.TableCoversLongUUID;
+import org.kar.archidata.dataAccess.addOn.model.TableCoversUUIDLong;
+import org.kar.archidata.dataAccess.addOn.model.TableCoversUUIDUUID;
+import org.kar.archidata.dataAccess.options.OverrideTableName;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;

 import jakarta.validation.constraints.NotNull;
@@ -42,7 +54,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 IllegalArgumentException, IllegalAccessException, SQLException, JsonProcessingException {
 		final Object data = field.get(rootObject);
 		if (data == null) {
 			ps.setNull(iii.value, Types.VARCHAR);
@@ -59,7 +72,7 @@ public class AddOnDataJson implements DataAccessAddOn {
 	}

 	@Override
-	public boolean isInsertAsync(final Field field) throws Exception {
+	public boolean isInsertAsync(final Field field) {
 		return false;
 	}

@@ -69,30 +82,259 @@ 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()) {
 			final ObjectMapper objectMapper = new ObjectMapper();
+			if (field.getType() == List.class) {
+				final ParameterizedType listType = (ParameterizedType) field.getGenericType();
+				final Class<?> listClass = (Class<?>) listType.getActualTypeArguments()[0];
+				if (listClass == Long.class) {
+					final Object dataParsed = objectMapper.readValue(jsonData, new TypeReference<List<Long>>() {});// field.getType());
+					field.set(data, dataParsed);
+					return;
+				}
+				if (listClass == Float.class) {
+					final Object dataParsed = objectMapper.readValue(jsonData, new TypeReference<List<Float>>() {});// field.getType());
+					field.set(data, dataParsed);
+					return;
+				}
+				if (listClass == Double.class) {
+					final Object dataParsed = objectMapper.readValue(jsonData, new TypeReference<List<Double>>() {});// field.getType());
+					field.set(data, dataParsed);
+					return;
+				}
+				if (listClass == Integer.class) {
+					final Object dataParsed = objectMapper.readValue(jsonData, new TypeReference<List<Integer>>() {});// field.getType());
+					field.set(data, dataParsed);
+					return;
+				}
+				if (listClass == Short.class) {
+					final Object dataParsed = objectMapper.readValue(jsonData, new TypeReference<List<Short>>() {});// field.getType());
+					field.set(data, dataParsed);
+					return;
+				}
+				if (listClass == String.class) {
+					final Object dataParsed = objectMapper.readValue(jsonData, new TypeReference<List<String>>() {});// field.getType());
+					field.set(data, dataParsed);
+					return;
+				}
+				if (listClass == UUID.class) {
+					final Object dataParsed = objectMapper.readValue(jsonData, new TypeReference<List<UUID>>() {});// field.getType());
+					field.set(data, dataParsed);
+					return;
+				}
+				LOGGER.warn("Maybe fail to translate Model in datajson list: List<{}>", listClass.getCanonicalName());
+			}
 			final Object dataParsed = objectMapper.readValue(jsonData, field.getType());
 			field.set(data, dataParsed);
 		}
 	}

 	@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 {
+		final String tableName = AnnotationTools.getTableName(clazz);
+		final TableCoversLongLong data = DataAccess.get(TableCoversLongLong.class, id,
+				new OverrideTableName(tableName));
+		if (data.covers == null) {
+			data.covers = new ArrayList<>();
+		}
+		for (final Long elem : data.covers) {
+			if (elem.equals(remoteKey)) {
+				return;
+			}
+		}
+		data.covers.add(remoteKey);
+		DataAccess.update(data, data.id, List.of("covers"), new OverrideTableName(tableName));
+	}
+
+	/**
+	 * Adds a remoteKey to the covers list of a data entry identified by the given class type and ID.
+	 * If the covers list is null, it initializes it. If the remoteKey already exists in the list,
+	 * the method returns without making any changes.
+	 *
+	 * @param clazz     The class type to retrieve the table name from.
+	 * @param id        The ID of the data object to fetch.
+	 * @param column    The name of the column (currently not used, but may be used for specifying a field name).
+	 * @param remoteKey The UUID to add to the covers list.
+	 * @throws Exception If an error occurs during data retrieval or update.
+	 */
+	public static void addLink(final Class<?> clazz, final Long id, final String column, final UUID remoteKey)
+			throws Exception {
+		final String tableName = AnnotationTools.getTableName(clazz);
+		// TODO: Get primary key name
+		final TableCoversLongUUID data = DataAccess.get(TableCoversLongUUID.class, id,
+				new OverrideTableName(tableName));
+		if (data.covers == null) {
+			data.covers = new ArrayList<>();
+		}
+		for (final UUID elem : data.covers) {
+			if (elem.equals(remoteKey)) {
+				return;
+			}
+		}
+		data.covers.add(remoteKey);
+		DataAccess.update(data, data.id, List.of("covers"), new OverrideTableName(tableName));// TODO:  ,new OverrideFieldName("covers", column));
+	}
+
+	/**
+	 * Adds a remoteKey to the covers list of a data entry identified by the given class type and ID.
+	 * If the covers list is null, it initializes it. If the remoteKey already exists in the list,
+	 * the method returns without making any changes.
+	 *
+	 * @param clazz     The class type to retrieve the table name from.
+	 * @param id        The ID of the data object to fetch.
+	 * @param column    The name of the column (currently not used, but may be used for specifying a field name).
+	 * @param remoteKey The UUID to add to the covers list.
+	 * @throws Exception If an error occurs during data retrieval or update.
+	 */
+	public static void addLink(final Class<?> clazz, final UUID uuid, final String column, final UUID remoteKey)
+			throws Exception {
+		final String tableName = AnnotationTools.getTableName(clazz);
+		final TableCoversUUIDUUID data = DataAccess.get(TableCoversUUIDUUID.class, uuid,
+				new OverrideTableName(tableName));
+		if (data.covers == null) {
+			data.covers = new ArrayList<>();
+		}
+		for (final UUID elem : data.covers) {
+			if (elem.equals(remoteKey)) {
+				return;
+			}
+		}
+		data.covers.add(remoteKey);
+		DataAccess.update(data, data.uuid, List.of("covers"), new OverrideTableName(tableName));
+	}
+
+	public static void addLink(final Class<?> clazz, final UUID uuid, final String column, final Long remoteKey)
+			throws Exception {
+		final String tableName = AnnotationTools.getTableName(clazz);
+		final TableCoversUUIDLong data = DataAccess.get(TableCoversUUIDLong.class, uuid,
+				new OverrideTableName(tableName));
+		if (data.covers == null) {
+			data.covers = new ArrayList<>();
+		}
+		for (final Long elem : data.covers) {
+			if (elem.equals(remoteKey)) {
+				return;
+			}
+		}
+		data.covers.add(remoteKey);
+		DataAccess.update(data, data.uuid, List.of("covers"), new OverrideTableName(tableName));
+	}
+
+	public static void removeLink(final Class<?> clazz, final UUID uuid, final String column, final Long remoteKey)
+			throws Exception {
+		final String tableName = AnnotationTools.getTableName(clazz);
+		final TableCoversUUIDLong data = DataAccess.get(TableCoversUUIDLong.class, uuid,
+				new OverrideTableName(tableName));
+		if (data.covers == null) {
+			return;
+		}
+		final List<Long> newList = new ArrayList<>();
+		for (final Long elem : data.covers) {
+			if (elem.equals(remoteKey)) {
+				continue;
+			}
+			newList.add(elem);
+		}
+		data.covers = newList;
+		DataAccess.update(data, data.uuid, List.of("covers"), new OverrideTableName(tableName));
+	}
+
+	public static void removeLink(final Class<?> clazz, final UUID uuid, final String column, final UUID remoteKey)
+			throws Exception {
+		final String tableName = AnnotationTools.getTableName(clazz);
+		final TableCoversUUIDUUID data = DataAccess.get(TableCoversUUIDUUID.class, uuid,
+				new OverrideTableName(tableName));
+		if (data.covers == null) {
+			return;
+		}
+		final List<UUID> newList = new ArrayList<>();
+		for (final UUID elem : data.covers) {
+			if (elem.equals(remoteKey)) {
+				continue;
+			}
+			newList.add(elem);
+		}
+		data.covers = newList;
+		DataAccess.update(data, data.uuid, List.of("covers"), new OverrideTableName(tableName));
+	}
+
+	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));
+		if (data.covers == null) {
+			return;
+		}
+		final List<Long> newList = new ArrayList<>();
+		for (final Long elem : data.covers) {
+			if (elem.equals(remoteKey)) {
+				continue;
+			}
+			newList.add(elem);
+		}
+		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 {
+		final String tableName = AnnotationTools.getTableName(clazz);
+		final TableCoversLongUUID data = DataAccess.get(TableCoversLongUUID.class, id,
+				new OverrideTableName(tableName));
+		if (data.covers == null) {
+			return;
+		}
+		final List<UUID> newList = new ArrayList<>();
+		for (final UUID elem : data.covers) {
+			if (elem.equals(remoteKey)) {
+				continue;
+			}
+			newList.add(elem);
+		}
+		data.covers = newList;
+		DataAccess.update(data, data.id, List.of("covers"), new OverrideTableName(tableName));
 	}
 }
--- a/src/org/kar/archidata/dataAccess/addOn/AddOnManyToMany.java
+++ b/src/org/kar/archidata/dataAccess/addOn/AddOnManyToMany.java
@@ -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,7 +68,22 @@ public class AddOnManyToMany implements DataAccessAddOn {

 	@Override
 	public boolean canRetrieve(final Field field) {
-		return true;
+		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 {
@@ -78,54 +99,82 @@ 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");
+		querySelect.append(" 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];
+		// TODO: manage better the eager and lazy !!
+		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 +184,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 +233,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 +272,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);
-		actions.add(() -> {
-			DataAccess.deleteWhere(LinkTable.class, new OverrideTableName(linkTableName), new Condition(new QueryCondition("object1Id", "=", localKey)));
-		});
-		asyncInsert(tableName, localKey, field, data, actions);
+
+		if (localKey instanceof final Long localKeyLong) {
+			if (objectClass == Long.class) {
+				actions.add(() -> {
+					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 +328,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,73 +341,203 @@ 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;
-		}
-		@SuppressWarnings("unchecked")
-		final List<Long> dataCasted = (List<Long>) data;
-		if (dataCasted.size() == 0) {
-			return;
-		}
-		final List<LinkTable> 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));
+		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<LinkTableLongLong> 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 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 {
-				throw new DataAccessException("Not manage access of remte key like ManyToMany other than Long: " + localKey.getClass().getCanonicalName());
+				// ========================================================
+				// == 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);
+					return;
+				}
+				actions.add(() -> {
+					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());
 		}
-		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));
-		});
+
 	}

 	@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);
-		postActionList.addAll(sqlCommand);
+		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());
+		}
 	}
 }
--- a/src/org/kar/archidata/dataAccess/addOn/AddOnManyToOne.java
+++ b/src/org/kar/archidata/dataAccess/addOn/AddOnManyToOne.java
@@ -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) {
-			ps.setNull(iii.value, Types.BIGINT);
+			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,11 +233,16 @@ 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);
 				}
-			} else {
+				return;
+			}
+			final Field remotePrimaryKeyField = AnnotationTools.getFieldOfId(objectClass);
+			final Class<?> remotePrimaryKeyType = remotePrimaryKeyField.getType();
+			if (remotePrimaryKeyType == Long.class) {
 				// here we have the field, the data and the the remote value ==> can create callback that generate the update of the value ...
 				final Long foreignKey = rs.getLong(count.value);
 				count.inc();
@@ -178,14 +258,47 @@ public class AddOnManyToOne implements DataAccessAddOn {
 					};
 					lazyCall.add(lambda);
 				}
+			} else if (remotePrimaryKeyType == UUID.class) {
+				// here we have the field, the data and the the remote value ==> can create callback that generate the update of the value ...
+				final UUID foreignKey = DataAccess.getListOfRawUUID(rs, count.value);
+				count.inc();
+				if (foreignKey != null) {
+					// In the lazy mode, the request is done in asynchronous mode, they will be done after...
+					final LazyGetter lambda = () -> {
+						// TODO: update to have get with abstract types ....
+						final Object foreignData = DataAccess.get(decorators.targetEntity(), foreignKey);
+						if (foreignData == null) {
+							return;
+						}
+						field.set(data, foreignData);
+					};
+					lazyCall.add(lambda);
+				}
 			}
 		}
 	}

 	// 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);
+		}
 	}
 }
--- a/src/org/kar/archidata/dataAccess/addOn/AddOnOneToMany.java
+++ b/src/org/kar/archidata/dataAccess/addOn/AddOnOneToMany.java
@@ -1,28 +1,36 @@
 package org.kar.archidata.dataAccess.addOn;

 import java.lang.reflect.Field;
+import java.lang.reflect.ParameterizedType;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Types;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 import java.util.stream.Collectors;

 import org.kar.archidata.annotation.AnnotationTools;
 import org.kar.archidata.dataAccess.CountInOut;
+import org.kar.archidata.dataAccess.DataAccess;
 import org.kar.archidata.dataAccess.DataAccessAddOn;
 import org.kar.archidata.dataAccess.DataFactory;
 import org.kar.archidata.dataAccess.LazyGetter;
+import org.kar.archidata.dataAccess.QueryCondition;
 import org.kar.archidata.dataAccess.QueryOptions;
+import org.kar.archidata.dataAccess.options.Condition;
+import org.kar.archidata.exception.DataAccessException;
+import org.kar.archidata.tools.ConfigBaseVariable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+import jakarta.persistence.FetchType;
 import jakarta.persistence.OneToMany;
 import jakarta.validation.constraints.NotNull;

 public class AddOnOneToMany implements DataAccessAddOn {
-	static final Logger LOGGER = LoggerFactory.getLogger(AddOnManyToMany.class);
+	static final Logger LOGGER = LoggerFactory.getLogger(AddOnOneToMany.class);
+	static final String SEPARATOR_LONG = "-";

 	/** Convert the list if external id in a string '-' separated
 	 * @param ids List of value (null are removed)
@@ -75,16 +83,9 @@ 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 {
-		final Object data = field.get(rootObject);
-		iii.inc();
-		if (data == null) {
-			ps.setNull(iii.value, Types.BIGINT);
-		} else {
-			@SuppressWarnings("unchecked")
-			final String dataTmp = getStringOfIds((List<Long>) data);
-			ps.setString(iii.value, dataTmp);
-		}
+	public void insertData(final PreparedStatement ps, final Field field, final Object rootObject, final CountInOut iii)
+			throws SQLException, IllegalArgumentException, IllegalAccessException {
+		throw new IllegalAccessException("Can not generate an inset of @OneToMany");
 	}

 	@Override
@@ -94,39 +95,226 @@ public class AddOnOneToMany implements DataAccessAddOn {

 	@Override
 	public boolean isInsertAsync(final Field field) throws Exception {
+		// TODO: can be implemented later...
 		return false;
 	}

 	@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 OneToMany decorators = field.getDeclaredAnnotation(OneToMany.class);
+		if (decorators == null) {
+			return false;
+		}
+		if (decorators.targetEntity() == objectClass) {
+			return true;
+		}
 		return false;
 	}

-	@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 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,
+			final Class<?> targetEntity,
+			final String mappedBy) throws Exception {
+		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
+				.getActualTypeArguments()[0];
+		final String remoteTableName = AnnotationTools.getTableName(targetEntity);
+		final String remoteTablePrimaryKeyName = AnnotationTools
+				.getFieldName(AnnotationTools.getPrimaryKeyField(targetEntity));
+		final String tmpRemoteVariable = "tmp_" + Integer.toString(count.value);
+		final String remoteDeletedFieldName = AnnotationTools.getDeletedFieldName(targetEntity);
+
+		querySelect.append(" (SELECT GROUP_CONCAT(");
+		querySelect.append(tmpRemoteVariable);
+		querySelect.append(".");
+		querySelect.append(remoteTablePrimaryKeyName);
+		querySelect.append(" ");
+		if ("sqlite".equals(ConfigBaseVariable.getDBType())) {
+			querySelect.append(", ");
+		} else {
+			querySelect.append("SEPARATOR ");
+		}
+		querySelect.append("'");
+		if (objectClass == Long.class) {
+			querySelect.append(SEPARATOR_LONG);
+		}
+		querySelect.append("') FROM ");
+		querySelect.append(remoteTableName);
+		querySelect.append(" ");
+		querySelect.append(tmpRemoteVariable);
+		querySelect.append(" WHERE ");
+		if (remoteDeletedFieldName != null) {
+			querySelect.append(tmpRemoteVariable);
+			querySelect.append(".");
+			querySelect.append(remoteDeletedFieldName);
+			querySelect.append(" = false");
+			querySelect.append(" AND ");
+		}
+		querySelect.append(tableName);
+		querySelect.append(".");
+		querySelect.append(primaryKey);
+		querySelect.append(" = ");
+		querySelect.append(tmpRemoteVariable);
+		querySelect.append(".");
+		querySelect.append(mappedBy);
+		querySelect.append(" ");
+		querySelect.append(") AS ");
+		querySelect.append(name);
+		querySelect.append(" ");
 	}

 	@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 {
-		final Long foreignKey = rs.getLong(count.value);
-		count.inc();
-		if (!rs.wasNull()) {
-
-			field.set(data, foreignKey);
+	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];
+		final OneToMany decorators = field.getDeclaredAnnotation(OneToMany.class);
+		if (decorators == null) {
+			return;
+		}
+		// TODO: manage better the eager and lazy !!
+		if (objectClass == Long.class || objectClass == UUID.class) {
+			generateConcatQuery(tableName, primaryKey, field, querySelect, query, name, count, options,
+					decorators.targetEntity(), decorators.mappedBy());
+			return;
+		}
+		if (objectClass == decorators.targetEntity()) {
+			if (decorators.fetch() == FetchType.EAGER) {
+				throw new DataAccessException("EAGER is not supported for list of element...");
+			} else {
+				// Force a copy of the primaryKey to permit the async retrieve of the data
+				querySelect.append(" ");
+				querySelect.append(tableName);
+				querySelect.append(".");
+				querySelect.append(primaryKey);
+				querySelect.append(" AS tmp_");
+				querySelect.append(Integer.toString(count.value));
+			}
 		}
 	}

-	// 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 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 OneToMany with other than List Model: {}", field.getType().getCanonicalName());
+			return;
+		}
+		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
+				.getActualTypeArguments()[0];
+		final OneToMany decorators = field.getDeclaredAnnotation(OneToMany.class);
+		if (decorators == null) {
+			return;
+		}
+		if (objectClass == Long.class) {
+			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;
+		}
+		if (objectClass == decorators.targetEntity()) {
+
+			Long parentIdTmp = null;
+			UUID parendUuidTmp = null;
+			try {
+				final String modelData = rs.getString(count.value);
+				parentIdTmp = Long.valueOf(modelData);
+				count.inc();
+			} catch (final NumberFormatException ex) {
+				final List<UUID> idList = DataAccess.getListOfRawUUIDs(rs, count.value);
+				parendUuidTmp = idList.get(0);
+				count.inc();
+			}
+			final Long parentId = parentIdTmp;
+			final UUID parendUuid = parendUuidTmp;
+			final String mappingKey = decorators.mappedBy();
+			// We get the parent ID ... ==> need to request the list of elements
+			if (objectClass == Long.class) {
+				LOGGER.error("Need to retreive all primary key of all elements");
+				//field.set(data, idList);
+				return;
+			} else if (objectClass == UUID.class) {
+				LOGGER.error("Need to retreive all primary key of all elements");
+				//field.set(data, idList);
+				return;
+			}
+			if (objectClass == decorators.targetEntity()) {
+				if (decorators.fetch() == FetchType.EAGER) {
+					throw new DataAccessException("EAGER is not supported for list of element...");
+				} else if (parentId != null) {
+					// In the lazy mode, the request is done in asynchronous mode, they will be done after...
+					final LazyGetter lambda = () -> {
+						@SuppressWarnings("unchecked")
+						final Object foreignData = DataAccess.getsWhere(decorators.targetEntity(),
+								new Condition(new QueryCondition(mappingKey, "=", parentId)));
+						if (foreignData == null) {
+							return;
+						}
+						field.set(data, foreignData);
+					};
+					lazyCall.add(lambda);
+				} else if (parendUuid != null) {
+					final LazyGetter lambda = () -> {
+						@SuppressWarnings("unchecked")
+						final Object foreignData = DataAccess.getsWhere(decorators.targetEntity(),
+								new Condition(new QueryCondition(mappingKey, "=", parendUuid)));
+						if (foreignData == null) {
+							return;
+						}
+						field.set(data, foreignData);
+					};
+					lazyCall.add(lambda);
+				}
+			}
+		}
+	}
+
+	// TODO : refacto this table to manage a generic table with dynamic name to be serialize with the default system
+	@Override
+	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 {
+		// This is a remote field ==> nothing to generate (it is stored in the remote object
 	}
 }
--- a/src/org/kar/archidata/dataAccess/addOn/AddOnSQLTableExternalForeinKeyAsList.java
+++ b/src/org/kar/archidata/dataAccess/addOn/AddOnSQLTableExternalForeinKeyAsList.java
@@ -1,114 +0,0 @@
-package org.kar.archidata.dataAccess.addOn;
-
-import java.lang.reflect.Field;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.kar.archidata.annotation.AnnotationTools;
-import org.kar.archidata.annotation.addOn.SQLTableExternalForeinKeyAsList;
-import org.kar.archidata.dataAccess.CountInOut;
-import org.kar.archidata.dataAccess.DataAccess;
-import org.kar.archidata.dataAccess.DataAccessAddOn;
-import org.kar.archidata.dataAccess.DataFactory;
-import org.kar.archidata.dataAccess.LazyGetter;
-import org.kar.archidata.dataAccess.QueryOptions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import jakarta.validation.constraints.NotNull;
-
-// TODO: maybe deprecated ==> use DataJson instead...
-public class AddOnSQLTableExternalForeinKeyAsList implements DataAccessAddOn {
-	static final Logger LOGGER = LoggerFactory.getLogger(AddOnManyToMany.class);
-	static final String SEPARATOR = "-";
-	
-	/** Convert the list if external id in a string '-' separated
-	 * @param ids List of value (null are removed)
-	 * @return '-' string separated */
-	protected static String getStringOfIds(final List<Long> ids) {
-		final List<Long> tmp = new ArrayList<>(ids);
-		return tmp.stream().map(String::valueOf).collect(Collectors.joining(SEPARATOR));
-	}
-	
-	@Override
-	public Class<?> getAnnotationClass() {
-		return SQLTableExternalForeinKeyAsList.class;
-	}
-	
-	@Override
-	public String getSQLFieldType(final Field field) throws Exception {
-		final String fieldName = AnnotationTools.getFieldName(field);
-		try {
-			return DataFactory.convertTypeInSQL(String.class, fieldName);
-		} catch (final Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return null;
-	}
-	
-	@Override
-	public boolean isCompatibleField(final Field field) {
-		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 {
-		final Object data = field.get(rootObject);
-		iii.inc();
-		if (data == null) {
-			ps.setNull(iii.value, Types.BIGINT);
-		} else {
-			@SuppressWarnings("unchecked")
-			final String dataTmp = getStringOfIds((List<Long>) data);
-			ps.setString(iii.value, dataTmp);
-		}
-	}
-	
-	@Override
-	public boolean canInsert(final Field field) {
-		return false;
-	}
-	
-	@Override
-	public boolean isInsertAsync(final Field field) throws Exception {
-		return false;
-	}
-	
-	@Override
-	public boolean canRetrieve(final Field field) {
-		return true;
-	}
-	
-	@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);
-	}
-	
-	@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 {
-		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);
-	}
-}
--- a/src/org/kar/archidata/dataAccess/addOn/model/LinkTableLongLong.java
+++ b/src/org/kar/archidata/dataAccess/addOn/model/LinkTableLongLong.java
@@ -1,16 +1,16 @@
 package org.kar.archidata.dataAccess.addOn.model;

-import org.kar.archidata.model.GenericData;
+import org.kar.archidata.model.UUIDGenericDataSoftDelete;

 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.Column;

-public class LinkTable extends GenericData {
-	public LinkTable() {
+public class LinkTableLongLong extends UUIDGenericDataSoftDelete {
+	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;
 	}
--- a/src/org/kar/archidata/dataAccess/addOn/model/LinkTableLongUUID.java
+++ b/src/org/kar/archidata/dataAccess/addOn/model/LinkTableLongUUID.java
@@ -0,0 +1,27 @@
+package org.kar.archidata.dataAccess.addOn.model;
+
+import java.util.UUID;
+
+import org.kar.archidata.model.UUIDGenericDataSoftDelete;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.Column;
+
+public class LinkTableLongUUID extends UUIDGenericDataSoftDelete {
+	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;
+
+}
--- a/src/org/kar/archidata/dataAccess/addOn/model/LinkTableUUIDLong.java
+++ b/src/org/kar/archidata/dataAccess/addOn/model/LinkTableUUIDLong.java
@@ -0,0 +1,27 @@
+package org.kar.archidata.dataAccess.addOn.model;
+
+import java.util.UUID;
+
+import org.kar.archidata.model.UUIDGenericDataSoftDelete;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.Column;
+
+public class LinkTableUUIDLong extends UUIDGenericDataSoftDelete {
+	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;
+
+}
--- a/src/org/kar/archidata/dataAccess/addOn/model/LinkTableUUIDUUID.java
+++ b/src/org/kar/archidata/dataAccess/addOn/model/LinkTableUUIDUUID.java
@@ -0,0 +1,27 @@
+package org.kar.archidata.dataAccess.addOn.model;
+
+import java.util.UUID;
+
+import org.kar.archidata.model.UUIDGenericDataSoftDelete;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.Column;
+
+public class LinkTableUUIDUUID extends UUIDGenericDataSoftDelete {
+	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;
+
+}
--- a/src/org/kar/archidata/dataAccess/addOn/model/TableCoversLongLong.java
+++ b/src/org/kar/archidata/dataAccess/addOn/model/TableCoversLongLong.java
@@ -0,0 +1,25 @@
+package org.kar.archidata.dataAccess.addOn.model;
+
+import java.util.List;
+
+import org.kar.archidata.annotation.DataJson;
+
+import jakarta.persistence.Id;
+
+public class TableCoversLongLong {
+	public TableCoversLongLong() {
+		// nothing to do...
+	}
+
+	public TableCoversLongLong(final Long id, final List<Long> covers) {
+		this.id = id;
+		this.covers = covers;
+	}
+
+	@Id
+	public Long id;
+
+	@DataJson()
+	public List<Long> covers;
+
+}
--- a/src/org/kar/archidata/dataAccess/addOn/model/TableCoversLongUUID.java
+++ b/src/org/kar/archidata/dataAccess/addOn/model/TableCoversLongUUID.java
@@ -0,0 +1,26 @@
+package org.kar.archidata.dataAccess.addOn.model;
+
+import java.util.List;
+import java.util.UUID;
+
+import org.kar.archidata.annotation.DataJson;
+
+import jakarta.persistence.Id;
+
+public class TableCoversLongUUID {
+	public TableCoversLongUUID() {
+		// nothing to do...
+	}
+
+	public TableCoversLongUUID(final Long id, final List<UUID> covers) {
+		this.id = id;
+		this.covers = covers;
+	}
+
+	@Id
+	public Long id;
+
+	@DataJson()
+	public List<UUID> covers;
+
+}
--- a/src/org/kar/archidata/dataAccess/addOn/model/TableCoversUUIDLong.java
+++ b/src/org/kar/archidata/dataAccess/addOn/model/TableCoversUUIDLong.java
@@ -0,0 +1,25 @@
+package org.kar.archidata.dataAccess.addOn.model;
+
+import java.util.List;
+import java.util.UUID;
+
+import org.kar.archidata.annotation.DataJson;
+
+import jakarta.persistence.Id;
+
+public class TableCoversUUIDLong {
+	public TableCoversUUIDLong() {
+		// nothing to do...
+	}
+
+	public TableCoversUUIDLong(final UUID uuid, final List<Long> covers) {
+		this.uuid = uuid;
+		this.covers = covers;
+	}
+
+	@Id
+	public UUID uuid;
+	@DataJson()
+	public List<Long> covers;
+
+}
--- a/src/org/kar/archidata/dataAccess/addOn/model/TableCoversUUIDUUID.java
+++ b/src/org/kar/archidata/dataAccess/addOn/model/TableCoversUUIDUUID.java
@@ -0,0 +1,25 @@
+package org.kar.archidata.dataAccess.addOn.model;
+
+import java.util.List;
+import java.util.UUID;
+
+import org.kar.archidata.annotation.DataJson;
+
+import jakarta.persistence.Id;
+
+public class TableCoversUUIDUUID {
+	public TableCoversUUIDUUID() {
+		// nothing to do...
+	}
+
+	public TableCoversUUIDUUID(final UUID uuid, final List<UUID> covers) {
+		this.uuid = uuid;
+		this.covers = covers;
+	}
+
+	@Id
+	public UUID uuid;
+	@DataJson()
+	public List<UUID> covers;
+
+}
--- a/src/org/kar/archidata/dataAccess/exportTools/README.md
+++ b/src/org/kar/archidata/dataAccess/exportTools/README.md
@@ -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
+```
+
+
--- a/src/org/kar/archidata/dataAccess/exportTools/TableQuery.java
+++ b/src/org/kar/archidata/dataAccess/exportTools/TableQuery.java
@@ -0,0 +1,14 @@
+package org.kar.archidata.dataAccess.exportTools;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TableQuery {
+
+	public final List<TableQueryTypes> headers;
+	public final List<List<Object>> values = new ArrayList<>();
+
+	public TableQuery(final List<TableQueryTypes> headers) {
+		this.headers = headers;
+	}
+}
--- a/src/org/kar/archidata/dataAccess/exportTools/TableQueryTypes.java
+++ b/src/org/kar/archidata/dataAccess/exportTools/TableQueryTypes.java
@@ -0,0 +1,20 @@
+package org.kar.archidata.dataAccess.exportTools;
+
+public class TableQueryTypes {
+
+	public Class<?> type;
+	public String name;
+	public String title;
+
+	public TableQueryTypes(final Class<?> type, final String name, final String title) {
+		this.type = type;
+		this.name = name;
+		this.title = title;
+	}
+
+	public TableQueryTypes(final Class<?> type, final String name) {
+		this.type = type;
+		this.name = name;
+		this.title = name;
+	}
+}
--- a/src/org/kar/archidata/dataAccess/options/AccessDeletedItems.java
+++ b/src/org/kar/archidata/dataAccess/options/AccessDeletedItems.java
@@ -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() {}
--- a/src/org/kar/archidata/dataAccess/options/CheckFunction.java
+++ b/src/org/kar/archidata/dataAccess/options/CheckFunction.java
@@ -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;
--- a/src/org/kar/archidata/dataAccess/options/CheckFunctionInterface.java
+++ b/src/org/kar/archidata/dataAccess/options/CheckFunctionInterface.java
@@ -3,6 +3,7 @@ package org.kar.archidata.dataAccess.options;
 import java.util.List;

 import org.kar.archidata.annotation.AnnotationTools;
+import org.kar.archidata.dataAccess.QueryOptions;

 /** By default some element are not read like createAt and UpdatedAt. This option permit to read it. */
 public interface CheckFunctionInterface {
@@ -11,10 +12,11 @@ public interface CheckFunctionInterface {
 	 * @param data The object that might be injected.
 	 * @param filterValue List of fields that might be check. If null, then all column must be checked.
 	 * @throws Exception Exception is generate if the data are incorrect. */
-	void check(final String baseName, Object data, List<String> filterValue) throws Exception;
+	void check(final String baseName, Object data, List<String> filterValue, final QueryOptions options)
+			throws Exception;

-	default void checkAll(final String baseName, final Object data) throws Exception {
-		check(baseName, data, AnnotationTools.getAllFieldsNames(data.getClass()));
+	default void checkAll(final String baseName, final Object data, final QueryOptions options) throws Exception {
+		check(baseName, data, AnnotationTools.getAllFieldsNames(data.getClass()), options);
 	}

 }
--- a/src/org/kar/archidata/dataAccess/options/CheckFunctionVoid.java
+++ b/src/org/kar/archidata/dataAccess/options/CheckFunctionVoid.java
@@ -2,10 +2,16 @@ package org.kar.archidata.dataAccess.options;

 import java.util.List;

+import org.kar.archidata.dataAccess.QueryOptions;
+
 /** By default some element are not read like createAt and UpdatedAt. This option permit to read it. */
 public class CheckFunctionVoid implements CheckFunctionInterface {
 	@Override
-	public void check(final String baseName, Object data, List<String> filterValue) {
+	public void check(
+			final String baseName,
+			final Object data,
+			final List<String> filterValue,
+			final QueryOptions options) {

 	}

--- a/src/org/kar/archidata/dataAccess/options/CheckJPA.java
+++ b/src/org/kar/archidata/dataAccess/options/CheckJPA.java
@@ -9,12 +9,14 @@ 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;
 import org.kar.archidata.annotation.DataJson;
 import org.kar.archidata.dataAccess.DataAccess;
 import org.kar.archidata.dataAccess.QueryCondition;
+import org.kar.archidata.dataAccess.QueryOptions;
 import org.kar.archidata.exception.DataAccessException;
 import org.kar.archidata.exception.InputException;
 import org.slf4j.Logger;
@@ -36,7 +38,7 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 		 * @param data The object that might be injected.
 		 * @param filterValue List of fields that might be check. If null, then all column must be checked.
 		 * @throws Exception Exception is generate if the data are incorrect. */
-		void check(final String baseName, final K data) throws Exception;
+		void check(final String baseName, final K data, final QueryOptions options) throws Exception;
 	}

 	protected Map<String, List<CheckInterface<T>>> checking = null;
@@ -65,19 +67,20 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 			for (final Field field : this.clazz.getFields()) {
 				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");
+					add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
+						throw new InputException(baseName + fieldName,
+								"This is a '@Id' (primaryKey) ==> can not be change");
 					});
 				}
 				if (AnnotationTools.getConstraintsNotNull(field)) {
-					add(fieldName, (final String baseName, final T data) -> {
+					add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
 						if (field.get(data) == null) {
 							throw new InputException(baseName + fieldName, "Can not be null");
 						}
 					});
 				}
 				if (AnnotationTools.isCreatedAtField(field) || AnnotationTools.isUpdateAtField(field)) {
-					add(fieldName, (final String baseName, final T data) -> {
+					add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
 						throw new InputException(baseName + fieldName, "It is forbidden to change this field");
 					});
 				}
@@ -86,7 +89,7 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 				if (type == Long.class || type == long.class) {
 					final Long maxValue = AnnotationTools.getConstraintsMax(field);
 					if (maxValue != null) {
-						add(fieldName, (final String baseName, final T data) -> {
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
 							final Object elem = field.get(data);
 							if (elem == null) {
 								return;
@@ -99,7 +102,7 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 					}
 					final Long minValue = AnnotationTools.getConstraintsMin(field);
 					if (minValue != null) {
-						add(fieldName, (final String baseName, final T data) -> {
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
 							final Object elem = field.get(data);
 							if (elem == null) {
 								return;
@@ -112,24 +115,28 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 					}
 					final ManyToOne annotationManyToOne = AnnotationTools.getManyToOne(field);
 					if (annotationManyToOne != null && annotationManyToOne.targetEntity() != null) {
-						add(fieldName, (final String baseName, final T data) -> {
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
 							final Object elem = field.get(data);
 							if (elem == null) {
 								return;
 							}
-							final long count = DataAccess.count(annotationManyToOne.targetEntity(), elem);
+							final List<ConditionChecker> condCheckers = options.get(ConditionChecker.class);
+							final Condition conditionCheck = condCheckers.isEmpty() ? null
+									: condCheckers.get(0).toCondition();
+							final long count = DataAccess.count(annotationManyToOne.targetEntity(), elem,
+									conditionCheck);
 							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();
-						add(fieldName, (final String baseName, final T data) -> {
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
 							final Object elem = field.get(data);
 							if (elem == null) {
 								return;
@@ -143,7 +150,7 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 					final Long minValueRoot = AnnotationTools.getConstraintsMin(field);
 					if (minValueRoot != null) {
 						final int minValue = minValueRoot.intValue();
-						add(fieldName, (final String baseName, final T data) -> {
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
 							final Object elem = field.get(data);
 							if (elem == null) {
 								return;
@@ -156,14 +163,30 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 					}
 					final ManyToOne annotationManyToOne = AnnotationTools.getManyToOne(field);
 					if (annotationManyToOne != null && annotationManyToOne.targetEntity() != null) {
-						add(fieldName, (final String baseName, final T data) -> {
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
 							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);
+								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 QueryOptions options) -> {
+							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);
 							}
 						});
 					}
@@ -173,7 +196,7 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 					final Long maxValueRoot = AnnotationTools.getConstraintsMax(field);
 					if (maxValueRoot != null) {
 						final float maxValue = maxValueRoot.floatValue();
-						add(fieldName, (final String baseName, final T data) -> {
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
 							final Object elem = field.get(data);
 							if (elem == null) {
 								return;
@@ -187,7 +210,7 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 					final Long minValueRoot = AnnotationTools.getConstraintsMin(field);
 					if (minValueRoot != null) {
 						final float minValue = minValueRoot.floatValue();
-						add(fieldName, (final String baseName, final T data) -> {
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
 							final Object elem = field.get(data);
 							if (elem == null) {
 								return;
@@ -202,7 +225,7 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 					final Long maxValueRoot = AnnotationTools.getConstraintsMax(field);
 					if (maxValueRoot != null) {
 						final double maxValue = maxValueRoot.doubleValue();
-						add(fieldName, (final String baseName, final T data) -> {
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
 							final Object elem = field.get(data);
 							if (elem == null) {
 								return;
@@ -216,7 +239,7 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 					final Long minValueRoot = AnnotationTools.getConstraintsMin(field);
 					if (minValueRoot != null) {
 						final double minValue = minValueRoot.doubleValue();
-						add(fieldName, (final String baseName, final T data) -> {
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
 							final Object elem = field.get(data);
 							if (elem == null) {
 								return;
@@ -236,44 +259,49 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 				} else if (type == String.class) {
 					final int maxSizeString = AnnotationTools.getLimitSize(field);
 					if (maxSizeString > 0) {
-						add(fieldName, (final String baseName, final T data) -> {
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
 							final Object elem = field.get(data);
 							if (elem == null) {
 								return;
 							}
 							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);
 							}
 						});
 					}
 					final Size limitSize = AnnotationTools.getConstraintsSize(field);
 					if (limitSize != null) {
-						add(fieldName, (final String baseName, final T data) -> {
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
 							final Object elem = field.get(data);
 							if (elem == null) {
 								return;
 							}
 							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.min());
 							}
 						});
 					}
 					final String patternString = AnnotationTools.getConstraintsPattern(field);
 					if (patternString != null) {
 						final Pattern pattern = Pattern.compile(patternString);
-						add(fieldName, (final String baseName, final T data) -> {
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
 							final Object elem = field.get(data);
 							if (elem == null) {
 								return;
 							}
 							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,9 +309,10 @@ 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();
-						add(fieldName, (final String baseName, final T data) -> {
-							instance.checkAll(baseName + fieldName + ".", field.get(data));
+						final CheckFunctionInterface instance = jsonAnnotation.checker().getDeclaredConstructor()
+								.newInstance();
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
+							instance.checkAll(baseName + fieldName + ".", field.get(data), options);
 						});
 					}
 				} else if (type.isEnum()) {
@@ -292,8 +321,17 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 				// keep this is last ==> take more time...
 				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))));
+					add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
+						final List<ConditionChecker> condCheckers = options.get(ConditionChecker.class);
+						Object other = null;
+						if (condCheckers.isEmpty()) {
+							other = DataAccess.getWhere(this.clazz,
+									new Condition(new QueryCondition(fieldName, "==", field.get(data))));
+						} else {
+							other = DataAccess.getWhere(this.clazz,
+									new Condition(new QueryCondition(fieldName, "==", field.get(data))),
+									condCheckers.get(0).toCondition());
+						}
 						if (other != null) {
 							throw new InputException(baseName + fieldName, "Name already exist in the DB");
 						}
@@ -308,7 +346,11 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 	}

 	@Override
-	public void check(final String baseName, final Object data, final List<String> filterValue) throws Exception {
+	public void check(
+			final String baseName,
+			final Object data,
+			final List<String> filterValue,
+			final QueryOptions options) throws Exception {
 		if (this.checking == null) {
 			initialize();
 		}
@@ -323,13 +365,13 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 				continue;
 			}
 			for (final CheckInterface<T> action : actions) {
-				action.check(baseName, dataCasted);
+				action.check(baseName, dataCasted, options);
 			}
 		}
-		checkTyped(dataCasted, filterValue);
+		checkTyped(dataCasted, filterValue, options);
 	}

-	public void checkTyped(final T data, final List<String> filterValue) throws Exception {
+	public void checkTyped(final T data, final List<String> filterValue, final QueryOptions options) throws Exception {
 		// nothing to do ...
 	}
 }
--- a/src/org/kar/archidata/dataAccess/options/Condition.java
+++ b/src/org/kar/archidata/dataAccess/options/Condition.java
@@ -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);
@@ -43,13 +46,12 @@ public class Condition extends QueryOption {
 				query.append(tableName);
 				query.append(".");
 				query.append(deletedFieldName);
-				query.append(" = false ");
+				query.append(" = false \n");
 			}
 			return;
 		}
 		query.append(" WHERE (");
-		this.condition.generateQuerry(query, tableName);
-
+		this.condition.generateQuery(query, tableName);
 		query.append(") ");
 		if (exclude_deleted && deletedFieldName != null) {
 			query.append("AND ");
@@ -58,5 +60,6 @@ public class Condition extends QueryOption {
 			query.append(deletedFieldName);
 			query.append(" = false ");
 		}
+		query.append("\n");
 	}
 }
--- a/src/org/kar/archidata/dataAccess/options/ConditionChecker.java
+++ b/src/org/kar/archidata/dataAccess/options/ConditionChecker.java
@@ -0,0 +1,25 @@
+package org.kar.archidata.dataAccess.options;
+
+import org.kar.archidata.dataAccess.QueryItem;
+
+/** Condition model apply to the check models. */
+public class ConditionChecker extends QueryOption {
+	public final QueryItem condition;
+
+	public ConditionChecker(final QueryItem items) {
+		this.condition = items;
+	}
+
+	public ConditionChecker(final Condition cond) {
+		this.condition = cond.condition;
+	}
+
+	public ConditionChecker() {
+		this.condition = null;
+	}
+
+	public Condition toCondition() {
+		return new Condition(this.condition);
+	}
+
+}
--- a/src/org/kar/archidata/dataAccess/options/CreateDropTable.java
+++ b/src/org/kar/archidata/dataAccess/options/CreateDropTable.java
@@ -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() {}
--- a/src/org/kar/archidata/dataAccess/options/DBInterfaceOption.java
+++ b/src/org/kar/archidata/dataAccess/options/DBInterfaceOption.java
@@ -0,0 +1,51 @@
+package org.kar.archidata.dataAccess.options;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.kar.archidata.GlobalConfiguration;
+import org.kar.archidata.dataAccess.QueryOptions;
+import org.kar.archidata.db.DBConfig;
+import org.kar.archidata.db.DBEntry;
+
+public class DBInterfaceOption extends QueryOption {
+	private DBEntry entry = null;
+	private final DBConfig config;
+	private final boolean root;
+
+	public DBInterfaceOption(final DBConfig config) {
+		this.config = config;
+		this.root = false;
+	}
+
+	public DBInterfaceOption(final DBConfig config, final boolean root) {
+		this.config = config;
+		this.root = root;
+	}
+
+	public DBEntry getEntry(final QueryOptions options) throws IOException {
+		if (this.entry == null) {
+			final List<DBInterfaceRoot> isRoot = options.get(DBInterfaceRoot.class);
+			this.entry = DBEntry.createInterface(this.config, isRoot.size() == 1 && isRoot.get(0).getRoot());
+		}
+		return this.entry;
+	}
+
+	public boolean getRoot() {
+		return this.root;
+	}
+
+	public static DBEntry getAutoEntry(final QueryOptions options) throws IOException {
+		if (options == null) {
+			return DBEntry.createInterface(GlobalConfiguration.dbConfig, false);
+		}
+		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.get(0).getEntry(options);
+		}
+	}
+
+}
--- a/src/org/kar/archidata/dataAccess/options/DBInterfaceRoot.java
+++ b/src/org/kar/archidata/dataAccess/options/DBInterfaceRoot.java
@@ -0,0 +1,14 @@
+package org.kar.archidata.dataAccess.options;
+
+public class DBInterfaceRoot extends QueryOption {
+	private final boolean root;
+
+	public DBInterfaceRoot(boolean root) {
+		this.root = root;
+	}
+
+	public boolean getRoot() {
+		return this.root;
+	}
+
+}
--- a/src/org/kar/archidata/dataAccess/options/FilterValue.java
+++ b/src/org/kar/archidata/dataAccess/options/FilterValue.java
@@ -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;
--- a/src/org/kar/archidata/dataAccess/options/GroupBy.java
+++ b/src/org/kar/archidata/dataAccess/options/GroupBy.java
@@ -0,0 +1,41 @@
+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;
+
+	public GroupBy(final List<String> childs) {
+		this.childs = childs;
+	}
+
+	public GroupBy(final String... childs) {
+		this.childs = List.of(childs);
+	}
+
+	public void generateQuery(final StringBuilder query, final String tableName) {
+		if (this.childs.size() == 0) {
+			return;
+		}
+		query.append(" GROUP BY ");
+		boolean first = true;
+		for (final String elem : this.childs) {
+			if (first) {
+				first = false;
+			} else {
+				query.append(", ");
+			}
+			// query.append("`");
+			query.append(elem);
+			// query.append("` ");
+		}
+		query.append("\n");
+	}
+
+	public void injectQuery(final PreparedStatement ps, final CountInOut iii) throws Exception {
+		// nothing to add.
+	}
+}
--- a/src/org/kar/archidata/dataAccess/options/Limit.java
+++ b/src/org/kar/archidata/dataAccess/options/Limit.java
@@ -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();
+	}
+}
--- a/src/org/kar/archidata/dataAccess/options/OrderBy.java
+++ b/src/org/kar/archidata/dataAccess/options/OrderBy.java
@@ -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,10 +16,11 @@ public class OrderBy extends QueryOption {
 		this.childs = List.of(childs);
 	}

-	public void generateQuerry(final StringBuilder query, final String tableName) {
-		if (this.childs.size() >= 1) {
-			query.append(" ORDER BY ");
+	public void generateQuery(final StringBuilder query, final String tableName) {
+		if (this.childs.size() == 0) {
+			return;
 		}
+		query.append(" ORDER BY ");
 		boolean first = true;
 		for (final OrderItem elem : this.childs) {
 			if (first) {
@@ -25,17 +28,16 @@ public class OrderBy extends QueryOption {
 			} else {
 				query.append(", ");
 			}
-			query.append("`");
+			// query.append("`");
 			query.append(elem.value);
-			query.append("` ");
+			// query.append("`");
+			query.append(" ");
 			query.append(elem.order.toString());
 		}
-		if (this.childs.size() >= 1) {
-			query.append(")");
-		}
+		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.
 	}
 }
--- a/src/org/kar/archidata/dataAccess/options/OrderItem.java
+++ b/src/org/kar/archidata/dataAccess/options/OrderItem.java
@@ -1,4 +1,4 @@
-package org.kar.archidata.dataAccess;
+package org.kar.archidata.dataAccess.options;

 public class OrderItem {
 	public enum Order {
--- a/src/org/kar/archidata/dataAccess/options/OverrideTableName.java
+++ b/src/org/kar/archidata/dataAccess/options/OverrideTableName.java
@@ -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 {
--- a/src/org/kar/archidata/dataAccess/options/QueryOption.java
+++ b/src/org/kar/archidata/dataAccess/options/QueryOption.java
@@ -0,0 +1,3 @@
+package org.kar.archidata.dataAccess.options;
+
+public class QueryOption {}
--- a/src/org/kar/archidata/dataAccess/options/ReadAllColumn.java
+++ b/src/org/kar/archidata/dataAccess/options/ReadAllColumn.java
@@ -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() {}
--- a/src/org/kar/archidata/dataAccess/options/TransmitKey.java
+++ b/src/org/kar/archidata/dataAccess/options/TransmitKey.java
@@ -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;
--- a/src/org/kar/archidata/db/DBConfig.java
+++ b/src/org/kar/archidata/db/DBConfig.java
@@ -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";
 	}
 }
--- a/src/org/kar/archidata/db/DBEntry.java
+++ b/src/org/kar/archidata/db/DBEntry.java
@@ -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));
 		}
--- a/src/org/kar/archidata/exception/FailException.java
+++ b/src/org/kar/archidata/exception/FailException.java
@@ -1,19 +1,34 @@
 package org.kar.archidata.exception;

+import org.kar.archidata.api.DataResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import jakarta.ws.rs.core.Response;

 public class FailException extends Exception {
+	private static final Logger LOGGER = LoggerFactory.getLogger(DataResource.class);
 	private static final long serialVersionUID = 1L;
 	public final Response.Status status;
+	public final Exception exception;

 	public FailException(final Response.Status status, final String message) {
 		super(message);
 		this.status = status;
+		this.exception = null;
+	}
+
+	public FailException(final Response.Status status, final String message, final Exception ex) {
+		super(message);
+		this.status = status;
+		this.exception = ex;
+		ex.printStackTrace();
+		LOGGER.error("Generate Fail exception with exceptionData: {}", ex.getMessage());
 	}

 	public FailException(final String message) {
 		super(message);
 		this.status = Response.Status.BAD_REQUEST;
-
+		this.exception = null;
 	}
 }
--- a/src/org/kar/archidata/exception/RESTErrorResponseExeption.java
+++ b/src/org/kar/archidata/exception/RESTErrorResponseExeption.java
@@ -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
+				+ "]";
 	}

 }
--- a/src/org/kar/archidata/externalRestApi/AnalyzeApi.java
+++ b/src/org/kar/archidata/externalRestApi/AnalyzeApi.java
@@ -0,0 +1,74 @@
+package org.kar.archidata.externalRestApi;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.kar.archidata.externalRestApi.model.ApiGroupModel;
+import org.kar.archidata.externalRestApi.model.ClassModel;
+import org.kar.archidata.externalRestApi.model.ModelGroup;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class AnalyzeApi {
+	static final Logger LOGGER = LoggerFactory.getLogger(AnalyzeApi.class);
+	protected final List<ApiGroupModel> apiModels = new ArrayList<>();
+	protected final ModelGroup modelGroup = new ModelGroup();
+
+	public void addAllModel(final List<Class<?>> classes) throws Exception {
+		this.modelGroup.addAll(classes);
+		analyzeModels();
+	}
+
+	public void addModel(final Class<?> clazz) throws Exception {
+		this.modelGroup.add(clazz);
+		analyzeModels();
+	}
+
+	public void addApi(final Class<?> clazz) throws Exception {
+		this.apiModels.add(new ApiGroupModel(clazz, this.modelGroup));
+		analyzeModels();
+	}
+
+	public void addAllApi(final List<Class<?>> classes) throws Exception {
+		for (final Class<?> clazz : classes) {
+			this.apiModels.add(new ApiGroupModel(clazz, this.modelGroup));
+		}
+		analyzeModels();
+	}
+
+	public List<ApiGroupModel> getAllApi() {
+		return this.apiModels;
+	}
+
+	public List<ClassModel> getAllModel() {
+		return this.modelGroup.getModels();
+	}
+
+	private void analyzeModels() throws Exception {
+		final List<ClassModel> dones = new ArrayList<>();
+		while (dones.size() < getAllModel().size()) {
+			final List<ClassModel> copyList = new ArrayList<>(this.modelGroup.getModels());
+			for (final ClassModel model : copyList) {
+				if (dones.contains(model)) {
+					continue;
+				}
+				LOGGER.info("Analyze: {}", model);
+				model.analyze(this.modelGroup);
+				dones.add(model);
+			}
+		}
+	}
+
+	public List<ClassModel> getCompatibleModels(final List<Class<?>> search) {
+		final List<ClassModel> out = new ArrayList<>();
+		for (final ClassModel model : getAllModel()) {
+			if (search.contains(model.getOriginClasses())) {
+				out.add(model);
+			}
+		}
+		if (out.isEmpty()) {
+			return null;
+		}
+		return out;
+	}
+}
--- a/src/org/kar/archidata/externalRestApi/DotGenerateApi.java
+++ b/src/org/kar/archidata/externalRestApi/DotGenerateApi.java
@@ -0,0 +1,232 @@
+package org.kar.archidata.externalRestApi;
+
+import java.io.FileWriter;
+import java.io.InputStream;
+import java.sql.Timestamp;
+import java.time.Instant;
+import java.time.LocalDate;
+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.ContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.kar.archidata.catcher.RestErrorResponse;
+import org.kar.archidata.externalRestApi.dot.DotApiGeneration;
+import org.kar.archidata.externalRestApi.dot.DotClassElement;
+import org.kar.archidata.externalRestApi.dot.DotClassElement.DefinedPosition;
+import org.kar.archidata.externalRestApi.dot.DotClassElementGroup;
+import org.kar.archidata.externalRestApi.model.ApiGroupModel;
+import org.kar.archidata.externalRestApi.model.ClassModel;
+
+public class DotGenerateApi {
+
+	public static void generateApi(final AnalyzeApi api, final String pathDotFile) throws Exception {
+		final List<DotClassElement> localModel = generateApiModel(api);
+		final DotClassElementGroup dotGroup = new DotClassElementGroup(localModel);
+
+		try (final FileWriter myWriter = new FileWriter(pathDotFile)) {
+			myWriter.write("""
+					# Architecture auto-generated file
+					digraph UML_Class_diagram {
+					    #rankdir=NS;
+						graph [
+							pad="0.5"
+							nodesep="1"
+							#ranksep="2"
+							label="Rest API server Model"
+							labelloc="t"
+							fontname="FreeMono,Sans-Mono,Helvetica,Arial,sans-serif"
+						]
+						node [
+							fontname="FreeMono,Sans-Mono,Helvetica,Arial,sans-serif"
+							shape=record
+							style=filled
+							fillcolor=gray95
+						]
+						edge [fontname="FreeMono,Sans-Mono,Helvetica,Arial,sans-serif"]
+					""");
+			/*
+			myWriter.write("""
+						subgraph REST_API {
+						style=filled;
+						color=lightgrey;
+						label="REST API";
+					    rankdir=LR;
+					""");
+			*/
+			for (final ApiGroupModel element : api.apiModels) {
+				final String tmp = DotApiGeneration.generateApiFile(element, dotGroup);
+				myWriter.write(tmp);
+				myWriter.write("\n");
+			}
+			// create an invisible link to force all element to be link together:
+			if (false) {
+				String previous = null;
+				for (final ApiGroupModel element : api.apiModels) {
+					if (previous == null) {
+						previous = element.name;
+						continue;
+					}
+					myWriter.write("\t{ ");
+					myWriter.write(previous);
+					myWriter.write(":s -> ");
+					previous = element.name;
+					myWriter.write(previous);
+					myWriter.write(":n [style=invis]}\n");
+				}
+			}
+			/*
+			myWriter.write("""
+						}
+					""");
+			myWriter.write("""
+						subgraph Models {
+						style=filled;
+						color=lightgrey;
+						label="Models";
+					    rankdir=NS;
+					""");
+			*/
+			// Generates all MODEL files
+			for (final DotClassElement element : localModel) {
+				final String tmp = element.generateFile(dotGroup);
+				myWriter.write(tmp);
+				myWriter.write("\n");
+			}
+			/*
+			myWriter.write("""
+						}
+					""");
+			*/
+			myWriter.write("""
+					}
+					""");
+		}
+	}
+
+	private static List<DotClassElement> generateApiModel(final AnalyzeApi api) throws Exception {
+		// First step is to add all specific basic elements the wrap correctly the model
+		final List<DotClassElement> dotModels = new ArrayList<>();
+		List<ClassModel> models = api.getCompatibleModels(List.of(Void.class, void.class));
+		if (models != null) {
+			dotModels.add(new DotClassElement(models, "void", "void", null, null, DefinedPosition.NATIVE));
+		}
+		models = api.getCompatibleModels(List.of(Object.class));
+		if (models != null) {
+			dotModels.add(new DotClassElement(models, "Object", "object", null, "Object", DefinedPosition.NATIVE));
+		}
+		// Map is binded to any ==> can not determine this complex model for now
+		models = api.getCompatibleModels(List.of(Map.class));
+		if (models != null) {
+			dotModels.add(new DotClassElement(models, "Object", "any", null, null, DefinedPosition.NATIVE));
+		}
+		models = api.getCompatibleModels(List.of(String.class));
+		if (models != null) {
+			dotModels.add(new DotClassElement(models, "String", "string", null, "String", DefinedPosition.NATIVE));
+		}
+		models = api.getCompatibleModels(
+				List.of(InputStream.class, FormDataContentDisposition.class, ContentDisposition.class));
+		if (models != null) {
+			dotModels.add(new DotClassElement(models, "File", "File", null, "File", DefinedPosition.NATIVE));
+		}
+		models = api.getCompatibleModels(List.of(Boolean.class));
+		if (models != null) {
+			dotModels.add(new DotClassElement(models, "Boolean", "boolean", null, "Boolean", DefinedPosition.NATIVE));
+		}
+		models = api.getCompatibleModels(List.of(boolean.class));
+		if (models != null) {
+			dotModels.add(new DotClassElement(models, "boolean", "boolean", null, "boolean", DefinedPosition.NATIVE));
+		}
+		models = api.getCompatibleModels(List.of(UUID.class));
+		if (models != null) {
+			dotModels.add(new DotClassElement(models, "UUID", "UUID", "isUUID", "UUID", DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(long.class));
+		if (models != null) {
+			dotModels.add(new DotClassElement(models, "long", "Long", "isLong", "long", DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(Long.class));
+		if (models != null) {
+			dotModels.add(new DotClassElement(models, "Long", "Long", "isLong", "Long", DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(short.class));
+		if (models != null) {
+			dotModels.add(new DotClassElement(models, "short", "Short", "isShort", "short", DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(Short.class));
+		if (models != null) {
+			dotModels.add(new DotClassElement(models, "Short", "Short", "isShort", "Short", DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(int.class));
+		if (models != null) {
+			dotModels.add(new DotClassElement(models, "int", "Integer", "isInteger", "int", DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(Integer.class));
+		if (models != null) {
+			dotModels.add(
+					new DotClassElement(models, "Integer", "Integer", "isInteger", "Integer", DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(double.class));
+		if (models != null) {
+			dotModels.add(new DotClassElement(models, "Double", "Double", "isDouble", "double", DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(Double.class));
+		if (models != null) {
+			dotModels.add(new DotClassElement(models, "Double", "Double", "isDouble", "Double", DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(float.class));
+		if (models != null) {
+			dotModels.add(new DotClassElement(models, "float", "Float", "isFloat", "float", DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(Float.class));
+		if (models != null) {
+			dotModels.add(new DotClassElement(models, "Float", "Float", "isFloat", "Float", DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(Instant.class));
+		if (models != null) {
+			dotModels.add(
+					new DotClassElement(models, "Instant", "Instant", "isInstant", "Instant", DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(Date.class));
+		if (models != null) {
+			dotModels.add(new DotClassElement(models, "Date", "IsoDate", "isIsoDate", "Date", DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(Timestamp.class));
+		if (models != null) {
+			dotModels.add(new DotClassElement(models, "Timestamp", "Timestamp", "isTimestamp", "Timestamp",
+					DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(LocalDate.class));
+		if (models != null) {
+			dotModels.add(new DotClassElement(models, "LocalDate", "LocalDate", "isLocalDate", "LocalDate",
+					DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(LocalTime.class));
+		if (models != null) {
+			dotModels.add(new DotClassElement(models, "LocalTime", "LocalTime", "isLocalTime", "LocalTime",
+					DefinedPosition.BASIC));
+		}
+		// needed for Rest interface
+		api.addModel(RestErrorResponse.class);
+		for (final ClassModel model : api.getAllModel()) {
+			boolean alreadyExist = false;
+			for (final DotClassElement elem : dotModels) {
+				if (elem.isCompatible(model)) {
+					alreadyExist = true;
+					break;
+				}
+			}
+			if (alreadyExist) {
+				continue;
+			}
+			dotModels.add(new DotClassElement(model));
+		}
+		return dotModels;
+
+	}
+
+}
--- a/src/org/kar/archidata/externalRestApi/PythonGenerateApi.java
+++ b/src/org/kar/archidata/externalRestApi/PythonGenerateApi.java
@@ -0,0 +1,8 @@
+package org.kar.archidata.externalRestApi;
+
+public class PythonGenerateApi {
+
+	public static void generateApi(final AnalyzeApi api) {
+
+	}
+}
--- a/src/org/kar/archidata/externalRestApi/TsGenerateApi.java
+++ b/src/org/kar/archidata/externalRestApi/TsGenerateApi.java
@@ -0,0 +1,242 @@
+package org.kar.archidata.externalRestApi;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.sql.Timestamp;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import org.glassfish.jersey.media.multipart.ContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.kar.archidata.catcher.RestErrorResponse;
+import org.kar.archidata.externalRestApi.model.ApiGroupModel;
+import org.kar.archidata.externalRestApi.model.ClassModel;
+import org.kar.archidata.externalRestApi.typescript.TsApiGeneration;
+import org.kar.archidata.externalRestApi.typescript.TsClassElement;
+import org.kar.archidata.externalRestApi.typescript.TsClassElement.DefinedPosition;
+import org.kar.archidata.externalRestApi.typescript.TsClassElementGroup;
+
+public class TsGenerateApi {
+	/**
+	 * Generate a full API tree for Typescript in a specific folder.
+	 * This generate a folder containing a full API with "model" filder and "api" folder.
+	 * The generation depend of Zod and can be strict compile.
+	 * @param api Data model to generate the api
+	 * @param pathPackage Path to store the api.
+	 */
+	public static void generateApi(final AnalyzeApi api, final String pathPackage) throws Exception {
+		final List<TsClassElement> localModel = generateApiModel(api);
+		final TsClassElementGroup tsGroup = new TsClassElementGroup(localModel);
+		// Generates all MODEL files
+		for (final TsClassElement element : localModel) {
+			element.generateFile(pathPackage, tsGroup);
+		}
+		// Generate index of model files
+		createModelIndex(pathPackage, tsGroup);
+
+		for (final ApiGroupModel element : api.apiModels) {
+			TsApiGeneration.generateApiFile(element, pathPackage, tsGroup);
+		}
+		// Generate index of model files
+		createResourceIndex(pathPackage, api.apiModels);
+		createIndex(pathPackage);
+		copyResourceFile("rest-tools.ts", pathPackage + File.separator + "rest-tools.ts");
+	}
+
+	private static void createIndex(final String pathPackage) throws IOException {
+		final String out = """
+				/**
+				 * Interface of the server (auto-generated code)
+				 */
+				export * from \"./model\";
+				export * from \"./api\";
+				export * from \"./rest-tools\";
+
+				""";
+		final FileWriter myWriter = new FileWriter(pathPackage + File.separator + "index.ts");
+		myWriter.write(out);
+		myWriter.close();
+	}
+
+	private static void createResourceIndex(final String pathPackage, final List<ApiGroupModel> apiModels)
+			throws IOException {
+		final StringBuilder out = new StringBuilder("""
+				/**
+				 * Interface of the server (auto-generated code)
+				 */
+				""");
+		final List<String> files = new ArrayList<>();
+		for (final ApiGroupModel elem : apiModels) {
+			files.add(TsClassElement.determineFileName(elem.name));
+		}
+		Collections.sort(files);
+		for (final String elem : files) {
+			out.append("export * from \"./");
+			out.append(elem);
+			out.append("\"\n");
+		}
+		final FileWriter myWriter = new FileWriter(pathPackage + File.separator + "api" + File.separator + "index.ts");
+		myWriter.write(out.toString());
+		myWriter.close();
+	}
+
+	private static void createModelIndex(final String pathPackage, final TsClassElementGroup tsGroup)
+			throws IOException {
+		final StringBuilder out = new StringBuilder("""
+				/**
+				 * Interface of the server (auto-generated code)
+				 */
+				""");
+		final List<String> files = new ArrayList<>();
+		for (final TsClassElement elem : tsGroup.getTsElements()) {
+			if (elem.nativeType == DefinedPosition.NATIVE) {
+				continue;
+			}
+			files.add(elem.fileName);
+		}
+		Collections.sort(files);
+		for (final String elem : files) {
+			out.append("export * from \"./");
+			out.append(elem);
+			out.append("\"\n");
+		}
+		final FileWriter myWriter = new FileWriter(
+				pathPackage + File.separator + "model" + File.separator + "index.ts");
+		myWriter.write(out.toString());
+		myWriter.close();
+	}
+
+	private static List<TsClassElement> generateApiModel(final AnalyzeApi api) throws Exception {
+		// First step is to add all specific basic elements the wrap correctly the model
+		final List<TsClassElement> tsModels = new ArrayList<>();
+		List<ClassModel> models = api.getCompatibleModels(List.of(Void.class, void.class));
+		if (models != null) {
+			tsModels.add(new TsClassElement(models, "void", "void", null, null, DefinedPosition.NATIVE));
+		}
+		models = api.getCompatibleModels(List.of(Object.class));
+		if (models != null) {
+			tsModels.add(
+					new TsClassElement(models, "zod.any()", "object", null, "zod.object()", DefinedPosition.NATIVE));
+		}
+		// Map is binded to any ==> can not determine this complex model for now
+		models = api.getCompatibleModels(List.of(Map.class));
+		if (models != null) {
+			tsModels.add(new TsClassElement(models, "zod.any()", "any", null, null, DefinedPosition.NATIVE));
+		}
+		models = api.getCompatibleModels(List.of(String.class));
+		if (models != null) {
+			tsModels.add(
+					new TsClassElement(models, "zod.string()", "string", null, "zod.string()", DefinedPosition.NATIVE));
+		}
+		models = api.getCompatibleModels(
+				List.of(InputStream.class, FormDataContentDisposition.class, ContentDisposition.class));
+		if (models != null) {
+			tsModels.add(new TsClassElement(models, "z.instanceof(File)", "File", null, "z.instanceof(File)",
+					DefinedPosition.NATIVE));
+		}
+		models = api.getCompatibleModels(List.of(Boolean.class, boolean.class));
+		if (models != null) {
+			tsModels.add(new TsClassElement(models, "zod.boolean()", "boolean", null, "zod.boolean()",
+					DefinedPosition.NATIVE));
+		}
+		models = api.getCompatibleModels(List.of(UUID.class));
+		if (models != null) {
+			tsModels.add(new TsClassElement(models, "ZodUUID", "UUID", "isUUID", "zod.string().uuid()",
+					DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(Long.class, long.class));
+		if (models != null) {
+			tsModels.add(
+					new TsClassElement(models, "ZodLong", "Long", "isLong", "zod.number()", DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(Short.class, short.class));
+		if (models != null) {
+			tsModels.add(new TsClassElement(models, "ZodShort", "Short", "isShort", "zod.number().safe()",
+					DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(Integer.class, int.class));
+		if (models != null) {
+			tsModels.add(new TsClassElement(models, "ZodInteger", "Integer", "isInteger", "zod.number().safe()",
+					DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(Double.class, double.class));
+		if (models != null) {
+			tsModels.add(new TsClassElement(models, "ZodDouble", "Double", "isDouble", "zod.number()",
+					DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(Float.class, float.class));
+		if (models != null) {
+			tsModels.add(
+					new TsClassElement(models, "ZodFloat", "Float", "isFloat", "zod.number()", DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(Instant.class));
+		if (models != null) {
+			tsModels.add(new TsClassElement(models, "ZodInstant", "Instant", "isInstant", "zod.string()",
+					DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(Date.class));
+		if (models != null) {
+			tsModels.add(new TsClassElement(models, "ZodIsoDate", "IsoDate", "isIsoDate",
+					"zod.string().datetime({ precision: 3 })", DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(Timestamp.class));
+		if (models != null) {
+			tsModels.add(new TsClassElement(models, "ZodTimestamp", "Timestamp", "isTimestamp",
+					"zod.string().datetime({ precision: 3 })", DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(LocalDate.class));
+		if (models != null) {
+			tsModels.add(new TsClassElement(models, "ZodLocalDate", "LocalDate", "isLocalDate", "zod.string().date()",
+					DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(LocalTime.class));
+		if (models != null) {
+			tsModels.add(new TsClassElement(models, "ZodLocalTime", "LocalTime", "isLocalTime", "zod.string().time()",
+					DefinedPosition.BASIC));
+		}
+		// needed for Rest interface
+		api.addModel(RestErrorResponse.class);
+		for (final ClassModel model : api.getAllModel()) {
+			boolean alreadyExist = false;
+			for (final TsClassElement elem : tsModels) {
+				if (elem.isCompatible(model)) {
+					alreadyExist = true;
+					break;
+				}
+			}
+			if (alreadyExist) {
+				continue;
+			}
+			tsModels.add(new TsClassElement(model));
+		}
+		return tsModels;
+
+	}
+
+	public static void copyResourceFile(final String name, final String destinationPath) throws IOException {
+		final InputStream ioStream = TsGenerateApi.class.getClassLoader().getResourceAsStream(name);
+		if (ioStream == null) {
+			throw new IllegalArgumentException("rest-tools.ts is not found");
+		}
+		final BufferedReader buffer = new BufferedReader(new InputStreamReader(ioStream));
+		final FileWriter myWriter = new FileWriter(destinationPath);
+		String line;
+		while ((line = buffer.readLine()) != null) {
+			myWriter.write(line);
+			myWriter.write("\n");
+		}
+		ioStream.close();
+		myWriter.close();
+	}
+}
--- a/src/org/kar/archidata/externalRestApi/dot/DotApiGeneration.java
+++ b/src/org/kar/archidata/externalRestApi/dot/DotApiGeneration.java
@@ -0,0 +1,414 @@
+package org.kar.archidata.externalRestApi.dot;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.kar.archidata.externalRestApi.dot.DotClassElement.DefinedPosition;
+import org.kar.archidata.externalRestApi.model.ApiGroupModel;
+import org.kar.archidata.externalRestApi.model.ApiModel;
+import org.kar.archidata.externalRestApi.model.ClassEnumModel;
+import org.kar.archidata.externalRestApi.model.ClassListModel;
+import org.kar.archidata.externalRestApi.model.ClassMapModel;
+import org.kar.archidata.externalRestApi.model.ClassModel;
+import org.kar.archidata.externalRestApi.model.ClassObjectModel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DotApiGeneration {
+	static final Logger LOGGER = LoggerFactory.getLogger(DotApiGeneration.class);
+
+	public static String generateClassEnumModelTypescript(
+			final ClassEnumModel model,
+			final DotClassElementGroup dotGroup,
+			final Set<ClassModel> imports) throws IOException {
+		imports.add(model);
+		final DotClassElement dotModel = dotGroup.find(model);
+		return dotModel.dotTypeName;
+	}
+
+	public static String generateClassObjectModelTypescript(
+			final ClassObjectModel model,
+			final DotClassElementGroup dotGroup,
+			final Set<ClassModel> imports) throws IOException {
+		final DotClassElement dotModel = dotGroup.find(model);
+		if (dotModel.nativeType != DefinedPosition.NATIVE) {
+			imports.add(model);
+		}
+		if (dotModel.nativeType != DefinedPosition.NORMAL) {
+			return dotModel.dotTypeName;
+		}
+		return dotModel.dotTypeName;
+	}
+
+	public static String generateClassMapModelTypescript(
+			final ClassMapModel model,
+			final DotClassElementGroup dotGroup,
+			final Set<ClassModel> imports) throws IOException {
+		final StringBuilder out = new StringBuilder();
+		out.append("Map&lt;");
+		out.append(generateClassModelTypescript(model.keyModel, dotGroup, imports));
+		out.append(", ");
+		out.append(generateClassModelTypescript(model.valueModel, dotGroup, imports));
+		out.append("&gt;");
+		return out.toString();
+	}
+
+	public static String generateClassListModelTypescript(
+			final ClassListModel model,
+			final DotClassElementGroup dotGroup,
+			final Set<ClassModel> imports) throws IOException {
+		final StringBuilder out = new StringBuilder();
+		out.append("List&lt;");
+		out.append(generateClassModelTypescript(model.valueModel, dotGroup, imports));
+		out.append("&gt;");
+		return out.toString();
+	}
+
+	public static String generateClassModelTypescript(
+			final ClassModel model,
+			final DotClassElementGroup dotGroup,
+			final Set<ClassModel> imports) throws IOException {
+		if (model instanceof final ClassObjectModel objectModel) {
+			return generateClassObjectModelTypescript(objectModel, dotGroup, imports);
+		}
+		if (model instanceof final ClassListModel listModel) {
+			return generateClassListModelTypescript(listModel, dotGroup, imports);
+		}
+		if (model instanceof final ClassMapModel mapModel) {
+			return generateClassMapModelTypescript(mapModel, dotGroup, imports);
+		}
+		if (model instanceof final ClassEnumModel enumModel) {
+			return generateClassEnumModelTypescript(enumModel, dotGroup, imports);
+		}
+		throw new IOException("Impossible model:" + model);
+	}
+
+	public static String generateClassModelsTypescript(
+			final List<ClassModel> models,
+			final DotClassElementGroup dotGroup) throws IOException {
+		if (models.size() == 0) {
+			return "void";
+		}
+		final StringBuilder out = new StringBuilder();
+		if (models.size() > 1) {
+			out.append("Union&lt;");
+		}
+		boolean isFirst = true;
+		for (final ClassModel model : models) {
+			if (isFirst) {
+				isFirst = false;
+			} else {
+				out.append(", ");
+			}
+			final String data = DotClassElement.generateClassModelTypescript(model, dotGroup);
+			out.append(data);
+		}
+		if (models.size() > 1) {
+			out.append("&gt;");
+		}
+		return out.toString();
+	}
+
+	public static List<String> generateClassModelsLinks(
+			final List<ClassModel> models,
+			final DotClassElementGroup dotGroup) throws IOException {
+		if (models.size() == 0) {
+			return null;
+		}
+		final List<String> out = new ArrayList<>();
+		final boolean isFirst = true;
+		for (final ClassModel model : models) {
+			final String data = DotClassElement.generateClassModelTypescriptLink(model, dotGroup);
+			if (data != null) {
+				out.add(data);
+			}
+		}
+		return out;
+	}
+
+	public static String capitalizeFirstLetter(final String str) {
+		if (str == null || str.isEmpty()) {
+			return str;
+		}
+		return str.substring(0, 1).toUpperCase() + str.substring(1);
+	}
+
+	public static String generateApiFile(final ApiGroupModel element, final DotClassElementGroup dotGroup)
+			throws IOException {
+		final StringBuilder data = new StringBuilder();
+		final StringBuilder outLinks = new StringBuilder();
+		data.append("""
+					%s [
+						shape=plain
+						label=<<table color="#FF3333" border="2" cellborder="1" cellspacing="0" cellpadding="4">
+						<tr>
+							<td><b>%s</b><br/>(REST)</td>
+						</tr>
+						<tr>
+							<td>
+								<table border="0" cellborder="0" cellspacing="0" >
+				""".formatted(element.name, element.name));
+		final Set<ClassModel> imports = new HashSet<>();
+		final Set<ClassModel> zodImports = new HashSet<>();
+		final Set<ClassModel> isImports = new HashSet<>();
+		final Set<ClassModel> writeImports = new HashSet<>();
+		final Set<String> toolImports = new HashSet<>();
+		for (final ApiModel interfaceElement : element.interfaces) {
+			final List<String> consumes = interfaceElement.consumes;
+			final List<String> produces = interfaceElement.produces;
+			final boolean needGenerateProgress = interfaceElement.needGenerateProgress;
+			/*
+			if (returnComplexModel != null) {
+				data.append(returnComplexModel.replaceAll("(?m)^", "\t"));
+				for (final ClassModel elem : interfaceElement.returnTypes) {
+					zodImports.addAll(elem.getDependencyGroupModels());
+				}
+			}
+			*/
+			data.append("\t\t\t\t\t<tr><td  align=\"left\" port=\"");
+			data.append(interfaceElement.name);
+			data.append("\"><b> + ");
+			data.append(interfaceElement.name);
+			data.append("(");
+			boolean hasParam = false;
+			/*
+			if (!interfaceElement.queries.isEmpty()) {
+				data.append("\n\t\tqueries: {");
+				for (final Entry<String, List<ClassModel>> queryEntry : interfaceElement.queries.entrySet()) {
+					data.append("\n\t\t\t");
+					data.append(queryEntry.getKey());
+					data.append("?: ");
+					data.append(generateClassModelsTypescript(queryEntry.getValue(), dotGroup, imports, false));
+					data.append(",");
+				}
+				data.append("\n\t\t},");
+			}
+			*/
+			/* fonctionnel mais trop de donnée
+			if (!interfaceElement.parameters.isEmpty()) {
+				//data.append("params: {");
+				for (final Entry<String, List<ClassModel>> paramEntry : interfaceElement.parameters.entrySet()) {
+					data.append("");
+					data.append(paramEntry.getKey());
+					data.append(": ");
+					data.append(generateClassModelsTypescript(paramEntry.getValue(), dotGroup, imports, false));
+					data.append(",");
+				}
+				//data.append("},");
+			}
+			*/
+			if (interfaceElement.unnamedElement.size() == 1) {
+				if (hasParam) {
+					data.append(", ");
+				}
+				hasParam = true;
+				data.append("data: ");
+				data.append(
+						generateClassModelTypescript(interfaceElement.unnamedElement.get(0), dotGroup, writeImports));
+			} else if (interfaceElement.multiPartParameters.size() != 0) {
+				if (hasParam) {
+					data.append(", ");
+				}
+				hasParam = true;
+				boolean hasParam2 = false;
+				data.append("data: {");
+				for (final Entry<String, List<ClassModel>> pathEntry : interfaceElement.multiPartParameters
+						.entrySet()) {
+					if (hasParam2) {
+						data.append(", ");
+					}
+					hasParam2 = true;
+					data.append(pathEntry.getKey());
+					data.append(": ");
+					data.append(generateClassModelsTypescript(pathEntry.getValue(), dotGroup));
+				}
+				data.append("}");
+			}
+			data.append("): ");
+			/*
+			String tmp = DotClassElement.generateLocalModel(
+					final String ModelName,
+					final List<ClassModel> models,
+					final DotClassElementGroup dotGroup)
+					public static String generateClassModelsTypescript(
+							final List<ClassModel> models,
+							final DotClassElementGroup dotGroup,
+							final Set<ClassModel> imports) throws IOException {
+			*/
+			final String returnType = generateClassModelsTypescript(interfaceElement.returnTypes, dotGroup);
+			data.append(returnType);
+			final List<String> returnLinks = generateClassModelsLinks(interfaceElement.returnTypes, dotGroup);
+			for (final String link : returnLinks) {
+				outLinks.append("\t");
+				outLinks.append(element.name);
+				outLinks.append(":");
+				outLinks.append(interfaceElement.name);
+				outLinks.append(":e -> ");
+				outLinks.append(link);
+				outLinks.append(":NAME:w\n");
+			}
+			data.append("</b>");
+			//data.append("<br align=\"left\"/>&nbsp;&nbsp;&nbsp;&nbsp;");
+			data.append("</td></tr>\n\t\t\t\t\t\t\t<tr><td  align=\"left\">    ");
+			/*
+			data.append("\n\t\t\trestModel: {");
+			data.append("\n\t\t\t\tendPoint: \"");
+			*/
+			data.append(interfaceElement.restEndPoint);
+			/*
+			data.append("\",");
+			data.append("\n\t\t\t\trequestType: HTTPRequestModel.");
+			toolImports.add("HTTPRequestModel");
+			data.append(interfaceElement.restTypeRequest);
+			data.append(",");
+			if (consumes != null) {
+				for (final String elem : consumes) {
+					if (MediaType.APPLICATION_JSON.equals(elem)) {
+						data.append("\n\t\t\t\tcontentType: HTTPMimeType.JSON,");
+						toolImports.add("HTTPMimeType");
+						break;
+					} else if (MediaType.MULTIPART_FORM_DATA.equals(elem)) {
+						data.append("\n\t\t\t\tcontentType: HTTPMimeType.MULTIPART,");
+						toolImports.add("HTTPMimeType");
+						break;
+					} else if (MediaType.TEXT_PLAIN.equals(elem)) {
+						data.append("\n\t\t\t\tcontentType: HTTPMimeType.TEXT_PLAIN,");
+						toolImports.add("HTTPMimeType");
+						break;
+					}
+				}
+			} else if (RestTypeRequest.DELETE.equals(interfaceElement.restTypeRequest)) {
+				data.append("\n\t\t\t\tcontentType: HTTPMimeType.TEXT_PLAIN,");
+				toolImports.add("HTTPMimeType");
+			}
+			if (produces != null) {
+				if (produces.size() > 1) {
+					data.append("\n\t\t\t\taccept: produce,");
+				} else {
+					final String returnType = generateClassModelsTypescript(interfaceElement.returnTypes, dotGroup,
+							imports, false);
+					if (!"void".equals(returnType)) {
+						for (final String elem : produces) {
+							if (MediaType.APPLICATION_JSON.equals(elem)) {
+								data.append("\n\t\t\t\taccept: HTTPMimeType.JSON,");
+								toolImports.add("HTTPMimeType");
+								break;
+							}
+						}
+					}
+				}
+			}
+			data.append("\n\t\t\t},");
+			data.append("\n\t\t\trestConfig,");
+			if (!interfaceElement.parameters.isEmpty()) {
+				data.append("\n\t\t\tparams,");
+			}
+			if (!interfaceElement.queries.isEmpty()) {
+				data.append("\n\t\t\tqueries,");
+			}
+			if (interfaceElement.unnamedElement.size() == 1) {
+				data.append("\n\t\t\tdata,");
+			} else if (interfaceElement.multiPartParameters.size() != 0) {
+				data.append("\n\t\t\tdata,");
+			}
+			if (needGenerateProgress) {
+				data.append("\n\t\t\tcallback,");
+			}
+			data.append("\n\t\t}");
+			if (returnComplexModel != null) {
+				data.append(", is");
+				data.append(returnModelNameIfComplex);
+			} else {
+				final DotClassElement retType = dotGroup.find(interfaceElement.returnTypes.get(0));
+				if (retType.dotCheckType != null) {
+					data.append(", ");
+					data.append(retType.dotCheckType);
+					imports.add(interfaceElement.returnTypes.get(0));
+				}
+			}
+			*/
+			data.append("</td></tr>\n");
+		}
+		/*
+		data.append("\n}\n");
+
+		final StringBuilder out = new StringBuilder();
+
+		final List<String> toolImportsList = new ArrayList<>(toolImports);
+		Collections.sort(toolImportsList);
+		if (toolImportsList.size() != 0) {
+			out.append("import {");
+			for (final String elem : toolImportsList) {
+				out.append("\n\t");
+				out.append(elem);
+				out.append(",");
+			}
+			out.append("\n} from \"../rest-tools\";\n\n");
+		}
+
+		if (zodImports.size() != 0) {
+			out.append("import { z as zod } from \"zod\"\n");
+		}
+
+		final Set<String> finalImportSet = new TreeSet<>();
+
+		for (final ClassModel model : imports) {
+			final DotClassElement dotModel = dotGroup.find(model);
+			if (dotModel.nativeType == DefinedPosition.NATIVE) {
+				continue;
+			}
+			finalImportSet.add(dotModel.dotTypeName);
+		}
+		for (final ClassModel model : isImports) {
+			final DotClassElement dotModel = dotGroup.find(model);
+			if (dotModel.nativeType == DefinedPosition.NATIVE) {
+				continue;
+			}
+			if (dotModel.dotCheckType != null) {
+				finalImportSet.add(dotModel.dotCheckType);
+			}
+		}
+		for (final ClassModel model : zodImports) {
+			final DotClassElement dotModel = dotGroup.find(model);
+			if (dotModel.nativeType == DefinedPosition.NATIVE) {
+				continue;
+			}
+			finalImportSet.add("Zod" + dotModel.dotTypeName);
+		}
+		for (final ClassModel model : writeImports) {
+			final DotClassElement dotModel = dotGroup.find(model);
+			if (dotModel.nativeType == DefinedPosition.NATIVE) {
+				continue;
+			}
+			finalImportSet.add(dotModel.dotTypeName + "Write");
+		}
+
+		if (finalImportSet.size() != 0) {
+			out.append("import {");
+			for (final String elem : finalImportSet) {
+				out.append("\n\t");
+				out.append(elem);
+				out.append(",");
+			}
+			out.append("\n} from \"../model\";\n\n");
+		}
+
+		out.append(data.toString());
+		*/
+
+		data.append("""
+									</table>
+								</td>
+							</tr>
+						</table>>
+					]
+				""");
+		data.append(outLinks.toString());
+		return data.toString();
+	}
+
+}
--- a/src/org/kar/archidata/externalRestApi/dot/DotClassElement.java
+++ b/src/org/kar/archidata/externalRestApi/dot/DotClassElement.java
@@ -0,0 +1,485 @@
+package org.kar.archidata.externalRestApi.dot;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map.Entry;
+
+import org.kar.archidata.externalRestApi.model.ClassEnumModel;
+import org.kar.archidata.externalRestApi.model.ClassListModel;
+import org.kar.archidata.externalRestApi.model.ClassMapModel;
+import org.kar.archidata.externalRestApi.model.ClassModel;
+import org.kar.archidata.externalRestApi.model.ClassObjectModel;
+import org.kar.archidata.externalRestApi.model.ClassObjectModel.FieldProperty;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DotClassElement {
+	static final Logger LOGGER = LoggerFactory.getLogger(DotClassElement.class);
+
+	public enum DefinedPosition {
+		NATIVE, // Native element of  dot language.
+		BASIC, // basic wrapping for JAVA type.
+		NORMAL // Normal Object to interpret.
+	}
+
+	public List<ClassModel> models;
+	public String zodName;
+	public String dotTypeName;
+	public String dotCheckType;
+	public String declaration;
+	public String fileName = null;
+	public String comment = null;
+	public DefinedPosition nativeType = DefinedPosition.NORMAL;
+
+	public static String determineFileName(final String className) {
+		return className.replaceAll("([a-z])([A-Z])", "$1-$2").replaceAll("([A-Z])([A-Z][a-z])", "$1-$2").toLowerCase();
+	}
+
+	public DotClassElement(final List<ClassModel> model, final String zodName, final String dotTypeName,
+			final String dotCheckType, final String declaration, final DefinedPosition nativeType) {
+		this.models = model;
+		this.zodName = zodName;
+		this.dotTypeName = dotTypeName;
+		this.declaration = declaration;
+		this.nativeType = nativeType;
+	}
+
+	public DotClassElement(final ClassModel model) {
+		this.models = List.of(model);
+		this.dotTypeName = model.getOriginClasses().getSimpleName();
+		this.declaration = null;
+	}
+
+	public boolean isCompatible(final ClassModel model) {
+		return this.models.contains(model);
+	}
+
+	public String generateEnum(final ClassEnumModel model, final DotClassElementGroup dotGroup) throws IOException {
+		final StringBuilder out = new StringBuilder();
+		out.append("""
+					%s [
+						shape=plain
+						label=<<table color="#33FF33" border="2" cellborder="1" cellspacing="0" cellpadding="4">
+							<tr>
+								<td port="NAME"><b>%s</b><br/>(ENUM)</td>
+							</tr>
+							<tr>
+								<td>
+									<table border="0" cellborder="0" cellspacing="0" >
+				""".formatted(this.dotTypeName, this.dotTypeName));
+		final boolean first = true;
+		for (final Entry<String, Object> elem : model.getListOfValues().entrySet()) {
+			out.append("\t\t\t\t\t\t<tr><td  align=\"left\"><b> + ");
+			out.append(elem.getKey());
+			out.append("</b> = ");
+			if (elem.getValue() instanceof final Integer value) {
+				out.append(value);
+			} else {
+				out.append("'");
+				out.append(elem.getValue());
+				out.append("'");
+			}
+			out.append("</td></tr>\n");
+		}
+		out.append("""
+									</table>
+								</td>
+							</tr>
+						</table>>
+					]
+				""");
+		return out.toString();
+	}
+
+	public String generateImporDot(final List<ClassModel> depModels, final DotClassElementGroup dotGroup)
+			throws IOException {
+		final StringBuilder out = new StringBuilder();
+		for (final ClassModel depModel : depModels) {
+			final DotClassElement dotModel = dotGroup.find(depModel);
+			if (dotModel.nativeType != DefinedPosition.NATIVE) {
+				out.append("import {");
+				out.append(dotModel.zodName);
+				out.append("} from \"./");
+				out.append(dotModel.fileName);
+				out.append("\";\n");
+			}
+		}
+		return out.toString();
+	}
+
+	private Object generateComment(final ClassObjectModel model) {
+		final StringBuilder out = new StringBuilder();
+		if (model.getDescription() != null || model.getExample() != null) {
+			out.append("/**\n");
+			if (model.getDescription() != null) {
+				for (final String elem : model.getDescription().split("\n")) {
+					out.append(" * ");
+					out.append(elem);
+					out.append("\n");
+				}
+			}
+			if (model.getExample() != null) {
+				out.append(" * Example:\n");
+				out.append(" * ```\n");
+				for (final String elem : model.getExample().split("\n")) {
+					out.append(" * ");
+					out.append(elem);
+					out.append("\n");
+				}
+				out.append(" * ```\n");
+			}
+			out.append(" */\n");
+		}
+		return out.toString();
+	}
+
+	public String optionalTypeZod(final FieldProperty field) {
+		// Common checking element (apply to List, Map, ...)
+		if (field.nullable()) {
+			return ".optional()";
+		}
+		if (field.notNull()) {
+			return "";
+		}
+		// Other object:
+		if (field.model().getOriginClasses() == null || field.model().getOriginClasses().isPrimitive()) {
+			return "";
+		}
+		if (field.columnNotNull()) {
+			return "";
+		}
+		return ".optional()";
+	}
+
+	public String maxSizeZod(final FieldProperty field) {
+		final StringBuilder builder = new StringBuilder();
+		final Class<?> clazz = field.model().getOriginClasses();
+		if (clazz == String.class) {
+			if (field.sizeMin() > 0) {
+				builder.append(".min(");
+				builder.append(field.sizeMin());
+				builder.append(")");
+			}
+			if (field.sizeMax() > 0) {
+				builder.append(".max(");
+				builder.append(field.sizeMax());
+				builder.append(")");
+			}
+		}
+		if (clazz == short.class || clazz == Short.class || clazz == int.class || clazz == Integer.class
+				|| clazz == long.class || clazz == Long.class || clazz == float.class || clazz == Float.class
+				|| clazz == double.class || clazz == Double.class) {
+			if (field.min() != null && field.min() > 0) {
+				builder.append(".min(");
+				builder.append(field.min());
+				builder.append(")");
+			}
+			if (field.max() != null && field.max() > 0) {
+				builder.append(".max(");
+				builder.append(field.max());
+				builder.append(")");
+			}
+		}
+		return builder.toString();
+	}
+
+	public String readOnlyZod(final FieldProperty field) {
+		if (field.readOnly()) {
+			return ".readonly()";
+		}
+		return "";
+	}
+
+	public String generateBaseObject() {
+		final StringBuilder out = new StringBuilder();
+		return out.toString();
+	}
+
+	public String convertHtml(final String data) {
+		return data.replace("<", "&lt;").replace(">", "&gt;");
+	}
+
+	public static String generateClassModelTypescript(final ClassModel model, final DotClassElementGroup dotGroup)
+			throws IOException {
+		if (model instanceof ClassEnumModel) {
+			final DotClassElement dotFieldModel = dotGroup.find(model);
+			return dotFieldModel.dotTypeName;
+		} else if (model instanceof ClassObjectModel) {
+			final DotClassElement dotFieldModel = dotGroup.find(model);
+			return dotFieldModel.dotTypeName;
+		} else if (model instanceof final ClassListModel fieldListModel) {
+			return generateDotList(fieldListModel, dotGroup);
+		} else if (model instanceof final ClassMapModel fieldMapModel) {
+			return generateDotMap(fieldMapModel, dotGroup);
+		}
+		throw new IOException("Impossible model:" + model);
+	}
+
+	public static String generateClassModelTypescriptLink(final ClassModel model, final DotClassElementGroup dotGroup)
+			throws IOException {
+		if (model instanceof ClassEnumModel) {
+			final DotClassElement dotFieldModel = dotGroup.find(model);
+			return dotFieldModel.dotTypeName;
+		} else if (model instanceof ClassObjectModel) {
+			final DotClassElement dotFieldModel = dotGroup.find(model);
+			if (dotFieldModel.nativeType == DefinedPosition.NORMAL) {
+				return dotFieldModel.dotTypeName;
+			}
+		} else if (model instanceof final ClassListModel fieldListModel) {
+			final String className = generateDotListClassName(fieldListModel, dotGroup);
+			if (className != null) {
+				return className;
+			}
+		} else if (model instanceof final ClassMapModel fieldMapModel) {
+			final String className = generateDotMapClassName(fieldMapModel, dotGroup);
+			if (className != null) {
+				return className;
+			}
+		}
+		return null;
+	}
+
+	public String generateObject(final ClassObjectModel model, final DotClassElementGroup dotGroup) throws IOException {
+		final StringBuilder out = new StringBuilder();
+		final StringBuilder outLinks = new StringBuilder();
+		out.append("""
+					%s [
+						shape=plain
+						ranksep="2"
+						label=<<table color="#000000" border="2" cellborder="1" cellspacing="0" cellpadding="4">
+							<tr>
+								<td port="NAME"><b>%s</b></td>
+							</tr>
+							<tr>
+								<td>
+									<table border="0" cellborder="0" cellspacing="0" >
+				""".formatted(this.dotTypeName, this.dotTypeName));
+		String inheritence = null;
+		if (model.getExtendsClass() != null) {
+			final ClassModel parentClass = model.getExtendsClass();
+			final DotClassElement dotParentModel = dotGroup.find(parentClass);
+			inheritence = dotParentModel.dotTypeName;
+		}
+		if (model.getFields().size() == 0) {
+			out.append("\t\t\t\t\t\t<tr><td> <i>(empty)</i> </td></tr>");
+		}
+		for (final FieldProperty field : model.getFields()) {
+			final ClassModel fieldModel = field.model();
+			if (field.comment() != null) {
+				out.append("\t\t\t\t\t\t<tr><td  align=\"left\"><i> // ");
+				out.append(convertHtml(field.comment()));
+				out.append("</i></td></tr>\n");
+			}
+			out.append("\t\t\t\t\t\t<tr><td  align=\"left\" port=\"");
+			out.append(field.name());
+			out.append("\"><b> + ");
+			out.append(field.name());
+			out.append("</b>: ");
+
+			out.append(generateClassModelTypescript(fieldModel, dotGroup));
+			final String remoteType = generateClassModelTypescriptLink(fieldModel, dotGroup);
+			if (remoteType != null) {
+				outLinks.append("\t");
+				outLinks.append(this.dotTypeName);
+				outLinks.append(":");
+				outLinks.append(field.name());
+				outLinks.append(":e -> ");
+				outLinks.append(remoteType);
+				outLinks.append(":NAME:w\n");
+			} else if (field.linkClass() != null) {
+				final String remoteLinkType = generateClassModelTypescriptLink(field.linkClass(), dotGroup);
+				if (remoteLinkType != null) {
+					outLinks.append("\t");
+					outLinks.append(this.dotTypeName);
+					outLinks.append(":");
+					outLinks.append(field.name());
+					outLinks.append(":e -> ");
+					outLinks.append(remoteLinkType);
+					outLinks.append(":NAME:w\n");
+				}
+			}
+			out.append("</td></tr>\n");
+		}
+		out.append("""
+									</table>
+								</td>
+							</tr>
+						</table>>
+					]
+				""");
+		if (inheritence != null) {
+			out.append("\tedge [dir=back arrowtail=empty arrowsize=2]\n");
+			out.append("\t");
+			out.append(inheritence);
+			// heritage stop link on the "s" South
+			out.append(":s -> ");
+			out.append(this.dotTypeName);
+			// heritage start link on the "n" North
+			out.append(":n\n");
+		}
+		if (!outLinks.isEmpty()) {
+			out.append("\tedge [dir=back arrowtail=diamond arrowsize=2]\n");
+			//out.append("\tedge [arrowhead=diamond arrowsize=2]\n");
+			out.append(outLinks.toString());
+
+		}
+		return out.toString();
+
+	}
+
+	private static String generateDotMap(final ClassMapModel model, final DotClassElementGroup dotGroup) {
+		final StringBuilder out = new StringBuilder();
+		out.append("Map&lt;");
+		if (model.keyModel instanceof final ClassListModel fieldListModel) {
+			final String tmp = generateDotList(fieldListModel, dotGroup);
+			out.append(tmp);
+		} else if (model.keyModel instanceof final ClassMapModel fieldMapModel) {
+			final String tmp = generateDotMap(fieldMapModel, dotGroup);
+			out.append(tmp);
+		} else if (model.keyModel instanceof final ClassObjectModel fieldObjectModel) {
+			final String tmp = generateDotObject(fieldObjectModel, dotGroup);
+			out.append(tmp);
+		} else if (model.keyModel instanceof final ClassEnumModel fieldEnumModel) {
+			final String tmp = generateDotEnum(fieldEnumModel, dotGroup);
+			out.append(tmp);
+		}
+		out.append(", ");
+		if (model.valueModel instanceof final ClassListModel fieldListModel) {
+			final String tmp = generateDotList(fieldListModel, dotGroup);
+			out.append(tmp);
+		} else if (model.valueModel instanceof final ClassMapModel fieldMapModel) {
+			final String tmp = generateDotMap(fieldMapModel, dotGroup);
+			out.append(tmp);
+		} else if (model.valueModel instanceof final ClassObjectModel fieldObjectModel) {
+			final String tmp = generateDotObject(fieldObjectModel, dotGroup);
+			out.append(tmp);
+		} else if (model.valueModel instanceof final ClassEnumModel fieldEnumModel) {
+			final String tmp = generateDotEnum(fieldEnumModel, dotGroup);
+			out.append(tmp);
+		}
+		out.append("&gt;");
+		return out.toString();
+	}
+
+	private static String generateDotEnum(final ClassEnumModel model, final DotClassElementGroup dotGroup) {
+		final DotClassElement dotParentModel = dotGroup.find(model);
+		return dotParentModel.dotTypeName;
+	}
+
+	private static String generateDotObject(final ClassObjectModel model, final DotClassElementGroup dotGroup) {
+		final DotClassElement dotParentModel = dotGroup.find(model);
+		return dotParentModel.dotTypeName;
+	}
+
+	private static String generateDotObjectClassName(
+			final ClassObjectModel model,
+			final DotClassElementGroup dotGroup) {
+		final DotClassElement dotParentModel = dotGroup.find(model);
+		if (dotParentModel.nativeType == DefinedPosition.NORMAL) {
+			return dotParentModel.dotTypeName;
+		}
+		return null;
+	}
+
+	private static String generateDotListClassName(final ClassListModel model, final DotClassElementGroup dotGroup) {
+		if (model.valueModel instanceof final ClassListModel fieldListModel) {
+			return generateDotListClassName(fieldListModel, dotGroup);
+		} else if (model.valueModel instanceof final ClassMapModel fieldMapModel) {
+			return generateDotMapClassName(fieldMapModel, dotGroup);
+		} else if (model.valueModel instanceof final ClassObjectModel fieldObjectModel) {
+			return generateDotObjectClassName(fieldObjectModel, dotGroup);
+		}
+		return null;
+	}
+
+	private static String generateDotMapClassName(final ClassMapModel model, final DotClassElementGroup dotGroup) {
+		if (model.valueModel instanceof final ClassListModel fieldListModel) {
+			return generateDotListClassName(fieldListModel, dotGroup);
+		} else if (model.valueModel instanceof final ClassMapModel fieldMapModel) {
+			return generateDotMapClassName(fieldMapModel, dotGroup);
+		} else if (model.valueModel instanceof final ClassObjectModel fieldObjectModel) {
+			return generateDotObjectClassName(fieldObjectModel, dotGroup);
+		} else if (model.valueModel instanceof final ClassEnumModel fieldEnumModel) {
+			return generateDotEnum(fieldEnumModel, dotGroup);
+		}
+		return null;
+	}
+
+	private static String generateDotList(final ClassListModel model, final DotClassElementGroup dotGroup) {
+		final StringBuilder out = new StringBuilder();
+		out.append("List&lt;");
+		if (model.valueModel instanceof final ClassListModel fieldListModel) {
+			final String tmp = generateDotList(fieldListModel, dotGroup);
+			out.append(tmp);
+		} else if (model.valueModel instanceof final ClassMapModel fieldMapModel) {
+			final String tmp = generateDotMap(fieldMapModel, dotGroup);
+			out.append(tmp);
+		} else if (model.valueModel instanceof final ClassObjectModel fieldObjectModel) {
+			final String tmp = generateDotObject(fieldObjectModel, dotGroup);
+			out.append(tmp);
+		}
+		out.append("&gt;");
+		return out.toString();
+	}
+
+	public String generateFile(final DotClassElementGroup dotGroup) throws IOException {
+		if (this.nativeType == DefinedPosition.NATIVE) {
+			return "";
+		}
+		final ClassModel model = this.models.get(0);
+		String data = "";
+		if (this.nativeType == DefinedPosition.BASIC && model instanceof ClassObjectModel) {
+			// nothing to do___ data = generateBaseObject();
+		} else if (model instanceof final ClassEnumModel modelEnum) {
+			data = generateEnum(modelEnum, dotGroup);
+		} else if (model instanceof final ClassObjectModel modelObject) {
+			data = generateObject(modelObject, dotGroup);
+		}
+		return data;
+	}
+
+	private static String generateLocalModelBase(final ClassModel model, final DotClassElementGroup dotGroup)
+			throws IOException {
+		if (model instanceof final ClassObjectModel objectModel) {
+			return generateDotObject(objectModel, dotGroup);
+		}
+		if (model instanceof final ClassEnumModel enumModel) {
+			return generateDotEnum(enumModel, dotGroup);
+		}
+		if (model instanceof final ClassListModel listModel) {
+			return generateDotList(listModel, dotGroup);
+		}
+		if (model instanceof final ClassMapModel mapModel) {
+			return generateDotMap(mapModel, dotGroup);
+		}
+		return "";
+	}
+
+	public static String generateLocalModel(
+			final String ModelName,
+			final List<ClassModel> models,
+			final DotClassElementGroup dotGroup) throws IOException {
+		if (models.size() == 1) {
+			if (models.get(0) instanceof ClassObjectModel) {
+				return null;
+			}
+			if (models.get(0) instanceof ClassEnumModel) {
+				return null;
+			}
+		}
+		final StringBuilder out = new StringBuilder();
+		if (models.size() == 1) {
+			out.append(generateLocalModelBase(models.get(0), dotGroup));
+		} else {
+			out.append("Union&lt;");
+			for (final ClassModel model : models) {
+				out.append("\t");
+				out.append(generateLocalModelBase(models.get(0), dotGroup));
+				out.append(",\n");
+			}
+			out.append("&gt;");
+		}
+		return out.toString();
+	}
+
+}
--- a/src/org/kar/archidata/externalRestApi/dot/DotClassElementGroup.java
+++ b/src/org/kar/archidata/externalRestApi/dot/DotClassElementGroup.java
@@ -0,0 +1,27 @@
+package org.kar.archidata.externalRestApi.dot;
+
+import java.util.List;
+
+import org.kar.archidata.externalRestApi.model.ClassModel;
+
+public class DotClassElementGroup {
+	private final List<DotClassElement> dotElements;
+
+	public List<DotClassElement> getDotElements() {
+		return this.dotElements;
+	}
+
+	public DotClassElementGroup(final List<DotClassElement> tsElements) {
+		this.dotElements = tsElements;
+	}
+
+	public DotClassElement find(final ClassModel model) {
+		for (final DotClassElement elem : this.dotElements) {
+			if (elem.isCompatible(model)) {
+				return elem;
+			}
+		}
+		return null;
+	}
+
+}
--- a/src/org/kar/archidata/externalRestApi/model/ApiGroupModel.java
+++ b/src/org/kar/archidata/externalRestApi/model/ApiGroupModel.java
@@ -0,0 +1,72 @@
+package org.kar.archidata.externalRestApi.model;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+// Temporary class that permit to order the list of API.
+record OrderedElement(
+		String methodName,
+		Method method) {}
+
+public class ApiGroupModel {
+	static final Logger LOGGER = LoggerFactory.getLogger(ApiGroupModel.class);
+
+	// Name of the REST end-point name
+	public String restEndPoint;
+	// Name of the Class
+	public String name;
+	// Origin class reference
+	public Class<?> originClass;
+	// List of all API
+	public List<ApiModel> interfaces = new ArrayList<>();
+
+	public ApiModel getInterfaceNamed(final String name) {
+		for (final ApiModel model : this.interfaces) {
+			if (name.equals(model.name)) {
+				return model;
+			}
+		}
+		return null;
+	}
+
+	public ApiGroupModel(final Class<?> clazz, final ModelGroup previousModel) throws Exception {
+		this.originClass = clazz;
+		// the basic path has no specific elements...
+		this.restEndPoint = ApiTool.apiAnnotationGetPath(clazz);
+		if (this.restEndPoint == null) {
+			this.restEndPoint = "";
+		}
+		this.name = clazz.getSimpleName();
+
+		final List<String> consumes = ApiTool.apiAnnotationGetConsumes(clazz);
+		final List<String> produces = ApiTool.apiAnnotationProduces(clazz);
+
+		// Get all method to order it. This permit to stabilize the generation.
+		// JAVA has dynamic allocation of member order, then we need to order it?.
+		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) {
+			// Check if the path is available
+			final RestTypeRequest methodType = ApiTool.apiAnnotationGetTypeRequest2(orderedElement.method());
+			if (methodType == null) {
+				LOGGER.info("    [{}] {} ==> No methode type @PATH, @GET ...", methodType, orderedElement.methodName());
+				continue;
+			}
+			final ApiModel model = new ApiModel(clazz, orderedElement.method(), this.restEndPoint, consumes, produces,
+					previousModel);
+			this.interfaces.add(model);
+		}
+	}
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Edouard DUPIN	ab7259f726	[RELEASE] create version v0.13.0	2024-06-25 15:47:53 +02:00
Edouard DUPIN	cdb4581799	[FEAT] add link of List<UUID> that is decorate with @ManyToOne, or @ManyToMany or @OneToMany	2024-06-20 00:10:22 +02:00
Edouard DUPIN	7e81bfef28	[FEAT] add generation of dot files	2024-06-20 00:10:22 +02:00
Edouard DUPIN	84525fd7aa	[FIX] cover tools	2024-06-13 08:27:33 +02:00
Edouard DUPIN	d4eb9c2a5f	[FIX] correct the ID in uuid for uuid primary-key	2024-06-12 20:08:26 +02:00
Edouard DUPIN	15688f93e5	[FIX] version number	2024-06-12 00:55:51 +02:00
Edouard DUPIN	906216f237	[FIX] throw when uploading data	2024-06-12 00:54:42 +02:00
Edouard DUPIN	b479414bc2	[FIX] callbacks elements	2024-06-12 00:54:22 +02:00
Edouard DUPIN	2bc68321e3	[DEV] develoopment version	2024-06-12 00:53:29 +02:00
Edouard DUPIN	d77a5518ff	[RELEASE] create version v0.12.1	2024-06-11 23:59:59 +02:00
Edouard DUPIN	5f9d13d315	[FEAT] remove in upload cover the filename	2024-06-11 23:48:43 +02:00
Yoann Fleury	0b57d8571c	fix: plural for callbacks	2024-06-11 12:41:31 +02:00
Edouard DUPIN	483c41914a	[RELEASE] create version v0.12.0	2024-06-10 22:26:57 +02:00
Edouard DUPIN	a1f56050bf	[FEAT] support the min and Max for number and string	2024-06-08 13:48:34 +02:00
Edouard DUPIN	a41e837f21	[FIX] import "Write" when no write availlable.	2024-06-08 11:55:51 +02:00
Edouard DUPIN	5496855698	[FEAT] add a remove warning	2024-06-08 11:43:29 +02:00
Edouard DUPIN	c9cb0d043a	[API] remove @SQLWhere	2024-06-08 11:43:00 +02:00
Edouard DUPIN	09cfcfc578	[FEAT] generate a full Zod object for write mode. - Add @NoWriteSpecificMode to permit to remove specific object write model - refactor Zod Write model - Add .nullable() in write Optional element Residual bug element use in APi that is mark as no write	2024-06-08 11:42:38 +02:00
Edouard DUPIN	e4c56a4da5	[RELEASE] create version v0.11.0	2024-06-02 21:30:58 +02:00
Edouard DUPIN	22614aee98	[DEPENDENCY] update dependency	2024-06-02 21:30:36 +02:00
Edouard DUPIN	5bbcf63c42	[FIX] close some statements	2024-06-02 21:28:29 +02:00
Edouard DUPIN	1c02d333a3	[FIX] remove a warnning of spotbug	2024-06-02 21:28:12 +02:00
Edouard DUPIN	1c41ea4273	[FEAT] add a simple tool to generate random string (usefull in test)	2024-06-02 21:27:53 +02:00
Edouard DUPIN	274767d89b	[FEAT] add some Logs when fail	2024-06-02 21:27:20 +02:00
Edouard DUPIN	4236dc38bd	[FIX] correct many data-access element that does not close elements	2024-06-02 21:23:57 +02:00
Edouard DUPIN	7d4b246d4a	[FEAT] add dependency of spotbug to have better code	2024-06-02 21:23:26 +02:00
Edouard DUPIN	f6f256c006	[FIX] Correct Exception types in the DataJson Add-on	2024-06-02 13:11:25 +02:00
Edouard DUPIN	d46b84c741	[FEAT] support DELETE return Data	2024-06-02 13:10:38 +02:00
Edouard DUPIN	3e6b9bf77c	[FIX] Correct RESTApi.gets retreive data list in a correct way	2024-06-02 13:10:18 +02:00
Edouard DUPIN	007003394a	[FEAT] add FailException adding exception context to permit better display of error in the future	2024-06-02 13:09:30 +02:00
Edouard DUPIN	54d4c420f9	[FEAT] DataAccess reduce log levels	2024-06-02 13:08:48 +02:00
Edouard DUPIN	0a307f3f6e	[FIX] correct annotation tool throws	2024-06-02 13:08:21 +02:00
Edouard DUPIN	d968a2c48f	[DOC] add spotbug documentation	2024-06-02 13:07:51 +02:00
Edouard DUPIN	c43e283b57	[FIX] socme checks	2024-06-01 19:49:36 +02:00
Edouard DUPIN	6af6f91166	[FIX] SpotBug finding some errors	2024-06-01 16:48:59 +02:00
Edouard DUPIN	c94f488747	[FIX] better compatibility with @OneToMany	2024-06-01 13:53:48 +02:00
Edouard DUPIN	c44b726cc1	[FEAT] add test for @OneToMany that fail	2024-06-01 13:10:28 +02:00
Edouard DUPIN	c412daa1ca	[TEST] simplify test model	2024-06-01 13:09:53 +02:00
Edouard DUPIN	aa700f9dc5	[FEAT] add a throw in an impossible class call	2024-06-01 13:09:20 +02:00
Edouard DUPIN	a1791cf61d	[TEST] LOG in TRACE only the library	2024-06-01 13:08:45 +02:00
Edouard DUPIN	9c9da21bdb	[STYLE] error commit	2024-06-01 13:08:15 +02:00
Edouard DUPIN	dc6eeac008	[FIX] fix @ManyToOne (add UUID test)	2024-06-01 13:07:58 +02:00
Edouard DUPIN	f3a9ebf5e1	[STYLE] set all the typescript generation in a sub-folder	2024-06-01 13:01:32 +02:00
Edouard DUPIN	1fe3cc3523	[FIX] Correct the fail retur API to transmit the error from backend when compatible and wrat it when error occured	2024-05-31 21:50:50 +02:00
Edouard DUPIN	91849094cd	[DEV] Correct all catcher to be named normalized	2024-05-31 19:51:24 +02:00
Edouard DUPIN	7b72b08fc0	[FEAT] permit a better support of @OneToMany	2024-05-29 20:16:48 +02:00
Edouard DUPIN	ebf1b4b76a	[RELEASE] create version v0.10.3	2024-05-29 10:40:06 +02:00
Edouard DUPIN	f6aff28488	[FIX] ser cover nullable	2024-05-29 00:01:28 +02:00
Edouard DUPIN	6ebb9eb395	[FIX] remove accept type when void return	2024-05-29 00:01:04 +02:00
Edouard DUPIN	17664f1c2f	[FIX] missing delete in links	2024-05-29 00:00:08 +02:00
Edouard DUPIN	1373760498	[FIX] correct the declaration of Object	2024-05-28 22:22:24 +02:00
Edouard DUPIN	8ffa392b2a	[FEAT] create sub-directories	2024-05-28 22:21:05 +02:00
Edouard DUPIN	6104b68a02	[FIX] correct input order.	2024-05-28 22:07:41 +02:00
Edouard DUPIN	3c85af5af9	[FEAT] add a contructor to simplify a checker API	2024-05-28 18:04:54 +02:00
Edouard DUPIN	38d1fa9241	[DEV] simple rework the Check JPA	2024-05-28 18:04:31 +02:00
Edouard DUPIN	0e498c6a26	[RELEASE] create version v0.10.2	2024-05-27 17:00:52 +02:00
Edouard DUPIN	187ffba188	[FEAT] manage @nullable contrainst on list and Map too.	2024-05-27 17:00:31 +02:00
Edouard DUPIN	2a2b6b8f3b	[RELEASE] create version v0.10.1	2024-05-24 12:33:16 +02:00
Edouard DUPIN	73770b03c3	[FIX] wrong type when set the @AsyncModel	2024-05-24 12:32:16 +02:00
Edouard DUPIN	5d8d4d9d2a	[RELEASE] create version v0.10.0	2024-05-24 00:27:50 +02:00
Edouard DUPIN	745b0cb39b	[FIX] correct API generation	2024-05-24 00:23:11 +02:00
Edouard DUPIN	9bad883866	[FEAT] add capability to support null queryOption to simplify API	2024-05-23 23:03:54 +02:00
Edouard DUPIN	f1c3b88a00	[DEV] add checker option to permit to inject some property in the checker	2024-05-23 00:08:56 +02:00
Edouard DUPIN	8c30336bdb	[FIX] Correct Rest tool interface for stric mode of Typescript	2024-05-22 17:27:36 +02:00
Edouard DUPIN	6f36f98cd6	[FIX] correct the JPA display of minimum error	2024-05-22 16:29:49 +02:00
Edouard DUPIN	c843d7a64b	[FIX] correct the size of ErrorRespose and remove needed of UUID	2024-05-22 16:29:21 +02:00
Edouard DUPIN	7059e687db	[RELEASE] create version v0.9.0	2024-05-21 23:54:32 +02:00
Edouard DUPIN	bfb6498782	[FIX] remove dead test	2024-05-21 23:54:01 +02:00
Edouard DUPIN	94abf842e7	[DEV] update dependency	2024-05-21 23:54:01 +02:00
Edouard DUPIN	300ce8eab6	[FIX] correct test	2024-05-21 23:54:01 +02:00
Edouard DUPIN	c33a73a567	[STYLE] format code	2024-05-21 23:54:01 +02:00
Edouard DUPIN	0597ba0df3	[FEAT remove old API and add type in enum int model	2024-05-21 23:53:57 +02:00
Edouard DUPIN	4dabfcf7d7	[DEV] full rework of Typescript generator (operational)	2024-05-21 23:53:31 +02:00
Edouard DUPIN	4f7d2d711f	[DEV] first step to generation of API	2024-05-21 23:53:31 +02:00
Edouard DUPIN	9ac3a95060	[FEAT] model generation is ready	2024-05-21 23:53:31 +02:00
Edouard DUPIN	dc022abd2d	[FEAT] continue refacto of the model generator (base model generated, not the API, mission some control like optional, and limit size	2024-05-21 23:53:26 +02:00
Edouard DUPIN	7a36580cce	[FEAT] continue refacto of the generation code	2024-05-21 23:52:53 +02:00
Edouard DUPIN	6031e6e557	[FEAT] continue integration	2024-05-21 23:52:53 +02:00
Edouard DUPIN	6d6fbf93ca	[DEV] refacto the external rest api generator	2024-05-21 23:52:53 +02:00
Edouard DUPIN	e1f1335e89	[DEV] update version dev	2024-05-20 13:19:59 +02:00
Edouard DUPIN	e914daf71b	[RELEASE] release v0.8.11	2024-05-20 13:19:31 +02:00
Edouard DUPIN	d859c7c278	[FIX] update any lines	2024-05-20 13:18:43 +02:00
Edouard DUPIN	420ea94b42	[DEV] update development tag	2024-05-20 09:59:21 +02:00
Edouard DUPIN	604c76103f	[RELEASE] create version v0.8.10	2024-05-20 09:55:54 +02:00
Edouard DUPIN	1fbc9e5874	[API] remove api to generate zod models index to prevent coding errors	2024-05-16 18:53:34 +02:00
Edouard DUPIN	17fdd7b83b	[FIX] correct enum type converting	2024-05-16 18:52:11 +02:00
Edouard DUPIN	4cbad1fc6a	[FIX] correct the deleted mode in @ManyToMany	2024-05-16 18:51:48 +02:00
Edouard DUPIN	6e784f5f50	Conver user cover as json and link table with UUID and delete	2024-05-15 23:24:04 +02:00
Edouard DUPIN	81672115c8	[RELEASE] release version v0.8.9	2024-05-12 23:55:19 +02:00
Edouard DUPIN	25e6972efd	[FIX] error of .ts	2024-05-12 23:54:08 +02:00
Edouard DUPIN	850964932f	[RELEASE] release version v0.8.8	2024-05-12 23:41:48 +02:00
Edouard DUPIN	b3364753dd	[FEAT] correct .ts in include	2024-05-12 23:38:52 +02:00
Edouard DUPIN	a0d96f1322	[RELEASA] create v0.8.7	2024-05-12 09:06:29 +02:00
Edouard DUPIN	ad3c1f4b7d	[FIX] missing basic constructor	2024-05-12 09:05:45 +02:00
Edouard DUPIN	a77db1035d	[DEPEN] update dependency	2024-05-12 08:40:18 +02:00
Edouard DUPIN	f1a31fed56	[FIX] permit to not check the type getted	2024-05-09 00:12:42 +02:00
Edouard DUPIN	7c087fcd8f	[FIX] correct the void get values	2024-05-09 00:11:14 +02:00
Edouard DUPIN	183906dc97	[FIX] correct format of json timestamp	2024-05-09 00:10:46 +02:00
Edouard DUPIN	94e5603380	[FIX] correct zod model for dates and times	2024-05-09 00:10:04 +02:00
Edouard DUPIN	f06b5a1edc	[DEV] set code compatible with ES2018	2024-05-08 19:11:04 +02:00
Edouard DUPIN	f3f6cd91d0	[RELEASE] release version v0.8.6	2024-05-06 21:52:05 +02:00
Edouard DUPIN	6c048ac22b	[FEAT] generate the typescipt interface ordered	2024-05-06 21:50:38 +02:00
Edouard DUPIN	755b258ddb	[RELEASE] create version v0.8.5	2024-05-06 19:08:19 +02:00
Edouard DUPIN	4be9f663ac	[DOC] add some documentation	2024-05-05 12:33:49 +02:00
Edouard DUPIN	280d86e333	[FEAT] add a minimum sample (Not tested)	2024-05-05 12:33:33 +02:00
Edouard DUPIN	70cbb1aae9	[FEAT] reorganize pakages	2024-05-05 12:33:08 +02:00
Edouard DUPIN	9d5c3c01db	[DEV] correct input order	2024-05-04 10:05:16 +02:00
Edouard DUPIN	148bdcbabd	[RELEASE] new version v0.8.4	2024-05-03 12:12:05 +02:00
Edouard DUPIN	46d1284174	[FEAT] update well produce when woid is return	2024-05-01 23:10:27 +02:00
Edouard DUPIN	866e28a645	[RELEASE] new version v0.8.3	2024-04-30 21:58:56 +02:00
Edouard DUPIN	62ec396ff7	[FEAT] Add capability to merge condition option in request and correct some back for SQLITE	2024-04-30 21:57:58 +02:00
Edouard DUPIN	4517854749	[DEV] update th format of the code	2024-04-28 16:56:33 +02:00
Edouard DUPIN	29a6e7602c	[FEAT] add capability to set condition in update	2024-04-28 11:44:01 +02:00
Edouard DUPIN	d94e526bd4	[RELEASE] release v0.8.2	2024-04-28 10:32:12 +02:00
Edouard DUPIN	b9b008b103	[API] set old add-on deprecated	2024-04-28 10:30:26 +02:00
Edouard DUPIN	c43dfa097a	[FEAT] add dependency of the primary key and rework quer(r)y	2024-04-28 10:27:30 +02:00
Edouard DUPIN	4fd13ceb1d	change id to uuid to well understand the id type	2024-04-27 08:53:30 +02:00
Edouard DUPIN	6c8ea9e46e	[FIX] correct the uuid list getted	2024-04-27 08:52:55 +02:00
Edouard DUPIN	e183ea7ff6	[RELEASE] version v0.8.1	2024-04-26 00:03:33 +02:00
Edouard DUPIN	69006ca067	[FIX] correct remote element	2024-04-26 00:02:42 +02:00
Edouard DUPIN	cfe488f2be	[DEV] fix format	2024-04-25 08:28:30 +02:00
Edouard DUPIN	cb0ee69820	[RELEASE] create version v0.8.0	2024-04-24 15:48:48 +02:00
Edouard DUPIN	cfc7ec2ff1	[FIX] correct the typescript gneration	2024-04-22 23:02:52 +02:00
Edouard DUPIN	0605ef0824	[DEV] better management of UUID as remove elemnt	2024-04-20 21:58:31 +02:00
Edouard DUPIN	3309abe053	[DEV] update some zond generation file	2024-04-19 08:47:24 +02:00
Edouard DUPIN	f069ce7cc3	[DEV] format code	2024-04-17 23:11:04 +02:00
Edouard DUPIN	a82c3e725d	[RELEASE] create a new version	2024-04-17 23:08:33 +02:00
Edouard DUPIN	08124f212a	[DEV] update REST tool for TS	2024-04-17 23:08:06 +02:00
Edouard DUPIN	631999e135	[FIX] correct the many to One insertion for type other than Long	2024-04-17 12:13:26 +02:00
Edouard DUPIN	7674d9a299	[DEV] well support of the callback for stream	2024-04-17 12:12:50 +02:00
Edouard DUPIN	9cd71ab601	[DEV] add progress callback ==> does not work	2024-04-15 00:56:00 +02:00
Edouard DUPIN	4cb8c84312	[VERSION] create version 0.7.2	2024-03-29 22:37:54 +01:00
Edouard DUPIN	5acdbfb0c7	[DEV] update models	2024-03-29 22:37:54 +01:00
Edouard DUPIN	d35c83fcbf	[DEV] generate a definable UUID	2024-03-19 23:14:11 +01:00
Edouard DUPIN	0fe769a203	[FORMAT] error while formating	2024-03-19 08:48:24 +01:00
Edouard DUPIN	dbe1b469f6	[DEV] update dev tag version	2024-03-19 08:43:14 +01:00
Edouard DUPIN	875b4b313b	[RELEASE] new version 0.7.0	2024-03-19 08:42:29 +01:00
Edouard DUPIN	15a7814a3b	[DEV] update new model	2024-03-19 08:37:07 +01:00
Edouard DUPIN	530d254bf2	Many correction of the cover, data ...	2024-03-17 23:43:56 +01:00
Edouard DUPIN	e1d9da70c8	[DEV] better zod export	2024-03-15 07:57:13 +01:00
Edouard DUPIN	c13f910620	[DEV] better management of generation of multiple Type requested	2024-03-11 22:51:04 +01:00
Edouard DUPIN	6944331761	[DEV] add capability to copy the tool file	2024-03-11 22:51:04 +01:00
Edouard DUPIN	151aa498e5	[DEV] manage native enum instead of String enum mode	2024-03-11 22:51:04 +01:00
Edouard DUPIN	db6a20fa02	[DEV] add mulktipart management	2024-03-11 22:51:04 +01:00
Edouard DUPIN	8e913b54ad	[DEV] update capacity to upload file	2024-03-11 22:51:04 +01:00
Edouard DUPIN	092bef5a7b	[DEV] add missing tools for TS	2024-03-11 00:02:35 +01:00
Edouard DUPIN	e5d75bc97b	Simplify the model	2024-03-10 23:58:44 +01:00
Edouard DUPIN	7c217716c9	[DEV] update Typescript API generation	2024-03-10 11:09:52 +01:00
Edouard DUPIN	526f902eae	[DEV] add API generation (base)	2024-03-09 08:42:26 +01:00
Edouard DUPIN	42ac2f3056	[DEV] add capacity to manage isXXX on Zod element	2024-03-04 23:50:44 +01:00
Edouard DUPIN	389e4138c3	[DEV] continue migration of the Zood and UUID for Data	2024-03-03 08:49:20 +01:00
Edouard DUPIN	6584022861	[DEV] correct timing	2024-03-02 15:21:03 +01:00
Edouard DUPIN	41fb181545	[DEV] work on uuid and callbak migration	2024-02-27 08:00:51 +01:00
Edouard DUPIN	56609e4f59	[DEV] add management of UUID (not tested)	2024-02-26 19:37:51 +01:00
Edouard DUPIN	e0b7ed1e1e	[DEV] update dev tag version	2024-02-25 23:57:01 +01:00
Edouard DUPIN	48c32a3744	[RELEASE] new version 0.6.3	2024-02-25 23:56:41 +01:00
Edouard DUPIN	fc521d2287	[DEV] correct some retreave data from json	2024-02-25 23:55:29 +01:00
Edouard DUPIN	15125e2d6d	[DEV] add condition in row request and better name naming in condition	2024-02-25 19:11:54 +01:00
Edouard DUPIN	6f1dd991c5	[DEV] update dev tag version	2024-02-25 19:10:51 +01:00
Edouard DUPIN	009831f5db	[RELEASE] new version 0.6.2	2024-02-25 19:10:19 +01:00
Edouard DUPIN	1bcdb1df8c	[DEBUG] fix the UserDBAccess	2024-02-03 18:47:30 +01:00
Edouard DUPIN	7ae948bb79	[DEV] add raw query	2024-02-03 18:47:11 +01:00
Edouard DUPIN	29402fc27e	[DEV] add csv serializator for user export	2024-02-03 18:46:30 +01:00
Edouard DUPIN	eca28292d5	[DEV] start retreive from random request	2024-01-29 01:06:24 +01:00
Edouard DUPIN	aef4cdabc3	[DEV] configure mode to access on multiple database	2024-01-28 23:49:12 +01:00
Edouard DUPIN	04114aa0cf	[DEV] format code	2024-01-19 21:23:29 +01:00
Edouard DUPIN	575102fbfa	[DEV] update dev tag version	2024-01-19 21:21:43 +01:00