[RELEASE] new version 0.14.0

- 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

.classpath

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry including="**/*.java" kind="src" output="out/maven/classes" path="src">
+	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" output="out/maven/test-classes" path="test/src">
+	<classpathentry kind="src" output="target/test-classes" path="test/src">
 		<attributes>
 			<attribute name="test" value="true"/>
 			<attribute name="optional" value="true"/>
@@ -18,17 +18,31 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="out/maven/test-classes" path="test/resources">
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="test/resources">
 		<attributes>
 			<attribute name="test" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="out/maven/classes"/>
+	<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"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="target/generated-sources/annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

.github/dependabot.yml

@@ -0,0 +1,12 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
+

.github/workflows/maven.yml

@@ -0,0 +1,37 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ "develop" ]
+  pull_request:
+    branches: [ "develop" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: '21'
+        distribution: 'temurin'
+        cache: maven
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
+    - name: find the element
+      run: find . -name "dependency-graph.json"
+
+    # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
+    - name: Update dependency graph
+      uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6

.gitignore

@@ -1,3 +1,4 @@
 out/
+target/
 *.class
 .settings/

.island/release.bash

@@ -0,0 +1,14 @@
+#!/bin/bash
+version_file="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

.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>

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>

LICENSE

@@ -1,6 +1,373 @@
-PROPIETARY licence
-==================
+Mozilla Public License Version 2.0
+==================================
 
-Copyright at Edouard DUPIN
+1. Definitions
+--------------
 
-you have no right
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.

README.md

@@ -1,18 +1,60 @@
-Generic backend for archidata in java
-===================================
+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
   
   
+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
+```
 
-// create a single package jar
-mvn clean compile assembly:single
+Run the test
+```bash
+mvn test
+```
 
+Install it for external use
+```bash
+mvn install
+```
 
+Develop With Eclipse:
+--------------------
 
-generic interface for all KAR web application
+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`
 
 
 Somes tools:
@@ -21,7 +63,7 @@ Somes tools:
 Auto-update dependency:
 -----------------------
 
-auto-update to the last version dependency:
+Auto-update to the last version dependency:
 
 ```bash
 mvn versions:use-latest-versions
@@ -36,6 +78,27 @@ Simply run the cmd-line:
 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
+
+Run Spot-bug:
+------------
+
+```bash
+mvn spotbugs:check
+```
 
 Add Gitea in the dependency for the registry:
 =============================================
@@ -65,8 +128,8 @@ edit file: ```~/.m2/settings.xml```
 release:
 ========
 
-```
-export PATH=/usr/lib/jvm/java-19-openjdk/bin:$PATH
+```bash
+export PATH=$(ls -d --color=never /usr/lib/jvm/java-2*-openjdk)/bin:$PATH
 mvn install
 mvn deploy
 ```

dependabot.yml

@@ -0,0 +1 @@
+

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);
+                )
+            )
+        )
+    );
+```
+
+

doc/TUTORIAL_01_first_install.md

@@ -0,0 +1,3 @@
+Basic tutorial
+==============
+

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
+====================
+

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)

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).
+

doc/typescript_api_generation.md

@@ -0,0 +1,5 @@
+TypeScript Api generation
+=========================
+
+
+

pom.xml

@@ -3,19 +3,17 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>kangaroo-and-rabbit</groupId>
 	<artifactId>archidata</artifactId>
-	<version>0.5.0</version>
+	<version>0.13.1-SNAPSHOT</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>
-
 		<maven.dependency.version>3.1.1</maven.dependency.version>
-
-		<jersey.version>3.1.1</jersey.version>
+		<jersey.version>3.1.5</jersey.version>
 		<jaxb.version>2.3.1</jaxb.version>
 		<istack.version>4.1.1</istack.version>
 	</properties>
-
 	<repositories>
 		<repository>
 			<id>gitea</id>
@@ -32,7 +30,6 @@
 			<url>https://gitea.atria-soft.org/api/packages/kangaroo-and-rabbit/maven</url>
 		</snapshotRepository>
 	</distributionManagement>
-
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
@@ -44,20 +41,43 @@
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
-	
 	<dependencies>
 		<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
 		<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>
+		<!-- Decode webP images -->
+		<dependency>
+			<groupId>com.twelvemonkeys.imageio</groupId>
+			<artifactId>imageio-webp</artifactId>
+			<version>3.11.0</version>
+		</dependency>
+		<!-- Decode JPEG image -->
+		<dependency>
+			<groupId>com.twelvemonkeys.imageio</groupId>
+			<artifactId>imageio-jpeg</artifactId>
+			<version>3.11.0</version>
+		</dependency>
+		<!-- Encode file in webp -->
+		<dependency>
+			<groupId>com.github.gotson</groupId>
+			<artifactId>webp-imageio</artifactId>
+			<version>0.2.2</version>
+		</dependency>
+		<!-- Detect type of a file with mime type -->
+		<dependency>
+			<groupId>org.apache.tika</groupId>
+			<artifactId>tika-core</artifactId>
+			<version>3.0.0-BETA2</version>
+		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.glassfish.jersey.media/jersey-media-multipart -->
 		<dependency>
 			<groupId>org.glassfish.jersey.media</groupId>
@@ -83,12 +103,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>
@@ -100,11 +120,13 @@
 			<artifactId>istack-commons-runtime</artifactId>
 			<version>${istack.version}</version>
 		</dependency>
+		<!-- continu to be needed ??? -->
 		<dependency>
 			<groupId>org.glassfish.jersey.test-framework.providers</groupId>
 			<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<!-- Serialize and un-serialize request in JSON-->
 		<dependency>
 			<groupId>org.glassfish.jersey.media</groupId>
 			<artifactId>jersey-media-json-jackson</artifactId>
@@ -112,35 +134,59 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-            <version>2.16.0</version>
+			<version>2.18.0-rc1</version>
+		</dependency>
+		<!-- encode output in CSV -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.dataformat</groupId>
+			<artifactId>jackson-dataformat-csv</artifactId>
+			<version>2.18.0-rc1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.datatype</groupId>
+			<artifactId>jackson-datatype-jsr310</artifactId>
+			<version>2.18.0-rc1</version>
 		</dependency>
 		<dependency>
 			<groupId>jakarta.servlet</groupId>
 			<artifactId>jakarta.servlet-api</artifactId>
-		    <version>6.1.0-M1</version>
+			<version>6.1.0</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>9.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.xerial</groupId>
 			<artifactId>sqlite-jdbc</artifactId>
-	        <version>3.44.1.0</version>
+			<version>3.46.1.0</version>
 		</dependency>
 		<!-- Interface for JWT token -->
 		<dependency>
 			<groupId>com.nimbusds</groupId>
 			<artifactId>nimbus-jose-jwt</artifactId>
-		    <version>9.37.1</version>
+			<version>9.41.1</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.2.23</version>
+		</dependency>
+		<!-- spotbug tooling -->
+		<dependency>
+			<groupId>com.github.spotbugs</groupId>
+			<artifactId>spotbugs-annotations</artifactId>
+			<version>4.8.6</version>
+			<scope>compile</scope>
 		</dependency>
 		<!--
 		************************************************************ 
@@ -150,21 +196,34 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
-			<version>5.10.1</version>
+			<version>5.11.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>
-			<version>5.10.1</version>
+			<version>5.11.0</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>net.revelc.code.formatter</groupId>
+			<artifactId>formatter-maven-plugin</artifactId>
+			<version>2.24.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-checkstyle-plugin</artifactId>
+			<version>3.5.0</version>
+		</dependency>
 	</dependencies>
-
 	<build>
 		<sourceDirectory>src</sourceDirectory>
+		<resources>
+			<resource>
+				<directory>${basedir}/src/resources</directory>
+			</resource>
+		</resources>
 		<testSourceDirectory>test/src</testSourceDirectory>
-    	<directory>${project.basedir}/out/maven/</directory>
 		<testResources>
 			<testResource>
 				<directory>${basedir}/test/resources</directory>
@@ -185,6 +244,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
+				<version>3.3.0</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>
@@ -194,6 +254,20 @@
 					</execution>
 				</executions>
 			</plugin>
+			<!-- For dependabot plugin -->
+			<plugin>
+				<groupId>org.apache.servicemix.tooling</groupId>
+				<artifactId>depends-maven-plugin</artifactId>
+				<version>1.5.0</version>
+				<executions>
+					<execution>
+						<id>generate-depends-file</id>
+						<goals>
+							<goal>generate-depends-file</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<!-- junit results -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -227,7 +301,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>3.1.0</version>
+				<version>3.3.1</version>
 				<configuration>
 					<configLocation>CheckStyle.xml</configLocation>
 					<consoleOutput>true</consoleOutput>
@@ -239,7 +313,7 @@
 			<plugin>
 				<groupId>net.revelc.code.formatter</groupId>
 				<artifactId>formatter-maven-plugin</artifactId>
-				<version>2.12.2</version>
+				<version>2.23.0</version>
 				<configuration>
 					<encoding>UTF-8</encoding>
 					<lineEnding>LF</lineEnding>
@@ -263,6 +337,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 -->
@@ -278,5 +369,4 @@
 			</plugin>
 		</plugins>
 	</reporting>
-
 </project>

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;
+		}
+	}
+}

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

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);
+	}
+}

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");
+	}
+
+}

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 + "]";
+	}
+
+
+}

spotbugs-security-exclude.xml

@@ -0,0 +1,5 @@
+<FindBugsFilter>
+    <Match>
+        <Bug category="SECURITY"/>
+    </Match>
+</FindBugsFilter>

spotbugs-security-include.xml

@@ -0,0 +1,2 @@
+<FindBugsFilter>
+</FindBugsFilter>

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

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);

src/org/kar/archidata/annotation/AnnotationTools.java

@@ -7,36 +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) {
@@ -45,38 +58,181 @@ public class AnnotationTools {
 		return tmp;
 	}
 
-	public static String getComment(final Field element) throws Exception {
-		final Annotation[] annotation = element.getDeclaredAnnotationsByType(DataComment.class);
+	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 @DataComment 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 getSchemaDescription(final Field 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 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 Integer getLimitSize(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;
+		}
+		return (ManyToOne) annotation[0];
+	}
+
+	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 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 DataAccessException {
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Max.class);
+		if (annotation.length == 0) {
+			return null;
+		}
+		if (annotation.length > 1) {
+			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 DataAccessException {
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Min.class);
+		if (annotation.length == 0) {
+			return null;
+		}
+		if (annotation.length > 1) {
+			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 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 ? null : length;
+		return length <= 0 ? 0 : length;
+	}
+
+	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 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 DataAccessException {
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Pattern.class);
+		if (annotation.length == 0) {
+			return null;
+		}
+		if (annotation.length > 1) {
+			throw new DataAccessException(
+					"Must not have more than 1 element @Pattern on " + element.getClass().getCanonicalName());
+		}
+		return ((Pattern) annotation[0]).regexp();
 	}
 
 	public static boolean isAnnotationGroup(final Field field, final Class<?> annotationType) {
@@ -102,14 +258,11 @@ public class AnnotationTools {
 		return false;
 	}
 
-	public static String getFieldName(final Field element) throws Exception {
+	public static String getFieldName(final Field element) {
 		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());
-		}
 		final String name = ((Column) annotation[0]).name();
 		if (name.isBlank()) {
 			return element.getName();
@@ -117,60 +270,104 @@ public class AnnotationTools {
 		return name;
 	}
 
-	public static boolean getNotNull(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 isPrimaryKey(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 DataAccessException(
+					"Must not have more than 1 element @NotNull on " + element.getClass().getCanonicalName());
+		}
+		return true;
+	}
+
+	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;
+		}
+		return true;
+	}
+
+	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 ..
@@ -187,7 +384,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 ..
@@ -221,15 +418,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 ..
@@ -244,11 +442,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);
+	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())) {
@@ -261,4 +460,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;
+	}
+
 }

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 {};
+}

src/org/kar/archidata/annotation/DataComment.java

@@ -7,8 +7,7 @@ import java.lang.annotation.Target;
 
 @Target({ ElementType.TYPE, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
+@Deprecated(since = "0.5.2")
 public @interface DataComment {
-
 	String value();
-
 }

src/org/kar/archidata/annotation/DataJson.java

@@ -5,6 +5,13 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.kar.archidata.dataAccess.options.CheckFunctionInterface;
+import org.kar.archidata.dataAccess.options.CheckFunctionVoid;
+
 @Target({ ElementType.TYPE, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
-public @interface DataJson {}
+public @interface DataJson {
+	Class<? extends CheckFunctionInterface> checker() default CheckFunctionVoid.class;
+
+	Class<?> targetEntity() default Void.class;
+}

src/org/kar/archidata/annotation/FormDataOptional.java

@@ -5,8 +5,8 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target({ ElementType.TYPE })
+@Target({ ElementType.PARAMETER })
 @Retention(RetentionPolicy.RUNTIME)
-public @interface SQLWhere {
-	String clause();
+public @interface FormDataOptional {
+
 }

src/org/kar/archidata/annotation/NoWriteSpecificMode.java

@@ -5,10 +5,9 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target({ ElementType.TYPE, ElementType.FIELD })
+/** When we wend to have only One type for read and write mode (Wrapping API). */
+@Target({ ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
-public @interface DataDefault {
-
-	String value();
+public @interface NoWriteSpecificMode {
 
 }

src/org/kar/archidata/annotation/TypeScriptProgress.java

@@ -0,0 +1,11 @@
+package org.kar.archidata.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/** In case of the update parameter with String input to detect null element. */
+@Target({ ElementType.PARAMETER, ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface TypeScriptProgress {}

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;
 
@@ -24,12 +26,15 @@ import org.glassfish.jersey.media.multipart.FormDataParam;
 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;
 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.GET;
@@ -54,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 */
@@ -81,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) {
@@ -91,10 +97,31 @@ 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 {
-			return DataAccess.getWhere(Data.class, new QueryCondition("sha512", "=", sha512));
+			return DataAccess.getWhere(Data.class, new Condition(new QueryCondition("sha512", "=", sha512)));
 		} catch (final Exception e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
@@ -113,7 +140,8 @@ public class DataResource {
 		return null;
 	}
 
-	public static Data createNewData(final long tmpUID, final String originalFileName, final String sha512) throws IOException {
+	public static Data createNewData(final long tmpUID, final String originalFileName, final String sha512)
+			throws IOException {
 		// determine mime type:
 		Data injectedData = new Data();
 		String mimeType = "";
@@ -135,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);
@@ -147,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));
 	}
 
@@ -164,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));
+		MessageDigest md = null;
+		try (OutputStream outpuStream = new FileOutputStream(new File(serverLocation))) {
+			md = MessageDigest.getInstance("SHA-512");
+		} catch (final IOException ex) {
+			throw new FailException(Response.Status.INTERNAL_SERVER_ERROR, "Can not write in temporary file", ex);
+		} catch (final NoSuchAlgorithmException ex) {
+			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];
-			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();
 			} catch (final IOException ex) {
-			LOGGER.info("Can not write in temporary file ... ");
-			ex.printStackTrace();
-		} catch (final NoSuchAlgorithmException ex) {
-			LOGGER.info("Can not find sha512 algorithms");
-			ex.printStackTrace();
+				throw new FailException(Response.Status.INTERNAL_SERVER_ERROR, "Can not write in temporary file", ex);
+			}
 		}
 		return out;
 	}
@@ -205,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) {
@@ -219,7 +266,11 @@ public class DataResource {
 	@Path("/upload/")
 	@Consumes({ MediaType.MULTIPART_FORM_DATA })
 	@RolesAllowed("ADMIN")
-	public Response uploadFile(@Context final SecurityContext sc, @FormDataParam("file") final InputStream fileInputStream, @FormDataParam("file") final FormDataContentDisposition fileMetaData) {
+	@Operation(description = "Insert a new data in the data environment", tags = "SYSTEM")
+	public void uploadFile(
+			@Context final SecurityContext sc,
+			@FormDataParam("file") final InputStream fileInputStream,
+			@FormDataParam("file") final FormDataContentDisposition fileMetaData) throws FailException {
 		final GenericContext gc = (GenericContext) sc.getUserPrincipal();
 		LOGGER.info("===================================================");
 		LOGGER.info("== DATA uploadFile {}", (gc == null ? "null" : gc.userByToken));
@@ -229,80 +280,113 @@ 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)
-	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 {
+	@Operation(description = "Get back some data from the data environment", tags = "SYSTEM")
+	public Response retrieveDataId(
+			@Context final SecurityContext sc,
+			@QueryParam(HttpHeaders.AUTHORIZATION) final String token,
+			@HeaderParam("Range") final String range,
+			@PathParam("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 {
-		// GenericContext gc = (GenericContext) sc.getUserPrincipal();
-		// logger.info("===================================================");
-		// logger.info("== DATA retriveDataThumbnailId ? {}", (gc==null?"null":gc.user));
-		// logger.info("===================================================");
-		final Data value = getSmall(id);
+	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 {
+		final GenericContext gc = (GenericContext) sc.getUserPrincipal();
+		LOGGER.info("===================================================");
+		LOGGER.info("== DATA retrieveDataThumbnailId ? {}", (gc == null ? "null" : gc.userByToken));
+		LOGGER.info("===================================================");
+		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);
+			}
+			LOGGER.info("input size image: {}x{} type={}", inputImage.getWidth(), inputImage.getHeight(),
+					inputImage.getType());
 			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());
 
 			// scales the input image to the output image
 			final Graphics2D g2d = outputImage.createGraphics();
+			LOGGER.info("output size image: {}x{}", scaledWidth, scaledHeight);
 			g2d.drawImage(inputImage, 0, 0, scaledWidth, scaledHeight, null);
 			g2d.dispose();
+			for (final String data : ImageIO.getWriterFormatNames()) {
+				LOGGER.info("availlable format: {}", data);
+			}
 			// create the output stream:
 			final ByteArrayOutputStream baos = new ByteArrayOutputStream();
 			try {
 				// TODO: check how to remove buffer file !!! here, it is not needed at all...
-				ImageIO.write(outputImage, "JPG", baos);
+				//ImageIO.write(outputImage, "JPEG", baos);
+				//ImageIO.write(outputImage, "png", baos);
+				ImageIO.write(outputImage, "WebP", 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();
+			LOGGER.info("output length {}", imageData.length);
 			// Response.ok(new ByteArrayInputStream(imageData)).build();
-			final Response.ResponseBuilder out = Response.ok(imageData).header(HttpHeaders.CONTENT_LENGTH, imageData.length);
-			out.type("image/jpeg");
+			final Response.ResponseBuilder out = Response.ok(imageData).header(HttpHeaders.CONTENT_LENGTH,
+					imageData.length);
+			//out.type("image/jpeg");
+			out.type("image/webp");
+			//out.type("image/png");
 			// TODO: move this in a decorator !!!
 			final CacheControl cc = new CacheControl();
 			cc.setMaxAge(3600);
@@ -310,34 +394,45 @@ public class DataResource {
 			out.cacheControl(cc);
 			return out.build();
 		}
+		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)
-	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
@@ -384,17 +479,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");
+		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()));
+			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);
+		}
 	}
 
 	public static void undelete(final Long id) throws Exception {

src/org/kar/archidata/api/FrontGeneric.java

@@ -6,6 +6,7 @@ import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import io.swagger.v3.oas.annotations.Operation;
 import jakarta.annotation.security.PermitAll;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.NotFoundException;
@@ -88,6 +89,7 @@ public class FrontGeneric {
 
 	@GET
 	@PermitAll()
+	@Operation(description = "Retrieve native element (index)", tags = "SYSTEM")
 	// @Produces(MediaType.APPLICATION_OCTET_STREAM)
 	// @CacheMaxAge(time = 1, unit = TimeUnit.DAYS)
 	public Response retrive0() throws Exception {
@@ -97,6 +99,7 @@ public class FrontGeneric {
 	@GET
 	@Path("{any: .*}")
 	@PermitAll()
+	@Operation(description = "Get specific file from the front environment", tags = "SYSTEM")
 	// @Produces(MediaType.APPLICATION_OCTET_STREAM)
 	// @CacheMaxAge(time = 10, unit = TimeUnit.DAYS)
 	public Response retrive1(@PathParam("any") final List<PathSegment> segments) throws Exception {

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) {

src/org/kar/archidata/api/ProxyResource.java

@@ -0,0 +1,43 @@
+package org.kar.archidata.api;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+
+@Path("/proxy")
+//@Produces(MediaType.APPLICATION_JSON)
+public class ProxyResource {
+	private static final Logger LOGGER = LoggerFactory.getLogger(ProxyResource.class);
+
+	@GET
+	@Produces(MediaType.APPLICATION_OCTET_STREAM)
+	public Response getImageFromUrl(@QueryParam("url") final String url) {
+		if (url == null || url.isEmpty()) {
+			return Response.status(Status.BAD_REQUEST).entity("URL manquante").build();
+		}
+		final Client client = ClientBuilder.newClient();
+		try {
+			final WebTarget target = client.target(url);
+			final Response response = target.request().get();
+			if (response.getStatus() != 200) {
+				return Response.status(Status.BAD_GATEWAY).entity("Can not get the image : " + response.getStatus())
+						.build();
+			}
+			return Response.ok(response.readEntity(byte[].class)).header("Access-Control-Allow-Origin", "*")
+					.header("Content-Type", response.getHeaderString("Content-Type")).build();
+		} catch (final Exception e) {
+			return Response.status(Status.INTERNAL_SERVER_ERROR).entity("SERVER internal error : " + e.getMessage())
+					.build();
+		}
+	}
+}

src/org/kar/archidata/api/openApiResource.java

@@ -0,0 +1,34 @@
+package org.kar.archidata.api;
+
+import io.swagger.v3.jaxrs2.integration.resources.BaseOpenApiResource;
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.annotation.security.PermitAll;
+import jakarta.servlet.ServletConfig;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Application;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
+@Path("/openapi")
+public class openApiResource extends BaseOpenApiResource {
+	@Context
+	ServletConfig config;
+
+	@Context
+	Application app;
+
+	@GET
+	@Path("swagger.json")
+	@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 {
+		return getOpenApi(headers, this.config, this.app, uriInfo, "json");
+	}
+}

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

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

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

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);
+	}
+
+}

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.printStackTrace();
+		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());
 	}
 
 }

src/org/kar/archidata/catcher/JacksonExceptionCatcher.java

@@ -0,0 +1,30 @@
+package org.kar.archidata.catcher;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+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 JacksonExceptionCatcher implements ExceptionMapper<JacksonException> {
+	private static final Logger LOGGER = LoggerFactory.getLogger(JacksonExceptionCatcher.class);
+
+	@Override
+	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();
+	}
+
+	private RestErrorResponse build(final Exception exception) {
+		return new RestErrorResponse(Response.Status.INTERNAL_SERVER_ERROR, "Catch JSON Exception",
+				exception.getMessage());
+	}
+
+}

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();

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();

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

src/org/kar/archidata/dataAccess/DataAccessAddOn.java

@@ -29,19 +29,41 @@ 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
-	boolean canInsert(final Field field);
+	/** Element can insert in the single request
+	 * @param field
+	 * @return */
+	default boolean canInsert(final Field field) {
+		return false;
+	}
 
-	// Element can be retrieve with the specific mode
-	boolean canRetrieve(final Field field);
+	/** Element can be retrieve with the specific mode
+	 * @param field
+	 * @return */
+	default boolean canRetrieve(final Field field) {
+		return false;
+	}
 
-	void generateQuerry(@NotNull String tableName, @NotNull Field field, @NotNull final StringBuilder querrySelect, @NotNull final StringBuilder querry, @NotNull String name,
-			@NotNull CountInOut count, QueryOptions options) throws Exception;
+	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.
@@ -53,7 +75,67 @@ 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
+	 * @return */
+	default boolean isInsertAsync(final Field field) throws Exception {
+		return false;
+	}
+
+	/** When insert is mark async, this function permit to create or update the data
+	 * @param tableName Name of the Table.
+	 * @param localId Local ID of the current table
+	 * @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 {
+
+	}
+
+	/** Some action must be done asynchronously for update or remove element
+	 * @param field
+	 * @return */
+	default boolean isUpdateAsync(final Field field) throws Exception {
+		return false;
+	}
+
+	/** When insert is mark async, this function permit to create or update the data
+	 * @param tableName Name of the Table.
+	 * @param localId Local ID of the current table
+	 * @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 drop(final String tableName, final Field field) throws Exception {
+
+	}
+
+	default void cleanAll(final String tableName, final Field field) throws Exception {
+
+	}
 
 }

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 + "'");
+	}
+
+}

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;
@@ -25,8 +27,11 @@ import jakarta.persistence.GenerationType;
 public class DataFactory {
 	static final Logger LOGGER = LoggerFactory.getLogger(DataFactory.class);
 
-	public static String convertTypeInSQL(final Class<?> type, final String fieldName) throws Exception {
+	public static String convertTypeInSQL(final Class<?> type, final String fieldName) throws DataAccessException {
 		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,11 +142,20 @@ 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 Integer limitSize = AnnotationTools.getLimitSize(elem);
-		final boolean notNull = AnnotationTools.getNotNull(elem);
+		final int limitSize = AnnotationTools.getLimitSize(elem);
+		final boolean notNull = AnnotationTools.getColumnNotNull(elem);
 
 		final boolean primaryKey = AnnotationTools.isPrimaryKey(elem);
 		final GenerationType strategy = AnnotationTools.getStrategy(elem);
@@ -142,7 +165,7 @@ public class DataFactory {
 		final String comment = AnnotationTools.getComment(elem);
 		final String defaultValue = AnnotationTools.getDefault(elem);
 
-		if (fieldId == 0) {
+		if (mainTableBuilder.toString().length() == 0) {
 			mainTableBuilder.append("\n\t\t`");
 		} else {
 			mainTableBuilder.append(",\n\t\t`");
@@ -152,7 +175,7 @@ public class DataFactory {
 		String typeValue = null;
 		typeValue = convertTypeInSQL(classModel, name);
 		if ("text".equals(typeValue) && !"sqlite".equals(ConfigBaseVariable.getDBType())) {
-			if (limitSize != null) {
+			if (limitSize > 0) {
 				mainTableBuilder.append("varchar(");
 				mainTableBuilder.append(limitSize);
 				mainTableBuilder.append(")");
@@ -172,16 +195,24 @@ public class DataFactory {
 			}
 			if (defaultValue == null) {
 				if (updateTime || createTime) {
+					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())) {
+						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,21 +385,26 @@ 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++;
 			}
 			final boolean dataInThisObject = tmpOut.toString().length() > 0;
 			if (dataInThisObject) {
+				LOGGER.info("Previous Object : '{}'", reverseOut.toString());
 				final boolean dataInPreviousObject = reverseOut.toString().length() > 0;
 				if (dataInPreviousObject) {
 					tmpOut.append(", ");

src/org/kar/archidata/dataAccess/QueryAnd.java

@@ -8,39 +8,47 @@ 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 querry, final String tableName) {
+	public void generateQuery(final StringBuilder query, final String tableName) {
 		if (this.childs.size() >= 1) {
-			querry.append(" (");
+			query.append(" (");
 		}
 		boolean first = true;
 		for (final QueryItem elem : this.childs) {
 			if (first) {
 				first = false;
 			} else {
-				querry.append(" AND ");
+				query.append(" AND ");
 			}
-			elem.generateQuerry(querry, tableName);
+			elem.generateQuery(query, tableName);
 		}
 		if (this.childs.size() >= 1) {
-			querry.append(")");
+			query.append(")");
 		}
 	}
 
 	@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();
+	}
 }

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,18 +20,19 @@ public class QueryCondition implements QueryItem {
 	}
 
 	@Override
-	public void generateQuerry(final StringBuilder querry, final String tableName) {
-		querry.append(tableName);
-		querry.append(".");
-		querry.append(this.key);
-		querry.append(" ");
-		querry.append(this.comparator);
-		querry.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);
+		query.append(" ?");
 	}
 
 	@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();
 	}

src/org/kar/archidata/dataAccess/QueryInList.java

@@ -18,27 +18,33 @@ public class QueryInList<T> implements QueryItem {
 		this(key, "IN", value);
 	}
 
+	public QueryInList(final String key, final T... value) {
+		this(key, "IN", List.of(value));
+	}
+
 	@Override
-	public void generateQuerry(final StringBuilder querry, final String tableName) {
-		querry.append(tableName);
-		querry.append(".");
-		querry.append(this.key);
-		querry.append(" ");
-		querry.append(this.comparator);
-		querry.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);
+		query.append(" (");
 		for (int iii = 0; iii < this.value.size(); iii++) {
 			if (iii != 0) {
-				querry.append(",?");
+				query.append(",?");
 			} else {
-				querry.append("?");
+				query.append("?");
 			}
 		}
-		querry.append(")");
+		query.append(")");
 
 	}
 
 	@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();

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 querry, String tableName);
+	void generateQuery(StringBuilder query, String tableName);
 
-	void injectQuerry(PreparedStatement ps, CountInOut iii) throws Exception;
+	void injectQuery(PreparedStatement ps, CountInOut iii) throws Exception;
 }

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 {}
+}

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 {}
+}

src/org/kar/archidata/dataAccess/QueryOption.java

@@ -1,3 +0,0 @@
-package org.kar.archidata.dataAccess;
-
-public class QueryOption {}

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;
@@ -18,13 +18,22 @@ public class QueryOptions {
 
 	private final List<QueryOption> options = new ArrayList<>();
 
-	public QueryOptions(final QueryOption... elems) {
-		Collections.addAll(this.options, elems);
-	}
-
 	public QueryOptions() {}
 
+	public QueryOptions(final QueryOption... elems) {
+		if (elems == null || elems.length == 0) {
+			return;
+		}
+		for (final QueryOption elem : elems) {
+			add(elem);
+		}
+
+	}
+
 	public void add(final QueryOption option) {
+		if (option == null) {
+			return;
+		}
 		this.options.add(option);
 	}
 
@@ -32,14 +41,19 @@ public class QueryOptions {
 		return this.options;
 	}
 
+	public QueryOption[] getAllArray() {
+		return this.options.toArray(new QueryOption[0]);
+	}
+
 	@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) {
@@ -57,5 +71,4 @@ public class QueryOptions {
 		}
 		return false;
 	}
-
 }

src/org/kar/archidata/dataAccess/QueryOr.java

@@ -10,29 +10,33 @@ public class QueryOr implements QueryItem {
 		this.childs = childs;
 	}
 
+	public QueryOr(final QueryItem... childs) {
+		this.childs = List.of(childs);
+	}
+
 	@Override
-	public void generateQuerry(final StringBuilder querry, final String tableName) {
+	public void generateQuery(final StringBuilder query, final String tableName) {
 		if (this.childs.size() >= 1) {
-			querry.append(" (");
+			query.append(" (");
 		}
 		boolean first = true;
 		for (final QueryItem elem : this.childs) {
 			if (first) {
 				first = false;
 			} else {
-				querry.append(" OR ");
+				query.append(" OR ");
 			}
-			elem.generateQuerry(querry, tableName);
+			elem.generateQuery(query, tableName);
 		}
 		if (this.childs.size() >= 1) {
-			querry.append(")");
+			query.append(")");
 		}
 	}
 
 	@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);
 		}
 	}
 }

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;
+}

src/org/kar/archidata/dataAccess/addOn/AddOnDataJson.java

@@ -1,22 +1,35 @@
 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.kar.archidata.exception.DataAccessException;
 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;
@@ -30,7 +43,7 @@ public class AddOnDataJson implements DataAccessAddOn {
 	}
 
 	@Override
-	public String getSQLFieldType(final Field elem) throws Exception {
+	public String getSQLFieldType(final Field elem) throws DataAccessException {
 		final String fieldName = AnnotationTools.getFieldName(elem);
 		return DataFactory.convertTypeInSQL(String.class, fieldName);
 	}
@@ -42,7 +55,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);
@@ -58,36 +72,270 @@ public class AddOnDataJson implements DataAccessAddOn {
 		return true;
 	}
 
+	@Override
+	public boolean isInsertAsync(final Field field) {
+		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) 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));
 	}
 }

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,11 @@ 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;
 import org.kar.archidata.tools.ConfigBaseVariable;
@@ -31,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() {
@@ -50,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 {
 
 	}
 
@@ -61,8 +68,23 @@ public class AddOnManyToMany implements DataAccessAddOn {
 
 	@Override
 	public boolean canRetrieve(final Field field) {
+		if (field.getType() != List.class) {
+			return false;
+		}
+		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
+				.getActualTypeArguments()[0];
+		if (objectClass == Long.class || objectClass == UUID.class) {
 			return true;
 		}
+		final ManyToMany decorators = field.getDeclaredAnnotation(ManyToMany.class);
+		if (decorators == null) {
+			return false;
+		}
+		if (decorators.targetEntity() == objectClass) {
+			return true;
+		}
+		return false;
+	}
 
 	public static String generateLinkTableNameField(final String tableName, final Field field) throws Exception {
 		final String name = AnnotationTools.getFieldName(field);
@@ -77,80 +99,101 @@ 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) {
-
-		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 ");
-		if (ConfigBaseVariable.getDBType().equals("sqlite")) {
-			querrySelect.append(", ");
+	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 ManyToMany manyToMany = AnnotationTools.getManyToMany(field);
+		String linkTableName = generateLinkTableName(tableName, name);
+		if (manyToMany.mappedBy() != null && manyToMany.mappedBy().length() != 0) {
+			// TODO:  get the remote table name .....
+			final String remoteTableName = AnnotationTools.getTableName(manyToMany.targetEntity());
+			linkTableName = generateLinkTableName(remoteTableName, manyToMany.mappedBy());
+		}
+		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);
+		if (manyToMany.mappedBy() == null || manyToMany.mappedBy().length() == 0) {
+			querySelect.append(".object2Id ");
 		} else {
-			querrySelect.append("SEPARATOR ");
+			querySelect.append(".object1Id ");
 		}
-		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 ");
-		if (!ConfigBaseVariable.getDBType().equals("sqlite")) {
-			querrySelect.append(" GROUP BY ");
-			querrySelect.append(tmpVariable);
-			querrySelect.append(".object1Id");
+		if ("sqlite".equals(ConfigBaseVariable.getDBType())) {
+			querySelect.append(", ");
+		} else {
+			querySelect.append("SEPARATOR ");
 		}
-		querrySelect.append(") AS ");
-		querrySelect.append(name);
-		querrySelect.append(" ");
+		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(".");
+		if (manyToMany.mappedBy() == null || manyToMany.mappedBy().length() == 0) {
+			querySelect.append("object1Id ");
+		} else {
+			querySelect.append("object2Id ");
+		}
+		if (!"sqlite".equals(ConfigBaseVariable.getDBType())) {
+			querySelect.append(" GROUP BY ");
+			querySelect.append(tmpVariable);
+			if (manyToMany.mappedBy() == null || manyToMany.mappedBy().length() == 0) {
+				querySelect.append(".object1Id");
+			} else {
+				querySelect.append(".object2Id");
+			}
+		}
+		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();
-	}
-
-	@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() != 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 ManyToMany decorators = field.getDeclaredAnnotation(ManyToMany.class);
-		if (decorators == null) {
-			return;
-		}
-		if (objectClass == decorators.targetEntity()) {
-			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);
-			}
-		}
-	}
-
-	@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 {
-		if (field.getType() != List.class) {
-			return;
-		}
-		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[0];
-		if (objectClass == Long.class) {
-			final List<Long> idList = DataAccess.getListOfIds(rs, count.value, SEPARATOR);
-			field.set(data, idList);
 		count.inc();
 	}
+
+	@Override
+	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];
+		// 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) {
 			return;
@@ -159,7 +202,46 @@ public class AddOnManyToMany implements DataAccessAddOn {
 			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);
+				generateConcatQuery(tableName, primaryKey, field, querySelect, query, name, count, options);
+			}
+		}
+	}
+
+	@Override
+	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];
+		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;
+		}
+		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 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) {
@@ -169,7 +251,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 QueryInList<>(idField, childs), null);
+						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;
 						}
@@ -181,29 +284,283 @@ public class AddOnManyToMany implements DataAccessAddOn {
 		}
 	}
 
-	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 QueryOptions options = new QueryOptions(new OverrideTableName(linkTableName));
-		DataAccess.insert(insertElement, options);
-
-	}
-
-	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);
-		final QueryOptions options = new QueryOptions(new OverrideTableName(linkTableName));
-		final QueryAnd condition = new QueryAnd(new QueryCondition("object1Id", "=", localKey), new QueryCondition("object2Id", "=", remoteKey));
-		return DataAccess.deleteWhere(LinkTable.class, condition, options);
+	@Override
+	public boolean isUpdateAsync(final Field field) {
+		return true;
 	}
 
 	@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 asyncUpdate(
+			final String tableName,
+			final Object localKey,
+			final Field field,
+			final Object data,
+			final List<LazyGetter> actions) throws Exception {
+		if (field.getType() != List.class) {
+			LOGGER.error("Can not ManyToMany with other than List Model: {}", field.getType().getCanonicalName());
+			return;
+		}
+		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
+				.getActualTypeArguments()[0];
+		if (objectClass != Long.class && objectClass != UUID.class) {
+			throw new DataAccessException("Can not ManyToMany with other than List<Long> or List<UUID> Model: List<"
+					+ objectClass.getCanonicalName() + ">");
+		}
+		final String columnName = AnnotationTools.getFieldName(field);
+		final String linkTableName = generateLinkTableName(tableName, columnName);
+
+		if (localKey instanceof final Long localKeyLong) {
+			if (objectClass == Long.class) {
+				actions.add(() -> {
+					DataAccess.deleteWhere(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
+	public boolean isInsertAsync(final Field field) {
+		return true;
+	}
+
+	@Override
+	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;
+		}
+		if (field.getType() != List.class) {
+			LOGGER.error("Can not ManyToMany with other than List Model: {}", field.getType().getCanonicalName());
+			return;
+		}
+		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
+				.getActualTypeArguments()[0];
+		if (objectClass != Long.class && objectClass != UUID.class) {
+			throw new DataAccessException("Can not ManyToMany with other than List<Long> or List<UUID> Model: List<"
+					+ objectClass.getCanonicalName() + ">");
+		}
+		final String columnName = AnnotationTools.getFieldName(field);
+		final String linkTableName = generateLinkTableName(tableName, columnName);
+		if (localKey instanceof final Long localKeyLong) {
+			if (objectClass == Long.class) {
+				// ========================================================
+				// == 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 {
+				// ========================================================
+				// == 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());
+		}
+
+	}
+
+	@Override
+	public void drop(final String tableName, final Field field) throws Exception {
+		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 && 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);
+		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 {
+		final String tableName = AnnotationTools.getTableName(clazz);
+		final String linkTableName = generateLinkTableName(tableName, column);
+		/* 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 {
+		final String tableName = AnnotationTools.getTableName(clazz);
+		final String linkTableName = generateLinkTableName(tableName, column);
+		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 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 ManyToMany manyToMany = AnnotationTools.getManyToMany(field);
+		if (manyToMany.mappedBy() != null && manyToMany.mappedBy().length() != 0) {
+			// not the reference model to create base:
+			return;
+		}
 		final String linkTableName = generateLinkTableNameField(tableName, field);
 		final QueryOptions options = new QueryOptions(new OverrideTableName(linkTableName));
-		final List<String> sqlCommand = DataFactory.createTable(LinkTable.class, options);
+		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
+				.getActualTypeArguments()[0];
+		if (objectClass != Long.class && objectClass != UUID.class) {
+			throw new DataAccessException("Can not ManyToMany with other than List<Long> or List<UUID> Model: List<"
+					+ objectClass.getCanonicalName() + ">");
+		}
+		final Class<?> primaryType = primaryField.getType();
+		if (primaryType == Long.class) {
+			if (objectClass == Long.class) {
+				final List<String> sqlCommand = DataFactory.createTable(LinkTableLongLong.class, options);
+				postActionList.addAll(sqlCommand);
+			} else {
+				final List<String> sqlCommand = DataFactory.createTable(LinkTableLongUUID.class, options);
 				postActionList.addAll(sqlCommand);
 			}
+		} else if (primaryType == UUID.class) {
+			if (objectClass == Long.class) {
+				final List<String> sqlCommand = DataFactory.createTable(LinkTableUUIDLong.class, options);
+				postActionList.addAll(sqlCommand);
+			} else {
+				final List<String> sqlCommand = DataFactory.createTable(LinkTableUUIDUUID.class, options);
+				postActionList.addAll(sqlCommand);
+			}
+		} else {
+			throw new DataAccessException("Can not ManyToMany with other than primary key type Long or UUID Model: "
+					+ primaryType.getCanonicalName());
+		}
+	}
 }

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) {
+			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);
@@ -81,9 +107,16 @@ public class AddOnManyToOne implements DataAccessAddOn {
 		return false;
 	}
 
+	@Override
+	public boolean isInsertAsync(final Field field) throws Exception {
+		return false;
+	}
+
 	@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);
@@ -94,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;
 			}
 		}
@@ -136,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();
@@ -145,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) {
@@ -153,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();
@@ -173,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);
+		}
 	}
 }

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
@@ -93,35 +94,227 @@ public class AddOnOneToMany implements DataAccessAddOn {
 	}
 
 	@Override
-	public boolean canRetrieve(final Field field) {
+	public boolean isInsertAsync(final Field field) throws Exception {
+		// TODO: can be implemented later...
 		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 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;
+	}
+
+	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);
+	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));
+			}
+		}
+	}
+
+	@Override
+	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();
-		if (!rs.wasNull()) {
+			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()) {
 
-			field.set(data, foreignKey);
+			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 serializable with the default system
+	// 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 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 {
+		// This is a remote field ==> nothing to generate (it is stored in the remote object
 	}
 }

src/org/kar/archidata/dataAccess/addOn/AddOnSQLTableExternalForeinKeyAsList.java

@@ -1,108 +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;
-
-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 canRetrieve(final Field field) {
-		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) {
-		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);
-	}
-}

src/org/kar/archidata/dataAccess/addOn/model/LinkTable.java

@@ -1,25 +0,0 @@
-package org.kar.archidata.dataAccess.addOn.model;
-
-import org.kar.archidata.annotation.DataComment;
-import org.kar.archidata.model.GenericDataSoftDelete;
-
-import jakarta.persistence.Column;
-
-public class LinkTable extends GenericDataSoftDelete {
-	public LinkTable() {
-		// nothing to do...
-	}
-
-	public LinkTable(final long object1Id, final long object2Id) {
-		this.object1Id = object1Id;
-		this.object2Id = object2Id;
-	}
-
-	@DataComment("Object reference 1")
-	@Column(nullable = false)
-	public Long object1Id;
-	@DataComment("Object reference 2")
-	@Column(nullable = false)
-	public Long object2Id;
-
-}

src/org/kar/archidata/dataAccess/addOn/model/LinkTableLongLong.java

@@ -0,0 +1,25 @@
+package org.kar.archidata.dataAccess.addOn.model;
+
+import org.kar.archidata.model.UUIDGenericDataSoftDelete;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.Column;
+
+public class LinkTableLongLong extends UUIDGenericDataSoftDelete {
+	public LinkTableLongLong() {
+		// nothing to do...
+	}
+
+	public LinkTableLongLong(final long object1Id, final long 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 Long object2Id;
+
+}

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;
+
+}

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;
+
+}

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;
+
+}

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;
+
+}

src/org/kar/archidata/dataAccess/addOn/model/TableCoversLongUUID.java

@@ -0,0 +1,27 @@
+package org.kar.archidata.dataAccess.addOn.model;
+
+import java.util.ArrayList;
+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 = new ArrayList<>(covers);
+	}
+
+	@Id
+	public Long id;
+
+	@DataJson()
+	public List<UUID> covers;
+
+}

src/org/kar/archidata/dataAccess/addOn/model/TableCoversUUIDLong.java

@@ -0,0 +1,26 @@
+package org.kar.archidata.dataAccess.addOn.model;
+
+import java.util.ArrayList;
+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 = new ArrayList<>(covers);
+	}
+
+	@Id
+	public UUID uuid;
+	@DataJson()
+	public List<Long> covers;
+
+}

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;
+
+}

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
+```
+
+

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;
+	}
+}

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;
+	}
+}

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() {}

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;

src/org/kar/archidata/dataAccess/options/CheckFunctionInterface.java

@@ -2,12 +2,21 @@ 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 {
 	/** This function implementation is design to check if the updated class is valid of not for insertion
+	 * @param baseName NAme of the object to be precise with the use of what fail.
 	 * @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(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, final QueryOptions options) throws Exception {
+		check(baseName, data, AnnotationTools.getAllFieldsNames(data.getClass()), options);
+	}
 
 }

src/org/kar/archidata/dataAccess/options/CheckFunctionVoid.java

@@ -0,0 +1,18 @@
+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,
+			final Object data,
+			final List<String> filterValue,
+			final QueryOptions options) {
+
+	}
+
+}

src/org/kar/archidata/dataAccess/options/CheckJPA.java

@@ -0,0 +1,377 @@
+package org.kar.archidata.dataAccess.options;
+
+import java.lang.reflect.Field;
+import java.sql.Timestamp;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.ArrayList;
+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;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import jakarta.persistence.ManyToOne;
+import jakarta.validation.constraints.Size;
+
+public class CheckJPA<T> implements CheckFunctionInterface {
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(CheckJPA.class);
+	private final Class<?> clazz;
+
+	/** By default some element are not read like createAt and UpdatedAt. This option permit to read it. */
+	public interface CheckInterface<K> {
+		/** This function implementation is design to check if the updated class is valid of not for insertion
+		 * @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, final QueryOptions options) throws Exception;
+	}
+
+	protected Map<String, List<CheckInterface<T>>> checking = null;
+
+	protected void add(final String field, final CheckInterface<T> checkFunction) {
+		List<CheckInterface<T>> actions = this.checking.get(field);
+		if (actions == null) {
+			actions = new ArrayList<>();
+			this.checking.put(field, actions);
+		}
+		actions.add(checkFunction);
+	}
+
+	public CheckJPA(final Class<T> clazz) {
+		this.clazz = clazz;
+	}
+
+	public void initialize() throws Exception {
+		if (this.checking != null) {
+			return;
+		}
+		try {
+			this.checking = new HashMap<>();
+			// create Table:
+			final List<String> primaryKeys = new ArrayList<>();
+			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, 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, 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, final QueryOptions options) -> {
+						throw new InputException(baseName + fieldName, "It is forbidden to change this field");
+					});
+				}
+
+				final Class<?> type = field.getType();
+				if (type == Long.class || type == long.class) {
+					final Long maxValue = AnnotationTools.getConstraintsMax(field);
+					if (maxValue != null) {
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
+							final Object elem = field.get(data);
+							if (elem == null) {
+								return;
+							}
+							final Long elemTyped = (Long) elem;
+							if (elemTyped > maxValue) {
+								throw new InputException(baseName + fieldName, "Value too height max: " + maxValue);
+							}
+						});
+					}
+					final Long minValue = AnnotationTools.getConstraintsMin(field);
+					if (minValue != null) {
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
+							final Object elem = field.get(data);
+							if (elem == null) {
+								return;
+							}
+							final Long elemTyped = (Long) elem;
+							if (elemTyped < minValue) {
+								throw new InputException(baseName + fieldName, "Value too Low min: " + minValue);
+							}
+						});
+					}
+					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 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);
+							}
+						});
+					}
+
+				} 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, final QueryOptions options) -> {
+							final Object elem = field.get(data);
+							if (elem == null) {
+								return;
+							}
+							final Integer elemTyped = (Integer) elem;
+							if (elemTyped > maxValue) {
+								throw new InputException(baseName + fieldName, "Value too height max: " + maxValue);
+							}
+						});
+					}
+					final Long minValueRoot = AnnotationTools.getConstraintsMin(field);
+					if (minValueRoot != null) {
+						final int minValue = minValueRoot.intValue();
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
+							final Object elem = field.get(data);
+							if (elem == null) {
+								return;
+							}
+							final Integer elemTyped = (Integer) elem;
+							if (elemTyped < minValue) {
+								throw new InputException(baseName + fieldName, "Value too Low min: " + minValue);
+							}
+						});
+					}
+					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);
+							}
+						});
+					}
+				} 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);
+							}
+						});
+					}
+				} else if (type == Boolean.class || type == boolean.class) {
+
+				} else if (type == Float.class || type == float.class) {
+					final Long maxValueRoot = AnnotationTools.getConstraintsMax(field);
+					if (maxValueRoot != null) {
+						final float maxValue = maxValueRoot.floatValue();
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
+							final Object elem = field.get(data);
+							if (elem == null) {
+								return;
+							}
+							final Float elemTyped = (Float) elem;
+							if (elemTyped > maxValue) {
+								throw new InputException(baseName + fieldName, "Value too height max: " + maxValue);
+							}
+						});
+					}
+					final Long minValueRoot = AnnotationTools.getConstraintsMin(field);
+					if (minValueRoot != null) {
+						final float minValue = minValueRoot.floatValue();
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
+							final Object elem = field.get(data);
+							if (elem == null) {
+								return;
+							}
+							final Float elemTyped = (Float) elem;
+							if (elemTyped < minValue) {
+								throw new InputException(baseName + fieldName, "Value too Low min: " + minValue);
+							}
+						});
+					}
+				} else if (type == Double.class || type == double.class) {
+					final Long maxValueRoot = AnnotationTools.getConstraintsMax(field);
+					if (maxValueRoot != null) {
+						final double maxValue = maxValueRoot.doubleValue();
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
+							final Object elem = field.get(data);
+							if (elem == null) {
+								return;
+							}
+							final Double elemTyped = (Double) elem;
+							if (elemTyped > maxValue) {
+								throw new InputException(baseName + fieldName, "Value too height max: " + maxValue);
+							}
+						});
+					}
+					final Long minValueRoot = AnnotationTools.getConstraintsMin(field);
+					if (minValueRoot != null) {
+						final double minValue = minValueRoot.doubleValue();
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
+							final Object elem = field.get(data);
+							if (elem == null) {
+								return;
+							}
+							final Double elemTyped = (Double) elem;
+							if (elemTyped < minValue) {
+								throw new InputException(baseName + fieldName, "Value too Low min: " + minValue);
+							}
+						});
+					}
+				} else if (type == Date.class || type == Timestamp.class) {
+
+				} else if (type == LocalDate.class) {
+
+				} else if (type == LocalTime.class) {
+
+				} else if (type == String.class) {
+					final int maxSizeString = AnnotationTools.getLimitSize(field);
+					if (maxSizeString > 0) {
+						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);
+							}
+						});
+					}
+					final Size limitSize = AnnotationTools.getConstraintsSize(field);
+					if (limitSize != null) {
+						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());
+							}
+							if (elemTyped.length() < limitSize.min()) {
+								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, 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
+												+ "'");
+							}
+						});
+					}
+				} else if (type == JsonValue.class) {
+					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, final QueryOptions options) -> {
+							instance.checkAll(baseName + fieldName + ".", field.get(data), options);
+						});
+					}
+				} else if (type.isEnum()) {
+					// nothing to do.
+				}
+				// keep this is last ==> take more time...
+				if (AnnotationTools.isUnique(field)) {
+					// Create the request ...
+					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");
+						}
+					});
+				}
+
+			}
+		} catch (final Exception ex) {
+			this.checking = null;
+			throw ex;
+		}
+	}
+
+	@Override
+	public void check(
+			final String baseName,
+			final Object data,
+			final List<String> filterValue,
+			final QueryOptions options) throws Exception {
+		if (this.checking == null) {
+			initialize();
+		}
+		if (!(this.clazz.isAssignableFrom(data.getClass()))) {
+			throw new DataAccessException("Incompatatyble type of Object" + data.getClass().getCanonicalName());
+		}
+		@SuppressWarnings("unchecked")
+		final T dataCasted = (T) data;
+		for (final String filter : filterValue) {
+			final List<CheckInterface<T>> actions = this.checking.get(filter);
+			if (actions == null) {
+				continue;
+			}
+			for (final CheckInterface<T> action : actions) {
+				action.check(baseName, dataCasted, options);
+			}
+		}
+		checkTyped(dataCasted, filterValue, options);
+	}
+
+	public void checkTyped(final T data, final List<String> filterValue, final QueryOptions options) throws Exception {
+		// nothing to do ...
+	}
+}

src/org/kar/archidata/dataAccess/options/Condition.java

@@ -0,0 +1,65 @@
+package org.kar.archidata.dataAccess.options;
+
+import java.sql.PreparedStatement;
+
+import org.kar.archidata.dataAccess.CountInOut;
+import org.kar.archidata.dataAccess.QueryItem;
+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 Condition extends QueryOption {
+	public final QueryItem condition;
+
+	public Condition(final QueryItem items) {
+		this.condition = items;
+	}
+
+	public Condition() {
+		this.condition = null;
+	}
+
+	public void generateQuery(final StringBuilder query, final String tableName) {
+		if (this.condition != null) {
+			this.condition.generateQuery(query, tableName);
+		}
+	}
+
+	public void injectQuery(final PreparedStatement ps, final CountInOut iii) throws Exception {
+		if (this.condition != null) {
+			this.condition.injectQuery(ps, iii);
+		}
+	}
+
+	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);
+		}
+		// Check if we have a condition to generate
+		if (this.condition == null) {
+			if (exclude_deleted && deletedFieldName != null) {
+				query.append(" WHERE ");
+				query.append(tableName);
+				query.append(".");
+				query.append(deletedFieldName);
+				query.append(" = false \n");
+			}
+			return;
+		}
+		query.append(" WHERE (");
+		this.condition.generateQuery(query, tableName);
+		query.append(") ");
+		if (exclude_deleted && deletedFieldName != null) {
+			query.append("AND ");
+			query.append(tableName);
+			query.append(".");
+			query.append(deletedFieldName);
+			query.append(" = false ");
+		}
+		query.append("\n");
+	}
+}

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);
+	}
+
+}

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() {}

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);
+		}
+	}
+
+}

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;
+	}
+
+}

src/org/kar/archidata/dataAccess/options/FilterValue.java

@@ -0,0 +1,20 @@
+package org.kar.archidata.dataAccess.options;
+
+import java.util.List;
+
+/** 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;
+
+	public FilterValue(final List<String> filterValue) {
+		this.filterValue = filterValue;
+	}
+
+	public FilterValue(final String... filterValue) {
+		this.filterValue = List.of(filterValue);
+	}
+
+	public List<String> getValues() {
+		return this.filterValue;
+	}
+}

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.
+	}
+}

src/org/kar/archidata/dataAccess/options/Limit.java

@@ -1,17 +1,23 @@
 package org.kar.archidata.dataAccess.options;
 
-import org.kar.archidata.dataAccess.QueryOption;
+import java.sql.PreparedStatement;
+
+import org.kar.archidata.dataAccess.CountInOut;
+import org.kar.archidata.dataAccess.DataAccess;
 
-/** 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 Limit extends QueryOption {
-	private final int limit;
+	protected final long limit;
 
-	public Limit(final int limit) {
+	public Limit(final long limit) {
 		this.limit = limit;
 	}
 
-	public int getLimit() {
-		return this.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();
 	}
 }

src/org/kar/archidata/dataAccess/options/OrderBy.java

@@ -0,0 +1,43 @@
+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;
+
+	public OrderBy(final List<OrderItem> childs) {
+		this.childs = childs;
+	}
+
+	public OrderBy(final OrderItem... childs) {
+		this.childs = List.of(childs);
+	}
+
+	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) {
+				first = false;
+			} else {
+				query.append(", ");
+			}
+			// query.append("`");
+			query.append(elem.value);
+			// query.append("`");
+			query.append(" ");
+			query.append(elem.order.toString());
+		}
+		query.append("\n");
+	}
+
+	public void injectQuery(final PreparedStatement ps, final CountInOut iii) throws Exception {
+		// nothing to add.
+	}
+}

src/org/kar/archidata/dataAccess/options/OrderItem.java

@@ -0,0 +1,16 @@
+package org.kar.archidata.dataAccess.options;
+
+public class OrderItem {
+	public enum Order {
+		ASC, DESC
+	};
+
+	public final String value;
+	public final Order order;
+
+	public OrderItem(final String value, final Order order) {
+		this.value = value;
+		this.order = order;
+	}
+
+}

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 {

src/org/kar/archidata/dataAccess/options/QueryOption.java

@@ -0,0 +1,3 @@
+package org.kar.archidata.dataAccess.options;
+
+public class QueryOption {}

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() {}

src/org/kar/archidata/dataAccess/options/TransmitKey.java

@@ -0,0 +1,14 @@
+package org.kar.archidata.dataAccess.options;
+
+/** Internal option that permit to transmit the Key when updating the ManyToMany values (first step). */
+public class TransmitKey extends QueryOption {
+	private final Object key;
+
+	public TransmitKey(final Object key) {
+		this.key = key;
+	}
+
+	public Object getKey() {
+		return this.key;
+	}
+}

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";
 	}
 }

src/org/kar/archidata/db/DBEntry.java

@@ -50,18 +50,21 @@ 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());
+			throw new IOException("Connection db fail: " + ex.getMessage() + " On URL: " + this.config.getUrl(true));
 		}
 
 	}
 
 	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());
+			LOGGER.error("Connection db fail: " + ex.getMessage() + " On URL: " + this.config.getUrl(true));
+			throw new IOException("Connection db fail: " + ex.getMessage() + " On URL: " + this.config.getUrl(true));
 		}
 
 	}

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;
 	}
 }