[DEV] full rework of Typescript generator (operational)

.classpath

@@ -25,7 +25,7 @@
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -35,5 +35,11 @@
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
+		<attributes>
+			<attribute name="test" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

.github/dependabot.yml

@@ -1,24 +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: "github-actions"
+  - package-ecosystem: "" # See documentation for possible values
-    directory: "/"
+    directory: "/" # Location of package manifests
     schedule:
-      interval: "daily"
+      interval: "weekly"
-      time: "05:00"
-      timezone: "Europe/Paris"
-    commit-message:
-      prefix: "[DEV-OPS] (dependabot) "
-    assignees:
-      - HeeroYui
 
-  - package-ecosystem: "maven"
-    directory: "/"
-    schedule:
-      interval: "daily"
-      time: "06:00"
-      timezone: "Europe/Paris"
-    commit-message:
-      prefix: "[DEV-OPS] (dependabot) "
-    assignees:
-      - HeeroYui

.github/workflows/assign-pr-author.yml

@@ -1,16 +0,0 @@
----
-name: "Assign PR Author as Assignee"
-
-on:
-  pull_request:
-    types:
-      - opened
-
-jobs:
-  assign-pr-author-as-assignee:
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Assign Author as Assignee"
-        uses: itsOliverBott/assign-pr-author-as-assignee@latest
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/check-title.yml

@@ -1,35 +0,0 @@
----
-name: "Check PR title"
-
-on:
-  pull_request:
-    types:
-      - opened
-      - edited
-      - synchronize
-      - ready_for_review
-      - reopened
-      - labeled
-      - unlabeled
-
-jobs:
-  check-title:
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Check title"
-        uses: Slashgear/action-check-pr-title@v4.3.0
-        with:
-          regexp: "\\[(API,)?(API|DEV-OPS|DOC|FEAT|FIX|FIX\\-CI|STYLE)\\]( \\([A-Za-z0-9.\\-/_]+\\))? [A-Za-z0-9: ,.'\\-!/_]+$"
-          helpMessage: |
-            Title of the PR MUST respect format: "[{TYPE}] clear description without typos in english" with {TYPE}:
-              * [API] Change API that permit to access on the application (un-compatibility only). This one can specifically added with [API,{TYPE}]
-              * [DEV-OPS] Update automatic build system, method to deliver application/packages, ...
-              * [DOC] Update or add some documentation.
-              * [FEAT] Develop a new feature
-              * [FIX] When fixing issue
-              * [FIX-CI] When the CI fail to build and we apply a correction to set it work again.
-              * [STYLE] Update of the style tools/checker, or add/remove rules.
-            Examples:
-              [FEAT] My beautiful feature
-              [API,FIX] Change API to fix typo
-              [FIX] (module) Correct part of ...

.github/workflows/maven.yml

@@ -10,17 +10,19 @@ name: Java CI with Maven
 
 on:
   push:
-    branches:
+    branches: [ "develop" ]
-      - develop
   pull_request:
+    branches: [ "develop" ]
 
 jobs:
   build:
+
     runs-on: ubuntu-latest
+
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
     - name: Set up JDK 17
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v3
       with:
         java-version: '21'
         distribution: 'temurin'
@@ -32,4 +34,4 @@ jobs:
 
     # 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@aeab9f885293af501bae8bdfe88c589528ea5e25
+      uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6

.island/release.bash

@@ -1,14 +1,4 @@
 #!/bin/bash
-version_file="version.txt"
 
-# update the Maven version number
+mvn versions:set -DnewVersion=$(cat version.txt)
-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,11 +10,6 @@
 			<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>
@@ -24,7 +19,6 @@
 	<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>

README.md

@@ -93,12 +93,7 @@ Enable the pre-commit checker
 
 > **_Note_**: You can change the code in `.git/hooks/pre-commit` by replacing `formatter:verify` with `formatter:format` to auto format the code @ every commit
 
-Run Spot-bug:
-------------
 
-```bash
-mvn spotbugs:check
-```
 
 Add Gitea in the dependency for the registry:
 =============================================

pom.xml

@@ -1,39 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.atria-soft</groupId>
+	<groupId>kangaroo-and-rabbit</groupId>
 	<artifactId>archidata</artifactId>
-	<version>0.27.2</version>
+	<version>0.8.10-SNAPSHOOT</version>
-	<description>Wrapper to manage a simple interface for REST project to bind MySQL, SQLite or mongoDB.</description>
+	<properties>
-	<url>https://github.com/kangaroo-and-rabbit/archidata</url>
+     	<java.version>21</java.version>
-	<licenses>
+		<maven.compiler.version>3.1</maven.compiler.version>
-		<license>
+		<maven.compiler.source>21</maven.compiler.source>
-			<name>Mozilla Public License 2.0</name>
+		<maven.compiler.target>21</maven.compiler.target>
-			<url>https://opensource.org/licenses/MPL-2.0</url>
+		<maven.dependency.version>3.1.1</maven.dependency.version>
-			<distribution>repo</distribution>
+		<jersey.version>3.1.5</jersey.version>
-		</license>
+		<jaxb.version>2.3.1</jaxb.version>
-	</licenses>
+		<istack.version>4.1.1</istack.version>
-	<developers>
+	</properties>
-		<developer>
+	<repositories>
-			<id>dev1</id>
+		<repository>
-			<name>Edouard DUPIN</name>
+			<id>gitea</id>
-			<email>yui.heero@gmail.com</email>
+			<url>https://gitea.atria-soft.org/api/packages/kangaroo-and-rabbit/maven</url>
-			<roles>
+		</repository>
-				<role>Lead Developer</role>
+	</repositories>
-			</roles>
+	<distributionManagement>
-		</developer>
+		<repository>
-	</developers>
+			<id>gitea</id>
-	<scm>
+			<url>https://gitea.atria-soft.org/api/packages/kangaroo-and-rabbit/maven</url>
-		<url>https://github.com/kangaroo-and-rabbit/archidata</url>
+		</repository>
-		<connection>scm:git:git://github.com/kangaroo-and-rabbit/archidata.git</connection>
+		<snapshotRepository>
-		<developerConnection>scm:git:ssh:github.com/kangaroo-and-rabbit/archidata.git</developerConnection>
+			<id>gitea</id>
-	</scm>
+			<url>https://gitea.atria-soft.org/api/packages/kangaroo-and-rabbit/maven</url>
+		</snapshotRepository>
+	</distributionManagement>
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
 				<groupId>org.glassfish.jersey</groupId>
 				<artifactId>jersey-bom</artifactId>
-				<version>4.0.0-M2</version>
+				<version>${jersey.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -52,30 +54,6 @@
 			<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.12.0</version>
-		</dependency>
-		<!-- Decode JPEG image -->
-		<dependency>
-			<groupId>com.twelvemonkeys.imageio</groupId>
-			<artifactId>imageio-jpeg</artifactId>
-			<version>3.12.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.1.0</version>
-		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.glassfish.jersey.media/jersey-media-multipart -->
 		<dependency>
 			<groupId>org.glassfish.jersey.media</groupId>
@@ -94,8 +72,9 @@
 			<artifactId>jersey-container-grizzly2-http</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.glassfish.jersey.ext</groupId>
+			<groupId>javax.xml.bind</groupId>
-			<artifactId>jersey-bean-validation</artifactId>
+			<artifactId>jaxb-api</artifactId>
+			<version>${jaxb.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jaxb</groupId>
@@ -107,7 +86,21 @@
 			<artifactId>jakarta.ws.rs-api</artifactId>
 			<version>4.0.0</version>
 		</dependency>
-		<!-- Serialize and un-serialize request in JSON-->
+		<dependency>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-impl</artifactId>
+			<version>${jaxb.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.istack</groupId>
+			<artifactId>istack-commons-runtime</artifactId>
+			<version>${istack.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jersey.test-framework.providers</groupId>
+			<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jersey.media</groupId>
 			<artifactId>jersey-media-json-jackson</artifactId>
@@ -115,79 +108,52 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.18.3</version>
+			<version>2.17.1</version>
 		</dependency>
-		<!-- encode output in CSV -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.dataformat</groupId>
 			<artifactId>jackson-dataformat-csv</artifactId>
-			<version>2.18.3</version>
+			<version>2.17.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.datatype</groupId>
 			<artifactId>jackson-datatype-jsr310</artifactId>
-			<version>2.18.3</version>
+			<version>2.17.1</version>
 		</dependency>
+
 		<dependency>
 			<groupId>jakarta.servlet</groupId>
 			<artifactId>jakarta.servlet-api</artifactId>
-			<version>6.1.0</version>
+			<version>6.1.0-M2</version>
 			<scope>provided</scope>
 		</dependency>
 		<!-- Interface for My-sql & sqlite DB -->
 		<dependency>
 			<groupId>com.mysql</groupId>
 			<artifactId>mysql-connector-j</artifactId>
-			<version>9.2.0</version>
+			<version>8.4.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.xerial</groupId>
 			<artifactId>sqlite-jdbc</artifactId>
-			<version>3.49.1.0</version>
+			<version>3.40.0.0</version>
 		</dependency>
 		<!-- Interface for JWT token -->
 		<dependency>
 			<groupId>com.nimbusds</groupId>
 			<artifactId>nimbus-jose-jwt</artifactId>
-			<version>10.0.2</version>
+			<version>9.39</version>
 		</dependency>
 		<dependency>
 			<groupId>jakarta.persistence</groupId>
 			<artifactId>jakarta.persistence-api</artifactId>
-			<version>3.2.0</version>
+			<version>3.2.0-M2</version>
 		</dependency>
 		<!-- Swagger dependencies -->
 		<dependency>
 			<groupId>io.swagger.core.v3</groupId>
 			<artifactId>swagger-jaxrs2-jakarta</artifactId>
-			<version>2.2.29</version>
+			<version>2.2.21</version>
-		</dependency>
-		<!-- spotbug tooling -->
-		<dependency>
-			<groupId>com.github.spotbugs</groupId>
-			<artifactId>spotbugs-annotations</artifactId>
-			<version>4.9.3</version>
-			<scope>compile</scope>
-		</dependency>
-		<!-- Morphia -->
-		<dependency>
-			<groupId>dev.morphia.morphia</groupId>
-			<artifactId>morphia-core</artifactId>
-			<version>2.4.15</version>
-		</dependency>
-		<!-- MongoDB Java Driver -->
-		<dependency>
-			<groupId>org.mongodb</groupId>
-			<artifactId>mongodb-driver-sync</artifactId>
-			<!--<version>5.3.1</version>-->
-			<!--Morphia 2.4.x does not support version upper than 4.x-->
-			<version>4.11.5</version>
-		</dependency>
-		<!-- Bean Validation (JSR 303 / 380) -->
-		<dependency>
-			<groupId>org.hibernate.validator</groupId>
-			<artifactId>hibernate-validator</artifactId>
-			<version>9.0.0.CR1</version>
 		</dependency>
 		<!--
 		************************************************************ 
@@ -197,26 +163,27 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
-			<version>5.12.1</version>
+			<version>5.11.0-M1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>
-			<version>5.12.1</version>
+			<version>5.11.0-M1</version>
-			<scope>test</scope>
+	        <scope>test</scope>
+	    </dependency>
+	    <dependency>
+		    <groupId>net.revelc.code.formatter</groupId>
+		    <artifactId>formatter-maven-plugin</artifactId>
+		    <version>2.23.0</version>
 		</dependency>
 		<dependency>
-			<groupId>net.revelc.code.formatter</groupId>
+		    <groupId>org.apache.maven.plugins</groupId>
-			<artifactId>formatter-maven-plugin</artifactId>
+		    <artifactId>maven-checkstyle-plugin</artifactId>
-			<version>2.25.0</version>
+		    <version>3.3.1</version>
 		</dependency>
-		<dependency>
+    </dependencies>
-			<groupId>org.apache.maven.plugins</groupId>
+
-			<artifactId>maven-checkstyle-plugin</artifactId>
-			<version>3.6.0</version>
-		</dependency>
-	</dependencies>
 	<build>
 		<sourceDirectory>src</sourceDirectory>
 		<resources>
@@ -234,22 +201,23 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.14.0</version>
+				<version>${maven.compiler.version}</version>
 				<configuration>
-					<source>21</source>
+					<source>${maven.compiler.source}</source>
-					<target>21</target>
+					<target>${maven.compiler.target}</target>
+					<!--<encoding>${project.build.sourceEncoding}</encoding>-->
 				</configuration>
 			</plugin>
 			<!-- Create the source bundle -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
-				<version>3.3.1</version>
+				<version>3.3.0</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>
 						<goals>
-							<goal>jar-no-fork</goal>
+							<goal>jar</goal>
 						</goals>
 					</execution>
 				</executions>
@@ -272,7 +240,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.5.3</version>
+				<version>3.0.0-M5</version>
 			</plugin>
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
@@ -291,21 +259,17 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.3.0</version>
+				<version>3.2.0</version>
-				<executions>
+				<configuration>
-					<execution>
+					<show>private</show>
-						<id>attach-javadocs</id>
+					<nohelp>true</nohelp>
-						<goals>
+				</configuration>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
 			</plugin>
 			<!-- Check the style of the code -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>3.6.0</version>
+		    	<version>3.3.1</version>
 				<configuration>
 					<configLocation>CheckStyle.xml</configLocation>
 					<consoleOutput>true</consoleOutput>
@@ -317,7 +281,7 @@
 			<plugin>
 				<groupId>net.revelc.code.formatter</groupId>
 				<artifactId>formatter-maven-plugin</artifactId>
-				<version>2.24.1</version>
+		    	<version>2.23.0</version>
 				<configuration>
 					<encoding>UTF-8</encoding>
 					<lineEnding>LF</lineEnding>
@@ -341,46 +305,19 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
+		</plugins>
-				<groupId>com.github.spotbugs</groupId>
+	</build>
-				<artifactId>spotbugs-maven-plugin</artifactId>
+	<!-- Generate Java-docs As Part Of Project Reports -->
-				<version>4.8.5.0</version>
+	<reporting>
-				<configuration>
+		<plugins>
-					<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>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-gpg-plugin</artifactId>
+				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>1.6</version>
+				<version>3.2.0</version>
-				<executions>
-					<execution>
-						<id>sign-artifacts</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>sign</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.sonatype.central</groupId>
-				<artifactId>central-publishing-maven-plugin</artifactId>
-				<version>0.7.0</version>
-				<extensions>true</extensions>
 				<configuration>
-					<publishingServerId>central</publishingServerId>
+					<show>public</show>
 				</configuration>
 			</plugin>
 		</plugins>
-	</build>
+	</reporting>
 </project>

sample/archidata/basic/WebLauncher.java

@@ -99,7 +99,7 @@ public class WebLauncher {
 		Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
 			@Override
 			public void run() {
-				WebLauncher.LOGGER.info("Stopping server..");
+				System.out.println("Stopping server..");
 				serverLink.shutdownNow();
 			}
 		}, "shutdownHook"));

spotbugs-security-exclude.xml

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

spotbugs-security-include.xml

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

src/org/kar/archidata/GlobalConfiguration.java

@@ -0,0 +1,15 @@
+package org.kar.archidata;
+
+import org.kar.archidata.db.DBConfig;
+import org.kar.archidata.tools.ConfigBaseVariable;
+
+public class GlobalConfiguration {
+	public static DBConfig dbConfig = null;
+
+	static {
+		dbConfig = new DBConfig(ConfigBaseVariable.getDBType(), ConfigBaseVariable.getDBHost(),
+				Integer.parseInt(ConfigBaseVariable.getDBPort()), ConfigBaseVariable.getDBLogin(),
+				ConfigBaseVariable.getDBPassword(), ConfigBaseVariable.getDBName(),
+				ConfigBaseVariable.getDBKeepConnected());
+	}
+}

src/org/kar/archidata/UpdateJwtPublicKey.java

@@ -2,17 +2,14 @@ package org.kar.archidata;
 
 import org.kar.archidata.tools.ConfigBaseVariable;
 import org.kar.archidata.tools.JWTWrapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class UpdateJwtPublicKey extends Thread {
-	private static final Logger LOGGER = LoggerFactory.getLogger(UpdateJwtPublicKey.class);
 	boolean kill = false;
 
 	@Override
 	public void run() {
 		if (ConfigBaseVariable.getSSOAddress() == null) {
-			LOGGER.warn("SSO INTERFACE is not provided ==> work alone.");
+			System.out.println("SSO INTERFACE is not provided ==> work alone.");
 			// No SO provided, kill the thread.
 			return;
 		}
@@ -22,7 +19,7 @@ public class UpdateJwtPublicKey extends Thread {
 				JWTWrapper.initLocalTokenRemote(ConfigBaseVariable.getSSOAddress(), "archidata");
 			} catch (final Exception e1) {
 				e1.printStackTrace();
-				LOGGER.error("Can not retreive the basic tocken");
+				System.out.println("Can not retreive the basic tocken");
 				return;
 			}
 			try {

src/org/kar/archidata/UserDB.java

@@ -0,0 +1,48 @@
+package org.kar.archidata;
+
+import java.io.IOException;
+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;
+
+public class UserDB {
+
+	public UserDB() {}
+
+	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, QueryOption... option)
+			throws Exception {
+		final User user = getUsers(userId);
+		if (user != null) {
+			return user;
+		}
+		createUsersInfoFromOAuth(userId, userLogin, option);
+		return getUsers(userId);
+	}
+
+	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);
+			ps.setLong(1, userId);
+			ps.setString(2, login);
+			ps.executeUpdate();
+		} catch (final SQLException throwables) {
+			throwables.printStackTrace();
+		} finally {
+			entry.close();
+		}
+	}
+}

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

@@ -2,36 +2,21 @@ package org.kar.archidata.annotation;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
-import java.lang.reflect.Parameter;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.kar.archidata.annotation.checker.Checker;
-import org.kar.archidata.annotation.checker.CollectionItemNotNull;
-import org.kar.archidata.annotation.checker.CollectionItemUnique;
-import org.kar.archidata.annotation.checker.CollectionNotEmpty;
 import org.kar.archidata.dataAccess.QueryOptions;
-import org.kar.archidata.dataAccess.options.OptionRenameColumn;
 import org.kar.archidata.dataAccess.options.OverrideTableName;
-import org.kar.archidata.exception.DataAccessException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import dev.morphia.annotations.Entity;
-import dev.morphia.mapping.Mapper;
 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.DecimalMax;
-import jakarta.validation.constraints.DecimalMin;
-import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotNull;
@@ -42,62 +27,7 @@ import jakarta.ws.rs.DefaultValue;
 public class AnnotationTools {
 	static final Logger LOGGER = LoggerFactory.getLogger(AnnotationTools.class);
 
-	public static <TYPE extends Annotation> TYPE get(final Parameter param, final Class<TYPE> clazz) {
+	public static String getTableName(final Class<?> clazz, final QueryOptions options) throws Exception {
-		final TYPE[] annotations = param.getDeclaredAnnotationsByType(clazz);
-
-		if (annotations.length == 0) {
-			return null;
-		}
-		return annotations[0];
-	}
-
-	public static <TYPE extends Annotation> TYPE[] gets(final Parameter param, final Class<TYPE> clazz) {
-		final TYPE[] annotations = param.getDeclaredAnnotationsByType(clazz);
-
-		if (annotations.length == 0) {
-			return null;
-		}
-		return annotations;
-	}
-
-	public static <TYPE extends Annotation> TYPE get(final Field element, final Class<TYPE> clazz) {
-		final TYPE[] annotations = element.getDeclaredAnnotationsByType(clazz);
-
-		if (annotations.length == 0) {
-			return null;
-		}
-		return annotations[0];
-	}
-
-	public static <TYPE extends Annotation> TYPE[] gets(final Field element, final Class<TYPE> clazz) {
-		final TYPE[] annotations = element.getDeclaredAnnotationsByType(clazz);
-
-		if (annotations.length == 0) {
-			return null;
-		}
-		return annotations;
-	}
-
-	public static <TYPE extends Annotation> TYPE get(final Class<?> classObject, final Class<TYPE> clazz) {
-		final TYPE[] annotations = classObject.getDeclaredAnnotationsByType(clazz);
-
-		if (annotations.length == 0) {
-			return null;
-		}
-		return annotations[0];
-	}
-
-	public static <TYPE extends Annotation> TYPE[] gets(final Class<?> classObject, final Class<TYPE> clazz) {
-		final TYPE[] annotations = classObject.getDeclaredAnnotationsByType(clazz);
-
-		if (annotations.length == 0) {
-			return null;
-		}
-		return annotations;
-	}
-
-	// For SQL declaration table Name
-	public static String getTableName(final Class<?> clazz, final QueryOptions options) throws DataAccessException {
 		if (options != null) {
 			final List<OverrideTableName> data = options.get(OverrideTableName.class);
 			if (data.size() == 1) {
@@ -107,13 +37,15 @@ public class AnnotationTools {
 		return AnnotationTools.getTableName(clazz);
 	}
 
-	// For SQL declaration table Name
+	public static String getTableName(final Class<?> element) throws Exception {
-	public static String getTableName(final Class<?> element) {
 		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());
+		}
 		final String tmp = ((Table) annotation[0]).name();
 		if (tmp == null) {
 			return element.getSimpleName();
@@ -121,130 +53,158 @@ public class AnnotationTools {
 		return tmp;
 	}
 
-	public static String getCollectionName(final Class<?> clazz, final QueryOptions options) {
+	public static boolean getSchemaReadOnly(final Field element) throws Exception {
-		if (options != null) {
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Schema.class);
-			// TODO: maybe change OverrideTableName with OverrideCollectionName
-			final List<OverrideTableName> data = options.get(OverrideTableName.class);
-			if (data.size() == 1) {
-				return data.get(0).getName();
-			}
-		}
-		return AnnotationTools.getCollectionName(clazz);
-	}
-
-	// For No-SQL Table/Collection Name
-	public static String getCollectionName(final Class<?> clazz) {
-		final Annotation[] annotation = clazz.getDeclaredAnnotationsByType(Entity.class);
 		if (annotation.length == 0) {
-			// when no annotation is detected, then the table name is the class name
+			return false;
-			return clazz.getSimpleName();
 		}
-		final String tmp = ((Entity) annotation[0]).value();
+		if (annotation.length > 1) {
-		if (tmp == null || tmp.length() == 0 || Mapper.IGNORED_FIELDNAME.equals(tmp)) {
+			throw new Exception(
-			return clazz.getSimpleName();
+					"Must not have more than 1 element @Schema on " + element.getClass().getCanonicalName());
 		}
-		return tmp;
+		return ((Schema) annotation[0]).readOnly();
 	}
 
-	public static CollectionItemNotNull getCollectionItemNotNull(final Field element) {
+	public static String getSchemaExample(final Class<?> element) throws Exception {
-		return get(element, CollectionItemNotNull.class);
-	}
-
-	public static CollectionItemUnique getCollectionItemUnique(final Field element) {
-		return get(element, CollectionItemUnique.class);
-	}
-
-	public static CollectionNotEmpty getCollectionNotEmpty(final Field element) {
-		return get(element, CollectionNotEmpty.class);
-	}
-
-	public static String getSchemaExample(final Class<?> element) {
 		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Schema.class);
 		if (annotation.length == 0) {
 			return null;
 		}
+		if (annotation.length > 1) {
+			throw new Exception(
+					"Must not have more than 1 element @Schema on " + element.getClass().getCanonicalName());
+		}
 		return ((Schema) annotation[0]).example();
 	}
 
-	public static String getSchemaDescription(final Class<?> element) {
+	public static String getSchemaDescription(final Class<?> element) throws Exception {
 		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Schema.class);
 		if (annotation.length == 0) {
 			return null;
 		}
-		return ((Schema) annotation[0]).description();
+		if (annotation.length > 1) {
-	}
+			throw new Exception(
-
+					"Must not have more than 1 element @Schema on " + element.getClass().getCanonicalName());
-	public static String getSchemaDescription(final Field element) {
-		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Schema.class);
-		if (annotation.length == 0) {
-			return null;
 		}
 		return ((Schema) annotation[0]).description();
 	}
 
-	public static String getDefault(final Field element) {
+	public static String getSchemaDescription(final Field element) throws Exception {
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Schema.class);
+		if (annotation.length == 0) {
+			return null;
+		}
+		if (annotation.length > 1) {
+			throw new Exception(
+					"Must not have more than 1 element @Schema on " + element.getClass().getCanonicalName());
+		}
+		return ((Schema) annotation[0]).description();
+	}
+
+	public static String getComment(final Field element) throws Exception {
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(DataComment.class);
+		if (annotation.length == 0) {
+			return getSchemaDescription(element);
+		}
+		if (annotation.length > 1) {
+			throw new Exception(
+					"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(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());
+		}
 		return ((DefaultValue) annotation[0]).value();
 	}
 
-	public static ManyToOne getManyToOne(final Field element) {
+	public static ManyToOne getManyToOne(final Field element) throws Exception {
-		return get(element, ManyToOne.class);
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(ManyToOne.class);
+		if (annotation.length == 0) {
+			return null;
+		}
+		if (annotation.length > 1) {
+			throw new Exception(
+					"Must not have more than 1 element @ManyToOne on " + element.getClass().getCanonicalName());
+		}
+		return (ManyToOne) annotation[0];
 	}
 
-	public static ManyToMany getManyToMany(final Field element) {
+	public static DataJson getDataJson(final Field element) throws Exception {
-		return get(element, ManyToMany.class);
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(DataJson.class);
+		if (annotation.length == 0) {
+			return null;
+		}
+		if (annotation.length > 1) {
+			throw new Exception(
+					"Must not have more than 1 element @ManyToOne on " + element.getClass().getCanonicalName());
+		}
+		return (DataJson) annotation[0];
 	}
 
-	public static OneToMany getOneToMany(final Field element) {
+	public static Long getConstraintsMax(final Field element) throws Exception {
-		return get(element, OneToMany.class);
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Max.class);
+		if (annotation.length == 0) {
+			return null;
+		}
+		if (annotation.length > 1) {
+			throw new Exception("Must not have more than 1 element @Size on " + element.getClass().getCanonicalName());
+		}
+		return ((Max) annotation[0]).value();
 	}
 
-	public static DataJson getDataJson(final Field element) {
+	public static Long getConstraintsMin(final Field element) throws Exception {
-		return get(element, DataJson.class);
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Min.class);
+		if (annotation.length == 0) {
+			return null;
+		}
+		if (annotation.length > 1) {
+			throw new Exception("Must not have more than 1 element @Size on " + element.getClass().getCanonicalName());
+		}
+		return ((Min) annotation[0]).value();
 	}
 
-	public static Checker[] getConstraintsCheckers(final Field element) {
+	public static int getLimitSize(final Field element) throws Exception {
-		return gets(element, Checker.class);
-	}
-
-	public static DecimalMin getConstraintsDecimalMin(final Field element) {
-		return get(element, DecimalMin.class);
-	}
-
-	public static DecimalMax getConstraintsDecimalMax(final Field element) {
-		return get(element, DecimalMax.class);
-	}
-
-	public static Max getConstraintsMax(final Field element) {
-		return get(element, Max.class);
-	}
-
-	public static Min getConstraintsMin(final Field element) {
-		return get(element, Min.class);
-	}
-
-	public static int getLimitSize(final Field element) {
 		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());
+		}
 		final int length = ((Column) annotation[0]).length();
 		return length <= 0 ? 0 : length;
 	}
 
-	public static Size getConstraintsSize(final Field element) {
+	public static Size getConstraintsSize(final Field element) throws Exception {
-		return get(element, Size.class);
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Size.class);
+		if (annotation.length == 0) {
+			return null;
+		}
+		if (annotation.length > 1) {
+			throw new Exception("Must not have more than 1 element @Size on " + element.getClass().getCanonicalName());
+		}
+		return (Size) annotation[0];
 	}
 
-	public static Pattern getConstraintsPattern(final Field element) {
+	public static String getConstraintsPattern(final Field element) throws Exception {
-		return get(element, Pattern.class);
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Pattern.class);
-	}
+		if (annotation.length == 0) {
-
+			return null;
-	public static Email getConstraintsEmail(final Field element) {
+		}
-		return get(element, Email.class);
+		if (annotation.length > 1) {
+			throw new Exception(
+					"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) {
@@ -270,11 +230,15 @@ public class AnnotationTools {
 		return false;
 	}
 
-	public static String getFieldNameRaw(final Field element) {
+	public static String getFieldName(final Field element) throws Exception {
 		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();
@@ -282,51 +246,31 @@ public class AnnotationTools {
 		return name;
 	}
 
-	public record FieldName(
+	public static boolean getColumnNotNull(final Field element) throws Exception {
-			String inStruct,
-			String inTable) {};
-
-	public static FieldName getFieldName(final Field element, final QueryOptions options) {
-		final String inStructName = getFieldNameRaw(element);
-		String inTableName = inStructName;
-		if (options != null) {
-			final List<OptionRenameColumn> renamesColumn = options.get(OptionRenameColumn.class);
-			for (final OptionRenameColumn rename : renamesColumn) {
-				if (rename.columnName.equals(inStructName)) {
-					inTableName = rename.colomnNewName;
-					LOGGER.trace("Detect overwrite of column name '{}' => '{}'", inStructName, inTableName);
-					break;
-				}
-			}
-		}
-		return new FieldName(inStructName, inTableName);
-	}
-
-	public static boolean getColumnNotNull(final Field element) {
 		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());
+		}
 		return !((Column) annotation[0]).nullable();
 	}
 
-	public static boolean getNullable(final Field element) {
+	public static boolean getConstraintsNotNull(final Field element) throws Exception {
-		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Nullable.class);
-		if (annotation.length == 0) {
-			return false;
-		}
-		return true;
-	}
-
-	public static boolean getConstraintsNotNull(final Field element) {
 		final Annotation[] annotation = element.getDeclaredAnnotationsByType(NotNull.class);
 		if (annotation.length == 0) {
 			return false;
 		}
+		if (annotation.length > 1) {
+			throw new Exception(
+					"Must not have more than 1 element @NotNull on " + element.getClass().getCanonicalName());
+		}
 		return true;
 	}
 
-	public static Field getPrimaryKeyField(final Class<?> clazz) {
+	public static Field getPrimaryKeyField(final Class<?> clazz) throws Exception {
 		for (final Field field : clazz.getFields()) {
 			// static field is only for internal global declaration ==> remove it ..
 			if (java.lang.reflect.Modifier.isStatic(field.getModifiers())) {
@@ -339,59 +283,59 @@ public class AnnotationTools {
 		return null;
 	}
 
-	public static boolean isPrimaryKey(final Field element) {
+	public static boolean isPrimaryKey(final Field element) throws Exception {
-		final Annotation[] annotationSQL = element.getDeclaredAnnotationsByType(Id.class);
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Id.class);
-		if (annotationSQL.length > 0) {
+		if (annotation.length == 0) {
-			return true;
+			return false;
 		}
-		final Annotation[] annotationMongo = element.getDeclaredAnnotationsByType(dev.morphia.annotations.Id.class);
+		return true;
-		if (annotationMongo.length > 0) {
-			return true;
-		}
-		return false;
 	}
 
-	public static boolean isUnique(final Field element) {
+	public static boolean isUnique(final Field element) throws Exception {
 		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());
+		}
 		return ((Column) annotation[0]).unique();
 	}
 
-	public static GenerationType getStrategy(final Field element) {
+	public static GenerationType getStrategy(final Field element) throws Exception {
 		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());
+		}
 		return ((GeneratedValue) annotation[0]).strategy();
 	}
 
-	public static boolean isDeletedField(final Field element) {
+	public static boolean isDeletedField(final Field element) throws Exception {
 		return element.getDeclaredAnnotationsByType(DataDeleted.class).length != 0;
 	}
 
-	public static boolean isCreatedAtField(final Field element) {
+	public static boolean isCreatedAtField(final Field element) throws Exception {
 		return element.getDeclaredAnnotationsByType(CreationTimestamp.class).length != 0;
 	}
 
-	public static boolean isUpdateAtField(final Field element) {
+	public static boolean isUpdateAtField(final Field element) throws Exception {
 		return element.getDeclaredAnnotationsByType(UpdateTimestamp.class).length != 0;
 	}
 
-	public static boolean isDefaultNotRead(final Field element) {
+	public static boolean isdefaultNotRead(final Field element) throws Exception {
 		return element.getDeclaredAnnotationsByType(DataNotRead.class).length != 0;
 	}
 
-	public static boolean isIdField(final Field element) {
+	public static boolean isIdField(final Field element) throws Exception {
-		if (element.getDeclaredAnnotationsByType(Id.class).length != 0) {
+		return element.getDeclaredAnnotationsByType(Id.class).length != 0;
-			return true;
-		}
-		return element.getDeclaredAnnotationsByType(dev.morphia.annotations.Id.class).length != 0;
 	}
 
-	// Note: delete field can not be renamed with OptionRenameColumn
+	public static String getDeletedFieldName(final Class<?> clazz) throws Exception {
-	public static String getDeletedFieldName(final Class<?> clazz) {
 		try {
 			for (final Field elem : clazz.getFields()) {
 				// static field is only for internal global declaration ==> remove it ..
@@ -399,7 +343,7 @@ public class AnnotationTools {
 					continue;
 				}
 				if (AnnotationTools.isDeletedField(elem)) {
-					return AnnotationTools.getFieldNameRaw(elem);
+					return AnnotationTools.getFieldName(elem);
 				}
 			}
 		} catch (final Exception ex) {
@@ -408,8 +352,7 @@ public class AnnotationTools {
 		return null;
 	}
 
-	// Note: update field can not be renamed with OptionRenameColumn
+	public static String getUpdatedFieldName(final Class<?> clazz) throws Exception {
-	public static String getUpdatedFieldName(final Class<?> clazz) {
 		try {
 			for (final Field elem : clazz.getFields()) {
 				// static field is only for internal global declaration ==> remove it ..
@@ -417,7 +360,7 @@ public class AnnotationTools {
 					continue;
 				}
 				if (AnnotationTools.isUpdateAtField(elem)) {
-					return AnnotationTools.getFieldNameRaw(elem);
+					return AnnotationTools.getFieldName(elem);
 				}
 			}
 		} catch (final Exception ex) {
@@ -443,28 +386,15 @@ public class AnnotationTools {
 		return null;
 	}
 
-	public static boolean hasFieldsName(final Class<?> clazz, final String name) {
+	public static List<String> getFieldsNames(final Class<?> clazz) throws Exception {
-		for (final Field field : clazz.getFields()) {
-			// static field is only for internal global declaration ==> remove it ..
-			if (java.lang.reflect.Modifier.isStatic(field.getModifiers())) {
-				continue;
-			}
-			if (field.getName().equals(name)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public static List<String> getFieldsNames(final Class<?> clazz) {
 		return getFieldsNamesFilter(clazz, false);
 	}
 
-	public static List<String> getAllFieldsNames(final Class<?> clazz) {
+	public static List<String> getAllFieldsNames(final Class<?> clazz) throws Exception {
 		return getFieldsNamesFilter(clazz, true);
 	}
 
-	private static List<String> getFieldsNamesFilter(final Class<?> clazz, final boolean full) {
+	private static List<String> getFieldsNamesFilter(final Class<?> clazz, final boolean full) throws Exception {
 		final List<String> out = new ArrayList<>();
 		for (final Field field : clazz.getFields()) {
 			// static field is only for internal global declaration ==> remove it ..
@@ -474,17 +404,17 @@ public class AnnotationTools {
 			if (!full && AnnotationTools.isGenericField(field)) {
 				continue;
 			}
-			out.add(AnnotationTools.getFieldNameRaw(field));
+			out.add(AnnotationTools.getFieldName(field));
 		}
 		return out;
 	}
 
-	public static boolean isGenericField(final Field elem) {
+	public static boolean isGenericField(final Field elem) throws Exception {
 		return AnnotationTools.isPrimaryKey(elem) || AnnotationTools.isCreatedAtField(elem)
 				|| AnnotationTools.isUpdateAtField(elem) || AnnotationTools.isDeletedField(elem);
 	}
 
-	public static Field getFieldOfId(final Class<?> clazz) {
+	public static Field getFieldOfId(final Class<?> clazz) throws Exception {
 		for (final Field field : clazz.getFields()) {
 			// static field is only for internal global declaration ==> remove it ..
 			if (java.lang.reflect.Modifier.isStatic(field.getModifiers())) {
@@ -497,13 +427,13 @@ public class AnnotationTools {
 		return null;
 	}
 
-	public static Field getFieldNamed(final Class<?> clazz, final String name) {
+	public static Field getFieldNamed(final Class<?> clazz, final String name) throws Exception {
 		for (final Field field : clazz.getFields()) {
 			// static field is only for internal global declaration ==> remove it ..
 			if (java.lang.reflect.Modifier.isStatic(field.getModifiers())) {
 				continue;
 			}
-			if (AnnotationTools.getFieldNameRaw(field).equals(name)) {
+			if (AnnotationTools.getFieldName(field).equals(name)) {
 				return field;
 			}
 		}

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

@@ -1,4 +1,4 @@
-package org.kar.archidata.annotation.apiGenerator;
+package org.kar.archidata.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ 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 ApiAsyncType {
+public @interface AsyncType {
 	// Possible class values.
 	Class<?>[] value();
 

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

@@ -5,39 +5,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * The CreationTimestamp annotation is used to automatically set the creation
- * date of an object in the database. This annotation ensures that the field
- * marked with @CreationTimestamp is populated with the current timestamp
- * when the object is first created.
- *
- * <p>Usage:
- * - Target: This annotation can be applied to fields within a class.
- * - Retention: The annotation is retained at runtime, allowing it to be
- *   processed by frameworks or libraries that handle data persistence logic.
- *
- * <p>Behavior:
- * - When a field is annotated with @CreationTimestamp, it will automatically
- *   be set to the current date and time when the object is inserted into the
- *   database.
- * - This annotation is typically used in conjunction with other annotations
- *   such as @Column to define database column properties.
- *
- * <p>Example:
- * <pre>{@code
- * public class MyEntity {
- *     @DataNotRead
- *     @CreationTimestamp
- *     @Column(nullable = false, insertable = false, updatable = false)
- *     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX") // optional depend on the configuration
- *     @Nullable
- *     public Date createdAt = null;
- * }
- * }</pre>
- *
- * In this example, the createdAt field will be automatically set to the
- * current timestamp when a new User object is created in the database.
- */
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface CreationTimestamp {

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

@@ -0,0 +1,13 @@
+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;
+
+@Target({ ElementType.TYPE, ElementType.FIELD })
+@Retention(RetentionPolicy.RUNTIME)
+@Deprecated(since = "0.5.2")
+public @interface DataComment {
+	String value();
+}

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

@@ -5,40 +5,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * The DataDeleted annotation is used to manage a boolean variable that marks
- * an object as 'deleted' in the database. This annotation helps in soft deletion
- * by excluding marked objects from being automatically retrieved unless
- * explicitly specified.
- *
- * <p>Usage:
- * - Target: This annotation can be applied to fields within a class.
- * - Retention: The annotation is retained at runtime, allowing it to be
- *   processed by frameworks or libraries that handle data retrieval logic.
- *
- * <p>Behavior:
- * - When a field is annotated with @DataDeleted, it will not be included in the
- *   default data retrieval process from the database if its value is false.
- * - To override this behavior and access deleted items, the query must include
- *   the option AccessDeletedItems.
- *
- * <p>Example:
- * <pre>{@code
- * public class MyEntity {
- *     public String username;
- *
- *     @DataDeleted
- *     @DataNotRead
- *     @Column(nullable = false)
- *     @DefaultValue("'0'")
- *     public Boolean deleted = null;
- * }
- * }</pre>
- *
- * In this example, objects with `deleted` set to true will not be retrieved
- * by default. To include them in the query results, the AccessDeletedItems
- * option must be specified in the query.
- */
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface DataDeleted {

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

@@ -5,43 +5,13 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
+import org.kar.archidata.dataAccess.options.CheckFunctionInterface;
- * The DataJson annotation is used to convert fields or classes to JSON format
+import org.kar.archidata.dataAccess.options.CheckFunctionVoid;
- * for storage in a database. This annotation allows storing complex data types
+
- * such as lists, maps, and other objects in SQL databases as JSON or STRING
- * (for SQLite).
- *
- * <p>Usage:
- * - Target: This annotation can be applied to both fields and classes.
- * - Retention: The annotation is retained at runtime, allowing it to be
- *   processed by frameworks or libraries that handle data persistence logic.
- *
- * <p>Behavior:
- * - When applied to a field or class, the DataJson annotation enables the
- *   conversion of the annotated element to JSON format before storing it in
- *   the database.
- * - This is particularly useful in SQL databases where only basic data types
- *   (char, short, int, long, float, string, timestamp) can be stored directly.
- *   The DataJson annotation makes it possible to store complex data structures
- *   by converting them to JSON.
- *
- * <p>Attributes:
- * - targetEntity: Specifies the target entity class to which the JSON data
- *   should be mapped. Defaults auto-detect if not specified.
- *
- * <p>Example:
- * <pre>{@code
- * public class User {
- *     @DataJson
- *     public Map<String, Object> additionalData;
- * }
- * }</pre>
- *
- * In this example, the additionalData field can store complex data structures
- * as JSON in the database.
- */
 @Target({ ElementType.TYPE, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface DataJson {
+	Class<? extends CheckFunctionInterface> checker() default CheckFunctionVoid.class;
+
 	Class<?> targetEntity() default Void.class;
 }

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

@@ -5,37 +5,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * The DataNotRead annotation is used to mark fields in a class that should not
- * be automatically read from the database. This annotation helps in optimizing
- * data retrieval by excluding certain fields from being fetched unless
- * explicitly specified.
- *
- * <p>Usage:
- * - Target: This annotation can be applied to fields within a class.
- * - Retention: The annotation is retained at runtime, allowing it to be
- *   processed by frameworks or libraries that handle data retrieval logic.
- *
- * <p>Behavior:
- * - When a field is annotated with @DataNotRead, it will not be included in the
- *   default data retrieval process from the database.
- * - To override this behavior and read all columns, including those marked with
- *   `@DataNotRead`, the query must include the option ReadAllColumn.
- *
- * <p>Example:
- * <pre>{@code
- * public class MyEntity {
- *     public String username;
- *
- *     @DataNotRead
- *     private String sensitiveData;
- * }
- * }</pre>
- *
- * In this example, the sensitiveData field will not be read from the database
- * by default. To include it in the query results, the ReadAllColumn option must
- * be specified in the query.
- */
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface DataNotRead {

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

@@ -0,0 +1,12 @@
+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;
+
+@Target({ ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface SQLWhere {
+	String clause();
+}

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/annotation/UpdateTimestamp.java

@@ -5,38 +5,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * The UpdateTimestamp annotation is used to automatically update the timestamp
- * of an object in the database whenever it is modified. This annotation ensures
- * that the field marked with @UpdateTimestamp is set to the current timestamp
- * each time the object is updated.
- *
- * <p>Usage:
- * - Target: This annotation can be applied to fields within a class.
- * - Retention: The annotation is retained at runtime, allowing it to be
- *   processed by frameworks or libraries that handle data persistence logic.
- *
- * <p>Behavior:
- * - When a field is annotated with @UpdateTimestamp, it will automatically
- *   be updated to the current date and time whenever the object is modified
- *   in the database.
- * - This annotation is typically used in conjunction with other annotations
- *   such as @Column to define database column properties.
- *
- * <p>Example:
- * <pre>{@code
- * public class MyEntity {
- *     @UpdateTimestamp
- *     @Column(nullable = false, insertable = false, updatable = false)
- *     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
- *     @Nullable
- *     public Date updatedAt = null;
- * }
- * }</pre>
- *
- * In this example, the updatedAt field will be automatically set to the
- * current timestamp whenever the User object is modified in the database.
- */
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface UpdateTimestamp {

src/org/kar/archidata/annotation/apiGenerator/ApiAccessLimitation.java

@@ -1,26 +0,0 @@
-package org.kar.archidata.annotation.apiGenerator;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-@Retention(RUNTIME)
-@Target(FIELD)
-public @interface ApiAccessLimitation {
-	/**
-	 * (Optional) The field is accessible in read (GET)
-	 */
-	boolean readable() default true;
-
-	/**
-	 * (Optional) The field is accessible in creation (POST)
-	 */
-	boolean creatable() default true;
-
-	/**
-	 * (Optional) The field is accessible in update mode (PUT, PATCH)
-	 */
-	boolean updatable() default true;
-}

src/org/kar/archidata/annotation/apiGenerator/ApiGenerationMode.java

@@ -1,57 +0,0 @@
-package org.kar.archidata.annotation.apiGenerator;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * The ApiGenerationMode annotation is used to indicate the generation mode for
- * API operations when producing code for other languages. This annotation is
- * particularly useful in code generators for client libraries where specific
- * data structures for read, create, and update operations may or may not be needed.
- *
- * <p>Usage:
- * - Target: This annotation can be applied to class types.
- * - Retention: The annotation is retained at runtime, allowing it to be
- *   processed by frameworks or libraries that handle code generation logic.
- *
- * <p>Behavior:
- * - When applied to a class, the ApiGenerationMode annotation specifies
- *   which API operations (read, create, update) should generate specific
- *   data structures. This can simplify the generated code by avoiding the
- *   creation of unnecessary structures.
- *
- * <p>Example:
- * <pre>{@code
- * @ApiGenerationMode(creatable=false, updatable=false)
- * public class User {
- *     public String username;
- *     public String email;
- * }
- * }</pre>
- *
- * In this example, the User class will not generate separate data structures
- * for create and update operations in the client code, only for read operations.
- */
-@Target({ ElementType.TYPE })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface ApiGenerationMode {
-	/**
-	 * (Optional) Enable the generation of specific code for read access
-	 * (generate object: MyClass).
-	 */
-	boolean read() default true;
-
-	/**
-	 * (Optional) Enable the generation of specific code for create access
-	 * (generate object: MyClassCreate).
-	 */
-	boolean create() default false;
-
-	/**
-	 * (Optional) Enable the generation of specific code for update access
-	 * (generate object: MyClassUpdate).
-	 */
-	boolean update() default false;
-}

src/org/kar/archidata/annotation/apiGenerator/ApiInputOptional.java

@@ -1,80 +0,0 @@
-package org.kar.archidata.annotation.apiGenerator;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * The FormDataOptional annotation is used to indicate that a form data parameter
- * is optional when generating client code. By default, form data parameters are
- * required, but this annotation allows them to be optional, enabling the creation
- * of polymorphic APIs.
- *
- * <p>Usage:
- * - Target: This annotation can be applied to method parameters.
- * - Retention: The annotation is retained at runtime, allowing it to be
- *   processed by frameworks or libraries that handle code generation logic.
- *
- * <p>Behavior:
- * - When applied to a parameter, the FormDataOptional annotation specifies that
- *   the parameter is optional in the generated client code. This allows for
- *   more flexible API designs where certain inputs can be omitted.
- *
- * <p>Example:
- *
- * {@code
- * public class AlbumService {
- *
- *     @POST
- *     @Path("{id}/cover")
- *     @RolesAllowed("ADMIN")
- *     @Consumes({ MediaType.MULTIPART_FORM_DATA })
- *     @Operation(description = "Add a cover on a specific album")
- *     @TypeScriptProgress
- *     public Album uploadCover(@PathParam("id") final Long id,
- *                              @ApiInputOptional @FormDataParam("uri") final String uri,
- *                              @ApiInputOptional @FormDataParam("file") final InputStream fileInputStream,
- *                              @ApiInputOptional @FormDataParam("file") final FormDataContentDisposition fileMetaData)
- *             throws Exception {
- *         // some code
- *     }
- * }
- * }
- *
- *
- * Note: @FormDataParam must be allway at the last position.
- *
- * In this example, the uri, fileInputStream, and fileMetaData parameters are
- * marked as optional, allowing the client to omit them when calling the API.
- *
- * <p>Generated TypeScript code example:
- *
- * {@code
- * //Add a cover on a specific album
- * export function uploadCover({
- *     restConfig,
- *     params,
- *     data,
- *     callbacks,
- * }: {
- *     restConfig: RESTConfig,
- *     params: {
- *         id: Long,
- *     },
- *     data: {
- *         file?: File, // element is optional
- *         uri?: string, // element is optional
- *     },
- *     callbacks?: RESTCallbacks,
- * }): Promise<Album> { ... }
- * }
- *
- *
- * The generated TypeScript function reflects the optional nature of the form data parameters
- */
-@Target({ ElementType.PARAMETER })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface ApiInputOptional {
-
-}

src/org/kar/archidata/annotation/apiGenerator/ApiNotNull.java

@@ -1,45 +0,0 @@
-package org.kar.archidata.annotation.apiGenerator;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation to explicitly define the nullability of a parameter in an API.
- *
- * This annotation allows marking a parameter as required (non-null) or optional (nullable),
- * overriding any other nullability considerations. It is useful in API generation frameworks
- * to ensure precise validation and documentation of method parameters.
- *
- * <p>Usage:
- * - Target: This annotation can be applied to field.
- * - Retention: The annotation is retained at runtime, allowing it to be
- *   processed by frameworks or libraries that handle code generation logic.
- *
- * <p>Behavior:
- * - When applied to a parameter, it explicitly marks it as optional or required in the API.
- *   This annotation overrides all other considerations regarding nullability.
- *
- * <p>Example:
- * <pre>{@code
- * public class User {
- *     @ReadOnlyField
- *     @ApiNotNull
- *     public String username;
- *     public String email;
- * }
- * }</pre>
- *
- * In this example, the `username` field in the `User` class is explicitly marked as non-null in the generated API.
- */
-@Target({ ElementType.FIELD })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface ApiNotNull {
-	/**
-	 * (Optional) Specifies whether the API element can be null.
-	 * If set to `true`, the element is required (non-null).
-	 * If set to `false`, the element is optional (nullable).
-	 */
-	boolean value() default true;
-}

src/org/kar/archidata/annotation/apiGenerator/ApiTypeScriptProgress.java

@@ -1,72 +0,0 @@
-package org.kar.archidata.annotation.apiGenerator;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * The TypeScriptProgress annotation is used to specify that an API method
- * will take a significant amount of time to complete, and thus requires a
- * callback API to provide more precise progress tracking, particularly for
- * upload operations.
- *
- * <p>Usage:
- * - Target: This annotation can be applied to method parameters and methods.
- * - Retention: The annotation is retained at runtime, allowing it to be
- *   processed by frameworks or libraries that handle code generation logic.
- *
- * <p>Behavior:
- * - When applied to a method or parameter, the TypeScriptProgress annotation
- *   indicates that the client code generator should provide a callback API
- *   for tracking the progress of the operation.
- * - Note: The use of this annotation implies that the standard browser fetch
- *   API is not used, as the callback API is not yet operational. Instead,
- *   the older XMLHttpRequest interface is utilized.
- *
- * <p>Example:
- * {@code
- * public class SeasonService {
- *
- *     @POST
- *     @Path("{id}/cover")
- *     @RolesAllowed("ADMIN")
- *     @Consumes(MediaType.MULTIPART_FORM_DATA)
- *     @Operation(description = "Upload a new season cover season", tags = "GLOBAL")
- *     @TypeScriptProgress
- *     public Season uploadCover(@PathParam("id") final Long id,
- *                               @FormDataParam("file") final InputStream fileInputStream,
- *                               @FormDataParam("file") final FormDataContentDisposition fileMetaData)
- *             throws Exception {
- *         // Upload logic
- *     }
- * }
- * }
- *
- * In this example, the uploadCover method will generate a client-side API
- * with progress tracking capabilities using XMLHttpRequest.
- *
- * <p>Generated TypeScript code example:
- * {@code
- * export function uploadCover({
- *        restConfig,
- *        params,
- *        data,
- *        callbacks, // add this callback handle
- *    }: {
- *    restConfig: RESTConfig,
- *    params: {
- *        id: Long,
- *    },
- *    data: {
- *        file: File,
- *    },
- *    callbacks?: RESTCallbacks,
- * }): Promise<Season> {...}
- * }
- *
- *
- */
-@Target({ ElementType.PARAMETER, ElementType.METHOD })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface ApiTypeScriptProgress {}

src/org/kar/archidata/annotation/checker/CheckForeignKey.java

@@ -1,30 +0,0 @@
-package org.kar.archidata.annotation.checker;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import jakarta.validation.Constraint;
-import jakarta.validation.Payload;
-
-@Constraint(validatedBy = CheckForeignKeyValidator.class)
-@Target({ ElementType.TYPE, //
-		ElementType.METHOD, //
-		ElementType.FIELD, //
-		ElementType.ANNOTATION_TYPE, //
-		ElementType.CONSTRUCTOR, //
-		ElementType.PARAMETER, //
-		ElementType.TYPE_USE, //
-})
-
-@Retention(RetentionPolicy.RUNTIME)
-public @interface CheckForeignKey {
-	Class<?> target();
-
-	String message() default "Foreign-key does not exist in the DB";
-
-	Class<?>[] groups() default {};
-
-	Class<? extends Payload>[] payload() default {};
-}

src/org/kar/archidata/annotation/checker/CheckForeignKeyValidator.java

@@ -1,36 +0,0 @@
-package org.kar.archidata.annotation.checker;
-
-import org.kar.archidata.dataAccess.DataAccess;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import jakarta.validation.ConstraintValidator;
-import jakarta.validation.ConstraintValidatorContext;
-
-public class CheckForeignKeyValidator implements ConstraintValidator<CheckForeignKey, Object> {
-	Class<?> target = null;
-	private final static Logger LOGGER = LoggerFactory.getLogger(CheckForeignKeyValidator.class);
-
-	@Override
-	public void initialize(final CheckForeignKey annotation) {
-		this.target = annotation.target();
-	}
-
-	@Override
-	public boolean isValid(final Object value, final ConstraintValidatorContext context) {
-		if (value == null) {
-			return true;
-		}
-		try {
-			final long count = DataAccess.count(this.target, value);
-			if (count != 1) {
-				return false;
-			}
-		} catch (final Exception e) {
-			LOGGER.error("Fail to access to the DB");
-			context.buildConstraintViolationWithTemplate("fail to access on the DB").addConstraintViolation();
-			return false;
-		}
-		return true;
-	}
-}

src/org/kar/archidata/annotation/checker/Checker.java

@@ -1,52 +0,0 @@
-package org.kar.archidata.annotation.checker;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.kar.archidata.dataAccess.options.CheckFunctionInterface;
-
-/**
- * The Checker annotation is used to specify a checker class that automatically
- * validates data for a parent class. This annotation can be applied to both
- * classes and fields to enforce validation rules defined in the checker class.
- *
- * <p>Usage:
- * - Target: This annotation can be applied to types (classes) and fields.
- * - Retention: The annotation is retained at runtime, allowing it to be
- *   processed by frameworks or libraries that handle data validation logic.
- *
- * <p>Behavior:
- * - When applied to a class or field, the Checker annotation specifies a
- *   checker class that implements the CheckFunctionInterface. This checker
- *   class is responsible for validating the data associated with the annotated
- *   element.
- * - The validation is automatically triggered when the data of the parent class
- *   is validated, ensuring that the data adheres to the specified rules.
- *
- * <p>Attributes:
- * - value: Specifies the checker class that implements the validation logic.
- *   This class must extend the CheckFunctionInterface.
- *
- * <p>Example:
- * <pre>{@code
- * public class User {
- *
- *     @Checker(UserDataChecker.class)
- *     public String email;
- * }
- *
- * public class UserDataChecker implements CheckFunctionInterface {
- *     ...
- * }
- * }</pre>
- *
- * In this example, the email field in the User class is validated using the
- * UserDataChecker class whenever the User class data is validated.
- */
-@Target({ ElementType.TYPE, ElementType.FIELD })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Checker {
-	Class<? extends CheckFunctionInterface> value();
-}

src/org/kar/archidata/annotation/checker/CollectionItemNotNull.java

@@ -1,20 +0,0 @@
-package org.kar.archidata.annotation.checker;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import jakarta.validation.Constraint;
-import jakarta.validation.Payload;
-
-@Constraint(validatedBy = CollectionItemNotNullValidator.class)
-@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface CollectionItemNotNull {
-	String message() default "Collection can not contain NULL item";
-
-	Class<?>[] groups() default {};
-
-	Class<? extends Payload>[] payload() default {};
-}

src/org/kar/archidata/annotation/checker/CollectionItemNotNullValidator.java

@@ -1,31 +0,0 @@
-package org.kar.archidata.annotation.checker;
-
-import java.util.Collection;
-
-import jakarta.validation.ConstraintValidator;
-import jakarta.validation.ConstraintValidatorContext;
-
-public class CollectionItemNotNullValidator implements ConstraintValidator<CollectionItemNotNull, Object> {
-
-	@Override
-	public void initialize(final CollectionItemNotNull annotation) {
-		// nothing to do...
-	}
-
-	@Override
-	public boolean isValid(final Object value, final ConstraintValidatorContext context) {
-		if (value == null) {
-			return true;
-		}
-		if (value instanceof final Collection<?> tmpCollection) {
-			final Object[] elements = tmpCollection.toArray();
-			for (final Object element : elements) {
-				if (element == null) {
-					return false;
-					//throw new InputException(baseName + fieldName + '[' + iii + ']', "Collection can not contain NULL item");
-				}
-			}
-		}
-		return true;
-	}
-}

src/org/kar/archidata/annotation/checker/CollectionItemUnique.java

@@ -1,21 +0,0 @@
-package org.kar.archidata.annotation.checker;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import jakarta.validation.Constraint;
-import jakarta.validation.Payload;
-
-@Constraint(validatedBy = CollectionItemUniqueValidator.class)
-@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface CollectionItemUnique {
-
-	String message() default "Cannot insert multiple times the same elements";
-
-	Class<?>[] groups() default {};
-
-	Class<? extends Payload>[] payload() default {};
-}

src/org/kar/archidata/annotation/checker/CollectionItemUniqueValidator.java

@@ -1,30 +0,0 @@
-package org.kar.archidata.annotation.checker;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import jakarta.validation.ConstraintValidator;
-import jakarta.validation.ConstraintValidatorContext;
-
-public class CollectionItemUniqueValidator implements ConstraintValidator<CollectionItemUnique, Object> {
-
-	@Override
-	public void initialize(final CollectionItemUnique annotation) {
-		// nothing to do...
-	}
-
-	@Override
-	public boolean isValid(final Object value, final ConstraintValidatorContext context) {
-		if (value == null) {
-			return true;
-		}
-		if (value instanceof final Collection<?> tmpCollection) {
-			final Set<Object> uniqueValues = new HashSet<>(tmpCollection);
-			if (uniqueValues.size() != tmpCollection.size()) {
-				return false;
-			}
-		}
-		return true;
-	}
-}

src/org/kar/archidata/annotation/checker/CollectionNotEmpty.java

@@ -1,21 +0,0 @@
-package org.kar.archidata.annotation.checker;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import jakarta.validation.Constraint;
-import jakarta.validation.Payload;
-
-@Constraint(validatedBy = CollectionNotEmptyValidator.class)
-@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface CollectionNotEmpty {
-
-	String message() default "Collection can not be empty";
-
-	Class<?>[] groups() default {};
-
-	Class<? extends Payload>[] payload() default {};
-}

src/org/kar/archidata/annotation/checker/CollectionNotEmptyValidator.java

@@ -1,27 +0,0 @@
-package org.kar.archidata.annotation.checker;
-
-import java.util.Collection;
-
-import jakarta.validation.ConstraintValidator;
-import jakarta.validation.ConstraintValidatorContext;
-
-public class CollectionNotEmptyValidator implements ConstraintValidator<CollectionNotEmpty, Object> {
-
-	@Override
-	public void initialize(final CollectionNotEmpty annotation) {
-		// nothing to do...
-	}
-
-	@Override
-	public boolean isValid(final Object value, final ConstraintValidatorContext context) {
-		if (value == null) {
-			return true;
-		}
-		if (value instanceof final Collection<?> tmpCollection) {
-			if (tmpCollection.isEmpty()) {
-				return false;
-			}
-		}
-		return true;
-	}
-}

src/org/kar/archidata/annotation/checker/ReadOnlyField.java

@@ -1,20 +0,0 @@
-package org.kar.archidata.annotation.checker;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import jakarta.validation.Constraint;
-import jakarta.validation.Payload;
-
-@Constraint(validatedBy = ReadOnlyFieldValidator.class)
-@Target({ ElementType.METHOD, ElementType.FIELD })
-@Retention(RetentionPolicy.RUNTIME)
-public @interface ReadOnlyField {
-	String message() default "Field can not be set, it is a read-only field.";
-
-	Class<?>[] groups() default {};
-
-	Class<? extends Payload>[] payload() default {};
-}

src/org/kar/archidata/annotation/checker/ReadOnlyFieldValidator.java

@@ -1,20 +0,0 @@
-package org.kar.archidata.annotation.checker;
-
-import jakarta.validation.ConstraintValidator;
-import jakarta.validation.ConstraintValidatorContext;
-
-public class ReadOnlyFieldValidator implements ConstraintValidator<ReadOnlyField, Object> {
-
-	@Override
-	public void initialize(final ReadOnlyField annotation) {
-		// nothing to do...
-	}
-
-	@Override
-	public boolean isValid(final Object value, final ConstraintValidatorContext context) {
-		if (value != null) {
-			return false;
-		}
-		return true;
-	}
-}

src/org/kar/archidata/annotation/method/ARCHIVE.java

@@ -1,19 +0,0 @@
-package org.kar.archidata.annotation.method;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import jakarta.ws.rs.HttpMethod;
-
-/**
-* Indicates that the annotated method responds to HTTP ARCHIVE requests.
-*
-* @author Edouard DUPIN
-* @see HttpMethod
-*/
-@Target({ ElementType.METHOD })
-@Retention(RetentionPolicy.RUNTIME)
-@HttpMethod("ARCHIVE")
-public @interface ARCHIVE {}

src/org/kar/archidata/annotation/method/RESTORE.java

@@ -1,19 +0,0 @@
-package org.kar.archidata.annotation.method;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import jakarta.ws.rs.HttpMethod;
-
-/**
-* Indicates that the annotated method responds to HTTP RESTORE requests.
-*
-* @author Edouard DUPIN
-* @see HttpMethod
-*/
-@Target({ ElementType.METHOD })
-@Retention(RetentionPolicy.RUNTIME)
-@HttpMethod("RESTORE")
-public @interface RESTORE {}

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

@@ -5,7 +5,6 @@ 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;
@@ -21,15 +20,12 @@ import java.util.UUID;
 
 import javax.imageio.ImageIO;
 
-import org.bson.types.ObjectId;
 import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 import org.glassfish.jersey.media.multipart.FormDataParam;
-import org.kar.archidata.annotation.apiGenerator.ApiInputOptional;
 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;
@@ -88,7 +84,18 @@ public class DataResource {
 		return filePath;
 	}
 
-	public static String getFileDataOld(final UUID uuid) {
+	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) {
+			e.printStackTrace();
+		}
+		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);
@@ -105,37 +112,11 @@ public class DataResource {
 		return filePath;
 	}
 
-	public static String getFileData(final ObjectId oid) {
+	public static String getFileMetaData(final UUID uuid) {
-		final String stringOid = oid.toHexString();
+		return getFileData(uuid) + ".json";
-		String dir1 = stringOid.substring(0, 2);
-		String dir2 = stringOid.substring(2, 4);
-		String dir3 = stringOid.substring(4, 6);
-		try {
-			final MessageDigest digest = MessageDigest.getInstance("SHA-256");
-			final byte[] hashBytes = digest.digest(oid.toByteArray());
-			dir1 = String.format("%02x", hashBytes[0]);
-			dir2 = String.format("%02x", hashBytes[1]);
-			dir3 = String.format("%02x", hashBytes[2]);
-		} catch (final NoSuchAlgorithmException ex) {
-			LOGGER.error("Fail to generate the hash of the objectId ==> ise direct value ... {}", ex.getMessage());
-		}
-		final String finalPath = dir1 + File.separator + dir2 + File.separator + dir3;
-		String filePath = ConfigBaseVariable.getMediaDataFolder() + "_oid" + File.separator + finalPath
-				+ File.separator;
-		try {
-			createFolder(filePath);
-		} catch (final IOException e) {
-			e.printStackTrace();
-		}
-		filePath += stringOid;
-		return filePath;
 	}
 
-	public static String getFileMetaData(final ObjectId oid) {
+	public static Data getWithSha512(final String sha512) {
-		return getFileData(oid) + ".json";
-	}
-
-	public Data getWithSha512(final String sha512) {
 		LOGGER.info("find sha512 = {}", sha512);
 		try {
 			return DataAccess.getWhere(Data.class, new Condition(new QueryCondition("sha512", "=", sha512)));
@@ -146,7 +127,7 @@ public class DataResource {
 		return null;
 	}
 
-	public Data getWithId(final long id) {
+	public static Data getWithId(final long id) {
 		LOGGER.info("find id = {}", id);
 		try {
 			return DataAccess.get(Data.class, id);
@@ -157,7 +138,7 @@ public class DataResource {
 		return null;
 	}
 
-	public Data createNewData(final long tmpUID, final String originalFileName, final String sha512)
+	public static Data createNewData(final long tmpUID, final String originalFileName, final String sha512)
 			throws IOException {
 		// determine mime type:
 		Data injectedData = new Data();
@@ -183,7 +164,7 @@ public class DataResource {
 			e.printStackTrace();
 			return null;
 		}
-		final String mediaPath = getFileData(injectedData.oid);
+		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);
@@ -191,9 +172,9 @@ public class DataResource {
 		return injectedData;
 	}
 
-	public static void modeFileOldModelToNewModel(final UUID uuid, final ObjectId oid) throws IOException {
+	public static void modeFileOldModelToNewModel(final long id, final UUID uuid) throws IOException {
-		String mediaCurentPath = getFileDataOld(uuid);
+		String mediaCurentPath = getFileDataOld(id);
-		String mediaDestPath = getFileData(oid);
+		String mediaDestPath = getFileData(uuid);
 		LOGGER.info("src = {}", mediaCurentPath);
 		LOGGER.info("dst = {}", mediaDestPath);
 		if (Files.exists(Paths.get(mediaCurentPath))) {
@@ -210,8 +191,7 @@ public class DataResource {
 		LOGGER.info("Move done");
 	}
 
-	public static String saveTemporaryFile(final InputStream uploadedInputStream, final long idData)
+	public static String saveTemporaryFile(final InputStream uploadedInputStream, final long idData) {
-			throws FailException {
 		return saveFile(uploadedInputStream, DataResource.getTmpFileInData(idData));
 	}
 
@@ -228,35 +208,35 @@ public class DataResource {
 	}
 
 	// save uploaded file to a defined location on the server
-	static String saveFile(final InputStream uploadedInputStream, final String serverLocation) throws FailException {
+	static String saveFile(final InputStream uploadedInputStream, final String serverLocation) {
 		String out = "";
-		MessageDigest md = null;
+		try {
-		try (OutputStream outpuStream = new FileOutputStream(new File(serverLocation))) {
+			OutputStream outpuStream = new FileOutputStream(new File(serverLocation));
-			md = MessageDigest.getInstance("SHA-512");
+			int read = 0;
-		} catch (final IOException ex) {
+			final byte[] bytes = new byte[CHUNK_SIZE_IN];
-			throw new FailException(Response.Status.INTERNAL_SERVER_ERROR, "Can not write in temporary file", ex);
+			final MessageDigest md = MessageDigest.getInstance("SHA-512");
-		} catch (final NoSuchAlgorithmException ex) {
+
-			throw new FailException(Response.Status.INTERNAL_SERVER_ERROR, "Can not find sha512 algorithms", ex);
+			outpuStream = new FileOutputStream(new File(serverLocation));
-		}
+			while ((read = uploadedInputStream.read(bytes)) != -1) {
-		if (md != null) {
+				// logger.info("write {}", read);
-			try (OutputStream outpuStream = new FileOutputStream(new File(serverLocation))) {
+				md.update(bytes, 0, read);
-				int read = 0;
+				outpuStream.write(bytes, 0, read);
-				final byte[] bytes = new byte[CHUNK_SIZE_IN];
-				while ((read = uploadedInputStream.read(bytes)) != -1) {
-					// logger.info("write {}", read);
-					md.update(bytes, 0, read);
-					outpuStream.write(bytes, 0, read);
-				}
-				LOGGER.info("Flush input stream ... {}", serverLocation);
-				outpuStream.flush();
-				// create the end of sha512
-				final byte[] sha512Digest = md.digest();
-				// convert in hexadecimal
-				out = bytesToHex(sha512Digest);
-				uploadedInputStream.close();
-			} catch (final IOException ex) {
-				throw new FailException(Response.Status.INTERNAL_SERVER_ERROR, "Can not write in temporary file", ex);
 			}
+			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();
 		}
 		return out;
 	}
@@ -269,9 +249,9 @@ public class DataResource {
 		return sb.toString();
 	}
 
-	public Data getSmall(final ObjectId oid) {
+	public Data getSmall(final UUID id) {
 		try {
-			return DataAccess.get(Data.class, oid);
+			return DataAccess.get(Data.class, id);
 		} catch (final Exception e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
@@ -287,7 +267,7 @@ public class DataResource {
 	public void uploadFile(
 			@Context final SecurityContext sc,
 			@FormDataParam("file") final InputStream fileInputStream,
-			@FormDataParam("file") final FormDataContentDisposition fileMetaData) throws FailException {
+			@FormDataParam("file") final FormDataContentDisposition fileMetaData) {
 		final GenericContext gc = (GenericContext) sc.getUserPrincipal();
 		LOGGER.info("===================================================");
 		LOGGER.info("== DATA uploadFile {}", (gc == null ? "null" : gc.userByToken));
@@ -297,15 +277,14 @@ public class DataResource {
 		final String filePath = ConfigBaseVariable.getTmpDataFolder() + File.separator + tmpFolderId++;
 		try {
 			createFolder(ConfigBaseVariable.getTmpDataFolder() + File.separator);
-		} catch (final IOException ex) {
+		} catch (final IOException e) {
-			throw new FailException(Response.Status.INTERNAL_SERVER_ERROR,
+			e.printStackTrace();
-					"Impossible to create the folder in the server", ex);
 		}
 		saveFile(fileInputStream, filePath);
 	}
 
 	@GET
-	@Path("{oid}")
+	@Path("{uuid}")
 	@PermitTokenInURI
 	@RolesAllowed("USER")
 	@Produces(MediaType.APPLICATION_OCTET_STREAM)
@@ -314,25 +293,20 @@ public class DataResource {
 			@Context final SecurityContext sc,
 			@QueryParam(HttpHeaders.AUTHORIZATION) final String token,
 			@HeaderParam("Range") final String range,
-			@PathParam("oid") final ObjectId oid) throws FailException {
+			@PathParam("uuid") final UUID uuid) throws Exception {
 		final GenericContext gc = (GenericContext) sc.getUserPrincipal();
 		// logger.info("===================================================");
-		LOGGER.info("== DATA retrieveDataId ? oid={} user={}", oid, (gc == null ? "null" : gc.userByToken));
+		LOGGER.info("== DATA retrieveDataId ? id={} user={}", uuid, (gc == null ? "null" : gc.userByToken));
 		// logger.info("===================================================");
-		final Data value = getSmall(oid);
+		final Data value = getSmall(uuid);
 		if (value == null) {
-			return Response.status(404).entity("media NOT FOUND: " + oid).type("text/plain").build();
+			Response.status(404).entity("media NOT FOUND: " + uuid).type("text/plain").build();
-		}
-		try {
-			return buildStream(getFileData(oid), 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(getFileData(uuid), range, value.mimeType);
 	}
 
 	@GET
-	@Path("thumbnail/{oid}")
+	@Path("thumbnail/{uuid}")
 	@RolesAllowed("USER")
 	@PermitTokenInURI
 	@Produces(MediaType.APPLICATION_OCTET_STREAM)
@@ -342,68 +316,51 @@ public class DataResource {
 			@Context final SecurityContext sc,
 			@QueryParam(HttpHeaders.AUTHORIZATION) final String token,
 			@HeaderParam("Range") final String range,
-			@PathParam("oid") final ObjectId oid) throws FailException {
+			@PathParam("uuid") final UUID uuid) throws Exception {
-		final GenericContext gc = (GenericContext) sc.getUserPrincipal();
+		// GenericContext gc = (GenericContext) sc.getUserPrincipal();
-		LOGGER.info("===================================================");
+		// logger.info("===================================================");
-		LOGGER.info("== DATA retrieveDataThumbnailId ? {}", (gc == null ? "null" : gc.userByToken));
+		// logger.info("== DATA retrieveDataThumbnailId ? {}", (gc==null?"null":gc.user));
-		LOGGER.info("===================================================");
+		// logger.info("===================================================");
-		final Data value = getSmall(oid);
+		final Data value = getSmall(uuid);
 		if (value == null) {
-			return Response.status(404).entity("media NOT FOUND: " + oid).type("text/plain").build();
+			return Response.status(404).entity("media NOT FOUND: " + uuid).type("text/plain").build();
 		}
-		final String filePathName = getFileData(oid);
+		final String filePathName = getFileData(uuid);
 		final File inputFile = new File(filePathName);
 		if (!inputFile.exists()) {
-			return Response.status(404).entity("{\"error\":\"media Does not exist: " + oid + "\"}")
+			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
-			BufferedImage inputImage;
+			final BufferedImage inputImage = ImageIO.read(inputFile);
-			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);
-
 			// 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, "JPEG", baos);
+				ImageIO.write(outputImage, "JPG", 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();
 			}
 			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");
+			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);
@@ -411,15 +368,11 @@ public class DataResource {
 			out.cacheControl(cc);
 			return out.build();
 		}
-		try {
+		return buildStream(filePathName, range, value.mimeType);
-			return buildStream(filePathName, range, value.mimeType);
-		} catch (final Exception ex) {
-			throw new FailException(Response.Status.INTERNAL_SERVER_ERROR, "Fail to build output stream", ex);
-		}
 	}
 
 	@GET
-	@Path("{oid}/{name}")
+	@Path("{uuid}/{name}")
 	@PermitTokenInURI
 	@RolesAllowed("USER")
 	@Produces(MediaType.APPLICATION_OCTET_STREAM)
@@ -427,29 +380,26 @@ public class DataResource {
 	public Response retrieveDataFull(
 			@Context final SecurityContext sc,
 			@QueryParam(HttpHeaders.AUTHORIZATION) final String token,
-			@ApiInputOptional @HeaderParam("Range") final String range,
+			@HeaderParam("Range") final String range,
-			@PathParam("oid") final ObjectId oid,
+			@PathParam("uuid") final UUID uuid,
 			@PathParam("name") final String name) throws Exception {
 		final GenericContext gc = (GenericContext) sc.getUserPrincipal();
 		// logger.info("===================================================");
-		LOGGER.info("== DATA retrieveDataFull ? id={} user={}", oid, (gc == null ? "null" : gc.userByToken));
+		LOGGER.info("== DATA retrieveDataFull ? id={} user={}", uuid, (gc == null ? "null" : gc.userByToken));
 		// logger.info("===================================================");
-		final Data value = getSmall(oid);
+		final Data value = getSmall(uuid);
 		if (value == null) {
-			return Response.status(404).entity("media NOT FOUND: " + oid).type("text/plain").build();
+			Response.status(404).entity("media NOT FOUND: " + uuid).type("text/plain").build();
 		}
-		return buildStream(getFileData(oid), range,
+		return buildStream(getFileData(uuid), range, value.mimeType);
-				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)
+	private Response buildStream(final String filename, final String range, final String mimeType) throws Exception {
-			throws FailException {
 		final File file = new File(filename);
 		// logger.info("request range : {}", range);
 		// range not requested : Firefox does not send range headers
@@ -495,29 +445,23 @@ public class DataResource {
 			to = file.length() - 1;
 		}
 		final String responseRange = String.format("bytes %d-%d/%d", from, to, file.length());
-		// LOGGER.info("responseRange: {}", responseRange);
+		// logger.info("responseRange: {}", responseRange);
-		try {
+		final RandomAccessFile raf = new RandomAccessFile(file, "r");
-			final RandomAccessFile raf = new RandomAccessFile(file, "r");
+		raf.seek(from);
-			raf.seek(from);
 
-			final long len = to - from + 1;
+		final long len = to - from + 1;
-			final MediaStreamer streamer = new MediaStreamer(len, raf);
+		final MediaStreamer streamer = new MediaStreamer(len, raf);
-			final Response.ResponseBuilder out = Response.ok(streamer).status(Response.Status.PARTIAL_CONTENT)
+		final Response.ResponseBuilder out = Response.ok(streamer).status(Response.Status.PARTIAL_CONTENT)
-					.header("Accept-Ranges", "bytes").header("Content-Range", responseRange)
+				.header("Accept-Ranges", "bytes").header("Content-Range", responseRange)
-					.header(HttpHeaders.CONTENT_LENGTH, streamer.getLenth())
+				.header(HttpHeaders.CONTENT_LENGTH, streamer.getLenth())
-					.header(HttpHeaders.LAST_MODIFIED, new Date(file.lastModified()));
+				.header(HttpHeaders.LAST_MODIFIED, new Date(file.lastModified()));
-			if (mimeType != null) {
+		if (mimeType != null) {
-				out.type(mimeType);
+			out.type(mimeType);
-			}
-			return out.build();
-		} catch (final FileNotFoundException ex) {
-			throw new FailException(Response.Status.INTERNAL_SERVER_ERROR, "Fail to find the required file.", ex);
-		} catch (final IOException ex) {
-			throw new FailException(Response.Status.INTERNAL_SERVER_ERROR, "Fail to access to the required file.", ex);
 		}
+		return out.build();
 	}
 
-	public void undelete(final Long id) throws Exception {
+	public static void undelete(final Long id) throws Exception {
 		DataAccess.unsetDelete(Data.class, id);
 	}
 

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

@@ -58,4 +58,5 @@ public class MediaStreamer implements StreamingOutput {
 	public long getLenth() {
 		return this.length;
 	}
+
 }

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

@@ -1,43 +0,0 @@
-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/catcher/ConstraintViolationExceptionCatcher.java

@@ -1,47 +0,0 @@
-package org.kar.archidata.catcher;
-
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import jakarta.validation.ConstraintViolationException;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.ext.ExceptionMapper;
-
-public class ConstraintViolationExceptionCatcher implements ExceptionMapper<ConstraintViolationException> {
-	private static final Logger LOGGER = LoggerFactory.getLogger(ConstraintViolationExceptionCatcher.class);
-
-	@Override
-	public Response toResponse(final ConstraintViolationException exception) {
-		LOGGER.warn("Catch ConstraintViolationException: {}", exception.getLocalizedMessage());
-		final RestErrorResponse ret = build(exception);
-		LOGGER.error("Error OID={}", ret.oid);
-		return Response.status(Response.Status.BAD_REQUEST).entity(ret).type(MediaType.APPLICATION_JSON).build();
-	}
-
-	private RestErrorResponse build(final ConstraintViolationException exception) {
-		final List<RestInputError> inputError = new ArrayList<>();
-		for (final var cv : exception.getConstraintViolations()) {
-			if (cv == null) {
-				continue;
-			}
-			inputError.add(new RestInputError(cv.getPropertyPath(), cv.getMessage()));
-		}
-		Collections.sort(inputError, Comparator.comparing(RestInputError::getFullPath));
-		String errorType = "Multiple error on input";
-		if (inputError.size() == 0) {
-			errorType = "Constraint Violation";
-		} else if (inputError.size() == 1) {
-			errorType = "Error on input='" + inputError.get(0).path + "'";
-		}
-		return new RestErrorResponse(Response.Status.BAD_REQUEST, Instant.now().toString(), errorType,
-				exception.getMessage(), inputError);
-	}
-
-}

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

@@ -14,15 +14,15 @@ public class ExceptionCatcher implements ExceptionMapper<Exception> {
 	public Response toResponse(final Exception exception) {
 		LOGGER.warn("Catch exception (not managed...):");
 		final RestErrorResponse ret = build(exception);
-		LOGGER.error("Error OID={}", ret.oid);
+		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,
+		return new RestErrorResponse(Response.Status.INTERNAL_SERVER_ERROR, "Catch Unknown Exception",
-				"Catch Unknown Exception: " + exception.getClass().getCanonicalName(), exception.getMessage());
+				exception.getMessage());
 	}
 
 }

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

@@ -3,24 +3,23 @@ package org.kar.archidata.catcher;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import jakarta.ws.rs.WebApplicationException;
+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 WebApplicationExceptionCatcher implements ExceptionMapper<WebApplicationException> {
+public class FailException404API implements ExceptionMapper<ClientErrorException> {
-	private static final Logger LOGGER = LoggerFactory.getLogger(WebApplicationExceptionCatcher.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(FailException404API.class);
 
 	@Override
-	public Response toResponse(final WebApplicationException exception) {
+	public Response toResponse(final ClientErrorException exception) {
 		final RestErrorResponse ret = build(exception);
-		LOGGER.error("Error OID={}", ret.oid);
+		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) {
+	private RestErrorResponse build(final ClientErrorException exception) {
-		exception.printStackTrace();
 		return new RestErrorResponse(exception.getResponse().getStatusInfo().toEnum(), "Catch system exception",
 				exception.getMessage());
 	}

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

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

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

@@ -1,26 +0,0 @@
-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);
-		// Archidata exceptions
-		rc.register(InputExceptionCatcher.class);
-		rc.register(SystemExceptionCatcher.class);
-		rc.register(FailExceptionCatcher.class);
-		// generic Exception catcher
-		rc.register(ConstraintViolationExceptionCatcher.class);
-		rc.register(QueryParamExceptionCatcher.class);
-		rc.register(ExceptionCatcher.class);
-		// Catch jakarta generic errors
-		rc.register(WebApplicationExceptionCatcher.class);
-	}
-
-}

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

@@ -8,35 +8,19 @@ import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.ext.ExceptionMapper;
 
-/**
- * This class catches InputException and maps it to a HTTP response.
- */
 public class InputExceptionCatcher implements ExceptionMapper<InputException> {
 	private static final Logger LOGGER = LoggerFactory.getLogger(InputExceptionCatcher.class);
 
-	/**
-	 * This method is called when an InputException is thrown.
-	 * It logs the exception and builds a response with the error details.
-	 *
-	 * @param exception the InputException that was thrown
-	 * @return a Response object containing the error details
-	 */
 	@Override
 	public Response toResponse(final InputException exception) {
 		LOGGER.warn("Catch InputException:");
 		final RestErrorResponse ret = build(exception);
-		LOGGER.error("Error OID={} ==> '{}'=>'{}'", ret.oid, exception.missingVariable,
+		LOGGER.error("Error UUID={} ==> '{}'=>'{}'", ret.uuid, exception.missingVariable,
 				exception.getLocalizedMessage());
 		// exception.printStackTrace();
 		return Response.status(exception.status).entity(ret).type(MediaType.APPLICATION_JSON).build();
 	}
 
-	/**
-	 * This method builds a RestErrorResponse object from the InputException.
-	 *
-	 * @param exception the InputException that was thrown
-	 * @return a RestErrorResponse object containing the error details
-	 */
 	private RestErrorResponse build(final InputException exception) {
 		return new RestErrorResponse(exception.status, "Error on input='" + exception.missingVariable + "'",
 				exception.getMessage());

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

@@ -0,0 +1,30 @@
+package org.kar.archidata.catcher;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+
+public class JacksonCatcher implements ExceptionMapper<JsonProcessingException> {
+	private static final Logger LOGGER = LoggerFactory.getLogger(JacksonCatcher.class);
+
+	@Override
+	public Response toResponse(final JsonProcessingException 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/JacksonExceptionCatcher.java

@@ -1,43 +0,0 @@
-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);
-
-	/**
-	 * This method is called when a JacksonException is thrown.
-	 * It logs the exception, builds a response with the error details, and returns it.
-	 *
-	 * @param exception the JacksonException that was thrown
-	 * @return a Response object containing the error details
-	 */
-	@Override
-	public Response toResponse(final JacksonException exception) {
-		LOGGER.warn("Catch exception Input data parsing:");
-		final RestErrorResponse ret = build(exception);
-		LOGGER.error("Error OID={}", ret.oid);
-		exception.printStackTrace();
-		return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(ret).type(MediaType.APPLICATION_JSON)
-				.build();
-	}
-
-	/**
-	 * Builds a RestErrorResponse object from the given exception.
-	 *
-	 * @param exception the Exception that was thrown
-	 * @return a RestErrorResponse object containing the error details
-	 */
-	private RestErrorResponse build(final Exception exception) {
-		return new RestErrorResponse(Response.Status.INTERNAL_SERVER_ERROR, "Catch JSON Exception",
-				exception.getMessage());
-	}
-
-}

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

@@ -1,34 +0,0 @@
-package org.kar.archidata.catcher;
-
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.glassfish.jersey.server.ParamException.QueryParamException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.ext.ExceptionMapper;
-
-public class QueryParamExceptionCatcher implements ExceptionMapper<QueryParamException> {
-	private static final Logger LOGGER = LoggerFactory.getLogger(QueryParamExceptionCatcher.class);
-
-	@Override
-	public Response toResponse(final QueryParamException exception) {
-		LOGGER.trace("Catch IllegalArgumentException: {}", exception.getLocalizedMessage());
-		final RestErrorResponse ret = build(exception);
-		LOGGER.error("Error OID={}", ret.oid);
-		return Response.status(Response.Status.BAD_REQUEST).entity(ret).type(MediaType.APPLICATION_JSON).build();
-	}
-
-	private RestErrorResponse build(final QueryParamException exception) {
-		final List<RestInputError> inputError = new ArrayList<>();
-		inputError.add(new RestInputError("query", exception.getParameterName(), exception.getCause().getMessage()));
-		final String errorType = "Error on query input='" + exception.getParameterName() + "'";
-		return new RestErrorResponse(Response.Status.BAD_REQUEST, Instant.now().toString(), errorType,
-				"Input parsing fail", inputError);
-	}
-
-}

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

@@ -1,50 +1,27 @@
 package org.kar.archidata.catcher;
 
 import java.time.Instant;
-import java.util.List;
+import java.util.UUID;
 
-import org.bson.types.ObjectId;
+import org.kar.archidata.tools.UuidUtils;
-import org.kar.archidata.annotation.apiGenerator.ApiGenerationMode;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-
-import jakarta.annotation.Nullable;
-import jakarta.persistence.Column;
 import jakarta.validation.constraints.NotNull;
 import jakarta.ws.rs.core.Response;
 
-@ApiGenerationMode
-@JsonInclude(JsonInclude.Include.NON_NULL)
 public class RestErrorResponse {
-	public ObjectId oid = new ObjectId();
 	@NotNull
-	@Column(length = 0)
+	public UUID uuid = UuidUtils.nextUUID();
+	@NotNull
 	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;
 	@NotNull
 	final public int status;
 	@NotNull
-	@Column(length = 0)
 	final public String statusMessage;
 
-	@Nullable
-	final public List<RestInputError> inputError;
-
-	public RestErrorResponse(final Response.Status status, final String time, final String error, final String message,
-			final List<RestInputError> inputError) {
-		this.time = time;
-		this.name = error;
-		this.message = message;
-		this.status = status.getStatusCode();
-		this.statusMessage = status.getReasonPhrase();
-		this.inputError = inputError;
-	}
-
 	public RestErrorResponse(final Response.Status status, final String time, final String error,
 			final String message) {
 		this.time = time;
@@ -52,7 +29,6 @@ public class RestErrorResponse {
 		this.message = message;
 		this.status = status.getStatusCode();
 		this.statusMessage = status.getReasonPhrase();
-		this.inputError = null;
 	}
 
 	public RestErrorResponse(final Response.Status status, final String error, final String message) {
@@ -61,7 +37,6 @@ public class RestErrorResponse {
 		this.message = message;
 		this.status = status.getStatusCode();
 		this.statusMessage = status.getReasonPhrase();
-		this.inputError = null;
 	}
 
 	public RestErrorResponse(final Response.Status status) {
@@ -70,7 +45,6 @@ public class RestErrorResponse {
 		this.time = Instant.now().toString();
 		this.status = status.getStatusCode();
 		this.statusMessage = status.getReasonPhrase();
-		this.inputError = null;
 	}
 
 }

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

@@ -1,59 +0,0 @@
-package org.kar.archidata.catcher;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-
-import jakarta.persistence.Column;
-import jakarta.validation.Path;
-import jakarta.validation.constraints.NotNull;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class RestInputError {
-	private static Pattern PATTERN = Pattern.compile("^([^.]+)\\.([^.]+)(\\.(.*))?");
-	@Column(length = 0)
-	public String argument;
-	@Column(length = 0)
-	public String path;
-	@NotNull
-	@Column(length = 0)
-	public String message;
-
-	@Override
-	public String toString() {
-		return "RestInputError [argument=" + this.argument + ", path=" + this.path + ", message=" + this.message + "]";
-	}
-
-	public RestInputError() {}
-
-	public RestInputError(final String argument, final String path, final String message) {
-		this.path = argument;
-		this.path = path;
-		this.message = message;
-	}
-
-	public RestInputError(final String path, final String message) {
-		this.path = path;
-		this.message = message;
-	}
-
-	public RestInputError(final Path path, final String message) {
-		final Matcher matcher = PATTERN.matcher(path.toString());
-		if (matcher.find()) {
-			//String firstPart = matcher.group(1); this is the request base element ==> not needed
-			this.argument = matcher.group(2);
-			this.path = matcher.group(4);
-		} else {
-			this.path = path.toString();
-		}
-		this.message = message;
-	}
-
-	String getFullPath() {
-		if (this.path == null) {
-			return this.argument;
-		}
-		return this.argument + "." + this.path;
-	}
-}

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

@@ -15,7 +15,7 @@ public class SystemExceptionCatcher implements ExceptionMapper<SystemException>
 	public Response toResponse(final SystemException exception) {
 		LOGGER.warn("Catch SystemException:");
 		final RestErrorResponse ret = build(exception);
-		LOGGER.error("Error OID={}", ret.oid);
+		LOGGER.error("Error UUID={}", ret.uuid);
 		exception.printStackTrace();
 		return Response.status(exception.status).entity(ret).type(MediaType.APPLICATION_JSON).build();
 	}

src/org/kar/archidata/checker/CheckJPA.java

@@ -1,898 +0,0 @@
-package org.kar.archidata.checker;
-
-import java.lang.reflect.Field;
-import java.sql.Timestamp;
-import java.time.LocalDate;
-import java.time.LocalTime;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-import org.kar.archidata.annotation.AnnotationTools;
-import org.kar.archidata.annotation.checker.CheckForeignKey;
-import org.kar.archidata.annotation.checker.Checker;
-import org.kar.archidata.annotation.checker.CollectionItemNotNull;
-import org.kar.archidata.annotation.checker.CollectionItemUnique;
-import org.kar.archidata.annotation.checker.CollectionNotEmpty;
-import org.kar.archidata.dataAccess.DBAccess;
-import org.kar.archidata.dataAccess.QueryCondition;
-import org.kar.archidata.dataAccess.QueryOptions;
-import org.kar.archidata.dataAccess.options.CheckFunctionInterface;
-import org.kar.archidata.dataAccess.options.CheckFunctionVoid;
-import org.kar.archidata.dataAccess.options.Condition;
-import org.kar.archidata.dataAccess.options.ConditionChecker;
-import org.kar.archidata.exception.DataAccessException;
-import org.kar.archidata.exception.InputException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import jakarta.persistence.ManyToOne;
-import jakarta.validation.constraints.DecimalMax;
-import jakarta.validation.constraints.DecimalMin;
-import jakarta.validation.constraints.Max;
-import jakarta.validation.constraints.Min;
-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 ioDb Access on the Data-Base
-		 * @param baseName Base of the name input that is displayed in exception generated.
-		 * @param data The object that might be injected.
-		 * @param modifiedValue List of fields that modification is requested.
-		 * @param options Some query option that the checker can need to generate basic check.
-		 * @throws Exception Exception is generate if the data are incorrect. */
-		void check(
-				final DBAccess ioDb,
-				final String baseName,
-				final K data,
-				List<String> modifiedValue,
-				final QueryOptions options) throws Exception;
-	}
-
-	protected Map<String, List<CheckInterface<T>>> checking = null;
-
-	protected void add(final String field, final CheckInterface<T> checkFunction) throws DataAccessException {
-		if (!AnnotationTools.hasFieldsName(this.clazz, field)) {
-			LOGGER.error("Try to add a JPA Filter on an inexistant Field: '{}' not in {}", field,
-					AnnotationTools.getAllFieldsNames(this.clazz));
-			throw new DataAccessException("Try to add a JPA Filter on an inexistant Field: '" + field + "' not in "
-					+ AnnotationTools.getAllFieldsNames(this.clazz));
-		}
-		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 DBAccess ioDb,
-									final String baseName,
-									final T data,
-									final List<String> modifiedValue,
-									final QueryOptions options) -> {
-								throw new InputException(baseName + fieldName,
-										"This is a '@Id' (primaryKey) ==> can not be change");
-							});
-				}
-				if (AnnotationTools.getConstraintsNotNull(field)) {
-					add(fieldName,
-							(
-									final DBAccess ioDb,
-									final String baseName,
-									final T data,
-									final List<String> modifiedValue,
-									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 DBAccess ioDb,
-									final String baseName,
-									final T data,
-									final List<String> modifiedValue,
-									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 DecimalMax maxValueDecimal = AnnotationTools.getConstraintsDecimalMax(field);
-					if (maxValueDecimal != null) {
-						final long maxValue = Long.parseLong(maxValueDecimal.value());
-						final boolean inclusive = maxValueDecimal.inclusive();
-						final String exceptionComment = "Value too height max=" + maxValue
-								+ (inclusive ? " (inclusive)" : " (exclusive)");
-						add(fieldName,
-								(
-										final DBAccess ioDb,
-										final String baseName,
-										final T data,
-										final List<String> modifiedValue,
-										final QueryOptions options) -> {
-									final Object elem = field.get(data);
-									if (elem == null) {
-										return;
-									}
-									final Long elemTyped = (Long) elem;
-									if (inclusive) {
-										if (elemTyped > maxValue) {
-											throw new InputException(baseName + fieldName, exceptionComment);
-										}
-									} else if (elemTyped >= maxValue) {
-										throw new InputException(baseName + fieldName, exceptionComment);
-									}
-								});
-					}
-					final DecimalMin minValueDecimal = AnnotationTools.getConstraintsDecimalMin(field);
-					if (minValueDecimal != null) {
-						final long minValue = Long.parseLong(minValueDecimal.value());
-						final boolean inclusive = minValueDecimal.inclusive();
-						final String exceptionComment = "Value too low min=" + minValue
-								+ (inclusive ? " (inclusive)" : " (exclusive)");
-						add(fieldName,
-								(
-										final DBAccess ioDb,
-										final String baseName,
-										final T data,
-										final List<String> modifiedValue,
-										final QueryOptions options) -> {
-									final Object elem = field.get(data);
-									if (elem == null) {
-										return;
-									}
-									final Long elemTyped = (Long) elem;
-									if (inclusive) {
-										if (elemTyped < minValue) {
-											throw new InputException(baseName + fieldName, exceptionComment);
-										}
-									} else if (elemTyped <= minValue) {
-										throw new InputException(baseName + fieldName, exceptionComment);
-									}
-								});
-					}
-					final Max maxValue = AnnotationTools.getConstraintsMax(field);
-					if (maxValue != null) {
-						final Long maxValueTmp = maxValue.value();
-						final String exceptionComment = "Value too height max=" + maxValueTmp + " (inclusive)";
-						add(fieldName,
-								(
-										final DBAccess ioDb,
-										final String baseName,
-										final T data,
-										final List<String> modifiedValue,
-										final QueryOptions options) -> {
-									final Object elem = field.get(data);
-									if (elem == null) {
-										return;
-									}
-									final Long elemTyped = (Long) elem;
-									if (elemTyped > maxValueTmp) {
-										throw new InputException(baseName + fieldName, exceptionComment);
-									}
-								});
-					}
-					final Min minValue = AnnotationTools.getConstraintsMin(field);
-					if (minValue != null) {
-						final Long minValueTmp = minValue.value();
-						final String exceptionComment = "Value too low min=" + minValueTmp + " (inclusive)";
-						add(fieldName,
-								(
-										final DBAccess ioDb,
-										final String baseName,
-										final T data,
-										final List<String> modifiedValue,
-										final QueryOptions options) -> {
-									final Object elem = field.get(data);
-									if (elem == null) {
-										return;
-									}
-									final Long elemTyped = (Long) elem;
-									if (elemTyped < minValueTmp) {
-										throw new InputException(baseName + fieldName, exceptionComment);
-									}
-								});
-					}
-				} else if (type == Integer.class || type == int.class) {
-					final DecimalMax maxValueDecimal = AnnotationTools.getConstraintsDecimalMax(field);
-					if (maxValueDecimal != null) {
-						final int maxValue = Integer.parseInt(maxValueDecimal.value());
-						final boolean inclusive = maxValueDecimal.inclusive();
-						final String exceptionComment = "Value too height max=" + maxValue
-								+ (inclusive ? " (inclusive)" : " (exclusive)");
-						add(fieldName,
-								(
-										final DBAccess ioDb,
-										final String baseName,
-										final T data,
-										final List<String> modifiedValue,
-										final QueryOptions options) -> {
-									final Object elem = field.get(data);
-									if (elem == null) {
-										return;
-									}
-									final Integer elemTyped = (Integer) elem;
-									if (inclusive) {
-										if (elemTyped > maxValue) {
-											throw new InputException(baseName + fieldName, exceptionComment);
-										}
-									} else if (elemTyped >= maxValue) {
-
-										throw new InputException(baseName + fieldName, exceptionComment);
-									}
-								});
-					}
-					final DecimalMin minValueDecimal = AnnotationTools.getConstraintsDecimalMin(field);
-					if (minValueDecimal != null) {
-						final int minValue = Integer.parseInt(minValueDecimal.value());
-						final boolean inclusive = minValueDecimal.inclusive();
-						final String exceptionComment = "Value too low min=" + minValue
-								+ (inclusive ? " (inclusive)" : " (exclusive)");
-						add(fieldName,
-								(
-										final DBAccess ioDb,
-										final String baseName,
-										final T data,
-										final List<String> modifiedValue,
-										final QueryOptions options) -> {
-									final Object elem = field.get(data);
-									if (elem == null) {
-										return;
-									}
-									final Integer elemTyped = (Integer) elem;
-									if (inclusive) {
-										if (elemTyped < minValue) {
-											throw new InputException(baseName + fieldName, exceptionComment);
-										}
-									} else if (elemTyped <= minValue) {
-										throw new InputException(baseName + fieldName, exceptionComment);
-									}
-								});
-					}
-					final Max maxValueRoot = AnnotationTools.getConstraintsMax(field);
-					if (maxValueRoot != null) {
-						final int maxValue = (int) maxValueRoot.value();
-						final String exceptionComment = "Value too height max=" + maxValue + " (inclusive)";
-						add(fieldName,
-								(
-										final DBAccess ioDb,
-										final String baseName,
-										final T data,
-										final List<String> modifiedValue,
-										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, exceptionComment);
-									}
-								});
-					}
-					final Min minValueRoot = AnnotationTools.getConstraintsMin(field);
-					if (minValueRoot != null) {
-						final int minValue = (int) minValueRoot.value();
-						final String exceptionComment = "Value too low min=" + minValue + " (inclusive)";
-						add(fieldName,
-								(
-										final DBAccess ioDb,
-										final String baseName,
-										final T data,
-										final List<String> modifiedValue,
-										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, exceptionComment);
-									}
-								});
-					}
-				} else if (type == Boolean.class || type == boolean.class) {
-
-				} else if (type == Float.class || type == float.class) {
-					final DecimalMax maxValueDecimal = AnnotationTools.getConstraintsDecimalMax(field);
-					if (maxValueDecimal != null) {
-						final float maxValue = Float.parseFloat(maxValueDecimal.value());
-						final boolean inclusive = maxValueDecimal.inclusive();
-						final String exceptionComment = "Value too height max=" + maxValue
-								+ (inclusive ? " (inclusive)" : " (exclusive)");
-						add(fieldName,
-								(
-										final DBAccess ioDb,
-										final String baseName,
-										final T data,
-										final List<String> modifiedValue,
-										final QueryOptions options) -> {
-									final Object elem = field.get(data);
-									if (elem == null) {
-										return;
-									}
-									final Float elemTyped = (Float) elem;
-									if (inclusive) {
-										if (elemTyped > maxValue) {
-											throw new InputException(baseName + fieldName, exceptionComment);
-										}
-									} else if (elemTyped >= maxValue) {
-										throw new InputException(baseName + fieldName, exceptionComment);
-									}
-								});
-					}
-					final DecimalMin minValueDecimal = AnnotationTools.getConstraintsDecimalMin(field);
-					if (minValueDecimal != null) {
-						final float minValue = Float.parseFloat(minValueDecimal.value());
-						final boolean inclusive = minValueDecimal.inclusive();
-						final String exceptionComment = "Value too low min=" + minValue
-								+ (inclusive ? " (inclusive)" : " (exclusive)");
-						add(fieldName,
-								(
-										final DBAccess ioDb,
-										final String baseName,
-										final T data,
-										final List<String> modifiedValue,
-										final QueryOptions options) -> {
-									final Object elem = field.get(data);
-									if (elem == null) {
-										return;
-									}
-									final Float elemTyped = (Float) elem;
-									if (inclusive) {
-										if (elemTyped < minValue) {
-											throw new InputException(baseName + fieldName, exceptionComment);
-										}
-									} else if (elemTyped <= minValue) {
-										throw new InputException(baseName + fieldName, exceptionComment);
-									}
-								});
-					}
-					final Max maxValueRoot = AnnotationTools.getConstraintsMax(field);
-					if (maxValueRoot != null) {
-						final float maxValue = maxValueRoot.value();
-						final String exceptionComment = "Value too height max=" + maxValue + " (inclusive)";
-						add(fieldName,
-								(
-										final DBAccess ioDb,
-										final String baseName,
-										final T data,
-										final List<String> modifiedValue,
-										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, exceptionComment);
-									}
-								});
-					}
-					final Min minValueRoot = AnnotationTools.getConstraintsMin(field);
-					if (minValueRoot != null) {
-						final float minValue = minValueRoot.value();
-						final String exceptionComment = "Value too low min=" + minValue + " (inclusive)";
-						add(fieldName,
-								(
-										final DBAccess ioDb,
-										final String baseName,
-										final T data,
-										final List<String> modifiedValue,
-										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, exceptionComment);
-									}
-								});
-					}
-				} else if (type == Double.class || type == double.class) {
-					final DecimalMax maxValueDecimal = AnnotationTools.getConstraintsDecimalMax(field);
-					if (maxValueDecimal != null) {
-						final double maxValue = Float.parseFloat(maxValueDecimal.value());
-						final boolean inclusive = maxValueDecimal.inclusive();
-						final String exceptionComment = "Value too height max=" + maxValue
-								+ (inclusive ? " (inclusive)" : " (exclusive)");
-						add(fieldName,
-								(
-										final DBAccess ioDb,
-										final String baseName,
-										final T data,
-										final List<String> modifiedValue,
-										final QueryOptions options) -> {
-									final Object elem = field.get(data);
-									if (elem == null) {
-										return;
-									}
-									final Double elemTyped = (Double) elem;
-									if (inclusive) {
-										if (elemTyped > maxValue) {
-											throw new InputException(baseName + fieldName, exceptionComment);
-										}
-									} else if (elemTyped >= maxValue) {
-										throw new InputException(baseName + fieldName, exceptionComment);
-									}
-								});
-					}
-					final DecimalMin minValueDecimal = AnnotationTools.getConstraintsDecimalMin(field);
-					if (minValueDecimal != null) {
-						final double minValue = Float.parseFloat(minValueDecimal.value());
-						final boolean inclusive = minValueDecimal.inclusive();
-						final String exceptionComment = "Value too low min=" + minValue
-								+ (inclusive ? " (inclusive)" : " (exclusive)");
-						add(fieldName,
-								(
-										final DBAccess ioDb,
-										final String baseName,
-										final T data,
-										final List<String> modifiedValue,
-										final QueryOptions options) -> {
-									final Object elem = field.get(data);
-									if (elem == null) {
-										return;
-									}
-									final Double elemTyped = (Double) elem;
-									if (inclusive) {
-										if (elemTyped < minValue) {
-											throw new InputException(baseName + fieldName,
-													"Value too Low min: " + minValue);
-										}
-									} else if (elemTyped <= minValue) {
-										throw new InputException(baseName + fieldName, exceptionComment);
-									}
-								});
-					}
-					final Max maxValueRoot = AnnotationTools.getConstraintsMax(field);
-					if (maxValueRoot != null) {
-						final double maxValue = maxValueRoot.value();
-						final String exceptionComment = "Value too height max=" + maxValue + " (inclusive)";
-						add(fieldName,
-								(
-										final DBAccess ioDb,
-										final String baseName,
-										final T data,
-										final List<String> modifiedValue,
-										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, exceptionComment);
-									}
-								});
-					}
-					final Min minValueRoot = AnnotationTools.getConstraintsMin(field);
-					if (minValueRoot != null) {
-						final double minValue = minValueRoot.value();
-						final String exceptionComment = "Value too low min=" + minValue + " (inclusive)";
-						add(fieldName,
-								(
-										final DBAccess ioDb,
-										final String baseName,
-										final T data,
-										final List<String> modifiedValue,
-										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, exceptionComment);
-									}
-								});
-					}
-				} else if (type == Date.class || type == Timestamp.class) {
-
-				} else if (type == LocalDate.class) {
-
-				} else if (type == LocalTime.class) {
-
-				} else if (type == String.class) {
-					final Size limitSize = AnnotationTools.getConstraintsSize(field);
-					if (limitSize != null) {
-						add(fieldName,
-								(
-										final DBAccess ioDb,
-										final String baseName,
-										final T data,
-										final List<String> modifiedValue,
-										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 jakarta.validation.constraints.Pattern patternString = AnnotationTools
-							.getConstraintsPattern(field);
-					if (patternString != null && patternString.regexp() != null) {
-						final Pattern pattern = Pattern.compile(patternString.regexp());
-						add(fieldName,
-								(
-										final DBAccess ioDb,
-										final String baseName,
-										final T data,
-										final List<String> modifiedValue,
-										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 '" + pattern
-														+ "'");
-									}
-								});
-					}
-					if (AnnotationTools.getConstraintsEmail(field) != null) {
-						final String emailPattern = "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$";
-						final Pattern pattern = Pattern.compile(emailPattern);
-						add(fieldName,
-								(
-										final DBAccess ioDb,
-										final String baseName,
-										final T data,
-										final List<String> modifiedValue,
-										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[email] (constraints) must be '"
-														+ emailPattern + "'");
-									}
-								});
-					}
-				} else if (type.isEnum()) {
-					// nothing to do.
-				}
-				final Checker[] checkers = AnnotationTools.getConstraintsCheckers(field);
-				if (checkers != null) {
-					for (final Checker checker : checkers) {
-						if (checker == null || checker.value() == CheckFunctionVoid.class) {
-							continue;
-						}
-						final CheckFunctionInterface checkerInstance = checker.value().getDeclaredConstructor()
-								.newInstance();
-						if (Collection.class.isAssignableFrom(field.getType())) {
-							add(fieldName,
-									(
-											final DBAccess ioDb,
-											final String baseName,
-											final T data,
-											final List<String> modifiedValue,
-											final QueryOptions options) -> {
-										// get the field of the specific element
-										final Object tmpData = field.get(data);
-										// It is not the objective of this element to check if it is authorize to set NULL
-										if (tmpData == null) {
-											return;
-										}
-										final Collection<?> tmpCollection = (Collection<?>) tmpData;
-										final Object[] elements = tmpCollection.toArray();
-										for (int iii = 0; iii < elements.length; iii++) {
-											if (elements[iii] != null) {
-												checkerInstance.check(ioDb, baseName + fieldName + '[' + iii + "].",
-														elements[iii], null, options);
-											}
-										}
-									});
-						} else {
-							add(fieldName,
-									(
-											final DBAccess ioDb,
-											final String baseName,
-											final T data,
-											final List<String> modifiedValue,
-											final QueryOptions options) -> {
-										// get the field of the specific element
-										final Object tmpData = field.get(data);
-										// It is not the objective of this element to check if it is authorize to set NULL
-										if (tmpData == null) {
-											return;
-										}
-										checkerInstance.check(ioDb, baseName + fieldName + '.', tmpData, null, options);
-									});
-						}
-					}
-				}
-				final CheckForeignKey foreighKey = AnnotationTools.get(field, CheckForeignKey.class);
-				if (foreighKey != null) {
-					if (Collection.class.isAssignableFrom(field.getType())) {
-						add(fieldName,
-								(
-										final DBAccess ioDb,
-										final String baseName,
-										final T data,
-										final List<String> modifiedValue,
-										final QueryOptions options) -> {
-									// get the field of the specific element
-									final Object tmpData = field.get(data);
-									// It is not the objective of this element to check if it is authorize to set NULL
-									if (tmpData == null) {
-										return;
-									}
-									final List<ConditionChecker> condCheckers = options.get(ConditionChecker.class);
-									final Condition conditionCheck = condCheckers.isEmpty() ? null
-											: condCheckers.get(0).toCondition();
-									final Collection<?> tmpCollection = (Collection<?>) tmpData;
-									final Object[] elements = tmpCollection.toArray();
-									for (int iii = 0; iii < elements.length; iii++) {
-										if (elements[iii] == null) {
-											continue;
-										}
-										final Long count = ioDb.count(foreighKey.target(), elements[iii],
-												conditionCheck);
-										if (count != 1) {
-											throw new InputException(baseName + fieldName + '[' + iii + ']',
-													"Foreign-key does not exist in the DB:" + elements[iii]);
-
-										}
-									}
-								});
-					} else {
-						add(fieldName,
-								(
-										final DBAccess ioDb,
-										final String baseName,
-										final T data,
-										final List<String> modifiedValue,
-										final QueryOptions options) -> {
-									final Object tmpData = field.get(data);
-									if (tmpData == null) {
-										return;
-									}
-									final List<ConditionChecker> condCheckers = options.get(ConditionChecker.class);
-									final Condition conditionCheck = condCheckers.isEmpty() ? null
-											: condCheckers.get(0).toCondition();
-									final Long count = ioDb.count(foreighKey.target(), tmpData, conditionCheck);
-									if (count != 1) {
-										throw new InputException(baseName + fieldName,
-												"Foreign-key does not exist in the DB:" + tmpData);
-									}
-								});
-					}
-				}
-				// check if we really want to keep it ...
-				final ManyToOne annotationManyToOne = AnnotationTools.getManyToOne(field);
-				if (annotationManyToOne != null && annotationManyToOne.targetEntity() != null) {
-					add(fieldName,
-							(
-									final DBAccess ioDb,
-									final String baseName,
-									final T data,
-									final List<String> modifiedValue,
-									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 = ioDb.count(annotationManyToOne.targetEntity(), elem, conditionCheck);
-								if (count == 0) {
-									throw new InputException(baseName + fieldName,
-											"Foreign element does not exist in the DB:" + elem);
-								}
-							});
-				}
-				final CollectionItemUnique collectionUnique = AnnotationTools.getCollectionItemUnique(field);
-				if (collectionUnique != null) {
-					if (!Collection.class.isAssignableFrom(field.getType())) {
-						throw new DataAccessException(
-								"Request @CollectionItemUnique on a non collection field: '" + fieldName + "'");
-					}
-					add(fieldName,
-							(
-									final DBAccess ioDb,
-									final String baseName,
-									final T data,
-									final List<String> modifiedValue,
-									final QueryOptions options) -> {
-								final Object tmpData = field.get(data);
-								if (tmpData == null) {
-									return;
-								}
-								final Collection<?> tmpCollection = (Collection<?>) tmpData;
-								final Set<Object> uniqueValues = new HashSet<>(tmpCollection);
-								if (uniqueValues.size() != tmpCollection.size()) {
-									throw new InputException(baseName + fieldName,
-											"Cannot insert multiple times the same elements");
-								}
-							});
-				}
-				final CollectionItemNotNull collectionNotNull = AnnotationTools.getCollectionItemNotNull(field);
-				if (collectionNotNull != null) {
-					if (!Collection.class.isAssignableFrom(field.getType())) {
-						throw new DataAccessException(
-								"Request @CollectionItemNotNull on a non collection field: '" + fieldName + "'");
-					}
-					add(fieldName,
-							(
-									final DBAccess ioDb,
-									final String baseName,
-									final T data,
-									final List<String> modifiedValue,
-									final QueryOptions options) -> {
-								final Object tmpData = field.get(data);
-								if (tmpData == null) {
-									return;
-								}
-
-								final Collection<?> tmpCollection = (Collection<?>) tmpData;
-								final Object[] elements = tmpCollection.toArray();
-								for (int iii = 0; iii < elements.length; iii++) {
-									if (elements[iii] == null) {
-										throw new InputException(baseName + fieldName + '[' + iii + ']',
-												"Collection can not contain NULL item");
-									}
-								}
-							});
-				}
-				final CollectionNotEmpty collectionNotEmpty = AnnotationTools.getCollectionNotEmpty(field);
-				if (collectionNotEmpty != null) {
-					if (!Collection.class.isAssignableFrom(field.getType())) {
-						throw new DataAccessException(
-								"Request @collectionNotEmpty on a non collection field: '" + fieldName + "'");
-					}
-					add(fieldName,
-							(
-									final DBAccess ioDb,
-									final String baseName,
-									final T data,
-									final List<String> modifiedValue,
-									final QueryOptions options) -> {
-								final Object tmpData = field.get(data);
-								if (tmpData == null) {
-									return;
-								}
-								final Collection<?> tmpCollection = (Collection<?>) tmpData;
-								if (tmpCollection.isEmpty()) {
-									throw new InputException(baseName + fieldName, "Collection can not be empty");
-								}
-							});
-				}
-				// keep this is last ==> take more time...
-				if (AnnotationTools.isUnique(field)) {
-					// Create the request ...
-					add(fieldName,
-							(
-									final DBAccess ioDb,
-									final String baseName,
-									final T data,
-									final List<String> modifiedValue,
-									final QueryOptions options) -> {
-								final List<ConditionChecker> condCheckers = options.get(ConditionChecker.class);
-								Object other = null;
-								if (condCheckers.isEmpty()) {
-									other = ioDb.getWhere(this.clazz,
-											new Condition(new QueryCondition(fieldName, "==", field.get(data))));
-								} else {
-									other = ioDb.getWhere(this.clazz,
-											new Condition(new QueryCondition(fieldName, "==", field.get(data))),
-											condCheckers.get(0).toCondition());
-								}
-								if (other != null) {
-									throw new InputException(baseName + fieldName,
-											"The field is already exist in the DB");
-								}
-							});
-				}
-
-			}
-		} catch (final Exception ex) {
-			this.checking = null;
-			throw ex;
-		}
-	}
-
-	public void check(final Object data) throws Exception {
-		check(null, "", data, null, null);
-	}
-
-	public void check(final String baseName, final Object data) throws Exception {
-		check(null, baseName, data, null, null);
-	}
-
-	public void check(final DBAccess ioDb, final String baseName, final Object data) throws Exception {
-		check(ioDb, baseName, data, null, null);
-	}
-
-	public void check(final DBAccess ioDb, final String baseName, final Object data, final List<String> modifiedValue)
-			throws Exception {
-		check(ioDb, baseName, data, modifiedValue, null);
-	}
-
-	@Override
-	public void check(
-			final DBAccess ioDb,
-			final String baseName,
-			final Object data,
-			List<String> modifiedValue,
-			final QueryOptions options) throws Exception {
-		if (this.checking == null) {
-			initialize();
-		}
-		if (modifiedValue == null) {
-			modifiedValue = AnnotationTools.getAllFieldsNames(this.clazz);
-		}
-		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 : modifiedValue) {
-			final List<CheckInterface<T>> actions = this.checking.get(filter);
-			if (actions == null) {
-				continue;
-			}
-			for (final CheckInterface<T> action : actions) {
-				action.check(ioDb, baseName, dataCasted, modifiedValue, options);
-			}
-		}
-		checkTyped(dataCasted, modifiedValue, options);
-	}
-
-	public void checkTyped(final T data, final List<String> modifiedValue, final QueryOptions options)
-			throws Exception {
-		// nothing to do ...
-	}
-
-}

src/org/kar/archidata/converter/Jakarta/DateParamConverterProvider.java

@@ -1,53 +0,0 @@
-package org.kar.archidata.converter.Jakarta;
-
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.util.Date;
-
-import org.kar.archidata.tools.DateTools;
-
-import jakarta.annotation.Priority;
-import jakarta.ws.rs.ext.ParamConverter;
-import jakarta.ws.rs.ext.ParamConverterProvider;
-import jakarta.ws.rs.ext.Provider;
-
-@Provider
-@Priority(1)
-public class DateParamConverterProvider implements ParamConverterProvider {
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public <T> ParamConverter<T> getConverter(
-			final Class<T> rawType,
-			final Type genericType,
-			final Annotation[] annotations) {
-		if (rawType != Date.class) {
-			return null;
-		}
-		return (ParamConverter<T>) new DateParamConverter();
-	}
-
-	public class DateParamConverter implements ParamConverter<Date> {
-		@Override
-		public Date fromString(final String value) {
-			if (value == null || value.isEmpty()) {
-				return null;
-			}
-			try {
-				return DateTools.parseDate(value);
-			} catch (final IOException e) {
-				throw new IllegalArgumentException("Invalid date format. Please use ISO8601", e);
-			}
-		}
-
-		@Override
-		public String toString(final Date value) {
-			if (value == null) {
-				return null;
-			}
-			return DateTools.serializeMilliWithUTCTimeZone(value);
-		}
-	}
-
-}

src/org/kar/archidata/converter/Jakarta/OffsetDateTimeParamConverterProvider.java

@@ -1,52 +0,0 @@
-package org.kar.archidata.converter.Jakarta;
-
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.time.OffsetDateTime;
-
-import org.kar.archidata.tools.DateTools;
-
-import jakarta.ws.rs.ext.ParamConverter;
-import jakarta.ws.rs.ext.ParamConverterProvider;
-import jakarta.ws.rs.ext.Provider;
-
-@Provider
-public class OffsetDateTimeParamConverterProvider implements ParamConverterProvider {
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public <T> ParamConverter<T> getConverter(
-			final Class<T> rawType,
-			final Type genericType,
-			final Annotation[] annotations) {
-		if (rawType != OffsetDateTime.class) {
-			return null;
-		}
-		return (ParamConverter<T>) new OffsetDateTimeParamConverter();
-	}
-
-	public class OffsetDateTimeParamConverter implements ParamConverter<OffsetDateTime> {
-
-		@Override
-		public OffsetDateTime fromString(final String value) {
-			if (value == null || value.isEmpty()) {
-				return null;
-			}
-			try {
-				return DateTools.parseOffsetDateTime(value);
-			} catch (final IOException e) {
-				throw new IllegalArgumentException("Invalid date format. Please use ISO8601", e);
-			}
-		}
-
-		@Override
-		public String toString(final OffsetDateTime value) {
-			if (value == null) {
-				return null;
-			}
-			return DateTools.serializeMilliWithUTCTimeZone(value);
-		}
-
-	};
-}

src/org/kar/archidata/converter/jackson/DateDeserializer.java

@@ -1,19 +0,0 @@
-package org.kar.archidata.converter.jackson;
-
-import java.io.IOException;
-import java.util.Date;
-
-import org.kar.archidata.tools.DateTools;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-
-public class DateDeserializer extends JsonDeserializer<Date> {
-	@Override
-	public Date deserialize(final JsonParser p, final DeserializationContext ctxt) throws IOException {
-		final String value = p.getText();
-		final Date ret = DateTools.parseDate(value);
-		return ret;
-	}
-}

src/org/kar/archidata/converter/jackson/DateSerializer.java

@@ -1,18 +0,0 @@
-package org.kar.archidata.converter.jackson;
-
-import java.io.IOException;
-import java.util.Date;
-
-import org.kar.archidata.tools.DateTools;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-
-public class DateSerializer extends JsonSerializer<Date> {
-	@Override
-	public void serialize(final Date value, final JsonGenerator gen, final SerializerProvider serializers)
-			throws IOException {
-		gen.writeString(DateTools.serializeMilliWithUTCTimeZone(value));
-	}
-}

src/org/kar/archidata/converter/jackson/JacksonModules.java

@@ -1,21 +0,0 @@
-package org.kar.archidata.converter.jackson;
-
-import java.time.OffsetDateTime;
-import java.util.Date;
-
-import org.bson.types.ObjectId;
-
-import com.fasterxml.jackson.databind.module.SimpleModule;
-
-public class JacksonModules {
-	public static SimpleModule getAllModules() {
-		final SimpleModule module = new SimpleModule();
-		module.addSerializer(ObjectId.class, new ObjectIdSerializer());
-		module.addDeserializer(ObjectId.class, new ObjectIdDeserializer());
-		module.addSerializer(Date.class, new DateSerializer());
-		module.addDeserializer(Date.class, new DateDeserializer());
-		module.addSerializer(OffsetDateTime.class, new OffsetDateTimeSerializer());
-		module.addDeserializer(OffsetDateTime.class, new OffsetDateTimeDeserializer());
-		return module;
-	}
-}

src/org/kar/archidata/converter/jackson/ObjectIdDeserializer.java

@@ -1,16 +0,0 @@
-package org.kar.archidata.converter.jackson;
-
-import java.io.IOException;
-
-import org.bson.types.ObjectId;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-
-public class ObjectIdDeserializer extends JsonDeserializer<ObjectId> {
-	@Override
-	public ObjectId deserialize(final JsonParser p, final DeserializationContext ctxt) throws IOException {
-		return new ObjectId(p.getValueAsString());
-	}
-}

src/org/kar/archidata/converter/jackson/ObjectIdSerializer.java

@@ -1,17 +0,0 @@
-package org.kar.archidata.converter.jackson;
-
-import java.io.IOException;
-
-import org.bson.types.ObjectId;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-
-public class ObjectIdSerializer extends JsonSerializer<ObjectId> {
-	@Override
-	public void serialize(final ObjectId value, final JsonGenerator gen, final SerializerProvider serializers)
-			throws IOException {
-		gen.writeString(value.toHexString());
-	}
-}

src/org/kar/archidata/converter/jackson/OffsetDateTimeDeserializer.java

@@ -1,19 +0,0 @@
-package org.kar.archidata.converter.jackson;
-
-import java.io.IOException;
-import java.time.OffsetDateTime;
-
-import org.kar.archidata.tools.DateTools;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-
-public class OffsetDateTimeDeserializer extends JsonDeserializer<OffsetDateTime> {
-	@Override
-	public OffsetDateTime deserialize(final JsonParser p, final DeserializationContext ctxt) throws IOException {
-		final String value = p.getText();
-		final OffsetDateTime ret = DateTools.parseOffsetDateTime(value);
-		return ret;
-	}
-}

src/org/kar/archidata/converter/jackson/OffsetDateTimeSerializer.java

@@ -1,18 +0,0 @@
-package org.kar.archidata.converter.jackson;
-
-import java.io.IOException;
-import java.time.OffsetDateTime;
-
-import org.kar.archidata.tools.DateTools;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-
-public class OffsetDateTimeSerializer extends JsonSerializer<OffsetDateTime> {
-	@Override
-	public void serialize(final OffsetDateTime value, final JsonGenerator gen, final SerializerProvider serializers)
-			throws IOException {
-		gen.writeString(DateTools.serializeMilliWithUTCTimeZone(value));
-	}
-}

src/org/kar/archidata/converter/morphia/SqlTimestampCodec.java

@@ -1,34 +0,0 @@
-package org.kar.archidata.converter.morphia;
-
-import java.sql.Timestamp;
-
-import org.bson.BsonReader;
-import org.bson.BsonType;
-import org.bson.BsonWriter;
-import org.bson.codecs.Codec;
-
-public class SqlTimestampCodec implements Codec<Timestamp> {
-
-	@Override
-	public void encode(
-			final BsonWriter writer,
-			final Timestamp value,
-			final org.bson.codecs.EncoderContext encoderContext) {
-		writer.writeDateTime(value.getTime());
-	}
-
-	@Override
-	public Timestamp decode(final BsonReader reader, final org.bson.codecs.DecoderContext decoderContext) {
-		final BsonType bsonType = reader.getCurrentBsonType();
-		if (bsonType == BsonType.DATE_TIME) {
-			return new Timestamp(reader.readDateTime());
-		} else {
-			throw new IllegalArgumentException("Expected a DATE_TIME but found " + bsonType);
-		}
-	}
-
-	@Override
-	public Class<Timestamp> getEncoderClass() {
-		return Timestamp.class;
-	}
-}

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

@@ -1,350 +0,0 @@
-package org.kar.archidata.dataAccess;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.kar.archidata.annotation.AnnotationTools;
-import org.kar.archidata.annotation.AnnotationTools.FieldName;
-import org.kar.archidata.dataAccess.options.Condition;
-import org.kar.archidata.dataAccess.options.FilterValue;
-import org.kar.archidata.dataAccess.options.Limit;
-import org.kar.archidata.dataAccess.options.OptionSpecifyType;
-import org.kar.archidata.dataAccess.options.QueryOption;
-import org.kar.archidata.dataAccess.options.TransmitKey;
-import org.kar.archidata.db.DbConfig;
-import org.kar.archidata.db.DbIo;
-import org.kar.archidata.db.DbIoFactory;
-import org.kar.archidata.db.DbIoMorphia;
-import org.kar.archidata.db.DbIoSql;
-import org.kar.archidata.exception.DataAccessException;
-import org.kar.archidata.tools.ContextGenericTools;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import jakarta.ws.rs.InternalServerErrorException;
-
-/* TODO list:
-   - Manage to group of SQL action to permit to commit only at the end.
- */
-
-/** Data access is an abstraction class that permit to access on the DB with a function wrapping that permit to minimize the SQL writing of SQL code. This interface support the SQL and SQLite
- * back-end. */
-public abstract class DBAccess implements Closeable {
-	final static Logger LOGGER = LoggerFactory.getLogger(DBAccess.class);
-
-	public static final DBAccess createInterface()
-			throws InternalServerErrorException, IOException, DataAccessException {
-		return DBAccess.createInterface(DbIoFactory.create());
-	}
-
-	public static final DBAccess createInterface(final DbConfig config)
-			throws InternalServerErrorException, IOException {
-		return DBAccess.createInterface(DbIoFactory.create(config));
-	}
-
-	public static final DBAccess createInterface(final DbIo io) throws InternalServerErrorException {
-		if (io instanceof final DbIoMorphia ioMorphia) {
-			try {
-				return new DBAccessMorphia(ioMorphia);
-			} catch (final IOException e) {
-				e.printStackTrace();
-				throw new InternalServerErrorException("Fail to create DB interface.");
-			}
-		} else if (io instanceof final DbIoSql ioSQL) {
-			try {
-				return new DBAccessSQL(ioSQL);
-			} catch (final IOException e) {
-				e.printStackTrace();
-				throw new InternalServerErrorException("Fail to create DB interface.");
-			}
-		}
-		throw new InternalServerErrorException("unknow DB interface ... ");
-	}
-
-	public boolean isDBExist(final String name, final QueryOption... option) throws InternalServerErrorException {
-		throw new InternalServerErrorException("Can Not manage the DB-access");
-	}
-
-	public boolean createDB(final String name) {
-		throw new InternalServerErrorException("Can Not manage the DB-access");
-	}
-
-	public boolean deleteDB(final String name) {
-		throw new InternalServerErrorException("Can Not manage the DB-access");
-	}
-
-	public boolean isTableExist(final String name, final QueryOption... option) throws InternalServerErrorException {
-		throw new InternalServerErrorException("Can Not manage the DB-access");
-	}
-
-	public <ID_TYPE> QueryCondition getTableIdCondition(
-			final Class<?> clazz,
-			final ID_TYPE idKey,
-			final QueryOptions options) throws DataAccessException {
-		// Find the ID field type ....
-		final Field idField = AnnotationTools.getIdField(clazz);
-		if (idField == null) {
-			throw new DataAccessException(
-					"The class have no annotation @Id ==> can not determine the default type searching");
-		}
-		// check the compatibility of the id and the declared ID
-		Class<?> typeClass = idField.getType();
-		if (idKey == null) {
-			throw new DataAccessException("Try to identify the ID type and object was null.");
-		}
-		final FieldName fieldName = AnnotationTools.getFieldName(idField, options);
-		final List<OptionSpecifyType> specificTypes = options.get(OptionSpecifyType.class);
-		if (typeClass == Object.class) {
-			for (final OptionSpecifyType specify : specificTypes) {
-				if (specify.name.equals(fieldName.inStruct())) {
-					typeClass = specify.clazz;
-					LOGGER.trace("Detect overwrite of typing ... '{}' => '{}'", typeClass.getCanonicalName(),
-							specify.clazz.getCanonicalName());
-					break;
-				}
-			}
-		}
-		if (idKey.getClass() != typeClass) {
-			if (idKey.getClass() == Condition.class) {
-				throw new DataAccessException(
-						"Try to identify the ID type on a condition 'close' internal API error use xxxWhere(...) instead.");
-			}
-			throw new DataAccessException("Request update with the wrong type ...");
-		}
-		return new QueryCondition(fieldName.inTable(), "=", idKey);
-	}
-
-	// TODO: manage insert batch...
-	public <T> List<T> insertMultiple(final List<T> data, final QueryOption... options) throws Exception {
-		final List<T> out = new ArrayList<>();
-		for (final T elem : data) {
-			final T tmp = insert(elem, options);
-			out.add(tmp);
-		}
-		return out;
-	}
-
-	abstract public <T> T insert(final T data, final QueryOption... option) throws Exception;
-
-	// seems a good idea, but very dangerous if we not filter input data... if set an id it can be complicated...
-	public <T> T insertWithJson(final Class<T> clazz, final String jsonData) throws Exception {
-		final ObjectMapper mapper = ContextGenericTools.createObjectMapper();
-		// parse the object to be sure the data are valid:
-		final T data = mapper.readValue(jsonData, clazz);
-		return insert(data);
-	}
-
-	/** Update an object with the inserted json data
-	 *
-	 * @param <T> Type of the object to insert
-	 * @param <ID_TYPE> Master key on the object manage with @Id
-	 * @param clazz Class reference of the insertion model
-	 * @param id Key to insert data
-	 * @param jsonData Json data (partial) values to update
-	 * @return the number of object updated
-	 * @throws Exception */
-	public <T, ID_TYPE> long updateWithJson(
-			final Class<T> clazz,
-			final ID_TYPE id,
-			final String jsonData,
-			final QueryOption... option) throws Exception {
-		final QueryOptions options = new QueryOptions(option);
-		options.add(new Condition(getTableIdCondition(clazz, id, options)));
-		options.add(new TransmitKey(id));
-		return updateWhereWithJson(clazz, jsonData, options.getAllArray());
-	}
-
-	public <T> long updateWhereWithJson(final Class<T> clazz, final String jsonData, final QueryOption... option)
-			throws Exception {
-		final QueryOptions options = new QueryOptions(option);
-		if (options.get(Condition.class).size() == 0) {
-			throw new DataAccessException("request a updateWhereWithJson without any condition");
-		}
-		final ObjectMapper mapper = ContextGenericTools.createObjectMapper();
-		// parse the object to be sure the data are valid:
-		final T data = mapper.readValue(jsonData, clazz);
-		// Read the tree to filter injection of data:
-		final JsonNode root = mapper.readTree(jsonData);
-		final List<String> keys = new ArrayList<>();
-		final var iterator = root.fieldNames();
-		iterator.forEachRemaining(e -> keys.add(e));
-		options.add(new FilterValue(keys));
-		return updateWhere(data, options.getAllArray());
-	}
-
-	public <T, ID_TYPE> long update(final T data, final ID_TYPE id) throws Exception {
-		return update(data, id, AnnotationTools.getFieldsNames(data.getClass()));
-	}
-
-	/** @param <T>
-	 * @param data
-	 * @param id
-	 * @param updateColomn
-	 * @param option
-	 * @return the affected rows.
-	 * @throws Exception */
-	public <T, ID_TYPE> long update(
-			final T data,
-			final ID_TYPE id,
-			final List<String> updateColomn,
-			final QueryOption... option) throws Exception {
-		final QueryOptions options = new QueryOptions(option);
-		options.add(new Condition(getTableIdCondition(data.getClass(), id, options)));
-		options.add(new FilterValue(updateColomn));
-		options.add(new TransmitKey(id));
-		return updateWhere(data, options);
-	}
-
-	public <T> long updateWhere(final T data, final QueryOption... option) throws Exception {
-		final QueryOptions options = new QueryOptions(option);
-		return updateWhere(data, options);
-	}
-
-	public abstract <T> long updateWhere(final T data, QueryOptions options) throws Exception;
-
-	public <T> T getWhere(final Class<T> clazz, final QueryOptions options) throws Exception {
-		options.add(new Limit(1));
-		final List<T> values = getsWhere(clazz, options);
-		if (values.size() == 0) {
-			return null;
-		}
-		return values.get(0);
-	}
-
-	public <T> T getWhere(final Class<T> clazz, final QueryOption... option) throws Exception {
-		final QueryOptions options = new QueryOptions(option);
-		return getWhere(clazz, options);
-	}
-
-	public <T> List<T> getsWhere(final Class<T> clazz, final QueryOption... option) throws Exception {
-		final QueryOptions options = new QueryOptions(option);
-		return getsWhere(clazz, options);
-	}
-
-	public Condition conditionFusionOrEmpty(final QueryOptions options, final boolean throwIfEmpty)
-			throws DataAccessException {
-		if (options == null) {
-			return new Condition();
-		}
-		final List<Condition> conditions = options.get(Condition.class);
-		if (conditions.size() == 0) {
-			if (throwIfEmpty) {
-				throw new DataAccessException("request a gets without any condition");
-			} else {
-				return new Condition();
-			}
-		}
-		Condition condition = null;
-		if (conditions.size() == 1) {
-			condition = conditions.get(0);
-		} else {
-			final QueryAnd andCondition = new QueryAnd();
-			for (final Condition cond : conditions) {
-				andCondition.add(cond.condition);
-			}
-			condition = new Condition(andCondition);
-		}
-		return condition;
-	}
-
-	abstract public <T> List<T> getsWhere(final Class<T> clazz, final QueryOptions options)
-			throws DataAccessException, IOException;
-
-	public <ID_TYPE> long count(final Class<?> clazz, final ID_TYPE id, final QueryOption... option) throws Exception {
-		final QueryOptions options = new QueryOptions(option);
-		options.add(new Condition(getTableIdCondition(clazz, id, options)));
-		return countWhere(clazz, options);
-	}
-
-	public long countWhere(final Class<?> clazz, final QueryOption... option) throws Exception {
-		final QueryOptions options = new QueryOptions(option);
-		return countWhere(clazz, options);
-	}
-
-	public abstract long countWhere(final Class<?> clazz, final QueryOptions options) throws Exception;
-
-	public <T, ID_TYPE> T get(final Class<T> clazz, final ID_TYPE id, final QueryOption... option) throws Exception {
-		final QueryOptions options = new QueryOptions(option);
-		options.add(new Condition(getTableIdCondition(clazz, id, options)));
-		return getWhere(clazz, options.getAllArray());
-	}
-
-	public <T> List<T> gets(final Class<T> clazz) throws Exception {
-		return getsWhere(clazz);
-	}
-
-	public <T> List<T> gets(final Class<T> clazz, final QueryOption... option) throws Exception {
-		return getsWhere(clazz, option);
-	}
-
-	/** Delete items with the specific Id (cf @Id) and some options. If the Entity is manage as a softDeleted model, then it is flag as removed (if not already done before).
-	 * @param <ID_TYPE> Type of the reference @Id
-	 * @param clazz Data model that might remove element
-	 * @param id Unique Id of the model
-	 * @param options (Optional) Options of the request
-	 * @return Number of element that is removed. */
-	public <ID_TYPE> long delete(final Class<?> clazz, final ID_TYPE id, final QueryOption... options)
-			throws Exception {
-		final String hasDeletedFieldName = AnnotationTools.getDeletedFieldName(clazz);
-		if (hasDeletedFieldName != null) {
-			return deleteSoft(clazz, id, options);
-		} else {
-			return deleteHard(clazz, id, options);
-		}
-	}
-
-	/** Delete items with the specific condition and some options. If the Entity is manage as a softDeleted model, then it is flag as removed (if not already done before).
-	 * @param clazz Data model that might remove element.
-	 * @param option (Optional) Options of the request.
-	 * @return Number of element that is removed. */
-	public long deleteWhere(final Class<?> clazz, final QueryOption... option) throws Exception {
-		final String hasDeletedFieldName = AnnotationTools.getDeletedFieldName(clazz);
-		if (hasDeletedFieldName != null) {
-			return deleteSoftWhere(clazz, option);
-		} else {
-			return deleteHardWhere(clazz, option);
-		}
-	}
-
-	public <ID_TYPE> long deleteHard(final Class<?> clazz, final ID_TYPE id, final QueryOption... option)
-			throws Exception {
-		final QueryOptions options = new QueryOptions(option);
-		options.add(new Condition(getTableIdCondition(clazz, id, options)));
-		return deleteHardWhere(clazz, options.getAllArray());
-	}
-
-	public abstract long deleteHardWhere(final Class<?> clazz, final QueryOption... option) throws Exception;
-
-	public <ID_TYPE> long deleteSoft(final Class<?> clazz, final ID_TYPE id, final QueryOption... option)
-			throws Exception {
-		final QueryOptions options = new QueryOptions(option);
-		options.add(new Condition(getTableIdCondition(clazz, id, options)));
-		return deleteSoftWhere(clazz, options.getAllArray());
-	}
-
-	public abstract long deleteSoftWhere(final Class<?> clazz, final QueryOption... option) throws Exception;
-
-	public <ID_TYPE> long unsetDelete(final Class<?> clazz, final ID_TYPE id) throws DataAccessException {
-		return unsetDeleteWhere(clazz, new Condition(getTableIdCondition(clazz, id, new QueryOptions())));
-	}
-
-	public <ID_TYPE> long unsetDelete(final Class<?> clazz, final ID_TYPE id, final QueryOption... option)
-			throws DataAccessException {
-		final QueryOptions options = new QueryOptions(option);
-		options.add(new Condition(getTableIdCondition(clazz, id, options)));
-		return unsetDeleteWhere(clazz, options.getAllArray());
-	}
-
-	public abstract long unsetDeleteWhere(final Class<?> clazz, final QueryOption... option) throws DataAccessException;
-
-	public abstract void drop(final Class<?> clazz, final QueryOption... option) throws Exception;
-
-	public abstract void cleanAll(final Class<?> clazz, final QueryOption... option) throws Exception;
-
-}

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

@@ -1,970 +0,0 @@
-package org.kar.archidata.dataAccess;
-
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.sql.Timestamp;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalTime;
-import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
-
-import org.bson.Document;
-import org.bson.conversions.Bson;
-import org.bson.types.ObjectId;
-import org.kar.archidata.annotation.AnnotationTools;
-import org.kar.archidata.annotation.AnnotationTools.FieldName;
-import org.kar.archidata.annotation.CreationTimestamp;
-import org.kar.archidata.annotation.UpdateTimestamp;
-import org.kar.archidata.dataAccess.addOnMongo.AddOnManyToOne;
-import org.kar.archidata.dataAccess.addOnMongo.AddOnOneToMany;
-import org.kar.archidata.dataAccess.addOnMongo.DataAccessAddOn;
-import org.kar.archidata.dataAccess.options.CheckFunction;
-import org.kar.archidata.dataAccess.options.Condition;
-import org.kar.archidata.dataAccess.options.FilterValue;
-import org.kar.archidata.dataAccess.options.Limit;
-import org.kar.archidata.dataAccess.options.OptionSpecifyType;
-import org.kar.archidata.dataAccess.options.OrderBy;
-import org.kar.archidata.dataAccess.options.QueryOption;
-import org.kar.archidata.db.DbIoMorphia;
-import org.kar.archidata.exception.DataAccessException;
-import org.kar.archidata.tools.UuidUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.mongodb.client.FindIterable;
-import com.mongodb.client.MongoCollection;
-import com.mongodb.client.MongoCursor;
-import com.mongodb.client.MongoDatabase;
-import com.mongodb.client.model.FindOneAndUpdateOptions;
-import com.mongodb.client.model.Projections;
-import com.mongodb.client.model.ReturnDocument;
-import com.mongodb.client.result.DeleteResult;
-import com.mongodb.client.result.InsertOneResult;
-import com.mongodb.client.result.UpdateResult;
-
-import jakarta.ws.rs.DefaultValue;
-import jakarta.ws.rs.InternalServerErrorException;
-
-/* TODO list:
-   - Manage to group of SQL action to permit to commit only at the end.
- */
-
-/** Data access is an abstraction class that permit to access on the DB with a function wrapping that permit to minimize the SQL writing of SQL code. This interface support the SQL and SQLite
- * back-end. */
-public class DBAccessMorphia extends DBAccess {
-	static final Logger LOGGER = LoggerFactory.getLogger(DBAccessMorphia.class);
-	// by default we manage some add-on that permit to manage non-native model (like json serialization, List of external key as String list...)
-	static final List<DataAccessAddOn> addOn = new ArrayList<>();
-
-	static {
-		//addOn.add(new AddOnManyToMany());
-		addOn.add(new AddOnManyToOne());
-		addOn.add(new AddOnOneToMany());
-		// no need, native support in mango .... addOn.add(new AddOnDataJson());
-	}
-
-	/** Add a new add-on on the current management.
-	 * @param addOn instantiate object on the Add-on
-	 */
-	public static void addAddOn(final DataAccessAddOn addOn) {
-		DBAccessMorphia.addOn.add(addOn);
-	}
-
-	private final DbIoMorphia db;
-
-	public DBAccessMorphia(final DbIoMorphia db) throws IOException {
-		this.db = db;
-		db.open();
-	}
-
-	@Override
-	public void close() throws IOException {
-		this.db.close();
-	}
-
-	public DbIoMorphia getInterface() {
-		return this.db;
-	}
-
-	@Override
-	public boolean isDBExist(final String name, final QueryOption... option) throws InternalServerErrorException {
-		// in Mongo DB we do not need to create a DB, then we have no need to check if it exist
-		return true;
-	}
-
-	@Override
-	public boolean createDB(final String name) {
-		// in Mongo DB we do not need to create a DB
-		return true;
-	}
-
-	@Override
-	public boolean deleteDB(final String name) {
-		final MongoDatabase database = this.db.getClient().getDatabase(name);
-		database.drop();
-		return true;
-	}
-
-	@Override
-	public boolean isTableExist(final String name, final QueryOption... option) throws InternalServerErrorException {
-		return true;
-	}
-
-	public byte[][] splitIntoGroupsOf16Bytes(final byte[] input) {
-		final int inputLength = input.length;
-		final int numOfGroups = (inputLength + 15) / 16; // Calculate the number of groups needed
-		final byte[][] groups = new byte[numOfGroups][16];
-
-		for (int i = 0; i < numOfGroups; i++) {
-			final int startIndex = i * 16;
-			final int endIndex = Math.min(startIndex + 16, inputLength);
-			groups[i] = Arrays.copyOfRange(input, startIndex, endIndex);
-		}
-
-		return groups;
-	}
-
-	protected <T> void setValueToDb(
-			final Class<?> type,
-			final T data,
-			final Field field,
-			final String fieldName,
-			final Document docSet,
-			final Document docUnSet) throws Exception {
-		if (field.get(data) == null) {
-			if (docUnSet != null) {
-				docUnSet.append(fieldName, "");
-			}
-			return;
-		}
-		if (type == long.class) {
-			docSet.append(fieldName, field.getLong(data));
-			return;
-		}
-		if (type == int.class) {
-			docSet.append(fieldName, field.getInt(data));
-			return;
-		}
-		if (type == float.class) {
-			docSet.append(fieldName, field.getFloat(data));
-			return;
-		}
-		if (type == double.class) {
-			docSet.append(fieldName, field.getDouble(data));
-			return;
-		}
-		if (type == boolean.class) {
-			docSet.append(fieldName, field.getBoolean(data));
-			return;
-		}
-		final Object tmp = field.get(data);
-		if (tmp == null) {
-			docUnSet.append(fieldName, "");
-			return;
-		}
-		if (type.isEnum()) {
-			docSet.append(fieldName, tmp.toString());
-			return;
-		}
-		if (type == Long.class) {
-			docSet.append(fieldName, tmp);
-			return;
-		}
-		if (type == Integer.class) {
-			docSet.append(fieldName, tmp);
-			return;
-		}
-		if (type == Float.class) {
-			docSet.append(fieldName, tmp);
-			return;
-		}
-		if (type == Double.class) {
-			docSet.append(fieldName, tmp);
-			return;
-		}
-		if (type == Boolean.class) {
-			docSet.append(fieldName, tmp);
-			return;
-		}
-		if (type == String.class) {
-			docSet.append(fieldName, tmp);
-			return;
-		}
-		if (type == Timestamp.class) {
-			docSet.append(fieldName, tmp);
-			return;
-		}
-		if (type == ObjectId.class) {
-			docSet.append(fieldName, tmp);
-			return;
-		}
-		if (type == UUID.class) {
-			docSet.append(fieldName, tmp);
-			return;
-		}
-		if (type == Date.class) {
-			/*
-				final Timestamp sqlDate = java.sql.Timestamp.from(((Date) tmp).toInstant());
-				ps.setTimestamp(iii.value, sqlDate);
-			*/
-		}
-		if (type == Instant.class) {
-			/*
-				final String sqlDate = ((Instant) tmp).toString();
-				ps.setString(iii.value, sqlDate);
-			*/
-		}
-		if (type == LocalDate.class) {
-			/*
-				final java.sql.Date sqlDate = java.sql.Date.valueOf((LocalDate) tmp);
-				ps.setDate(iii.value, sqlDate);
-			*/
-		}
-		if (type == LocalTime.class) {
-			/*
-				final java.sql.Time sqlDate = java.sql.Time.valueOf((LocalTime) tmp);
-				ps.setTime(iii.value, sqlDate);
-			*/
-		}
-		docSet.append(fieldName, tmp);
-		//throw new DataAccessException("Unknown Field Type");
-	}
-
-	public <T> void setValueFromDoc(
-			final Class<?> type,
-			final Object data,
-			final Field field,
-			final Document doc,
-			final List<LazyGetter> lazyCall,
-			final QueryOptions options) throws Exception {
-		final String fieldName = AnnotationTools.getFieldName(field, options).inTable();
-		if (!doc.containsKey(fieldName)) {
-			field.set(data, null);
-			return;
-		}
-		if (type == UUID.class) {
-			final UUID value = doc.get(fieldName, UUID.class);
-			field.set(data, value);
-			return;
-		}
-		if (type == ObjectId.class) {
-			final ObjectId value = doc.get(fieldName, ObjectId.class);
-			field.set(data, value);
-			return;
-		}
-		if (type == Long.class || type == long.class) {
-			final Long value = doc.getLong(fieldName);
-			field.set(data, value);
-			return;
-		}
-		if (type == Integer.class || type == int.class) {
-			final Integer value = doc.getInteger(fieldName);
-			field.set(data, value);
-			return;
-		}
-		if (type == Float.class || type == float.class) {
-			final Double value = doc.getDouble(fieldName);
-			field.set(data, (float) ((double) value));
-			return;
-		}
-		if (type == Double.class || type == double.class) {
-			final Double value = doc.getDouble(fieldName);
-			field.set(data, value);
-			return;
-		}
-		if (type == Boolean.class || type == boolean.class) {
-			final Boolean value = doc.getBoolean(fieldName);
-			field.set(data, value);
-			return;
-		}
-		if (type == Timestamp.class) {
-			final Date value = doc.get(fieldName, Date.class);
-			final Timestamp newData = new Timestamp(value.getTime());
-			field.set(data, newData);
-			return;
-		}
-		if (type == Date.class) {
-			final Date value = doc.get(fieldName, Date.class);
-			field.set(data, value);
-			return;
-		}
-		if (type == Instant.class) {
-			final Date value = doc.get(fieldName, Date.class);
-			final Instant newData = value.toInstant();
-			field.set(data, newData);
-			return;
-		}
-		if (type == LocalDate.class) {
-			final Date value = doc.get(fieldName, Date.class);
-			final LocalDate newData = value.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
-			field.set(data, newData);
-			return;
-		}
-		if (type == LocalTime.class) {
-			final Long value = doc.getLong(fieldName);
-			final LocalTime newData = LocalTime.ofNanoOfDay(value);
-			field.set(data, newData);
-			return;
-		}
-		if (type == String.class) {
-			final String value = doc.getString(fieldName);
-			field.set(data, value);
-			return;
-		}
-		if (type == UUID.class) {
-			final Object value = doc.get(fieldName, field.getType());
-			field.set(data, value);
-			return;
-		}
-		if (type.isEnum()) {
-			final String value = doc.getString(fieldName);
-			boolean find = false;
-			final Object[] arr = type.getEnumConstants();
-			for (final Object elem : arr) {
-				if (elem.toString().equals(value)) {
-					field.set(data, elem);
-					find = true;
-					break;
-				}
-			}
-			if (!find) {
-				throw new DataAccessException("Enum value does not exist in the Model: '" + value + "'");
-			}
-			return;
-		}
-		if (List.class == field.getType()) {
-			final Object value = doc.get(fieldName, field.getType());
-			field.set(data, value);
-		} else {
-			final Object value = createObjectFromDocument(doc.get(fieldName, Document.class), field.getType(),
-					new QueryOptions(), lazyCall);
-			field.set(data, value);
-		}
-
-		return;
-		//throw new ArchiveException("wrong type of field [" + fieldName + "]: " + doc.toJson());
-	}
-
-	protected Object convertDefaultField(String data, final Field field) throws Exception {
-		if (data.startsWith("'") && data.endsWith("'")) {
-			data = data.substring(1, data.length() - 1);
-		}
-		final Class<?> type = field.getType();
-		if (type == UUID.class) {
-
-		}
-		if (type == Long.class || type == long.class) {
-			return Long.parseLong(data);
-		}
-		if (type == Integer.class || type == int.class) {
-			return Integer.parseInt(data);
-		}
-		if (type == Float.class || type == float.class) {
-			return Float.parseFloat(data);
-		}
-		if (type == Double.class || type == double.class) {
-			return Double.parseDouble(data);
-		}
-		if (type == Boolean.class || type == boolean.class) {
-			return Boolean.parseBoolean(data);
-		}
-		if (type == Timestamp.class) {}
-		if (type == Date.class) {}
-		if (type == Instant.class) {}
-		if (type == LocalDate.class) {}
-		if (type == LocalTime.class) {}
-		if (type == String.class) {}
-		if (type.isEnum()) {
-			final boolean find = false;
-			final Object[] arr = type.getEnumConstants();
-			for (final Object elem : arr) {
-				if (elem.toString().equals(data)) {
-					return elem;
-				}
-			}
-			if (!find) {
-				throw new DataAccessException("Enum value does not exist in the Model: '" + data + "'");
-			}
-		}
-		LOGGER.warn("Request default of unknow native type {} => {}", type.getCanonicalName(), data);
-		return null;
-	}
-
-	public boolean isAddOnField(final Field field) {
-		return findAddOnforField(field) != null;
-	}
-
-	public DataAccessAddOn findAddOnforField(final Field field) {
-		for (final DataAccessAddOn elem : addOn) {
-			if (elem.isCompatibleField(field)) {
-				return elem;
-			}
-		}
-		return null;
-	}
-
-	public long getNextSequenceLongValue(final String collectionName, String fieldName) {
-		if (fieldName == null || fieldName.isEmpty()) {
-			fieldName = "sequence_id";
-		}
-		// Collection "counters" to store the sequences if Ids
-		final MongoCollection<Document> countersCollection = this.db.getDatastore().getDatabase()
-				.getCollection("counters");
-
-		// Filter to find the specific counter for the collections
-		final Document filter = new Document("_id", collectionName);
-
-		// Update the field <fieldName> of 1
-		final Document update = new Document("$inc", new Document(fieldName, 1L));
-
-		// get the value after updated it
-		final FindOneAndUpdateOptions options = new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
-				.upsert(true); // create field if not exist
-
-		// Real creation of the unique counter.
-		final Document updatedCounter = countersCollection.findOneAndUpdate(filter, update, options);
-
-		// Return the new sequence value...
-		return updatedCounter.getLong(fieldName);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public <T> T insert(final T data, final QueryOption... option) throws Exception {
-		final Class<?> clazz = data.getClass();
-		final QueryOptions options = new QueryOptions(option);
-
-		// External checker of data:
-		final List<CheckFunction> checks = options.get(CheckFunction.class);
-		for (final CheckFunction check : checks) {
-			check.getChecker().check(this, "", data, AnnotationTools.getFieldsNames(clazz), options);
-		}
-
-		final List<Field> asyncFieldUpdate = new ArrayList<>();
-		final String collectionName = AnnotationTools.getCollectionName(clazz, options);
-		Field primaryKeyField = null;
-		Object uniqueId = null;
-		// real add in the BDD:
-		ObjectId insertedId = null;
-		final List<OptionSpecifyType> specificTypes = options.get(OptionSpecifyType.class);
-		try {
-			final MongoCollection<Document> collection = this.db.getDatastore().getDatabase()
-					.getCollection(collectionName);
-			final Document docSet = new Document();
-			final Document docUnSet = new Document();
-			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;
-				}
-				final FieldName tableFieldName = AnnotationTools.getFieldName(field, options);
-				Object currentInsertValue = field.get(data);
-				if (AnnotationTools.isPrimaryKey(field)) {
-					primaryKeyField = field;
-					if (primaryKeyField.getType() == UUID.class) {
-						final UUID uuid = UuidUtils.nextUUID();
-						uniqueId = uuid;
-						docSet.append(tableFieldName.inTable(), uuid);
-						continue;
-					} else if (primaryKeyField.getType() == Long.class || primaryKeyField.getType() == long.class) {
-						// By default the MongoDB does not manage the
-						final long id = getNextSequenceLongValue(collectionName, tableFieldName.inTable());
-						uniqueId = id;
-						docSet.append(tableFieldName.inTable(), id);
-						continue;
-					}
-					LOGGER.error("TODO: Manage the ID primary key for type: {}=>{}", clazz.getCanonicalName(),
-							primaryKeyField.getType());
-					continue;
-				}
-				final boolean createTime = field.getDeclaredAnnotationsByType(CreationTimestamp.class).length != 0;
-				if (createTime) {
-					docSet.append(tableFieldName.inTable(), Date.from(Instant.now()));
-					continue;
-				}
-				final boolean updateTime = field.getDeclaredAnnotationsByType(UpdateTimestamp.class).length != 0;
-				if (updateTime) {
-					docSet.append(tableFieldName.inTable(), Date.from(Instant.now()));
-					continue;
-				}
-				final DataAccessAddOn addOn = findAddOnforField(field);
-				if (addOn != null && !addOn.canInsert(field)) {
-					if (addOn.isInsertAsync(field)) {
-						LOGGER.error("TODO: add async objects ...");
-						//asyncFieldUpdate.add(field);
-					}
-					continue;
-				}
-				if (currentInsertValue == null && !field.getClass().isPrimitive()) {
-					final DefaultValue[] defaultValue = field.getDeclaredAnnotationsByType(DefaultValue.class);
-					if (defaultValue.length == 0) {
-						continue;
-					} else {
-						final String value = defaultValue[0].value();
-						if (value == null) {
-							continue;
-						}
-						currentInsertValue = convertDefaultField(value, field);
-					}
-				}
-				// conversion table ...
-				//doc.append(tableFieldName, currentInsertValue);
-				if (addOn != null) {
-					addOn.insertData(this, field, data, options, docSet, docUnSet);
-				} else {
-					final Class<?> type = field.getType();
-					if (!type.isPrimitive()) {
-						if (field.get(data) == null) {
-							if (currentInsertValue != null) {
-								docSet.append(tableFieldName.inTable(), currentInsertValue);
-							}
-							continue;
-						}
-					}
-					setValueToDb(type, data, field, tableFieldName.inTable(), docSet, null);
-				}
-			}
-			final InsertOneResult result = collection.insertOne(docSet);
-			// Get the Object of inserted object:
-			insertedId = result.getInsertedId().asObjectId().getValue();
-			LOGGER.info("Document inserted with ID: " + insertedId);
-
-			// Rechercher et récupérer le document inséré à partir de son ObjectId
-			final Document insertedDocument = collection.find(new Document("_id", insertedId)).first();
-
-			// Afficher le document récupéré
-			LOGGER.trace("Inserted document: " + insertedDocument);
-
-		} catch (final Exception ex) {
-			LOGGER.error("Fail SQL request: {}", ex.getMessage());
-			ex.printStackTrace();
-			throw new DataAccessException("Fail to Insert data in DB : " + ex.getMessage());
-		}
-		final List<LazyGetter> asyncActions = new ArrayList<>();
-		for (final Field field : asyncFieldUpdate) {
-			final DataAccessAddOn addOn = findAddOnforField(field);
-			if (uniqueId instanceof final Long id) {
-				LOGGER.error("TODO: Add on not managed .1. ");
-				//addOn.asyncInsert(tableName, id, field, field.get(data), asyncActions);
-			} else if (uniqueId instanceof final UUID uuid) {
-				LOGGER.error("TODO: Add on not managed .2. ");
-				//addOn.asyncInsert(tableName, uuid, field, field.get(data), asyncActions);
-			}
-		}
-		for (final LazyGetter action : asyncActions) {
-			action.doRequest();
-		}
-		return (T) getWhere(clazz, new Condition(new QueryCondition("_id", "=", insertedId)));
-	}
-
-	@Override
-	public <T> long updateWhere(final T data, QueryOptions options) throws Exception {
-		final Class<?> clazz = data.getClass();
-		if (options == null) {
-			options = new QueryOptions();
-		}
-		final Condition condition = conditionFusionOrEmpty(options, true);
-		final List<FilterValue> filterKeys = options != null ? options.get(FilterValue.class) : new ArrayList<>();
-		if (filterKeys.size() != 1) {
-			throw new DataAccessException("request a gets without/or with more 1 filter of values");
-		}
-		final FilterValue filterKey = filterKeys.get(0);
-		// External checker of data:
-		if (options != null) {
-			final List<CheckFunction> checks = options.get(CheckFunction.class);
-			for (final CheckFunction check : checks) {
-				check.getChecker().check(this, "", data, filterKey.getValues(), options);
-			}
-		}
-		final List<LazyGetter> asyncActions = new ArrayList<>();
-
-		// real add in the BDD:
-		try {
-			final String collectionName = AnnotationTools.getCollectionName(clazz, options);
-
-			final String deletedFieldName = AnnotationTools.getDeletedFieldName(clazz);
-			final Bson filters = condition.getFilter(collectionName, options, deletedFieldName);
-			final Document docSet = new Document();
-			final Document docUnSet = new Document();
-			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;
-				}
-				final FieldName fieldName = AnnotationTools.getFieldName(field, options);
-				// update field is not conditioned by filter:
-				final boolean updateTime = field.getDeclaredAnnotationsByType(UpdateTimestamp.class).length != 0;
-				if (updateTime) {
-					docSet.append(fieldName.inTable(), Date.from(Instant.now()));
-					continue;
-				}
-				if (!filterKey.getValues().contains(fieldName.inStruct())) {
-					continue;
-				} else if (AnnotationTools.isGenericField(field)) {
-					continue;
-				}
-				final DataAccessAddOn addOn = findAddOnforField(field);
-				if (addOn != null && !addOn.canInsert(field)) {
-					if (addOn.isInsertAsync(field)) {
-						LOGGER.error("TODO: Add on not managed .3. ");
-						/*
-						final List<TransmitKey> transmitKey = options.get(TransmitKey.class);
-						if (transmitKey.size() != 1) {
-							throw new DataAccessException(
-									"Fail to transmit Key to update the async update... (must have only 1)");
-						}
-						addOn.asyncUpdate(tableName, transmitKey.get(0).getKey(), field, field.get(data), asyncActions);
-						*/
-					}
-					continue;
-				}
-				if (addOn != null) {
-					addOn.insertData(this, field, data, options, docSet, docUnSet);
-				} else {
-					final Class<?> type = field.getType();
-					if (!type.isPrimitive()) {
-						final Object tmp = field.get(data);
-						if (tmp == null && field.getDeclaredAnnotationsByType(DefaultValue.class).length != 0) {
-							continue;
-						}
-					}
-					setValueToDb(type, data, field, fieldName.inTable(), docSet, docUnSet);
-				}
-			}
-			// Do the query ...
-			final MongoCollection<Document> collection = this.db.getDatastore().getDatabase()
-					.getCollection(collectionName);
-			final Document actions = new Document();
-			if (!docSet.isEmpty()) {
-				actions.append("$set", docSet);
-			}
-			if (!docUnSet.isEmpty()) {
-				actions.append("$unset", docUnSet);
-			}
-			LOGGER.info("updateWhere with value: {}", actions.toJson());
-			final UpdateResult ret = collection.updateMany(filters, actions);
-			return ret.getModifiedCount();
-		} catch (final Exception ex) {
-			ex.printStackTrace();
-		}
-		for (final LazyGetter action : asyncActions) {
-			action.doRequest();
-		}
-		return 0;
-	}
-
-	public List<String> generateSelectField(final Class<?> clazz, final QueryOptions options) throws Exception {
-		final boolean readAllfields = QueryOptions.readAllColomn(options);
-		final List<String> fieldsName = new ArrayList<>();
-
-		for (final Field elem : clazz.getFields()) {
-			// static field is only for internal global declaration ==> remove it ..
-			if (java.lang.reflect.Modifier.isStatic(elem.getModifiers())) {
-				continue;
-			}
-			final DataAccessAddOn addOn = findAddOnforField(elem);
-			if (addOn != null && !addOn.canRetrieve(elem)) {
-				continue;
-			}
-			final boolean notRead = AnnotationTools.isDefaultNotRead(elem);
-			if (!readAllfields && notRead) {
-				continue;
-			}
-			final String name = AnnotationTools.getFieldName(elem, options).inTable();
-			fieldsName.add(name);
-		}
-		return fieldsName;
-	}
-
-	@Override
-	public Condition conditionFusionOrEmpty(final QueryOptions options, final boolean throwIfEmpty)
-			throws DataAccessException {
-		if (options == null) {
-			return new Condition();
-		}
-		final List<Condition> conditions = options.get(Condition.class);
-		if (conditions.size() == 0) {
-			if (throwIfEmpty) {
-				throw new DataAccessException("request a gets without any condition");
-			} else {
-				return new Condition();
-			}
-		}
-		Condition condition = null;
-		if (conditions.size() == 1) {
-			condition = conditions.get(0);
-		} else {
-			final QueryAnd andCondition = new QueryAnd();
-			for (final Condition cond : conditions) {
-				andCondition.add(cond.condition);
-			}
-			condition = new Condition(andCondition);
-		}
-		return condition;
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public <T> List<T> getsWhere(final Class<T> clazz, final QueryOptions options)
-			throws DataAccessException, IOException {
-
-		final Condition condition = conditionFusionOrEmpty(options, false);
-		final List<LazyGetter> lazyCall = new ArrayList<>();
-		final String deletedFieldName = AnnotationTools.getDeletedFieldName(clazz);
-		final String collectionName = AnnotationTools.getCollectionName(clazz, options);
-		final List<T> outs = new ArrayList<>();
-		final MongoCollection<Document> collection = this.db.getDatastore().getDatabase().getCollection(collectionName);
-		try {
-			// Generate the filtering of the data:
-			final Bson filters = condition.getFilter(collectionName, options, deletedFieldName);
-			FindIterable<Document> retFind = null;
-			if (filters != null) {
-				//LOGGER.info("getsWhere Find filter: {}", filters.toBsonDocument().toJson());
-				retFind = collection.find(filters);
-			} else {
-				retFind = collection.find();
-			}
-			/* Not manage right now ...
-			final List<GroupBy> groups = options.get(GroupBy.class);
-			for (final GroupBy group : groups) {
-				group.generateQuery(query, tableName);
-			}
-			*/
-			final List<OrderBy> orders = options.get(OrderBy.class);
-			if (orders.size() != 0) {
-				final Document sorts = new Document();
-				for (final OrderBy order : orders) {
-					order.generateSort(sorts);
-				}
-				retFind = retFind.sort(sorts);
-			}
-
-			final List<Limit> limits = options.get(Limit.class);
-			if (limits.size() == 1) {
-				retFind = retFind.limit((int) limits.get(0).getValue());
-			} else if (limits.size() > 1) {
-				throw new DataAccessException("Request with multiple 'limit'...");
-			}
-			// Select values to read
-			final List<String> listFields = generateSelectField(clazz, options);
-			listFields.add("_id");
-			retFind = retFind.projection(Projections.include(listFields.toArray(new String[0])));
-
-			LOGGER.info("GetsWhere ...");
-			final MongoCursor<Document> cursor = retFind.iterator();
-			try (cursor) {
-				while (cursor.hasNext()) {
-					final Document doc = cursor.next();
-					LOGGER.info("    - getWhere value: {}", doc.toJson());
-					final Object data = createObjectFromDocument(doc, clazz, options, lazyCall);
-					final T out = (T) data;
-					outs.add(out);
-				}
-				LOGGER.info("Async calls: {}", lazyCall.size());
-				for (final LazyGetter elem : lazyCall) {
-					elem.doRequest();
-				}
-			}
-		} catch (final Exception ex) {
-			ex.printStackTrace();
-			throw new DataAccessException("Catch an Exception: " + ex.getMessage());
-		}
-		return outs;
-	}
-
-	public Object createObjectFromDocument(
-			final Document doc,
-			final Class<?> clazz,
-			final QueryOptions options,
-			final List<LazyGetter> lazyCall) throws Exception {
-		final List<OptionSpecifyType> specificTypes = options.get(OptionSpecifyType.class);
-		LOGGER.info("createObjectFromDocument: {}", clazz.getCanonicalName());
-		final boolean readAllfields = QueryOptions.readAllColomn(options);
-		// TODO: manage class that is defined inside a class ==> Not manage for now...
-		Object data = null;
-		for (final Constructor<?> contructor : clazz.getConstructors()) {
-			if (contructor.getParameterCount() == 0) {
-				data = contructor.newInstance();
-				break;
-			}
-		}
-		if (data == null) {
-			throw new DataAccessException(
-					"Can not find the default constructor for the class: " + clazz.getCanonicalName());
-		}
-		for (final Field elem : clazz.getFields()) {
-			LOGGER.info("    Inspect field: name='{}' type='{}'", elem.getName(), elem.getType().getCanonicalName());
-			// static field is only for internal global declaration ==> remove it ..
-			if (java.lang.reflect.Modifier.isStatic(elem.getModifiers())) {
-				LOGGER.info("        ==> static");
-				continue;
-			}
-			final DataAccessAddOn addOn = findAddOnforField(elem);
-			if (addOn != null && !addOn.canRetrieve(elem)) {
-				LOGGER.info("        ==> Can not retreive this field");
-				continue;
-			}
-			final boolean notRead = AnnotationTools.isDefaultNotRead(elem);
-			if (!readAllfields && notRead) {
-				LOGGER.info("        ==> Not read this element");
-				continue;
-			}
-			if (addOn != null) {
-				addOn.fillFromDoc(this, doc, elem, data, options, lazyCall);
-			} else {
-				Class<?> type = elem.getType();
-				if (type == Object.class) {
-					for (final OptionSpecifyType specify : specificTypes) {
-						if (specify.name.equals(elem.getName())) {
-							type = specify.clazz;
-							LOGGER.info("Detect overwrite of typing var={} ... '{}' => '{}'", elem.getName(),
-									elem.getType().getCanonicalName(), specify.clazz.getCanonicalName());
-							break;
-						}
-					}
-				}
-				setValueFromDoc(type, data, elem, doc, lazyCall, options);
-			}
-		}
-		return data;
-	}
-
-	@Override
-	public <ID_TYPE> long count(final Class<?> clazz, final ID_TYPE id, final QueryOption... option) throws Exception {
-		final QueryOptions options = new QueryOptions(option);
-		options.add(new Condition(getTableIdCondition(clazz, id, options)));
-		return this.countWhere(clazz, options);
-	}
-
-	@Override
-	public long countWhere(final Class<?> clazz, final QueryOption... option) throws Exception {
-		final QueryOptions options = new QueryOptions(option);
-		return countWhere(clazz, options);
-	}
-
-	@Override
-	public long countWhere(final Class<?> clazz, final QueryOptions options) throws Exception {
-		final Condition condition = conditionFusionOrEmpty(options, false);
-		final String deletedFieldName = AnnotationTools.getDeletedFieldName(clazz);
-		final String collectionName = AnnotationTools.getCollectionName(clazz, options);
-		final MongoCollection<Document> collection = this.db.getDatastore().getDatabase().getCollection(collectionName);
-		try {
-			// Generate the filtering of the data:
-			final Bson filters = condition.getFilter(collectionName, options, deletedFieldName);
-			if (filters != null) {
-				return collection.countDocuments(filters);
-			}
-			return collection.countDocuments();
-		} catch (final Exception ex) {
-			ex.printStackTrace();
-			throw new DataAccessException("Catch an Exception: " + ex.getMessage());
-		}
-	}
-
-	@Override
-	public <T, ID_TYPE> T get(final Class<T> clazz, final ID_TYPE id, final QueryOption... option) throws Exception {
-		final QueryOptions options = new QueryOptions(option);
-		options.add(new Condition(getTableIdCondition(clazz, id, options)));
-		return this.getWhere(clazz, options.getAllArray());
-	}
-
-	@Override
-	public <ID_TYPE> long deleteHard(final Class<?> clazz, final ID_TYPE id, final QueryOption... option)
-			throws Exception {
-		final QueryOptions options = new QueryOptions(option);
-		options.add(new Condition(getTableIdCondition(clazz, id, options)));
-		return deleteHardWhere(clazz, options.getAllArray());
-	}
-
-	@Override
-	public long deleteHardWhere(final Class<?> clazz, final QueryOption... option) throws Exception {
-		final QueryOptions options = new QueryOptions(option);
-		final Condition condition = conditionFusionOrEmpty(options, true);
-		final String collectionName = AnnotationTools.getCollectionName(clazz, options);
-		final String deletedFieldName = AnnotationTools.getDeletedFieldName(clazz);
-		final MongoCollection<Document> collection = this.db.getDatastore().getDatabase().getCollection(collectionName);
-		final Bson filters = condition.getFilter(collectionName, options, deletedFieldName);
-		DeleteResult retFind;
-		if (filters != null) {
-			retFind = collection.deleteMany(filters);
-		} else {
-			throw new DataAccessException("Too dangerout to delete element with no filter values !!!");
-		}
-		return retFind.getDeletedCount();
-	}
-
-	@Override
-	public <ID_TYPE> long deleteSoft(final Class<?> clazz, final ID_TYPE id, final QueryOption... option)
-			throws Exception {
-		final QueryOptions options = new QueryOptions(option);
-		options.add(new Condition(getTableIdCondition(clazz, id, options)));
-		return deleteSoftWhere(clazz, options.getAllArray());
-	}
-
-	@Override
-	public long deleteSoftWhere(final Class<?> clazz, final QueryOption... option) throws Exception {
-		final QueryOptions options = new QueryOptions(option);
-		final Condition condition = conditionFusionOrEmpty(options, true);
-		final String collectionName = AnnotationTools.getCollectionName(clazz, options);
-		final String deletedFieldName = AnnotationTools.getDeletedFieldName(clazz);
-		final MongoCollection<Document> collection = this.db.getDatastore().getDatabase().getCollection(collectionName);
-		final Bson filters = condition.getFilter(collectionName, options, deletedFieldName);
-		final Document actions = new Document("$set", new Document(deletedFieldName, true));
-		LOGGER.info("update some values: {}", actions.toJson());
-		final UpdateResult ret = collection.updateMany(filters, actions);
-		return ret.getModifiedCount();
-	}
-
-	@Override
-	public <ID_TYPE> long unsetDelete(final Class<?> clazz, final ID_TYPE id) throws DataAccessException {
-		return unsetDeleteWhere(clazz, new Condition(getTableIdCondition(clazz, id, new QueryOptions())));
-	}
-
-	@Override
-	public <ID_TYPE> long unsetDelete(final Class<?> clazz, final ID_TYPE id, final QueryOption... option)
-			throws DataAccessException {
-		final QueryOptions options = new QueryOptions(option);
-		options.add(new Condition(getTableIdCondition(clazz, id, options)));
-		return unsetDeleteWhere(clazz, options.getAllArray());
-	}
-
-	@Override
-	public long unsetDeleteWhere(final Class<?> clazz, final QueryOption... option) throws DataAccessException {
-		final QueryOptions options = new QueryOptions(option);
-		final Condition condition = conditionFusionOrEmpty(options, true);
-		final String collectionName = AnnotationTools.getCollectionName(clazz, options);
-		final String deletedFieldName = AnnotationTools.getDeletedFieldName(clazz);
-		if (deletedFieldName == null) {
-			throw new DataAccessException("The class " + clazz.getCanonicalName() + " has no deleted field");
-		}
-		final MongoCollection<Document> collection = this.db.getDatastore().getDatabase().getCollection(collectionName);
-		final Bson filters = condition.getFilter(collectionName, options, deletedFieldName);
-		final Document actions = new Document("$set", new Document(deletedFieldName, false));
-		LOGGER.info("update some values: {}", actions.toJson());
-		final UpdateResult ret = collection.updateMany(filters, actions);
-		return ret.getModifiedCount();
-	}
-
-	@Override
-	public void drop(final Class<?> clazz, final QueryOption... option) throws Exception {
-		final QueryOptions options = new QueryOptions(option);
-		final String collectionName = AnnotationTools.getCollectionName(clazz, options);
-		final MongoCollection<Document> collection = this.db.getDatastore().getDatabase().getCollection(collectionName);
-		collection.drop();
-	}
-
-	@Override
-	public void cleanAll(final Class<?> clazz, final QueryOption... option) throws Exception {
-		final QueryOptions options = new QueryOptions(option);
-		final String collectionName = AnnotationTools.getCollectionName(clazz, options);
-		final MongoCollection<Document> collection = this.db.getDatastore().getDatabase().getCollection(collectionName);
-		collection.deleteMany(new Document());
-	}
-
-}

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

@@ -1,4 +1,4 @@
-package org.kar.archidata.dataAccess.addOnSQL;
+package org.kar.archidata.dataAccess;
 
 import java.lang.reflect.Field;
 import java.sql.PreparedStatement;
@@ -6,11 +6,6 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
 
-import org.kar.archidata.dataAccess.CountInOut;
-import org.kar.archidata.dataAccess.DBAccessSQL;
-import org.kar.archidata.dataAccess.LazyGetter;
-import org.kar.archidata.dataAccess.QueryOptions;
-
 import jakarta.validation.constraints.NotNull;
 
 public interface DataAccessAddOn {
@@ -21,9 +16,7 @@ public interface DataAccessAddOn {
 	/** Get the SQL type that is needed to declare for the specific Field Type.
 	 * @param elem Field to declare.
 	 * @return SQL type to create. */
-	default String getSQLFieldType(final Field elem, final QueryOptions options) throws Exception {
+	String getSQLFieldType(Field elem) throws Exception;
-		return null;
-	}
 
 	/** Check if the field is manage by the local add-on
 	 * @param elem Field to inspect.
@@ -31,11 +24,12 @@ public interface DataAccessAddOn {
 	boolean isCompatibleField(Field elem);
 
 	/** Insert data in the specific field (the field must be in the current db, otherwiise it does not work at all.
-	 * @param ioDb DB statement interface.
+	 * @param ps DB statement interface.
 	 * @param data The date to inject.
 	 * @param iii The index of injection
+	 * @return the new index of injection in case of multiple value management
 	 * @throws SQLException */
-	void insertData(final DBAccessSQL ioDb, PreparedStatement ps, final Field field, Object data, CountInOut iii)
+	void insertData(PreparedStatement ps, final Field field, Object data, CountInOut iii)
 			throws Exception, SQLException, IllegalArgumentException, IllegalAccessException;
 
 	/** Element can insert in the single request
@@ -64,7 +58,6 @@ public interface DataAccessAddOn {
 
 	// Return the number of colomn read
 	void fillFromQuery(
-			final DBAccessSQL ioDb,
 			ResultSet rs,
 			Field field,
 			Object data,
@@ -75,28 +68,23 @@ public interface DataAccessAddOn {
 
 	/** Create associated table of the specific element.
 	 * @param tableName
-	 * @param primaryField
+	 * @param elem
-	 * @param field
 	 * @param mainTableBuilder
-	 * @param preActionList
+	 * @param ListOtherTables
-	 * @param postActionList
 	 * @param createIfNotExist
 	 * @param createDrop
 	 * @param fieldId
 	 * @throws Exception */
-	default void createTables(
+	void createTables(
-			final String tableName,
+			String tableName,
 			final Field primaryField,
-			final Field field,
+			Field field,
-			final StringBuilder mainTableBuilder,
+			StringBuilder mainTableBuilder,
-			final List<String> preActionList,
+			List<String> preActionList,
-			final List<String> postActionList,
+			List<String> postActionList,
-			final boolean createIfNotExist,
+			boolean createIfNotExist,
-			final boolean createDrop,
+			boolean createDrop,
-			final int fieldId,
+			int fieldId) throws Exception;
-			final QueryOptions options) throws Exception {
-
-	}
 
 	/** Some action must be done asynchronously for update or remove element
 	 * @param field
@@ -112,13 +100,11 @@ public interface DataAccessAddOn {
 	 * @param data Data that might be inserted.
 	 * @param actions Asynchronous action to do after main request. */
 	default void asyncInsert(
-			final DBAccessSQL ioDb,
 			final String tableName,
 			final Object localId,
 			final Field field,
 			final Object data,
-			final List<LazyGetter> actions,
+			final List<LazyGetter> actions) throws Exception {
-			final QueryOptions options) throws Exception {
 
 	}
 
@@ -136,23 +122,19 @@ public interface DataAccessAddOn {
 	 * @param data Data that might be inserted.
 	 * @param actions Asynchronous action to do after main request. */
 	default void asyncUpdate(
-			final DBAccessSQL ioDb,
 			final String tableName,
 			final Object localId,
 			final Field field,
 			final Object data,
-			final List<LazyGetter> actions,
+			final List<LazyGetter> actions) throws Exception {
-			final QueryOptions options) throws Exception {
 
 	}
 
-	default void drop(final DBAccessSQL ioDb, final String tableName, final Field field, final QueryOptions options)
+	default void drop(final String tableName, final Field field) throws Exception {
-			throws Exception {
 
 	}
 
-	default void cleanAll(final DBAccessSQL ioDb, final String tableName, final Field field, final QueryOptions options)
+	default void cleanAll(final String tableName, final Field field) throws Exception {
-			throws Exception {
 
 	}
 

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

@@ -19,12 +19,13 @@ 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.ContextGenericTools;
 import org.kar.archidata.tools.DateTools;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -245,24 +246,24 @@ public class DataExport {
 	}
 
 	public static TableQuery queryTable(
-			final DBAccessSQL ioDb,
 			final List<TableQueryTypes> headers,
 			final String query,
 			final List<Object> parameters,
 			final QueryOption... option) throws Exception {
 		final QueryOptions options = new QueryOptions(option);
-		return queryTable(ioDb, headers, query, parameters, options);
+		return queryTable(headers, query, parameters, options);
 	}
 
 	public static TableQuery queryTable(
-			final DBAccessSQL ioDb,
 			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 = ioDb.conditionFusionOrEmpty(options, false);
+		final Condition condition = DataAccess.conditionFusionOrEmpty(options, false);
 		final StringBuilder query = new StringBuilder(queryBase);
 		final TableQuery out = new TableQuery(headers);
 		// real add in the BDD:
@@ -285,18 +286,18 @@ public class DataExport {
 			}
 			LOGGER.warn("generate the query: '{}'", query.toString());
 			// prepare the request:
-			final PreparedStatement ps = ioDb.getConnection().prepareStatement(query.toString(),
+			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) {
-					ioDb.addElement(ps, elem, iii);
+					DataAccess.addElement(ps, elem, iii);
 				}
 				iii.inc();
 			}
-			condition.injectQuery(ioDb, ps, iii);
+			condition.injectQuery(ps, iii);
 			if (limits.size() == 1) {
-				limits.get(0).injectQuery(ioDb, ps, iii);
+				limits.get(0).injectQuery(ps, iii);
 			}
 			// execute the request
 			final ResultSet rs = ps.executeQuery();
@@ -331,6 +332,8 @@ public class DataExport {
 			throw ex;
 		} catch (final Exception ex) {
 			ex.printStackTrace();
+		} finally {
+			entry.close();
 		}
 		return out;
 	}
@@ -392,7 +395,7 @@ public class DataExport {
 		}
 		if (MediaType.APPLICATION_JSON.equals(accept)) {
 			LOGGER.info("Start mapping josn");
-			final ObjectMapper objectMapper = ContextGenericTools.createObjectMapper();
+			final ObjectMapper objectMapper = new ObjectMapper();
 			LOGGER.info("Start find modules josn");
 			objectMapper.findAndRegisterModules();
 			LOGGER.info("Start map object");

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

@@ -10,14 +10,11 @@ import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 
-import org.bson.types.ObjectId;
 import org.kar.archidata.annotation.AnnotationTools;
 import org.kar.archidata.annotation.CreationTimestamp;
 import org.kar.archidata.annotation.DataIfNotExists;
 import org.kar.archidata.annotation.UpdateTimestamp;
-import org.kar.archidata.dataAccess.addOnSQL.DataAccessAddOn;
 import org.kar.archidata.dataAccess.options.CreateDropTable;
-import org.kar.archidata.dataAccess.options.OptionSpecifyType;
 import org.kar.archidata.exception.DataAccessException;
 import org.kar.archidata.tools.ConfigBaseVariable;
 import org.slf4j.Logger;
@@ -28,17 +25,13 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import jakarta.persistence.GenerationType;
 
 public class DataFactory {
-	private static final Logger LOGGER = LoggerFactory.getLogger(DataFactory.class);
+	static final Logger LOGGER = LoggerFactory.getLogger(DataFactory.class);
 
-	public static String convertTypeInSQL(final Class<?> type, final String fieldName) throws DataAccessException {
+	public static String convertTypeInSQL(final Class<?> type, final String fieldName) throws Exception {
-		final String typelocal = ConfigBaseVariable.getDBType();
+		if (!"sqlite".equals(ConfigBaseVariable.getDBType())) {
-		if ("mysql".equals(typelocal)) {
 			if (type == UUID.class) {
 				return "binary(16)";
 			}
-			if (type == ObjectId.class) {
-				return "binary(12)";
-			}
 			if (type == Long.class || type == long.class) {
 				return "bigint";
 			}
@@ -89,13 +82,10 @@ public class DataFactory {
 				out.append(")");
 				return out.toString();
 			}
-		} else if ("sqlite".equals(typelocal)) {
+		} else {
 			if (type == UUID.class) {
 				return "BINARY(16)";
 			}
-			if (type == ObjectId.class) {
-				return "BINARY(12)";
-			}
 			if (type == Long.class || type == long.class) {
 				return "INTEGER";
 			}
@@ -148,9 +138,6 @@ public class DataFactory {
 				out.append(" ) )");
 				return out.toString();
 			}
-		} else if ("mongo".equals(typelocal)) {
-			// no importance for mango ...
-			return "text";
 		}
 		throw new DataAccessException("Imcompatible type of element in object for: " + type.getCanonicalName());
 	}
@@ -165,9 +152,8 @@ public class DataFactory {
 			final boolean createIfNotExist,
 			final boolean createDrop,
 			final int fieldId,
-			final Class<?> classModel,
+			final Class<?> classModel) throws Exception {
-			final QueryOptions options) throws Exception {
+		final String name = AnnotationTools.getFieldName(elem);
-		final String name = AnnotationTools.getFieldName(elem, options).inTable();
 		final int limitSize = AnnotationTools.getLimitSize(elem);
 		final boolean notNull = AnnotationTools.getColumnNotNull(elem);
 
@@ -176,10 +162,10 @@ public class DataFactory {
 
 		final boolean createTime = elem.getDeclaredAnnotationsByType(CreationTimestamp.class).length != 0;
 		final boolean updateTime = elem.getDeclaredAnnotationsByType(UpdateTimestamp.class).length != 0;
-		final String comment = AnnotationTools.getSchemaDescription(elem);
+		final String comment = AnnotationTools.getComment(elem);
 		final String defaultValue = AnnotationTools.getDefault(elem);
 
-		if (mainTableBuilder.toString().length() == 0) {
+		if (fieldId == 0) {
 			mainTableBuilder.append("\n\t\t`");
 		} else {
 			mainTableBuilder.append(",\n\t\t`");
@@ -313,10 +299,7 @@ public class DataFactory {
 		}
 	}
 
-	private static boolean isFieldFromSuperClass(
+	private static boolean isFieldFromSuperClass(final Class<?> model, final String filedName) {
-			final Class<?> model,
-			final String filedName,
-			final QueryOptions options) {
 		final Class<?> superClass = model.getSuperclass();
 		if (superClass == null) {
 			return false;
@@ -324,7 +307,7 @@ public class DataFactory {
 		for (final Field field : superClass.getFields()) {
 			String name;
 			try {
-				name = AnnotationTools.getFieldName(field, options).inTable();
+				name = AnnotationTools.getFieldName(field);
 				if (filedName.equals(name)) {
 					return true;
 				}
@@ -372,7 +355,7 @@ public class DataFactory {
 		for (final Field elem : clazz.getFields()) {
 			// DEtect the primary key (support only one primary key right now...
 			if (AnnotationTools.isPrimaryKey(elem)) {
-				primaryKeys.add(AnnotationTools.getFieldName(elem, options).inTable());
+				primaryKeys.add(AnnotationTools.getFieldName(elem));
 			}
 		}
 		// Here we insert the data in the reverse mode ==> the parent class add there parameter at the start (we reorder the field with the parenting).
@@ -389,8 +372,8 @@ public class DataFactory {
 				if (java.lang.reflect.Modifier.isStatic(elem.getModifiers())) {
 					continue;
 				}
-				final String dataName = AnnotationTools.getFieldName(elem, options).inTable();
+				final String dataName = AnnotationTools.getFieldName(elem);
-				if (isFieldFromSuperClass(currentClazz, dataName, options)) {
+				if (isFieldFromSuperClass(currentClazz, dataName)) {
 					LOGGER.trace("        SKIP:  '{}'", elem.getName());
 					continue;
 				}
@@ -399,46 +382,28 @@ public class DataFactory {
 					continue;
 				}
 				alreadyAdded.add(dataName);
-
-				List<OptionSpecifyType> specificTypes = new ArrayList<>();
-				if (options != null) {
-					specificTypes = options.get(OptionSpecifyType.class);
-				}
-				Class<?> basicType = elem.getType();
-				if (basicType == Object.class) {
-					for (final OptionSpecifyType specify : specificTypes) {
-						if (specify.name.equals(elem.getName())) {
-							basicType = specify.clazz;
-							LOGGER.trace("Detect overwrite of typing ... '{}' => '{}'",
-									elem.getType().getCanonicalName(), specify.clazz.getCanonicalName());
-							break;
-						}
-					}
-				}
 				LOGGER.trace("        + '{}'", elem.getName());
-				if (DBAccessSQL.isAddOnField(elem)) {
+				if (DataAccess.isAddOnField(elem)) {
-					final DataAccessAddOn addOn = DBAccessSQL.findAddOnforField(elem);
+					final DataAccessAddOn addOn = DataAccess.findAddOnforField(elem);
-					LOGGER.trace("Create type for: {} ==> {} (ADD-ON)",
+					LOGGER.trace("Create type for: {} ==> {} (ADD-ON)", AnnotationTools.getFieldName(elem),
-							AnnotationTools.getFieldName(elem, options).inTable(), basicType);
+							elem.getType());
 					if (addOn != null) {
 						addOn.createTables(tableName, primaryField, elem, tmpOut, preActionList, postActionList,
-								createIfNotExist, createDrop, fieldId, options);
+								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, options).inTable()
+								+ tableName + " field name=" + AnnotationTools.getFieldName(elem) + " type="
-								+ " type=" + basicType);
+								+ elem.getType());
 					}
 				} else {
-					LOGGER.trace("Create type for: {} ==> {}", AnnotationTools.getFieldName(elem, options).inTable(),
+					LOGGER.trace("Create type for: {} ==> {}", AnnotationTools.getFieldName(elem), elem.getType());
-							basicType);
 					DataFactory.createTablesSpecificType(tableName, tablePrimaryKeyField, elem, tmpOut, preActionList,
-							postActionList, createIfNotExist, createDrop, fieldId, basicType, options);
+							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/DataFactoryTsApi.java

@@ -0,0 +1,524 @@
+package org.kar.archidata.dataAccess;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
+import java.lang.reflect.ParameterizedType;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.kar.archidata.catcher.RestErrorResponse;
+import org.kar.archidata.dataAccess.DataFactoryZod.ClassElement;
+import org.kar.archidata.dataAccess.DataFactoryZod.GeneratedTypes;
+import org.kar.archidata.externalRestApi.model.ApiTool;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+
+public class DataFactoryTsApi {
+	static final Logger LOGGER = LoggerFactory.getLogger(DataFactoryTsApi.class);
+
+	record APIModel(
+			String data,
+			String className) {}
+
+	/** Request the generation of the TypeScript file for the "Zod" export model
+	 * @param classs List of class used in the model
+	 * @throws Exception */
+	public static List<String> createApi(
+			final List<Class<?>> classs,
+			final GeneratedTypes previous,
+			final String pathPackage) throws Exception {
+		final List<String> apis = new ArrayList<>();
+		final String globalheader = """
+				/**
+				 * API of the server (auto-generated code)
+				 */
+				import {
+				  HTTPMimeType,
+				  HTTPRequestModel,
+				  ModelResponseHttp,
+				  RESTCallbacks,
+				  RESTConfig,
+				  RESTRequestJson,
+				  RESTRequestJsonArray,
+				  RESTRequestVoid
+				} from "./rest-tools"
+				import {""";
+
+		for (final Class<?> clazz : classs) {
+			final Set<Class<?>> includeModel = new HashSet<>();
+			final Set<Class<?>> includeCheckerModel = new HashSet<>();
+			final APIModel api = createSingleApi(clazz, includeModel, includeCheckerModel, previous);
+			final StringBuilder generatedData = new StringBuilder();
+			generatedData.append(globalheader);
+			final List<String> includedElements = new ArrayList<>();
+			for (final Class<?> elem : includeModel) {
+				if (elem == null) {
+					continue;
+				}
+				final ClassElement classElement = DataFactoryZod.createTable(elem, previous);
+				if (classElement.nativeType) {
+					continue;
+				}
+				includedElements.add(classElement.tsTypeName);
+			}
+			Collections.sort(includedElements);
+			for (final String elem : includedElements) {
+				generatedData.append("\n  ");
+				generatedData.append(elem);
+				generatedData.append(",");
+			}
+			for (final Class<?> elem : includeCheckerModel) {
+				if (elem == null) {
+					continue;
+				}
+				final ClassElement classElement = DataFactoryZod.createTable(elem, previous);
+				if (classElement.nativeType) {
+					continue;
+				}
+				generatedData.append("\n  ");
+				generatedData.append(classElement.tsCheckType);
+				generatedData.append(",");
+			}
+			generatedData.append("\n} from \"./model\"\n");
+			generatedData.append(api.data());
+
+			String fileName = api.className();
+			fileName = fileName.replaceAll("([A-Z])", "-$1").toLowerCase();
+			fileName = fileName.replaceAll("^\\-*", "");
+			apis.add(fileName);
+			final FileWriter myWriter = new FileWriter(pathPackage + File.separator + fileName + ".ts");
+			myWriter.write(generatedData.toString());
+			myWriter.close();
+		}
+		return apis;
+	}
+
+	record OrderedElement(
+			String methodName,
+			Method method) {}
+
+	public static APIModel createSingleApi(
+			final Class<?> clazz,
+			final Set<Class<?>> includeModel,
+			final Set<Class<?>> includeCheckerModel,
+			final GeneratedTypes previous) throws Exception {
+		final StringBuilder builder = new StringBuilder();
+		// the basic path has no specific elements...
+		final String basicPath = ApiTool.apiAnnotationGetPath(clazz);
+		final String classSimpleName = clazz.getSimpleName();
+
+		builder.append("export namespace ");
+		builder.append(classSimpleName);
+		builder.append(" {\n");
+		LOGGER.info("Parse Class for path: {} => {}", classSimpleName, basicPath);
+
+		final List<OrderedElement> orderedElements = new ArrayList<>();
+		for (final Method method : clazz.getDeclaredMethods()) {
+			final String methodName = method.getName();
+			orderedElements.add(new OrderedElement(methodName, method));
+		}
+		final Comparator<OrderedElement> comparator = Comparator.comparing(OrderedElement::methodName);
+		Collections.sort(orderedElements, comparator);
+
+		for (final OrderedElement orderedElement : orderedElements) {
+			final Method method = orderedElement.method();
+			final String methodName = orderedElement.methodName();
+			final String methodPath = ApiTool.apiAnnotationGetPath(method);
+			final String methodType = ApiTool.apiAnnotationGetTypeRequest(method);
+			if (methodType == null) {
+				LOGGER.error("    [{}] {} => {}/{} ==> No methode type @PATH, @GET ...", methodType, methodName,
+						basicPath, methodPath);
+				continue;
+			}
+			final String methodDescription = ApiTool.apiAnnotationGetOperationDescription(method);
+			final List<String> consumes = ApiTool.apiAnnotationGetConsumes(clazz, method);
+			List<String> produces = ApiTool.apiAnnotationProduces(clazz, method);
+			LOGGER.trace("    [{}] {} => {}/{}", methodType, methodName, basicPath, methodPath);
+			if (methodDescription != null) {
+				LOGGER.trace("         description: {}", methodDescription);
+			}
+			final boolean needGenerateProgress = ApiTool.apiAnnotationTypeScriptProgress(method);
+			Class<?>[] returnTypeModel = ApiTool.apiAnnotationGetAsyncType(method);
+			boolean isUnmanagedReturnType = false;
+			boolean returnModelIsArray = false;
+			List<ClassElement> tmpReturn;
+			if (returnTypeModel == null) {
+				Class<?> returnTypeModelRaw = method.getReturnType();
+				LOGGER.info("Get type: {}", returnTypeModelRaw);
+				if (returnTypeModelRaw == Response.class) {
+					LOGGER.info("Get type: {}", returnTypeModelRaw);
+				}
+				if (returnTypeModelRaw == Response.class || returnTypeModelRaw == void.class
+						|| returnTypeModelRaw == Void.class) {
+					if (returnTypeModelRaw == Response.class) {
+						isUnmanagedReturnType = true;
+					}
+					returnTypeModel = new Class<?>[] { Void.class };
+					tmpReturn = new ArrayList<>();
+					produces = null;
+				} else if (returnTypeModelRaw == Map.class) {
+					LOGGER.warn("Not manage the Map Model ... set any");
+					returnTypeModel = new Class<?>[] { Map.class };
+					tmpReturn = DataFactoryZod.createTables(returnTypeModel, previous);
+				} else if (returnTypeModelRaw == List.class) {
+					final ParameterizedType listType = (ParameterizedType) method.getGenericReturnType();
+					returnTypeModelRaw = (Class<?>) listType.getActualTypeArguments()[0];
+					returnModelIsArray = true;
+					returnTypeModel = new Class<?>[] { returnTypeModelRaw };
+					tmpReturn = DataFactoryZod.createTables(returnTypeModel, previous);
+				} else {
+					returnTypeModel = new Class<?>[] { returnTypeModelRaw };
+					tmpReturn = DataFactoryZod.createTables(returnTypeModel, previous);
+				}
+			} else if (returnTypeModel.length >= 0 && (returnTypeModel[0] == Response.class
+					|| returnTypeModel[0] == Void.class || returnTypeModel[0] == void.class)) {
+				if (returnTypeModel[0] == Response.class) {
+					isUnmanagedReturnType = true;
+				}
+				returnTypeModel = new Class<?>[] { Void.class };
+				tmpReturn = new ArrayList<>();
+				produces = null;
+			} else if (returnTypeModel.length > 0 && returnTypeModel[0] == Map.class) {
+				LOGGER.warn("Not manage the Map Model ...");
+				returnTypeModel = new Class<?>[] { Map.class };
+				tmpReturn = DataFactoryZod.createTables(returnTypeModel, previous);
+			} else {
+				tmpReturn = DataFactoryZod.createTables(returnTypeModel, previous);
+			}
+			for (final ClassElement elem : tmpReturn) {
+				includeModel.add(elem.model[0]);
+				includeCheckerModel.add(elem.model[0]);
+			}
+			LOGGER.trace("         return: {}", tmpReturn.size());
+			for (final ClassElement elem : tmpReturn) {
+				LOGGER.trace("             - {}", elem.tsTypeName);
+			}
+			final Map<String, String> queryParams = new HashMap<>();
+			final Map<String, String> pathParams = new HashMap<>();
+			final Map<String, String> formDataParams = new HashMap<>();
+			final List<String> emptyElement = new ArrayList<>();
+			// LOGGER.info(" Parameters:");
+			for (final Parameter parameter : method.getParameters()) {
+				// Security context are internal parameter (not available from API)
+				if (ApiTool.apiAnnotationIsContext(parameter)) {
+					continue;
+				}
+				final Class<?> parameterType = parameter.getType();
+				String parameterTypeString;
+				final Class<?>[] asyncType = ApiTool.apiAnnotationGetAsyncType(parameter);
+				if (parameterType == List.class) {
+					if (asyncType == null) {
+						LOGGER.warn("Detect List param ==> not managed type ==> any[] !!!");
+						parameterTypeString = "any[]";
+					} else {
+						final List<ClassElement> tmp = DataFactoryZod.createTables(asyncType, previous);
+						for (final ClassElement elem : tmp) {
+							includeModel.add(elem.model[0]);
+						}
+						parameterTypeString = ApiTool.convertInTypeScriptType(tmp, true);
+					}
+				} else if (asyncType == null) {
+					final ClassElement tmp = DataFactoryZod.createTable(parameterType, previous);
+					includeModel.add(tmp.model[0]);
+					parameterTypeString = tmp.tsTypeName;
+				} else {
+					final List<ClassElement> tmp = DataFactoryZod.createTables(asyncType, previous);
+					for (final ClassElement elem : tmp) {
+						includeModel.add(elem.model[0]);
+					}
+					parameterTypeString = ApiTool.convertInTypeScriptType(tmp, true);
+				}
+				final String pathParam = ApiTool.apiAnnotationGetPathParam(parameter);
+				final String queryParam = ApiTool.apiAnnotationGetQueryParam(parameter);
+				final String formDataParam = ApiTool.apiAnnotationGetFormDataParam(parameter);
+				if (queryParam != null) {
+					queryParams.put(queryParam, parameterTypeString);
+				} else if (pathParam != null) {
+					pathParams.put(pathParam, parameterTypeString);
+				} else if (formDataParam != null) {
+					formDataParams.put(formDataParam, parameterTypeString);
+				} else if (asyncType != null) {
+					final List<ClassElement> tmp = DataFactoryZod.createTables(asyncType, previous);
+					parameterTypeString = "";
+					for (final ClassElement elem : tmp) {
+						includeModel.add(elem.model[0]);
+						if (parameterTypeString.length() != 0) {
+							parameterTypeString += " | ";
+						}
+						parameterTypeString += elem.tsTypeName;
+					}
+					emptyElement.add(parameterTypeString);
+				} else if (parameterType == List.class) {
+					parameterTypeString = "any[]";
+					final Class<?> plop = parameterType.arrayType();
+					LOGGER.info("ArrayType = {}", plop);
+					emptyElement.add(parameterTypeString);
+				} else {
+					final ClassElement tmp = DataFactoryZod.createTable(parameterType, previous);
+					includeModel.add(tmp.model[0]);
+					emptyElement.add(tmp.tsTypeName);
+				}
+			}
+			if (!queryParams.isEmpty()) {
+				LOGGER.trace("         Query parameter:");
+				for (final Entry<String, String> queryEntry : queryParams.entrySet()) {
+					LOGGER.trace("             - {}: {}", queryEntry.getKey(), queryEntry.getValue());
+				}
+			}
+			if (!pathParams.isEmpty()) {
+				LOGGER.trace("         Path parameter:");
+				for (final Entry<String, String> pathEntry : pathParams.entrySet()) {
+					LOGGER.trace("             - {}: {}", pathEntry.getKey(), pathEntry.getValue());
+				}
+			}
+			if (emptyElement.size() > 1) {
+				LOGGER.error("         Fail to parse: Too much element in the model for the data ...");
+				continue;
+			} else if (emptyElement.size() == 1 && formDataParams.size() != 0) {
+				LOGGER.error("         Fail to parse: Incompatible form data & direct data ...");
+				continue;
+			} else if (emptyElement.size() == 1) {
+				LOGGER.trace("         data type: {}", emptyElement.get(0));
+			}
+			// ALL is good can generate the Elements
+
+			if (methodDescription != null) {
+				builder.append("\n\t/**\n\t * ");
+				builder.append(methodDescription);
+				builder.append("\n\t */");
+			}
+			if (isUnmanagedReturnType) {
+				builder.append(
+						"\n\t// TODO: unmanaged \"Response\" type: please specify @AsyncType or considered as 'void'.");
+			}
+			builder.append("\n\texport function ");
+			builder.append(methodName);
+			builder.append("({\n\t\t\trestConfig,");
+			if (!queryParams.isEmpty()) {
+				builder.append("\n\t\t\tqueries,");
+			}
+			if (!pathParams.isEmpty()) {
+				builder.append("\n\t\t\tparams,");
+			}
+			if (produces != null && produces.size() > 1) {
+				builder.append("\n\t\t\tproduce,");
+			}
+			if (emptyElement.size() == 1 || formDataParams.size() != 0) {
+				builder.append("\n\t\t\tdata,");
+			}
+			if (needGenerateProgress) {
+				builder.append("\n\t\t\tcallback,");
+			}
+			builder.append("\n\t\t}: {");
+			builder.append("\n\t\trestConfig: RESTConfig,");
+			if (!queryParams.isEmpty()) {
+				builder.append("\n\t\tqueries: {");
+				for (final Entry<String, String> queryEntry : queryParams.entrySet()) {
+					builder.append("\n\t\t\t");
+					builder.append(queryEntry.getKey());
+					builder.append("?: ");
+					builder.append(queryEntry.getValue());
+					builder.append(",");
+				}
+				builder.append("\n\t\t},");
+			}
+			if (!pathParams.isEmpty()) {
+				builder.append("\n\t\tparams: {");
+				for (final Entry<String, String> pathEntry : pathParams.entrySet()) {
+					builder.append("\n\t\t\t");
+					builder.append(pathEntry.getKey());
+					builder.append(": ");
+					builder.append(pathEntry.getValue());
+					builder.append(",");
+				}
+				builder.append("\n\t\t},");
+			}
+			if (emptyElement.size() == 1) {
+				builder.append("\n\t\tdata: ");
+				builder.append(emptyElement.get(0));
+				builder.append(",");
+			} else if (formDataParams.size() != 0) {
+				builder.append("\n\t\tdata: {");
+				for (final Entry<String, String> pathEntry : formDataParams.entrySet()) {
+					builder.append("\n\t\t\t");
+					builder.append(pathEntry.getKey());
+					builder.append(": ");
+					builder.append(pathEntry.getValue());
+					builder.append(",");
+				}
+				builder.append("\n\t\t},");
+			}
+			if (produces != null && produces.size() > 1) {
+				builder.append("\n\t\tproduce: ");
+				String isFist = null;
+				for (final String elem : produces) {
+					String lastElement = null;
+
+					if (MediaType.APPLICATION_JSON.equals(elem)) {
+						lastElement = "HTTPMimeType.JSON";
+					}
+					if (MediaType.MULTIPART_FORM_DATA.equals(elem)) {
+						lastElement = "HTTPMimeType.MULTIPART";
+					}
+					if (DataExport.CSV_TYPE.equals(elem)) {
+						lastElement = "HTTPMimeType.CSV";
+					}
+					if (lastElement != null) {
+						if (isFist == null) {
+							isFist = lastElement;
+						} else {
+							builder.append(" | ");
+						}
+						builder.append(lastElement);
+					} else {
+						LOGGER.error("Unmanaged model type: {}", elem);
+					}
+				}
+				builder.append(",");
+			}
+			if (needGenerateProgress) {
+				builder.append("\n\t\tcallback?: RESTCallbacks,");
+			}
+			builder.append("\n\t}): Promise<");
+			if (tmpReturn.size() == 0 //
+					|| tmpReturn.get(0).tsTypeName == null //
+					|| tmpReturn.get(0).tsTypeName.equals("void")) {
+				builder.append("void");
+			} else {
+				builder.append(ApiTool.convertInTypeScriptType(tmpReturn, returnModelIsArray));
+			}
+			builder.append("> {");
+			if (tmpReturn.size() == 0 //
+					|| tmpReturn.get(0).tsTypeName == null //
+					|| tmpReturn.get(0).tsTypeName.equals("void")) {
+				builder.append("\n\t\treturn RESTRequestVoid({");
+			} else if (returnModelIsArray) {
+				builder.append("\n\t\treturn RESTRequestJsonArray({");
+			} else {
+				builder.append("\n\t\treturn RESTRequestJson({");
+			}
+			builder.append("\n\t\t\trestModel: {");
+			builder.append("\n\t\t\t\tendPoint: \"");
+			builder.append(basicPath);
+			if (methodPath != null) {
+				builder.append("/");
+				builder.append(methodPath);
+			}
+			builder.append("\",");
+			builder.append("\n\t\t\t\trequestType: HTTPRequestModel.");
+			builder.append(methodType);
+			builder.append(",");
+			if (consumes != null) {
+				for (final String elem : consumes) {
+					if (MediaType.APPLICATION_JSON.equals(elem)) {
+						builder.append("\n\t\t\t\tcontentType: HTTPMimeType.JSON,");
+						break;
+					} else if (MediaType.MULTIPART_FORM_DATA.equals(elem)) {
+						builder.append("\n\t\t\t\tcontentType: HTTPMimeType.MULTIPART,");
+						break;
+					} else if (MediaType.TEXT_PLAIN.equals(elem)) {
+						builder.append("\n\t\t\t\tcontentType: HTTPMimeType.TEXT_PLAIN,");
+						break;
+					}
+				}
+			} else if ("DELETE".equals(methodType)) {
+				builder.append("\n\t\t\t\tcontentType: HTTPMimeType.TEXT_PLAIN,");
+			}
+			if (produces != null) {
+				if (produces.size() > 1) {
+					builder.append("\n\t\t\t\taccept: produce,");
+				} else {
+					for (final String elem : produces) {
+						if (MediaType.APPLICATION_JSON.equals(elem)) {
+							builder.append("\n\t\t\t\taccept: HTTPMimeType.JSON,");
+							break;
+						}
+					}
+				}
+			}
+			builder.append("\n\t\t\t},");
+			builder.append("\n\t\t\trestConfig,");
+			if (!pathParams.isEmpty()) {
+				builder.append("\n\t\t\tparams,");
+			}
+			if (!queryParams.isEmpty()) {
+				builder.append("\n\t\t\tqueries,");
+			}
+			if (emptyElement.size() == 1) {
+				builder.append("\n\t\t\tdata,");
+			} else if (formDataParams.size() != 0) {
+				builder.append("\n\t\t\tdata,");
+			}
+			if (needGenerateProgress) {
+				builder.append("\n\t\t\tcallback,");
+			}
+			builder.append("\n\t\t}");
+			if (tmpReturn.size() != 0 && tmpReturn.get(0).tsTypeName != null
+					&& !tmpReturn.get(0).tsTypeName.equals("void")) {
+				builder.append(", ");
+				// TODO: correct this it is really bad ...
+				builder.append(ApiTool.convertInTypeScriptCheckType(tmpReturn));
+			}
+			builder.append(");");
+			builder.append("\n\t};");
+		}
+		builder.append("\n}\n");
+		return new APIModel(builder.toString(), classSimpleName);
+	}
+
+	public static void generatePackage(
+			final List<Class<?>> classApi,
+			final List<Class<?>> classModel,
+			final String pathPackage) throws Exception {
+		final GeneratedTypes previous = DataFactoryZod.createBasicType();
+		DataFactoryZod.createTable(RestErrorResponse.class, previous);
+		final List<String> listApi = createApi(classApi, previous, pathPackage);
+		final String packageApi = DataFactoryZod.createTables(new ArrayList<>(classModel), previous);
+		FileWriter myWriter = new FileWriter(pathPackage + File.separator + "model.ts");
+		myWriter.write(packageApi.toString());
+		myWriter.close();
+
+		final StringBuilder index = new StringBuilder("""
+				/**
+				 * Global import of the package
+				 */
+				export * from "./model";
+				""");
+		for (final String api : listApi) {
+			index.append("export * from \"./").append(api).append("\";\n");
+		}
+		myWriter = new FileWriter(pathPackage + File.separator + "index.ts");
+		myWriter.write(index.toString());
+		myWriter.close();
+		final InputStream ioStream = DataFactoryTsApi.class.getClassLoader().getResourceAsStream("rest-tools.ts");
+		if (ioStream == null) {
+			throw new IllegalArgumentException("rest-tools.ts is not found");
+		}
+		final BufferedReader buffer = new BufferedReader(new InputStreamReader(ioStream));
+		myWriter = new FileWriter(pathPackage + File.separator + "rest-tools.ts");
+		String line;
+		while ((line = buffer.readLine()) != null) {
+			myWriter.write(line);
+			myWriter.write("\n");
+		}
+		ioStream.close();
+		myWriter.close();
+		return;
+	}
+
+}

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

@@ -0,0 +1,471 @@
+package org.kar.archidata.dataAccess;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Field;
+import java.lang.reflect.ParameterizedType;
+import java.sql.Timestamp;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.kar.archidata.annotation.AnnotationTools;
+import org.kar.archidata.exception.DataAccessException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jakarta.ws.rs.core.Response;
+
+public class DataFactoryZod {
+	static final Logger LOGGER = LoggerFactory.getLogger(DataFactoryZod.class);
+
+	static public class ClassElement {
+		public Class<?>[] model;
+		public String zodName;
+		public String tsTypeName;
+		public String tsCheckType;
+		public String declaration;
+		public String comment = null;
+		public boolean isEnum = false;
+		public boolean nativeType;
+
+		public ClassElement(final Class<?> model[], final String zodName, final String tsTypeName,
+				final String tsCheckType, final String declaration, final boolean nativeType) {
+			this.model = model;
+			this.zodName = zodName;
+			this.tsTypeName = tsTypeName;
+			this.tsCheckType = tsCheckType;
+			this.declaration = declaration;
+			this.nativeType = nativeType;
+		}
+
+		public ClassElement(final Class<?> model) {
+			this(new Class<?>[] { model });
+		}
+
+		public ClassElement(final Class<?> model[]) {
+			this.model = model;
+			this.zodName = "Zod" + model[0].getSimpleName();
+			this.tsTypeName = model[0].getSimpleName();
+			this.tsCheckType = "is" + model[0].getSimpleName();
+			this.declaration = null;
+			this.nativeType = false;
+		}
+	}
+
+	public static class GeneratedTypes {
+		final List<ClassElement> previousGeneration = new ArrayList<>();
+		final List<Class<?>> order = new ArrayList<>();
+
+		public ClassElement find(final Class<?> clazz) {
+			for (final ClassElement elem : this.previousGeneration) {
+				for (final Class<?> elemClass : elem.model) {
+					if (elemClass == clazz) {
+						return elem;
+					}
+				}
+			}
+			return null;
+		}
+
+		public void add(final ClassElement elem) {
+			this.previousGeneration.add(elem);
+		}
+
+		public void add(final ClassElement elem, final boolean addOrder) {
+			this.previousGeneration.add(elem);
+			if (addOrder) {
+				this.order.add(elem.model[0]);
+			}
+		}
+
+		public void addOrder(final ClassElement elem) {
+			this.order.add(elem.model[0]);
+		}
+	}
+
+	public static ClassElement convertTypeZodEnum(final Class<?> clazz, final GeneratedTypes previous)
+			throws Exception {
+		final ClassElement element = new ClassElement(clazz);
+		previous.add(element);
+		final Object[] arr = clazz.getEnumConstants();
+		final StringBuilder out = new StringBuilder();
+		if (System.getenv("ARCHIDATA_GENERATE_ZOD_ENUM") != null) {
+			boolean first = true;
+			out.append("zod.enum([");
+			for (final Object elem : arr) {
+				if (!first) {
+					out.append(",\n\t");
+				} else {
+					out.append("\n\t");
+					first = false;
+				}
+				out.append("'");
+				out.append(elem.toString());
+				out.append("'");
+			}
+			if (first) {
+				out.append("]}");
+			} else {
+				out.append("\n\t])");
+			}
+		} else {
+			element.isEnum = true;
+			boolean first = true;
+			out.append("{");
+			for (final Object elem : arr) {
+				if (!first) {
+					out.append(",\n\t");
+				} else {
+					out.append("\n\t");
+					first = false;
+				}
+				out.append(elem.toString());
+				out.append(" = '");
+				out.append(elem.toString());
+				out.append("'");
+			}
+			if (first) {
+				out.append("}");
+			} else {
+				out.append(",\n\t}");
+			}
+		}
+		element.declaration = out.toString();
+		previous.addOrder(element);
+		return element;
+	}
+
+	public static String convertTypeZod(final Class<?> type, final GeneratedTypes previous) throws Exception {
+		final ClassElement previousType = previous.find(type);
+		if (previousType != null) {
+			return previousType.zodName;
+		}
+		if (type.isEnum()) {
+			return convertTypeZodEnum(type, previous).zodName;
+		}
+		if (type == List.class) {
+			throw new DataAccessException("Imcompatible type of element in object for: " + type.getCanonicalName()
+					+ " Unmanaged List of List ... ");
+		}
+		final ClassElement elemCreated = createTable(type, previous);
+		if (elemCreated != null) {
+			return elemCreated.zodName;
+		}
+		throw new DataAccessException("Imcompatible type of element in object for: " + type.getCanonicalName());
+	}
+
+	public static String convertTypeZod(final Field field, final GeneratedTypes previous) throws Exception {
+		final Class<?> type = field.getType();
+		final ClassElement previousType = previous.find(type);
+		if (previousType != null) {
+			return previousType.zodName;
+		}
+		if (type.isEnum()) {
+			return convertTypeZodEnum(type, previous).zodName;
+		}
+		if (type == List.class) {
+			final ParameterizedType listType = (ParameterizedType) field.getGenericType();
+			final Class<?> listClass = (Class<?>) listType.getActualTypeArguments()[0];
+			final String simpleSubType = convertTypeZod(listClass, previous);
+			return "zod.array(" + simpleSubType + ")";
+		}
+		final ClassElement elemCreated = createTable(type, previous);
+		if (elemCreated != null) {
+			return elemCreated.zodName;
+		}
+		throw new DataAccessException("Imcompatible type of element in object for: " + type.getCanonicalName());
+	}
+
+	public static String optionalTypeZod(final Class<?> type) throws Exception {
+		if (type.isPrimitive()) {
+			return "";
+		}
+		return ".optional()";
+	}
+
+	public static void createTablesSpecificType(
+			final Field elem,
+			final int fieldId,
+			final StringBuilder builder,
+			final GeneratedTypes previous) throws Exception {
+		final String name = elem.getName();
+		final Class<?> classModel = elem.getType();
+		final int limitSize = AnnotationTools.getLimitSize(elem);
+
+		final String comment = AnnotationTools.getComment(elem);
+
+		if (fieldId != 0) {
+			builder.append(",");
+		}
+		if (comment != null) {
+			builder.append("\n\t// ");
+			builder.append(comment);
+		}
+		builder.append("\n\t");
+		builder.append(name);
+		builder.append(": ");
+		builder.append(convertTypeZod(elem, previous));
+		if (limitSize > 0 && classModel == String.class) {
+			builder.append(".max(");
+			builder.append(limitSize);
+			builder.append(")");
+		}
+		if (AnnotationTools.getSchemaReadOnly(elem)) {
+			builder.append(".readonly()");
+		}
+		builder.append(optionalTypeZod(classModel));
+	}
+
+	private static boolean isFieldFromSuperClass(final Class<?> model, final String filedName) {
+		final Class<?> superClass = model.getSuperclass();
+		if (superClass == null) {
+			return false;
+		}
+		for (final Field field : superClass.getFields()) {
+			String name;
+			try {
+				name = AnnotationTools.getFieldName(field);
+				if (filedName.equals(name)) {
+					return true;
+				}
+			} catch (final Exception e) {
+				// TODO Auto-generated catch block
+				LOGGER.trace("Catch error field name in parent create data table: {}", e.getMessage());
+			}
+		}
+		return false;
+	}
+
+	public static GeneratedTypes createBasicType() throws Exception {
+		final GeneratedTypes previous = new GeneratedTypes();
+		previous.add(new ClassElement(new Class<?>[] { Void.class, void.class }, "void", "void", null, null, true));
+		// Map is binded to any ==> can not determine this complex model for now
+		previous.add(new ClassElement(new Class<?>[] { Map.class }, "any", "any", null, null, true));
+		previous.add(new ClassElement(new Class<?>[] { String.class }, "zod.string()", "string", null, "zod.string()",
+				true));
+		previous.add(new ClassElement(new Class<?>[] { InputStream.class, FormDataContentDisposition.class },
+				"z.instanceof(File)", "File", null, "z.instanceof(File)", true));
+		previous.add(new ClassElement(new Class<?>[] { Boolean.class, boolean.class }, "zod.boolean()", "boolean", null,
+				"zod.boolean()", true));
+		previous.add(new ClassElement(new Class<?>[] { UUID.class }, "ZodUUID", "UUID", "isUUID", "zod.string().uuid()",
+				false), true);
+		previous.add(new ClassElement(new Class<?>[] { Long.class, long.class }, "ZodLong", "Long", "isLong",
+				// "zod.bigint()",
+				"zod.number()", false), true);
+		previous.add(new ClassElement(new Class<?>[] { Integer.class, int.class }, "ZodInteger", "Integer", "isInteger",
+				"zod.number().safe()", false), true);
+		previous.add(new ClassElement(new Class<?>[] { Double.class, double.class }, "ZodDouble", "Double", "isDouble",
+				"zod.number()", true), true);
+		previous.add(new ClassElement(new Class<?>[] { Float.class, float.class }, "ZodFloat", "Float", "isFloat",
+				"zod.number()", false), true);
+		previous.add(new ClassElement(new Class<?>[] { Instant.class }, "ZodInstant", "Instant", "isInstant",
+				"zod.string()", false), true);
+		previous.add(new ClassElement(new Class<?>[] { Date.class }, "ZodDate", "Date", "isDate",
+				"zod.string().datetime({ precision: 3 })", false), true);
+		previous.add(new ClassElement(new Class<?>[] { Timestamp.class }, "ZodTimestamp", "Timestamp", "isTimestamp",
+				"zod.string().datetime({ precision: 3 })", false), true);
+		previous.add(new ClassElement(new Class<?>[] { LocalDate.class }, "ZodLocalDate", "LocalDate", "isLocalDate",
+				"zod.string().date()", false), true);
+		previous.add(new ClassElement(new Class<?>[] { LocalTime.class }, "ZodLocalTime", "LocalTime", "isLocalTime",
+				"zod.string().time()", false), true);
+		return previous;
+	}
+
+	/** Request the generation of the TypeScript file for the "Zod" export model
+	 * @param classs List of class used in the model
+	 * @return A string representing the Server models
+	 * @throws Exception */
+	public static String createTables(final List<Class<?>> classs) throws Exception {
+		return createTables(classs, createBasicType());
+	}
+
+	public static String createTables(final List<Class<?>> classs, final GeneratedTypes previous) throws Exception {
+		for (final Class<?> clazz : classs) {
+			createTable(clazz, previous);
+		}
+
+		final StringBuilder generatedData = new StringBuilder();
+		generatedData.append("""
+				/**
+				 * Interface of the server (auto-generated code)
+				 */
+				import { z as zod } from \"zod\";
+
+				""");
+		for (final Class<?> elem : previous.order) {
+			final ClassElement data = previous.find(elem);
+			if (!data.nativeType) {
+				if (data.comment != null) {
+					generatedData.append(data.comment);
+				}
+				generatedData.append(createDeclaration(data));
+				generatedData.append("\n\n");
+			}
+		}
+		LOGGER.info("generated: {}", generatedData.toString());
+		return generatedData.toString();
+	}
+
+	public static List<ClassElement> createTables(final Class<?>[] classs, final GeneratedTypes previous)
+			throws Exception {
+		final List<ClassElement> out = new ArrayList<>();
+		for (final Class<?> clazz : classs) {
+			if (clazz == Response.class) {
+				throw new IOException("Can not generate a Zod element for an unknow type Response");
+			}
+			out.add(createTable(clazz, previous));
+		}
+		return out;
+	}
+
+	public static ClassElement createTable(final Class<?> clazz, final GeneratedTypes previous) throws Exception {
+		if (clazz == null) {
+			return null;
+		}
+		if (clazz == Response.class) {
+			throw new IOException("Can not generate a Zod element for an unknow type Response");
+		}
+		final ClassElement alreadyExist = previous.find(clazz);
+		if (previous.find(clazz) != null) {
+			return alreadyExist;
+		}
+		if (clazz.isPrimitive()) {
+			return null;
+		}
+
+		if (clazz.isEnum()) {
+			return convertTypeZodEnum(clazz, previous);
+		}
+
+		// add the current class to prevent multiple creation
+		final ClassElement curentElementClass = new ClassElement(clazz);
+		previous.add(curentElementClass);
+		// Local generation of class:
+		final StringBuilder internalBuilder = new StringBuilder();
+		final List<String> alreadyAdded = new ArrayList<>();
+		LOGGER.trace("parse class: '{}'", clazz.getCanonicalName());
+		int fieldId = 0;
+		for (final Field elem : clazz.getFields()) {
+			// static field is only for internal global declaration ==> remove it ..
+			if (java.lang.reflect.Modifier.isStatic(elem.getModifiers())) {
+				continue;
+			}
+			final String dataName = elem.getName();
+			if (isFieldFromSuperClass(clazz, dataName)) {
+				LOGGER.trace("        SKIP:  '{}'", elem.getName());
+				continue;
+			}
+			if (alreadyAdded.contains(dataName)) {
+				LOGGER.trace("        SKIP2: '{}'", elem.getName());
+				continue;
+			}
+			alreadyAdded.add(dataName);
+			LOGGER.trace("        + '{}'", elem.getName());
+			if (false && DataAccess.isAddOnField(elem)) {
+				final DataAccessAddOn addOn = DataAccess.findAddOnforField(elem);
+				LOGGER.error("Create type for: {} ==> {} (ADD-ON) ==> Not managed now ....",
+						AnnotationTools.getFieldName(elem), elem.getType());
+				/* LOGGER.trace("Create type for: {} ==> {} (ADD-ON)", AnnotationTools.getFieldName(elem), elem.getType()); if (addOn != null) { addOn.createTables(tableName, elem, tmpOut,
+				 * preActionList, postActionList, createIfNotExist, createDrop, fieldId); } else { throw new DataAccessException( "Element matked as add-on but add-on does not loaded: table:" +
+				 * tableName + " field name=" + AnnotationTools.getFieldName(elem) + " type=" + elem.getType()); } fieldId++; */
+			} else {
+				LOGGER.trace("Create type for: {} ==> {}", AnnotationTools.getFieldName(elem), elem.getType());
+				DataFactoryZod.createTablesSpecificType(elem, fieldId, internalBuilder, previous);
+				fieldId++;
+			}
+
+		}
+		final String description = AnnotationTools.getSchemaDescription(clazz);
+		final String example = AnnotationTools.getSchemaExample(clazz);
+		final StringBuilder generatedCommentedData = new StringBuilder();
+		if (description != null || example != null) {
+			generatedCommentedData.append("/**\n");
+			if (description != null) {
+				for (final String elem : description.split("\n")) {
+					generatedCommentedData.append(" * ");
+					generatedCommentedData.append(elem);
+					generatedCommentedData.append("\n");
+				}
+			}
+			if (example != null) {
+				generatedCommentedData.append(" * Example:\n");
+				generatedCommentedData.append(" * ```\n");
+				for (final String elem : example.split("\n")) {
+					generatedCommentedData.append(" * ");
+					generatedCommentedData.append(elem);
+					generatedCommentedData.append("\n");
+				}
+				generatedCommentedData.append(" * ```\n");
+			}
+			generatedCommentedData.append(" */\n");
+		}
+		curentElementClass.comment = generatedCommentedData.toString();
+		final StringBuilder generatedData = new StringBuilder();
+		final Class<?> parentClass = clazz.getSuperclass();
+		if (parentClass != null && parentClass != Object.class && parentClass != Record.class) {
+			final ClassElement parentDeclaration = createTable(parentClass, previous);
+			generatedData.append(parentDeclaration.zodName);
+			generatedData.append(".extend({");
+		} else {
+			generatedData.append("zod.object({");
+		}
+		generatedData.append(internalBuilder.toString());
+		generatedData.append("\n})");
+		// Remove the previous to reorder the map ==> parent must be inserted before us.
+		curentElementClass.declaration = generatedData.toString();
+		previous.addOrder(curentElementClass);
+		return curentElementClass;
+	}
+
+	public static String createDeclaration(final ClassElement elem) {
+		final StringBuilder generatedData = new StringBuilder();
+		if (elem.isEnum) {
+			generatedData.append("export enum ");
+			generatedData.append(elem.tsTypeName);
+			generatedData.append(" ");
+			generatedData.append(elem.declaration);
+			generatedData.append(";");
+			generatedData.append("\nexport const ");
+			generatedData.append(elem.zodName);
+			generatedData.append(" = zod.nativeEnum(");
+			generatedData.append(elem.tsTypeName);
+			generatedData.append(");");
+		} else {
+			generatedData.append("export const ");
+			generatedData.append(elem.zodName);
+			generatedData.append(" = ");
+			generatedData.append(elem.declaration);
+			generatedData.append(";");
+			generatedData.append("\nexport type ");
+			generatedData.append(elem.tsTypeName);
+			generatedData.append(" = zod.infer<typeof ");
+			generatedData.append(elem.zodName);
+			generatedData.append(">;");
+		}
+		// declare generic isXXX:
+		generatedData.append("\nexport function ");
+		generatedData.append(elem.tsCheckType);
+		generatedData.append("(data: any): data is ");
+		generatedData.append(elem.tsTypeName);
+		generatedData.append(" {\n\ttry {\n\t\t");
+		generatedData.append(elem.zodName);
+		generatedData.append("""
+				.parse(data);
+						return true;
+					} catch (e: any) {
+						console.log(`Fail to parse data ${e}`);
+						return false;
+					}
+				}
+				""");
+		return generatedData.toString();
+	}
+
+}

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

@@ -5,10 +5,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.bson.conversions.Bson;
-
-import com.mongodb.client.model.Filters;
-
 public class QueryAnd implements QueryItem {
 	protected final List<QueryItem> childs;
 
@@ -45,22 +41,14 @@ public class QueryAnd implements QueryItem {
 	}
 
 	@Override
-	public void injectQuery(final DBAccessSQL ioDb, 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.injectQuery(ioDb, ps, iii);
+			elem.injectQuery(ps, iii);
 		}
 	}
 
 	public int size() {
 		return this.childs.size();
 	}
-
-	@Override
-	public void generateFilter(final List<Bson> filters) {
-		final List<Bson> filtersLocal = new ArrayList<>();
-		for (final QueryItem elem : this.childs) {
-			elem.generateFilter(filtersLocal);
-		}
-		filters.add(Filters.and(filtersLocal.toArray(new Bson[0])));
-	}
 }

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

@@ -1,16 +1,8 @@
 package org.kar.archidata.dataAccess;
 
 import java.sql.PreparedStatement;
-import java.util.List;
-
-import org.bson.conversions.Bson;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.mongodb.client.model.Filters;
 
 public class QueryCondition implements QueryItem {
-	static final Logger LOGGER = LoggerFactory.getLogger(DBAccess.class);
 	private final String key;
 	private final String comparator;
 	private final Object value;
@@ -40,28 +32,8 @@ public class QueryCondition implements QueryItem {
 	}
 
 	@Override
-	public void injectQuery(final DBAccessSQL ioDb, final PreparedStatement ps, final CountInOut iii) throws Exception {
+	public void injectQuery(final PreparedStatement ps, final CountInOut iii) throws Exception {
-		ioDb.addElement(ps, this.value, iii);
+		DataAccess.addElement(ps, this.value, iii);
 		iii.inc();
 	}
-
-	@Override
-	public void generateFilter(final List<Bson> filters) {
-		if ("=".equals(this.comparator)) {
-			filters.add(Filters.eq(this.key, this.value));
-		} else if ("!=".equals(this.comparator)) {
-			filters.add(Filters.ne(this.key, this.value));
-		} else if (">".equals(this.comparator)) {
-			filters.add(Filters.gt(this.key, this.value));
-		} else if (">=".equals(this.comparator)) {
-			filters.add(Filters.gte(this.key, this.value));
-		} else if ("<".equals(this.comparator)) {
-			filters.add(Filters.lt(this.key, this.value));
-		} else if ("<=".equals(this.comparator)) {
-			filters.add(Filters.lte(this.key, this.value));
-		} else {
-			LOGGER.error("Not manage comparison: '{}'", this.key);
-		}
-
-	}
 }

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

@@ -3,10 +3,6 @@ package org.kar.archidata.dataAccess;
 import java.sql.PreparedStatement;
 import java.util.List;
 
-import org.bson.conversions.Bson;
-
-import com.mongodb.client.model.Filters;
-
 public class QueryInList<T> implements QueryItem {
 	protected final String key;
 	protected final String comparator;
@@ -48,15 +44,10 @@ public class QueryInList<T> implements QueryItem {
 	}
 
 	@Override
-	public void injectQuery(final DBAccessSQL ioDb, 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) {
-			ioDb.addElement(ps, elem, iii);
+			DataAccess.addElement(ps, elem, iii);
 			iii.inc();
 		}
 	}
-
-	@Override
-	public void generateFilter(final List<Bson> filters) {
-		filters.add(Filters.in(this.key, this.value));
-	}
 }

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

@@ -1,17 +1,9 @@
 package org.kar.archidata.dataAccess;
 
 import java.sql.PreparedStatement;
-import java.util.List;
-
-import org.bson.conversions.Bson;
 
 public interface QueryItem {
-	// For SQL mode query construction
 	void generateQuery(StringBuilder query, String tableName);
 
-	// For SQL mode query injection
+	void injectQuery(PreparedStatement ps, CountInOut iii) throws Exception;
-	void injectQuery(DBAccessSQL ioDb, PreparedStatement ps, CountInOut iii) throws Exception;
-
-	// For No-SQL mode filter creation
-	void generateFilter(List<Bson> filters);
 }

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

@@ -1,11 +1,6 @@
 package org.kar.archidata.dataAccess;
 
 import java.sql.PreparedStatement;
-import java.util.List;
-
-import org.bson.conversions.Bson;
-
-import com.mongodb.client.model.Filters;
 
 public class QueryNotNull implements QueryItem {
 	private final String key;
@@ -25,11 +20,5 @@ public class QueryNotNull implements QueryItem {
 	}
 
 	@Override
-	public void injectQuery(final DBAccessSQL ioDb, final PreparedStatement ps, final CountInOut iii)
+	public void injectQuery(final PreparedStatement ps, final CountInOut iii) throws Exception {}
-			throws Exception {}
-
-	@Override
-	public void generateFilter(final List<Bson> filters) {
-		filters.add(Filters.exists(this.key));
-	}
 }

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

@@ -1,11 +1,6 @@
 package org.kar.archidata.dataAccess;
 
 import java.sql.PreparedStatement;
-import java.util.List;
-
-import org.bson.conversions.Bson;
-
-import com.mongodb.client.model.Filters;
 
 public class QueryNull implements QueryItem {
 	private final String key;
@@ -25,12 +20,5 @@ public class QueryNull implements QueryItem {
 	}
 
 	@Override
-	public void injectQuery(final DBAccessSQL ioDb, final PreparedStatement ps, final CountInOut iii)
+	public void injectQuery(final PreparedStatement ps, final CountInOut iii) throws Exception {}
-			throws Exception {}
-
-	@Override
-	public void generateFilter(final List<Bson> filters) {
-		// Not sure of the result ... maybe check it ...
-		filters.add(Filters.eq(this.key, null));
-	}
 }

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

@@ -1,6 +1,7 @@
 package org.kar.archidata.dataAccess;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.kar.archidata.dataAccess.options.AccessDeletedItems;
@@ -24,16 +25,10 @@ public class QueryOptions {
 		if (elems == null || elems.length == 0) {
 			return;
 		}
-		for (final QueryOption elem : elems) {
+		Collections.addAll(this.options, elems);
-			add(elem);
-		}
-
 	}
 
 	public void add(final QueryOption option) {
-		if (option == null) {
-			return;
-		}
 		this.options.add(option);
 	}
 

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

@@ -1,13 +1,8 @@
 package org.kar.archidata.dataAccess;
 
 import java.sql.PreparedStatement;
-import java.util.ArrayList;
 import java.util.List;
 
-import org.bson.conversions.Bson;
-
-import com.mongodb.client.model.Filters;
-
 public class QueryOr implements QueryItem {
 	protected final List<QueryItem> childs;
 
@@ -39,18 +34,9 @@ public class QueryOr implements QueryItem {
 	}
 
 	@Override
-	public void injectQuery(final DBAccessSQL ioDb, 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.injectQuery(ioDb, ps, iii);
+			elem.injectQuery(ps, iii);
 		}
 	}
-
-	@Override
-	public void generateFilter(final List<Bson> filters) {
-		final List<Bson> filtersLocal = new ArrayList<>();
-		for (final QueryItem elem : this.childs) {
-			elem.generateFilter(filtersLocal);
-		}
-		filters.add(Filters.or(filtersLocal.toArray(new Bson[0])));
-	}
 }

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

@@ -0,0 +1,320 @@
+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.Types;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import org.kar.archidata.annotation.AnnotationTools;
+import org.kar.archidata.annotation.DataJson;
+import org.kar.archidata.dataAccess.CountInOut;
+import org.kar.archidata.dataAccess.DataAccess;
+import org.kar.archidata.dataAccess.DataAccessAddOn;
+import org.kar.archidata.dataAccess.DataFactory;
+import org.kar.archidata.dataAccess.LazyGetter;
+import org.kar.archidata.dataAccess.QueryOptions;
+import org.kar.archidata.dataAccess.addOn.model.TableCoversLongLong;
+import org.kar.archidata.dataAccess.addOn.model.TableCoversLongUUID;
+import org.kar.archidata.dataAccess.addOn.model.TableCoversUUIDLong;
+import org.kar.archidata.dataAccess.addOn.model.TableCoversUUIDUUID;
+import org.kar.archidata.dataAccess.options.OverrideTableName;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import jakarta.validation.constraints.NotNull;
+
+public class AddOnDataJson implements DataAccessAddOn {
+	static final Logger LOGGER = LoggerFactory.getLogger(AddOnDataJson.class);
+
+	@Override
+	public Class<?> getAnnotationClass() {
+		return DataJson.class;
+	}
+
+	@Override
+	public String getSQLFieldType(final Field elem) throws Exception {
+		final String fieldName = AnnotationTools.getFieldName(elem);
+		return DataFactory.convertTypeInSQL(String.class, fieldName);
+	}
+
+	@Override
+	public boolean isCompatibleField(final Field elem) {
+		final DataJson decorators = elem.getDeclaredAnnotation(DataJson.class);
+		return decorators != null;
+	}
+
+	@Override
+	public void insertData(final PreparedStatement ps, final Field field, final Object rootObject, final CountInOut iii)
+			throws Exception {
+		final Object data = field.get(rootObject);
+		if (data == null) {
+			ps.setNull(iii.value, Types.VARCHAR);
+		}
+		final ObjectMapper objectMapper = new ObjectMapper();
+		final String dataString = objectMapper.writeValueAsString(data);
+		ps.setString(iii.value, dataString);
+		iii.inc();
+	}
+
+	@Override
+	public boolean canInsert(final Field field) {
+		return true;
+	}
+
+	@Override
+	public boolean isInsertAsync(final Field field) throws Exception {
+		return false;
+	}
+
+	@Override
+	public boolean canRetrieve(final Field field) {
+		return true;
+	}
+
+	@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 {
+		querySelect.append(" ");
+		querySelect.append(tableName);
+		querySelect.append(".");
+		querySelect.append(name);
+		count.inc();
+		return;
+	}
+
+	@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 {
+		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 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));
+	}
+
+	public static void addLink(final Class<?> clazz, final Long id, final String column, final UUID remoteKey)
+			throws Exception {
+		final String tableName = AnnotationTools.getTableName(clazz);
+		final TableCoversLongUUID data = DataAccess.get(TableCoversLongUUID.class, id,
+				new OverrideTableName(tableName));
+		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));
+	}
+
+	public static void addLink(final Class<?> clazz, final UUID id, final String column, final UUID remoteKey)
+			throws Exception {
+		final String tableName = AnnotationTools.getTableName(clazz);
+		final TableCoversUUIDUUID data = DataAccess.get(TableCoversUUIDUUID.class, id,
+				new OverrideTableName(tableName));
+		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));
+	}
+
+	public static void addLink(final Class<?> clazz, final UUID id, final String column, final Long remoteKey)
+			throws Exception {
+		final String tableName = AnnotationTools.getTableName(clazz);
+		final TableCoversUUIDLong data = DataAccess.get(TableCoversUUIDLong.class, id,
+				new OverrideTableName(tableName));
+		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));
+	}
+
+	public static void removeLink(final Class<?> clazz, final UUID id, final String column, final Long remoteKey)
+			throws Exception {
+		final String tableName = AnnotationTools.getTableName(clazz);
+		final TableCoversUUIDLong data = DataAccess.get(TableCoversUUIDLong.class, id,
+				new OverrideTableName(tableName));
+		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 UUID id, final String column, final UUID remoteKey)
+			throws Exception {
+		final String tableName = AnnotationTools.getTableName(clazz);
+		final TableCoversUUIDUUID data = DataAccess.get(TableCoversUUIDUUID.class, id,
+				new OverrideTableName(tableName));
+		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));
+	}
+
+	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));
+	}
+	/* public static <TYPE> void addLink(final Class<TYPE> clazz, final Object localKey, final String column, final Object remoteKey) throws Exception { final String tableName =
+	 * AnnotationTools.getTableName(clazz); final TYPE data = DataAccess.get(clazz, localKey); // TODO: add filter of the "column" // find the field column: // add the remoteKey in the list: // post
+	 * new data in the DB final String linkTableName = generateLinkTableName(this.tableName, this.column); final LinkTable insertElement = new LinkTable(this.localKey, this.remoteKey);
+	 * DataAccess.insert(insertElement, new OverrideTableName(linkTableName)); } */
+
+}

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

@@ -0,0 +1,542 @@
+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.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+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.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.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;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ManyToMany;
+import jakarta.validation.constraints.NotNull;
+
+public class AddOnManyToMany implements DataAccessAddOn {
+	static final Logger LOGGER = LoggerFactory.getLogger(AddOnManyToMany.class);
+	static final String SEPARATOR_LONG = "-";
+	static final String SEPARATOR_UUID = "_";
+
+	@Override
+	public Class<?> getAnnotationClass() {
+		return ManyToMany.class;
+	}
+
+	@Override
+	public String getSQLFieldType(final Field elem) {
+		return null;
+	}
+
+	@Override
+	public boolean isCompatibleField(final Field elem) {
+		final ManyToMany decorators = elem.getDeclaredAnnotation(ManyToMany.class);
+		return decorators != null;
+	}
+
+	@Override
+	public void insertData(final PreparedStatement ps, final Field field, final Object rootObject, final CountInOut iii)
+			throws SQLException, IllegalArgumentException, IllegalAccessException {
+
+	}
+
+	@Override
+	public boolean canInsert(final Field field) {
+		return false;
+	}
+
+	@Override
+	public boolean canRetrieve(final Field field) {
+		if (field.getType() != List.class) {
+			return false;
+		}
+		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
+				.getActualTypeArguments()[0];
+		if (objectClass == Long.class || objectClass == UUID.class) {
+			return true;
+		}
+		final 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);
+		return generateLinkTableName(tableName, name);
+	}
+
+	public static String generateLinkTableName(final String tableName, final String name) {
+		String localName = name;
+		if (name.endsWith("s")) {
+			localName = name.substring(0, name.length() - 1);
+		}
+		return tableName + "_link_" + localName;
+	}
+
+	public void generateConcatQuery(
+			@NotNull final String tableName,
+			@NotNull final String primaryKey,
+			@NotNull final Field field,
+			@NotNull final StringBuilder querySelect,
+			@NotNull final StringBuilder query,
+			@NotNull final String name,
+			@NotNull final CountInOut count,
+			final QueryOptions options) throws Exception {
+		final String linkTableName = generateLinkTableName(tableName, name);
+		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
+				.getActualTypeArguments()[0];
+		final String tmpVariable = "tmp_" + Integer.toString(count.value);
+		querySelect.append(" (SELECT GROUP_CONCAT(");
+		querySelect.append(tmpVariable);
+		querySelect.append(".object2Id ");
+		if ("sqlite".equals(ConfigBaseVariable.getDBType())) {
+			querySelect.append(", ");
+		} else {
+			querySelect.append("SEPARATOR ");
+		}
+		querySelect.append("'");
+		if (objectClass == Long.class) {
+			querySelect.append(SEPARATOR_LONG);
+		} else if (objectClass == UUID.class) {} else {
+			final Class<?> foreignKeyType = AnnotationTools.getPrimaryKeyField(objectClass).getType();
+			if (foreignKeyType == Long.class) {
+				querySelect.append(SEPARATOR_LONG);
+			}
+		}
+		querySelect.append("') FROM ");
+		querySelect.append(linkTableName);
+		querySelect.append(" ");
+		querySelect.append(tmpVariable);
+		querySelect.append(" WHERE ");
+		querySelect.append(tmpVariable);
+		querySelect.append(".deleted = false");
+		querySelect.append(" AND ");
+		querySelect.append(tableName);
+		querySelect.append(".");
+		querySelect.append(primaryKey);
+		querySelect.append(" = ");
+		querySelect.append(tmpVariable);
+		querySelect.append(".");
+		querySelect.append("object1Id ");
+		if (!"sqlite".equals(ConfigBaseVariable.getDBType())) {
+			querySelect.append(" GROUP BY ");
+			querySelect.append(tmpVariable);
+			querySelect.append(".object1Id");
+		}
+		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" + */
+		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];
+		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;
+		}
+		if (objectClass == decorators.targetEntity()) {
+			if (decorators.fetch() == FetchType.EAGER) {
+				throw new DataAccessException("EAGER is not supported for list of element...");
+			} else {
+				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) {
+					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<Long> childs = new ArrayList<>(idList);
+						// TODO: update to have get with abstract types ....
+						@SuppressWarnings("unchecked")
+						final Object foreignData = DataAccess.getsWhere(decorators.targetEntity(),
+								new Condition(new QueryInList<>(idField, childs)));
+						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;
+						}
+						field.set(data, foreignData);
+					};
+					lazyCall.add(lambda);
+				}
+			}
+		}
+	}
+
+	@Override
+	public boolean isUpdateAsync(final Field field) {
+		return true;
+	}
+
+	@Override
+	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 String linkTableName = generateLinkTableNameField(tableName, field);
+		final QueryOptions options = new QueryOptions(new OverrideTableName(linkTableName));
+		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
+				.getActualTypeArguments()[0];
+		if (objectClass != Long.class && objectClass != UUID.class) {
+			throw new DataAccessException("Can not ManyToMany with other than List<Long> or List<UUID> Model: List<"
+					+ objectClass.getCanonicalName() + ">");
+		}
+		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

@@ -1,4 +1,4 @@
-package org.kar.archidata.dataAccess.addOnSQL;
+package org.kar.archidata.dataAccess.addOn;
 
 import java.lang.reflect.Field;
 import java.sql.PreparedStatement;
@@ -7,11 +7,10 @@ import java.sql.Types;
 import java.util.List;
 import java.util.UUID;
 
-import org.bson.types.ObjectId;
 import org.kar.archidata.annotation.AnnotationTools;
-import org.kar.archidata.annotation.AnnotationTools.FieldName;
 import org.kar.archidata.dataAccess.CountInOut;
-import org.kar.archidata.dataAccess.DBAccessSQL;
+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;
@@ -33,10 +32,10 @@ public class AddOnManyToOne implements DataAccessAddOn {
 	}
 
 	@Override
-	public String getSQLFieldType(final Field field, final QueryOptions options) throws Exception {
+	public String getSQLFieldType(final Field field) throws Exception {
-		final FieldName fieldName = AnnotationTools.getFieldName(field, options);
+		final String fieldName = AnnotationTools.getFieldName(field);
 		try {
-			return DataFactory.convertTypeInSQL(field.getType(), fieldName.inTable());
+			return DataFactory.convertTypeInSQL(field.getType(), fieldName);
 		} catch (final Exception e) {
 			e.printStackTrace();
 		}
@@ -49,12 +48,8 @@ public class AddOnManyToOne implements DataAccessAddOn {
 	}
 
 	@Override
-	public void insertData(
+	public void insertData(final PreparedStatement ps, final Field field, final Object rootObject, final CountInOut iii)
-			final DBAccessSQL ioDb,
+			throws Exception {
-			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) {
@@ -67,8 +62,6 @@ public class AddOnManyToOne implements DataAccessAddOn {
 				ps.setNull(iii.value, Types.VARCHAR);
 			} else if (field.getType() == UUID.class) {
 				ps.setNull(iii.value, Types.BINARY);
-			} else if (field.getType() == ObjectId.class) {
-				ps.setNull(iii.value, Types.BINARY);
 			}
 		} else if (field.getType() == Long.class) {
 			final Long dataTyped = (Long) data;
@@ -87,11 +80,6 @@ public class AddOnManyToOne implements DataAccessAddOn {
 			LOGGER.info("Generate UUTD for DB: {}", dataTyped);
 			final byte[] dataByte = UuidUtils.asBytes(dataTyped);
 			ps.setBytes(iii.value, dataByte);
-		} else if (field.getType() == ObjectId.class) {
-			final ObjectId dataTyped = (ObjectId) data;
-			LOGGER.info("Generate ObjectId for DB: {}", dataTyped);
-			final byte[] dataByte = dataTyped.toByteArray();
-			ps.setBytes(iii.value, dataByte);
 		} else {
 			final Field idField = AnnotationTools.getFieldOfId(field.getType());
 			final Object uid = idField.get(data);
@@ -109,8 +97,7 @@ public class AddOnManyToOne implements DataAccessAddOn {
 	@Override
 	public boolean canInsert(final Field field) {
 		if (field.getType() == Long.class || field.getType() == Integer.class || field.getType() == Short.class
-				|| field.getType() == String.class || field.getType() == UUID.class
+				|| field.getType() == String.class || field.getType() == UUID.class) {
-				|| field.getType() == ObjectId.class) {
 			return true;
 		}
 		final ManyToOne decorators = field.getDeclaredAnnotation(ManyToOne.class);
@@ -129,7 +116,7 @@ public class AddOnManyToOne implements DataAccessAddOn {
 	public boolean canRetrieve(final Field field) {
 		final Class<?> classType = field.getType();
 		if (classType == Long.class || classType == Integer.class || classType == Short.class
-				|| classType == String.class || classType == UUID.class || classType == ObjectId.class) {
+				|| classType == String.class || classType == UUID.class) {
 			return true;
 		}
 		final ManyToOne decorators = field.getDeclaredAnnotation(ManyToOne.class);
@@ -150,8 +137,7 @@ public class AddOnManyToOne implements DataAccessAddOn {
 			@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
+				|| field.getType() == String.class || field.getType() == UUID.class) {
-				|| field.getType() == ObjectId.class) {
 			querySelect.append(" ");
 			querySelect.append(tableName);
 			querySelect.append(".");
@@ -163,7 +149,7 @@ public class AddOnManyToOne implements DataAccessAddOn {
 		if (field.getType() == decorators.targetEntity()) {
 			if (decorators.fetch() == FetchType.EAGER) {
 				// TODO: rework this to have a lazy mode ...
-				DBAccessSQL.generateSelectField(querySelect, query, field.getType(), options, count);
+				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);
@@ -172,11 +158,11 @@ public class AddOnManyToOne implements DataAccessAddOn {
 				query.append("` ON ");
 				query.append(subTableName);
 				query.append(".");
-				query.append(AnnotationTools.getFieldName(idField, options).inTable());
+				query.append(AnnotationTools.getFieldName(idField));
 				query.append(" = ");
 				query.append(tableName);
 				query.append(".");
-				query.append(AnnotationTools.getFieldName(field, options).inTable());
+				query.append(AnnotationTools.getFieldName(field));
 			} else {
 				querySelect.append(" ");
 				querySelect.append(tableName);
@@ -192,7 +178,6 @@ public class AddOnManyToOne implements DataAccessAddOn {
 
 	@Override
 	public void fillFromQuery(
-			final DBAccessSQL ioDb,
 			final ResultSet rs,
 			final Field field,
 			final Object data,
@@ -240,15 +225,6 @@ public class AddOnManyToOne implements DataAccessAddOn {
 			}
 			return;
 		}
-		if (field.getType() == ObjectId.class) {
-			final byte[] tmp = rs.getBytes(count.value);
-			count.inc();
-			if (!rs.wasNull()) {
-				final ObjectId foreignKey = new ObjectId(tmp);
-				field.set(data, foreignKey);
-			}
-			return;
-		}
 		final Class<?> objectClass = field.getType();
 		final ManyToOne decorators = field.getDeclaredAnnotation(ManyToOne.class);
 		if (decorators == null) {
@@ -257,16 +233,12 @@ public class AddOnManyToOne implements DataAccessAddOn {
 		if (objectClass == decorators.targetEntity()) {
 			if (decorators.fetch() == FetchType.EAGER) {
 				final CountInOut countNotNull = new CountInOut(0);
-				final Object dataNew = ioDb.createObjectFromSQLRequest(rs, objectClass, count, countNotNull, options,
+				final Object dataNew = DataAccess.createObjectFromSQLRequest(rs, objectClass, count, countNotNull,
-						lazyCall);
+						options, lazyCall);
 				if (dataNew != null && countNotNull.value != 0) {
 					field.set(data, dataNew);
 				}
-				return;
+			} else {
-			}
-			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();
@@ -274,39 +246,7 @@ public class AddOnManyToOne implements DataAccessAddOn {
 					// 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 = ioDb.get(decorators.targetEntity(), foreignKey);
+						final Object foreignData = DataAccess.get(decorators.targetEntity(), foreignKey);
-						if (foreignData == null) {
-							return;
-						}
-						field.set(data, foreignData);
-					};
-					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 = ioDb.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 = ioDb.get(decorators.targetEntity(), foreignKey);
-						if (foreignData == null) {
-							return;
-						}
-						field.set(data, foreignData);
-					};
-					lazyCall.add(lambda);
-				}
-			} else if (remotePrimaryKeyType == ObjectId.class) {
-				// here we have the field, the data and the the remote value ==> can create callback that generate the update of the value ...
-				final ObjectId foreignKey = ioDb.getListOfRawOID(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 = ioDb.get(decorators.targetEntity(), foreignKey);
 						if (foreignData == null) {
 							return;
 						}
@@ -329,17 +269,16 @@ public class AddOnManyToOne implements DataAccessAddOn {
 			final List<String> postActionList,
 			final boolean createIfNotExist,
 			final boolean createDrop,
-			final int fieldId,
+			final int fieldId) throws Exception {
-			final QueryOptions options) throws Exception {
 		final Class<?> classType = field.getType();
 		if (classType == Long.class || classType == Integer.class || classType == Short.class
-				|| classType == String.class || classType == UUID.class || classType == ObjectId.class) {
+				|| classType == String.class || classType == UUID.class) {
 			DataFactory.createTablesSpecificType(tableName, primaryField, field, mainTableBuilder, preActionList,
-					postActionList, createIfNotExist, createDrop, fieldId, classType, options);
+					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, options);
+					postActionList, createIfNotExist, createDrop, fieldId, Long.class);
 		}
 	}
 }

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

@@ -0,0 +1,154 @@
+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.dataAccess.CountInOut;
+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.persistence.OneToMany;
+import jakarta.validation.constraints.NotNull;
+
+public class AddOnOneToMany implements DataAccessAddOn {
+	static final Logger LOGGER = LoggerFactory.getLogger(AddOnManyToMany.class);
+
+	/** 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("-"));
+	}
+
+	/** extract a list of "-" separated element from a SQL input data.
+	 * @param rs Result Set of the BDD
+	 * @param iii Id in the result set
+	 * @return The list of Long value
+	 * @throws SQLException if an error is generated in the sql request. */
+	protected static List<Long> getListOfIds(final ResultSet rs, final int iii) throws SQLException {
+		final String trackString = rs.getString(iii);
+		if (rs.wasNull()) {
+			return null;
+		}
+		final List<Long> out = new ArrayList<>();
+		final String[] elements = trackString.split("-");
+		for (final String elem : elements) {
+			final Long tmp = Long.parseLong(elem);
+			out.add(tmp);
+		}
+		return out;
+	}
+
+	@Override
+	public Class<?> getAnnotationClass() {
+		return OneToMany.class;
+	}
+
+	@Override
+	public String getSQLFieldType(final Field field) throws Exception {
+		final String fieldName = AnnotationTools.getFieldName(field);
+		try {
+			return DataFactory.convertTypeInSQL(Long.class, fieldName);
+		} catch (final Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	@Override
+	public boolean isCompatibleField(final Field field) {
+		final OneToMany decorators = field.getDeclaredAnnotation(OneToMany.class);
+		return decorators != null;
+	}
+
+	@Override
+	public void insertData(final PreparedStatement ps, final Field field, final Object rootObject, final CountInOut iii)
+			throws SQLException, IllegalArgumentException, IllegalAccessException {
+		final Object data = field.get(rootObject);
+		iii.inc();
+		if (data == null) {
+			ps.setNull(iii.value, Types.BIGINT);
+		} else {
+			@SuppressWarnings("unchecked")
+			final String dataTmp = getStringOfIds((List<Long>) data);
+			ps.setString(iii.value, dataTmp);
+		}
+	}
+
+	@Override
+	public boolean canInsert(final Field field) {
+		return false;
+	}
+
+	@Override
+	public boolean isInsertAsync(final Field field) throws Exception {
+		return false;
+	}
+
+	@Override
+	public boolean canRetrieve(final Field field) {
+		return false;
+	}
+
+	@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) {
+		querySelect.append(" ");
+		querySelect.append(tableName);
+		querySelect.append(".");
+		querySelect.append(name);
+		count.inc();
+	}
+
+	@Override
+	public void fillFromQuery(
+			final ResultSet rs,
+			final Field field,
+			final Object data,
+			final CountInOut count,
+			final QueryOptions options,
+			final List<LazyGetter> lazyCall) throws SQLException, IllegalArgumentException, IllegalAccessException {
+		final Long foreignKey = rs.getLong(count.value);
+		count.inc();
+		if (!rs.wasNull()) {
+
+			field.set(data, foreignKey);
+		}
+	}
+
+	// TODO : refacto this table to manage a generic table with dynamic name to be serializable with the default system
+	@Override
+	public void createTables(
+			final String tableName,
+			final Field primaryField,
+			final Field field,
+			final StringBuilder mainTableBuilder,
+			final List<String> preActionList,
+			final List<String> postActionList,
+			final boolean createIfNotExist,
+			final boolean createDrop,
+			final int fieldId) throws Exception {
+		DataFactory.createTablesSpecificType(tableName, primaryField, field, mainTableBuilder, preActionList,
+				postActionList, createIfNotExist, createDrop, fieldId, Long.class);
+	}
+}

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

@@ -0,0 +1,136 @@
+package org.kar.archidata.dataAccess.addOn;
+
+import java.lang.reflect.Field;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.kar.archidata.annotation.AnnotationTools;
+import org.kar.archidata.annotation.addOn.SQLTableExternalForeinKeyAsList;
+import org.kar.archidata.dataAccess.CountInOut;
+import org.kar.archidata.dataAccess.DataAccess;
+import org.kar.archidata.dataAccess.DataAccessAddOn;
+import org.kar.archidata.dataAccess.DataFactory;
+import org.kar.archidata.dataAccess.LazyGetter;
+import org.kar.archidata.dataAccess.QueryOptions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jakarta.validation.constraints.NotNull;
+
+// TODO: maybe deprecated ==> use DataJson instead...
+@Deprecated
+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 true;
+	}
+
+	@Override
+	public boolean isInsertAsync(final Field field) throws Exception {
+		return false;
+	}
+
+	@Override
+	public boolean canRetrieve(final Field field) {
+		return true;
+	}
+
+	@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) {
+		count.inc();
+		querySelect.append(" ");
+		querySelect.append(tableName);
+		querySelect.append(".");
+		querySelect.append(name);
+	}
+
+	@Override
+	public void fillFromQuery(
+			final ResultSet rs,
+			final Field field,
+			final Object data,
+			final CountInOut count,
+			final QueryOptions options,
+			final List<LazyGetter> lazyCall) throws SQLException, IllegalArgumentException, IllegalAccessException {
+		final List<Long> idList = DataAccess.getListOfIds(rs, count.value, SEPARATOR);
+		field.set(data, idList);
+		count.inc();
+	}
+
+	@Override
+	public void createTables(
+			final String tableName,
+			final Field primaryField,
+			final Field field,
+			final StringBuilder mainTableBuilder,
+			final List<String> preActionList,
+			final List<String> postActionList,
+			final boolean createIfNotExist,
+			final boolean createDrop,
+			final int fieldId) throws Exception {
+		DataFactory.createTablesSpecificType(tableName, primaryField, field, mainTableBuilder, preActionList,
+				postActionList, createIfNotExist, createDrop, fieldId, String.class);
+	}
+}

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,28 @@
+package org.kar.archidata.dataAccess.addOn.model;
+
+import java.util.List;
+
+import org.kar.archidata.annotation.DataJson;
+import org.kar.archidata.model.GenericData;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Id;
+
+public class TableCoversLongLong extends GenericData {
+	public TableCoversLongLong() {
+		// nothing to do...
+	}
+
+	public TableCoversLongLong(final Long id, final List<Long> covers) {
+		this.id = id;
+		this.covers = covers;
+	}
+
+	@Column(nullable = false)
+	@Id
+	public Long id;
+	@DataJson()
+	@Column(nullable = false)
+	public List<Long> covers;
+
+}

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

@@ -0,0 +1,29 @@
+package org.kar.archidata.dataAccess.addOn.model;
+
+import java.util.List;
+import java.util.UUID;
+
+import org.kar.archidata.annotation.DataJson;
+import org.kar.archidata.model.GenericData;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Id;
+
+public class TableCoversLongUUID extends GenericData {
+	public TableCoversLongUUID() {
+		// nothing to do...
+	}
+
+	public TableCoversLongUUID(final Long id, final List<UUID> covers) {
+		this.id = id;
+		this.covers = covers;
+	}
+
+	@Column(nullable = false)
+	@Id
+	public Long id;
+	@DataJson()
+	@Column(nullable = false)
+	public List<UUID> covers;
+
+}

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

@@ -0,0 +1,29 @@
+package org.kar.archidata.dataAccess.addOn.model;
+
+import java.util.List;
+import java.util.UUID;
+
+import org.kar.archidata.annotation.DataJson;
+import org.kar.archidata.model.GenericData;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Id;
+
+public class TableCoversUUIDLong extends GenericData {
+	public TableCoversUUIDLong() {
+		// nothing to do...
+	}
+
+	public TableCoversUUIDLong(final UUID id, final List<Long> covers) {
+		this.id = id;
+		this.covers = covers;
+	}
+
+	@Column(nullable = false)
+	@Id
+	public UUID id;
+	@DataJson()
+	@Column(nullable = false)
+	public List<Long> covers;
+
+}

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

@@ -0,0 +1,29 @@
+package org.kar.archidata.dataAccess.addOn.model;
+
+import java.util.List;
+import java.util.UUID;
+
+import org.kar.archidata.annotation.DataJson;
+import org.kar.archidata.model.GenericData;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Id;
+
+public class TableCoversUUIDUUID extends GenericData {
+	public TableCoversUUIDUUID() {
+		// nothing to do...
+	}
+
+	public TableCoversUUIDUUID(final UUID id, final List<UUID> covers) {
+		this.id = id;
+		this.covers = covers;
+	}
+
+	@Column(nullable = false)
+	@Id
+	public UUID id;
+	@DataJson()
+	@Column(nullable = false)
+	public List<UUID> covers;
+
+}

src/org/kar/archidata/dataAccess/addOnMongo/AddOnManyToMany.java

@@ -1,447 +0,0 @@
-package org.kar.archidata.dataAccess.addOnMongo;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.ParameterizedType;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-import org.bson.Document;
-import org.kar.archidata.annotation.AnnotationTools;
-import org.kar.archidata.annotation.AnnotationTools.FieldName;
-import org.kar.archidata.dataAccess.CountInOut;
-import org.kar.archidata.dataAccess.DBAccess;
-import org.kar.archidata.dataAccess.DBAccessMorphia;
-import org.kar.archidata.dataAccess.DataFactory;
-import org.kar.archidata.dataAccess.LazyGetter;
-import org.kar.archidata.dataAccess.QueryAnd;
-import org.kar.archidata.dataAccess.QueryCondition;
-import org.kar.archidata.dataAccess.QueryOptions;
-import org.kar.archidata.dataAccess.addOnSQL.model.LinkTableGeneric;
-import org.kar.archidata.dataAccess.options.Condition;
-import org.kar.archidata.dataAccess.options.OptionSpecifyType;
-import org.kar.archidata.dataAccess.options.OverrideTableName;
-import org.kar.archidata.exception.DataAccessException;
-import org.kar.archidata.tools.ConfigBaseVariable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import jakarta.persistence.ManyToMany;
-import jakarta.validation.constraints.NotNull;
-
-public class AddOnManyToMany implements DataAccessAddOn {
-	static final Logger LOGGER = LoggerFactory.getLogger(AddOnManyToMany.class);
-	static final String SEPARATOR_LONG = "-";
-	static final String SEPARATOR_UUID = "_";
-
-	@Override
-	public Class<?> getAnnotationClass() {
-		return ManyToMany.class;
-	}
-
-	@Override
-	public boolean isCompatibleField(final Field elem) {
-		final ManyToMany decorators = elem.getDeclaredAnnotation(ManyToMany.class);
-		return decorators != null;
-	}
-
-	@Override
-	public void insertData(
-			final DBAccessMorphia ioDb,
-			final Field field,
-			final Object rootObject,
-			final QueryOptions options,
-			final Document docSet,
-			final Document docUnSet) throws Exception {
-
-	}
-
-	@Override
-	public boolean canInsert(final Field field) {
-		return false;
-	}
-
-	@Override
-	public boolean canRetrieve(final Field field) {
-		if (field.getType() != List.class) {
-			return false;
-		}
-		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
-				.getActualTypeArguments()[0];
-		if (objectClass == Long.class || objectClass == UUID.class) {
-			return true;
-		}
-		final 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,
-			final QueryOptions options) throws Exception {
-		final FieldName name = AnnotationTools.getFieldName(field, options);
-		return generateLinkTableName(tableName, name.inTable());
-	}
-
-	public static String generateLinkTableName(final String tableName, final String name) {
-		String localName = name;
-		if (name.endsWith("s")) {
-			localName = name.substring(0, name.length() - 1);
-		}
-		return tableName + "_link_" + localName;
-	}
-
-	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 {
-			querySelect.append(".object1Id ");
-		}
-		if ("sqlite".equals(ConfigBaseVariable.getDBType())) {
-			querySelect.append(", ");
-		} else {
-			querySelect.append("SEPARATOR ");
-		}
-		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" + */
-		count.inc();
-	}
-
-	@Override
-	public void fillFromDoc(
-			final DBAccessMorphia ioDb,
-			final Document doc,
-			final Field field,
-			final Object data,
-			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 String fieldName = AnnotationTools.getFieldName(field);
-		if (!doc.containsKey(fieldName)) {
-			field.set(data, null);
-			return;
-		}
-		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
-				.getActualTypeArguments()[0];
-		if (objectClass == Long.class) {
-			final List<Long> idList = ioDb.getListOfIds(rs, count.value, SEPARATOR_LONG);
-			field.set(data, idList);
-			count.inc();
-			return;
-		} else if (objectClass == UUID.class) {
-			final List<UUID> idList = ioDb.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 (foreignKeyType == Long.class) {
-				final List<Long> idList = ioDb.getListOfIds(rs, count.value, SEPARATOR_LONG);
-				// 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<Long> childs = new ArrayList<>(idList);
-						// TODO: update to have get with abstract types ....
-						@SuppressWarnings("unchecked")
-						final Object foreignData = ioDb.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 = ioDb.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 = ioDb.getsWhere(decorators.targetEntity(),
-								new Condition(new QueryInList<>(idField, childs)));
-						if (foreignData == null) {
-							return;
-						}
-						field.set(data, foreignData);
-					};
-					lazyCall.add(lambda);
-				}
-			}
-		}
-		*/
-	}
-
-	@Override
-	public boolean isUpdateAsync(final Field field) {
-		return true;
-	}
-
-	@Override
-	public void asyncUpdate(
-			final DBAccessMorphia ioDb,
-			final String tableName,
-			final Object localKey,
-			final Field field,
-			final Object data,
-			final List<LazyGetter> actions,
-			final QueryOptions options) 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 FieldName columnName = AnnotationTools.getFieldName(field, options);
-		final String linkTableName = generateLinkTableName(tableName, columnName.inTable());
-
-		actions.add(() -> {
-			ioDb.deleteWhere(LinkTableGeneric.class, new OverrideTableName(linkTableName),
-					new Condition(new QueryCondition("object1Id", "=", localKey)),
-					new OptionSpecifyType("object1Id", localKey.getClass()),
-					new OptionSpecifyType("object2Id", objectClass));
-		});
-		asyncInsert(ioDb, tableName, localKey, field, data, actions, options);
-	}
-
-	@Override
-	public boolean isInsertAsync(final Field field) {
-		return true;
-	}
-
-	@Override
-	public void asyncInsert(
-			final DBAccessMorphia ioDb,
-			final String tableName,
-			final Object localKey,
-			final Field field,
-			final Object data,
-			final List<LazyGetter> actions,
-			final QueryOptions options) 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 FieldName columnName = AnnotationTools.getFieldName(field, options);
-		final String linkTableName = generateLinkTableName(tableName, columnName.inTable());
-
-		@SuppressWarnings("unchecked")
-		final List<Object> dataCasted = (List<Object>) data;
-		if (dataCasted.size() == 0) {
-			return;
-		}
-		final List<LinkTableGeneric> insertElements = new ArrayList<>();
-		for (final Object remoteKey : dataCasted) {
-			if (remoteKey == null) {
-				throw new DataAccessException("Try to insert remote key with null value");
-			}
-			insertElements.add(new LinkTableGeneric(localKey, remoteKey));
-		}
-		if (insertElements.size() == 0) {
-			LOGGER.warn("Insert multiple link without any value (may have null in the list): {}", dataCasted);
-			return;
-		}
-		actions.add(() -> {
-			ioDb.insertMultiple(insertElements, new OverrideTableName(linkTableName),
-					new OptionSpecifyType("object1Id", localKey.getClass()),
-					new OptionSpecifyType("object2Id", objectClass));
-		});
-	}
-
-	@Override
-	public void drop(final DBAccessMorphia ioDb, final String tableName, final Field field, final QueryOptions options)
-			throws Exception {
-		final String columnName = AnnotationTools.getFieldName(field, options).inTable();
-		final String linkTableName = generateLinkTableName(tableName, columnName);
-		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
-				.getActualTypeArguments()[0];
-		ioDb.drop(LinkTableGeneric.class, new OverrideTableName(linkTableName),
-				new OptionSpecifyType("object1Id", Long.class), new OptionSpecifyType("object2Id", Long.class));
-	}
-
-	@Override
-	public void cleanAll(
-			final DBAccessMorphia ioDb,
-			final String tableName,
-			final Field field,
-			final QueryOptions options) throws Exception {
-		final String columnName = AnnotationTools.getFieldName(field, options).inTable();
-		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() + ">");
-		}
-		ioDb.cleanAll(LinkTableGeneric.class, new OverrideTableName(linkTableName),
-				new OptionSpecifyType("object1Id", Long.class), new OptionSpecifyType("object2Id", Long.class));
-	}
-
-	public static void addLink(
-			final DBAccess ioDb,
-			final Class<?> clazz,
-			final long localKey,
-			final String column,
-			final long remoteKey) throws Exception {
-		if (ioDb instanceof final DBAccessMorphia daSQL) {
-			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 LinkTableGeneric insertElement = new LinkTableGeneric(localKey, remoteKey);
-			daSQL.insert(insertElement, new OverrideTableName(linkTableName),
-					new OptionSpecifyType("object1Id", Long.class), new OptionSpecifyType("object2Id", Long.class));
-		} else if (ioDb instanceof final DBAccessMorphia dam) {
-
-		} else {
-			throw new DataAccessException("DataAccess Not managed");
-		}
-
-	}
-
-	public static long removeLink(
-			final DBAccess ioDb,
-			final Class<?> clazz,
-			final long localKey,
-			final String column,
-			final long remoteKey) throws Exception {
-		if (ioDb instanceof final DBAccessMorphia daSQL) {
-			final String tableName = AnnotationTools.getTableName(clazz);
-			final String linkTableName = generateLinkTableName(tableName, column);
-			return daSQL.deleteWhere(LinkTableGeneric.class, new OverrideTableName(linkTableName),
-					new Condition(new QueryAnd(new QueryCondition("object1Id", "=", localKey),
-							new QueryCondition("object2Id", "=", remoteKey))),
-					new OptionSpecifyType("object1Id", Long.class), new OptionSpecifyType("object2Id", Long.class));
-		} else if (ioDb instanceof final DBAccessMorphia dam) {
-			return 0L;
-		} else {
-			throw new DataAccessException("DataAccess Not managed");
-		}
-	}
-
-	@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,
-			final QueryOptions options) 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, options);
-		final QueryOptions options2 = new QueryOptions(new OverrideTableName(linkTableName));
-		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
-				.getActualTypeArguments()[0];
-		final Class<?> primaryType = primaryField.getType();
-		options2.add(new OptionSpecifyType("object1Id", primaryType));
-		options2.add(new OptionSpecifyType("object2Id", objectClass));
-		final List<String> sqlCommand = DataFactory.createTable(LinkTableGeneric.class, options2);
-		postActionList.addAll(sqlCommand);
-	}
-}