[RELEASE] new version 0.5.0

.checkstyle

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+  <fileset name="all" enabled="true" check-config-name="Google Checks" local="false">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+</fileset-config>

.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="out/maven/classes" path="src">
+	<classpathentry including="**/*.java" kind="src" output="out/maven/classes" path="src">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -8,17 +8,24 @@
 	</classpathentry>
 	<classpathentry kind="src" output="out/maven/test-classes" path="test/src">
 		<attributes>
+			<attribute name="test" value="true"/>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry excluding="**" kind="src" output="out/maven/test-classes" path="test/resources">
+		<attributes>
+			<attribute name="test" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

.gitignore

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

.jenkinsfile

@@ -0,0 +1,31 @@
+pipeline {
+  agent any
+  environment {
+    REGISTRY_ADDRESS = "gitea.atria-soft.org"
+    REGISTRY_ADDRESS_FULL = "https://${REGISTRY_ADDRESS}"
+    REPOSITORY_BASE_NAME = 'kangaroo-and-rabbit/archidata'
+    TAG_DOCKER = getEnvName(env.BRANCH_NAME)
+  }
+  stages {
+    stage('save-evironment') {
+      steps {
+        sh 'ls -la'
+        sh 'pwd'
+        sh 'uname -a'
+        sh 'printenv | sort'
+        //sh 'cat version.txt'
+        sh 'git log -n 20'
+        sh 'javac --version'
+      }
+    }
+  }
+}
+
+def getEnvName(branchName) {
+  if("master".equals(branchName)) {
+    return "latest";
+  } else if("dev".equals(branchName)) {
+    return "dev";
+  }
+  return "other";
+}

.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>achi-data</name>
+	<name>archi-data</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -20,4 +20,15 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1682721079856</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

README.md

@@ -15,13 +15,60 @@ generic interface for all KAR web application
 
 
 
+Somes tools:
+============
+
+Auto-update dependency:
+-----------------------
+
+auto-update to the last version dependency:
+
+```bash
+mvn versions:use-latest-versions
+```
+
+Format the code
+---------------
+
+Simply run the cmd-line:
+
+```bash
+mvn formatter:format
+```
+
+
+Add Gitea in the dependency for the registry:
+=============================================
+
 Read instruction for tocken in ~/.m2/setting.xml
 
-release:
+edit file: ```~/.m2/settings.xml``` 
 
-export PATH=/usr/lib/jvm/java-18-openjdk/bin:$PATH
+```xml
+<settings>
+  <servers>
+    <server>
+      <id>gitea</id>
+      <configuration>
+        <httpHeaders>
+          <property>
+            <name>Authorization</name>
+            <value>token xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx</value>
+          </property>
+        </httpHeaders>
+      </configuration>
+    </server>
+  </servers>
+</settings>
+```
+
+release:
+========
+
+```
+export PATH=/usr/lib/jvm/java-19-openjdk/bin:$PATH
 mvn install
 mvn deploy
-
+```
 
 

pom.xml

@@ -1,19 +1,19 @@
+<?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>kangaroo-and-rabbit</groupId>
 	<artifactId>archidata</artifactId>
-  <version>0.1.3</version>
+	<version>0.5.0</version>
 	<properties>
-		<jaxrs.version>2.1</jaxrs.version>
-		<jersey.version>2.32</jersey.version>
-		<jaxb.version>2.3.1</jaxb.version>
-		<istack.version>3.0.7</istack.version>
-		
 		<maven.compiler.version>3.1</maven.compiler.version>
-		<maven.compiler.source>17</maven.compiler.source>
-		<maven.compiler.target>17</maven.compiler.target>
+		<maven.compiler.source>21</maven.compiler.source>
+		<maven.compiler.target>21</maven.compiler.target>
 
 		<maven.dependency.version>3.1.1</maven.dependency.version>
+
+		<jersey.version>3.1.1</jersey.version>
+		<jaxb.version>2.3.1</jaxb.version>
+		<istack.version>4.1.1</istack.version>
 	</properties>
 
 	<repositories>
@@ -46,11 +46,27 @@
 	</dependencyManagement>
 	
 	<dependencies>
+		<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>2.0.9</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
+			<version>2.0.9</version>
+			<scope>test</scope>
+		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.glassfish.jersey.media/jersey-media-multipart -->
 		<dependency>
 			<groupId>org.glassfish.jersey.media</groupId>
 			<artifactId>jersey-media-multipart</artifactId>
 		</dependency>
+		<dependency>
+    		<groupId>org.glassfish.jersey.core</groupId>
+    		<artifactId>jersey-client</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jersey.inject</groupId>
 			<artifactId>jersey-hk2</artifactId>
@@ -65,9 +81,14 @@
 			<version>${jaxb.version}</version>
 		</dependency>
 		<dependency>
-		    <groupId>javax.ws.rs</groupId>
-		    <artifactId>javax.ws.rs-api</artifactId>
-		    <version>2.1.1</version>
+		    <groupId>org.glassfish.jaxb</groupId>
+		    <artifactId>jaxb-runtime</artifactId>
+		    <version>4.0.4</version>
+		</dependency>
+		<dependency>
+		    <groupId>jakarta.ws.rs</groupId>
+		    <artifactId>jakarta.ws.rs-api</artifactId>
+		    <version>3.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.sun.xml.bind</groupId>
@@ -84,11 +105,6 @@
 			<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
 			<scope>test</scope> 
 		</dependency>
-		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-			<version>8.0.30</version>
-		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jersey.media</groupId>
 			<artifactId>jersey-media-json-jackson</artifactId>
@@ -96,24 +112,52 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.8.10</version>
+            <version>2.16.0</version>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>3.0.1</version>
-            <scope>compile</scope>
+		    <groupId>jakarta.servlet</groupId>
+		    <artifactId>jakarta.servlet-api</artifactId>
+		    <version>6.1.0-M1</version>
+		    <scope>provided</scope>
+        </dependency>
+        <!-- Interface for My-sql & sqlite DB -->
+		<dependency>
+		    <groupId>com.mysql</groupId>
+		    <artifactId>mysql-connector-j</artifactId>
+		    <version>8.2.0</version>
 		</dependency>
 		<dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
-            <version>RELEASE</version>
-            <scope>compile</scope>
+	        <groupId>org.xerial</groupId>
+	        <artifactId>sqlite-jdbc</artifactId>
+	        <version>3.44.1.0</version>
 	    </dependency>
+        <!-- Interface for JWT token -->
 		<dependency>
 		    <groupId>com.nimbusds</groupId>
 		    <artifactId>nimbus-jose-jwt</artifactId>
-		    <version>9.22</version>
+		    <version>9.37.1</version>
+		</dependency>
+		<dependency>
+			<groupId>jakarta.persistence</groupId>
+			<artifactId>jakarta.persistence-api</artifactId>
+			<version>3.2.0-M1</version>
+		</dependency>
+		<!--
+		************************************************************ 
+		** TEST dependency                                        **
+		************************************************************
+		-->
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-api</artifactId>
+			<version>5.10.1</version>
+			<scope>test</scope>
+		</dependency>
+	    <dependency>
+	        <groupId>org.junit.jupiter</groupId>
+	        <artifactId>junit-jupiter-engine</artifactId>
+			<version>5.10.1</version>
+	        <scope>test</scope>
 	    </dependency>
     </dependencies>
 
@@ -121,6 +165,11 @@
 		<sourceDirectory>src</sourceDirectory>
 		<testSourceDirectory>test/src</testSourceDirectory>
     	<directory>${project.basedir}/out/maven/</directory>
+		<testResources>
+			<testResource>
+				<directory>${basedir}/test/resources</directory>
+			</testResource>
+		</testResources>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -174,6 +223,46 @@
 					<nohelp>true</nohelp>
 				</configuration>
 			</plugin>
+			<!-- Check the style of the code -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<version>3.1.0</version>
+				<configuration>
+					<configLocation>CheckStyle.xml</configLocation>
+					<consoleOutput>true</consoleOutput>
+					<failOnViolation>true</failOnViolation>
+					<failsOnError>true</failsOnError>
+					<includeTestSourceDirectory>true</includeTestSourceDirectory>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>net.revelc.code.formatter</groupId>
+				<artifactId>formatter-maven-plugin</artifactId>
+				<version>2.12.2</version>
+				<configuration>
+					<encoding>UTF-8</encoding>
+					<lineEnding>LF</lineEnding>
+					<configFile>Formatter.xml</configFile>
+					<directories>
+						<directory>src/</directory>
+						<directory>test/src</directory>
+					</directories>
+					<includes>
+						<include>**/*.java</include>
+					</includes>
+					<excludes>
+						<exclude>module-info.java</exclude>
+					</excludes>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>validate</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 	<!-- Generate Java-docs As Part Of Project Reports -->

src/org/kar/archidata/GlobalConfiguration.java

@@ -1,16 +1,13 @@
 package org.kar.archidata;
 
 import org.kar.archidata.db.DBConfig;
-import org.kar.archidata.util.ConfigBaseVariable;
+import org.kar.archidata.tools.ConfigBaseVariable;
 
 public class GlobalConfiguration {
 	public static DBConfig dbConfig = null;
 
 	static {
-    	dbConfig = new DBConfig(ConfigBaseVariable.getDBHost(),
-				Integer.parseInt(ConfigBaseVariable.getDBPort()),
-				ConfigBaseVariable.getDBLogin(),
-				ConfigBaseVariable.getDBPassword(),
-				ConfigBaseVariable.getDBName());
+		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

@@ -1,27 +1,36 @@
 package org.kar.archidata;
 
-import org.kar.archidata.util.ConfigBaseVariable;
-import org.kar.archidata.util.JWTWrapper;
+import org.kar.archidata.tools.ConfigBaseVariable;
+import org.kar.archidata.tools.JWTWrapper;
 
 public class UpdateJwtPublicKey extends Thread {
 	boolean kill = false;
+
+	@Override
 	public void run() {
-    	while (this.kill == false) {
-    		// need to uppgrade when server call us...
+		if (ConfigBaseVariable.getSSOAddress() == null) {
+			System.out.println("SSO INTERFACE is not provided ==> work alone.");
+			// No SO provided, kill the thread.
+			return;
+		}
+		while (!this.kill) {
+			// need to upgrade when server call us...
 			try {
 				JWTWrapper.initLocalTokenRemote(ConfigBaseVariable.getSSOAddress(), "archidata");
-			} catch (Exception e1) {
+			} catch (final Exception e1) {
 				e1.printStackTrace();
 				System.out.println("Can not retreive the basic tocken");
 				return;
 			}
 			try {
+				// update every 5 minutes the master token
 				Thread.sleep(1000 * 60 * 5, 0);
-			} catch (InterruptedException e) {
+			} catch (final InterruptedException e) {
 				e.printStackTrace();
 			}
 		}
 	}
+
 	public void kill() {
 		this.kill = true;
 	}

src/org/kar/archidata/UserDB.java

@@ -1,23 +1,23 @@
 package org.kar.archidata;
 
-import org.kar.archidata.db.DBEntry;
-import org.kar.archidata.model.User;
-
+import java.io.IOException;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
+import org.kar.archidata.dataAccess.DataAccess;
+import org.kar.archidata.db.DBEntry;
+import org.kar.archidata.model.User;
+
 public class UserDB {
 
-    public UserDB() {
+	public UserDB() {}
+
+	public static User getUsers(final long userId) throws Exception {
+		return DataAccess.get(User.class, userId);
 	}
 
-    public static User getUsers(long userId) throws Exception {
-    	return SqlWrapper.get(User.class, userId);
-    }
-
-    
-    public static User getUserOrCreate(long userId, String userLogin) throws Exception {
-        User user = getUsers(userId);
+	public static User getUserOrCreate(final long userId, final String userLogin) throws Exception {
+		final User user = getUsers(userId);
 		if (user != null) {
 			return user;
 		}
@@ -25,50 +25,18 @@ public class UserDB {
 		return getUsers(userId);
 	}
 
-    private static void createUsersInfoFromOAuth(long userId, String login) {
-        DBEntry entry = new DBEntry(GlobalConfiguration.dbConfig);
-        String query = "INSERT INTO `user` (`id`, `login`, `lastConnection`, `admin`, `blocked`, `removed`) VALUE (?,?,now(3),'0','0','0')";
+	private static void createUsersInfoFromOAuth(final long userId, final String login) throws IOException {
+		final DBEntry entry = DBEntry.createInterface(GlobalConfiguration.dbConfig);
+		final String query = "INSERT INTO `user` (`id`, `login`, `lastConnection`, `admin`, `blocked`, `removed`) VALUE (?,?,now(3),'0','0','0')";
 		try {
-            PreparedStatement ps = entry.connection.prepareStatement(query);
+			final PreparedStatement ps = entry.connection.prepareStatement(query);
 			ps.setLong(1, userId);
 			ps.setString(2, login);
 			ps.executeUpdate();
-        } catch (SQLException throwables) {
+		} catch (final SQLException throwables) {
 			throwables.printStackTrace();
+		} finally {
+			entry.close();
 		}
-        entry.disconnect();
 	}
-
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

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

@@ -0,0 +1,264 @@
+package org.kar.archidata.annotation;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.kar.archidata.dataAccess.QueryOptions;
+import org.kar.archidata.dataAccess.options.OverrideTableName;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+
+public class AnnotationTools {
+	static final Logger LOGGER = LoggerFactory.getLogger(AnnotationTools.class);
+
+	public static String getTableName(final Class<?> clazz, final QueryOptions options) throws Exception {
+		if (options != null) {
+			final OverrideTableName data = options.get(OverrideTableName.class);
+			if (data != null) {
+				return data.getName();
+			}
+		}
+		return AnnotationTools.getTableName(clazz);
+	}
+
+	public static String getTableName(final Class<?> element) throws Exception {
+		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();
+		}
+		return tmp;
+	}
+
+	public static String getComment(final Field element) throws Exception {
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(DataComment.class);
+		if (annotation.length == 0) {
+			return null;
+		}
+		if (annotation.length > 1) {
+			throw new Exception("Must not have more than 1 element @DataComment on " + element.getClass().getCanonicalName());
+		}
+		return ((DataComment) annotation[0]).value();
+	}
+
+	public static String getDefault(final Field element) throws Exception {
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(DataDefault.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 ((DataDefault) annotation[0]).value();
+	}
+
+	public static Integer getLimitSize(final Field element) throws Exception {
+		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 ? null : length;
+	}
+
+	public static boolean isAnnotationGroup(final Field field, final Class<?> annotationType) {
+		try {
+			final Annotation[] anns = field.getAnnotations();
+			for (final Annotation ann : anns) {
+				if (ann.annotationType() == annotationType) {
+					return true;
+				}
+			}
+			for (final Annotation ann : anns) {
+				final Annotation[] anns2 = ann.annotationType().getDeclaredAnnotations();
+				for (final Annotation ann2 : anns2) {
+					if (ann2.annotationType() == annotationType) {
+						return true;
+					}
+				}
+			}
+		} catch (final Exception ex) {
+			LOGGER.error("Catch exception when try to get annotation...{}", ex.getLocalizedMessage());
+			return false;
+		}
+		return false;
+	}
+
+	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();
+		}
+		return name;
+	}
+
+	public static boolean getNotNull(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]).nullable();
+	}
+
+	public static boolean isPrimaryKey(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) 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) throws Exception {
+		return element.getDeclaredAnnotationsByType(DataDeleted.class).length != 0;
+	}
+
+	public static boolean isCreatedAtField(final Field element) throws Exception {
+		return element.getDeclaredAnnotationsByType(CreationTimestamp.class).length != 0;
+	}
+
+	public static boolean isUpdateAtField(final Field element) throws Exception {
+		return element.getDeclaredAnnotationsByType(UpdateTimestamp.class).length != 0;
+	}
+
+	public static boolean isdefaultNotRead(final Field element) throws Exception {
+		return element.getDeclaredAnnotationsByType(DataNotRead.class).length != 0;
+	}
+
+	public static boolean isIdField(final Field element) throws Exception {
+		return element.getDeclaredAnnotationsByType(Id.class).length != 0;
+	}
+
+	public static String getDeletedFieldName(final Class<?> clazz) throws Exception {
+		try {
+			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;
+				}
+				if (AnnotationTools.isDeletedField(elem)) {
+					return AnnotationTools.getFieldName(elem);
+				}
+			}
+		} catch (final Exception ex) {
+			ex.printStackTrace();
+		}
+		return null;
+	}
+
+	public static String getUpdatedFieldName(final Class<?> clazz) throws Exception {
+		try {
+			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;
+				}
+				if (AnnotationTools.isUpdateAtField(elem)) {
+					return AnnotationTools.getFieldName(elem);
+				}
+			}
+		} catch (final Exception ex) {
+			ex.printStackTrace();
+		}
+		return null;
+	}
+
+	public static Field getIdField(final Class<?> clazz) {
+		try {
+			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.isIdField(field)) {
+					return field;
+				}
+			}
+		} catch (final Exception ex) {
+			ex.printStackTrace();
+		}
+		return null;
+	}
+
+	public static List<String> getFieldsNames(final Class<?> clazz) throws Exception {
+		return getFieldsNamesFilter(clazz, false);
+	}
+
+	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) throws Exception {
+		final List<String> out = new ArrayList<>();
+		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 (!full && AnnotationTools.isGenericField(field)) {
+				continue;
+			}
+			out.add(AnnotationTools.getFieldName(field));
+		}
+		return out;
+	}
+
+	public static boolean isGenericField(final Field elem) throws Exception {
+		return AnnotationTools.isPrimaryKey(elem) || AnnotationTools.isCreatedAtField(elem) || AnnotationTools.isUpdateAtField(elem);
+	}
+
+	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())) {
+				continue;
+			}
+			if (AnnotationTools.isIdField(field)) {
+				return field;
+			}
+		}
+		return null;
+	}
+
+}

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

@@ -7,6 +7,6 @@ import java.lang.annotation.Target;
 
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface SQLAutoIncrement {
+public @interface CreationTimestamp {
 
 }

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

@@ -7,7 +7,7 @@ import java.lang.annotation.Target;
 
 @Target({ ElementType.TYPE, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
-public @interface SQLDefault {
+public @interface DataComment {
 
 	String value();
 

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

@@ -7,7 +7,7 @@ import java.lang.annotation.Target;
 
 @Target({ ElementType.TYPE, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
-public @interface SQLComment {
+public @interface DataDefault {
 
 	String value();
 

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

@@ -7,6 +7,6 @@ import java.lang.annotation.Target;
 
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface SQLNotNull {
+public @interface DataDeleted {
 
 }

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

@@ -7,6 +7,6 @@ import java.lang.annotation.Target;
 
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface SQLIfNotExists {
+public @interface DataIfNotExists {
 
 }

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

@@ -5,8 +5,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target(ElementType.FIELD)
+@Target({ ElementType.TYPE, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
-public @interface SQLCreateTime {
-
-}
+public @interface DataJson {}

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

@@ -7,6 +7,6 @@ import java.lang.annotation.Target;
 
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface SQLNotRead {
+public @interface DataNotRead {
 
 }

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

@@ -1,12 +0,0 @@
-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.FIELD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface SQLForeignKey {
-	String value();
-}

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

@@ -1,20 +0,0 @@
-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.FIELD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface SQLTableLinkGeneric {
-	public enum ModelLink {
-		NONE,
-		INTERNAL,
-		EXTERNAL
-	};
-	ModelLink value() default ModelLink.EXTERNAL;
-}

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

@@ -1,14 +0,0 @@
-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 SQLTableName {
-
-	String value();
-
-}

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

@@ -1,12 +0,0 @@
-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.FIELD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface SQLUpdateTime {
-
-}

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

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

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

@@ -7,6 +7,6 @@ import java.lang.annotation.Target;
 
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface SQLPrimaryKey {
+public @interface UpdateTimestamp {
 
 }

src/org/kar/archidata/annotation/addOn/SQLTableExternalForeinKeyAsList.java

@@ -0,0 +1,12 @@
+package org.kar.archidata.annotation.addOn;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface SQLTableExternalForeinKeyAsList {
+
+}

src/org/kar/archidata/annotation/security/DenyAll.java

@@ -1,14 +0,0 @@
-package org.kar.archidata.annotation.security;
-
-import javax.ws.rs.NameBinding;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-@NameBinding
-@Retention(RUNTIME)
-@Target({METHOD})
-public @interface DenyAll {
-}

src/org/kar/archidata/annotation/security/PermitAll.java

@@ -1,14 +0,0 @@
-package org.kar.archidata.annotation.security;
-
-import javax.ws.rs.NameBinding;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-@NameBinding
-@Retention(RUNTIME)
-@Target({METHOD})
-public @interface PermitAll {
-}

src/org/kar/archidata/annotation/security/PermitTokenInURI.java

@@ -1,14 +1,14 @@
 package org.kar.archidata.annotation.security;
 
-import javax.ws.rs.NameBinding;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import jakarta.ws.rs.NameBinding;
+
 @NameBinding
 @Retention(RUNTIME)
 @Target({ METHOD })
-public @interface PermitTokenInURI {
-}
+public @interface PermitTokenInURI {}

src/org/kar/archidata/annotation/security/RolesAllowed.java

@@ -1,15 +0,0 @@
-package org.kar.archidata.annotation.security;
-
-import javax.ws.rs.NameBinding;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-@NameBinding
-@Retention(RUNTIME)
-@Target({METHOD})
-public @interface RolesAllowed {
-	String[] value();
-}

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

@@ -1,26 +1,15 @@
 package org.kar.archidata.api;
 
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
-import org.glassfish.jersey.media.multipart.FormDataParam;
-import org.kar.archidata.filter.GenericContext;
-import org.kar.archidata.model.Data;
-import org.kar.archidata.SqlWrapper;
-import org.kar.archidata.annotation.security.PermitTokenInURI;
-import org.kar.archidata.annotation.security.RolesAllowed;
-import org.kar.archidata.util.ConfigBaseVariable;
-
-import javax.imageio.ImageIO;
-import javax.ws.rs.*;
-import javax.ws.rs.core.CacheControl;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.SecurityContext;
-import javax.ws.rs.core.StreamingOutput;
-import java.awt.*;
+import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.RandomAccessFile;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
@@ -28,21 +17,50 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Date;
 
+import javax.imageio.ImageIO;
+
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.kar.archidata.annotation.security.PermitTokenInURI;
+import org.kar.archidata.dataAccess.DataAccess;
+import org.kar.archidata.dataAccess.QueryCondition;
+import org.kar.archidata.filter.GenericContext;
+import org.kar.archidata.model.Data;
+import org.kar.archidata.tools.ConfigBaseVariable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jakarta.annotation.security.RolesAllowed;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.InternalServerErrorException;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.CacheControl;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.SecurityContext;
+import jakarta.ws.rs.core.StreamingOutput;
 
 // https://stackoverflow.com/questions/35367113/jersey-webservice-scalable-approach-to-download-file-and-reply-to-client
 // https://gist.github.com/aitoroses/4f7a2b197b732a6a691d
 
 @Path("/data")
-@Produces({MediaType.APPLICATION_JSON})
+@Produces(MediaType.APPLICATION_JSON)
 public class DataResource {
+	private static final Logger LOGGER = LoggerFactory.getLogger(MediaType.class);
 	private final static int CHUNK_SIZE = 1024 * 1024; // 1MB chunks
 	private final static int CHUNK_SIZE_IN = 50 * 1024 * 1024; // 1MB chunks
-    /**
-     * Upload some datas
-     */
+	/** Upload some datas */
 	private static long tmpFolderId = 1;
 
-    private static void createFolder(String path) throws IOException {
+	private static void createFolder(final String path) throws IOException {
 		if (!Files.exists(java.nio.file.Path.of(path))) {
 			// Log.print("Create folder: " + path);
 			Files.createDirectories(java.nio.file.Path.of(path));
@@ -53,160 +71,144 @@ public class DataResource {
 		return tmpFolderId++;
 	}
 
-    public static String getTmpFileInData(long tmpFolderId) {
-        String filePath = ConfigBaseVariable.getTmpDataFolder() + File.separator + tmpFolderId;
+	public static String getTmpFileInData(final long tmpFolderId) {
+		final String filePath = ConfigBaseVariable.getTmpDataFolder() + File.separator + tmpFolderId;
 		try {
 			createFolder(ConfigBaseVariable.getTmpDataFolder() + File.separator);
-        } catch (IOException e) {
+		} catch (final IOException e) {
 			e.printStackTrace();
 		}
 		return filePath;
 	}
 
-    public static String getFileData(long tmpFolderId) {
-        String filePath = ConfigBaseVariable.getMediaDataFolder() + File.separator + tmpFolderId + File.separator + "data";
+	public static String getFileData(final long tmpFolderId) {
+		final String filePath = ConfigBaseVariable.getMediaDataFolder() + File.separator + tmpFolderId + File.separator + "data";
 		try {
 			createFolder(ConfigBaseVariable.getMediaDataFolder() + File.separator + tmpFolderId + File.separator);
-        } catch (IOException e) {
+		} catch (final IOException e) {
 			e.printStackTrace();
 		}
 		return filePath;
 	}
 
-    public static Data getWithSha512(String sha512) {
-        System.out.println("find sha512 = " + sha512);
+	public static Data getWithSha512(final String sha512) {
+		LOGGER.info("find sha512 = {}", sha512);
 		try {
-			return SqlWrapper.getWhere(Data.class, "sha512", "=", sha512);
-		} catch (Exception e) {
+			return DataAccess.getWhere(Data.class, new QueryCondition("sha512", "=", sha512));
+		} catch (final Exception e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 		return null;
 	}
 
-    public static Data getWithId(long id) {
-        System.out.println("find id = " + id);
+	public static Data getWithId(final long id) {
+		LOGGER.info("find id = {}", id);
 		try {
-			return SqlWrapper.get(Data.class, id);
-		} catch (Exception e) {
+			return DataAccess.get(Data.class, id);
+		} catch (final Exception e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 		return null;
 	}
 
-    public static Data createNewData(long tmpUID, String originalFileName, String sha512) throws IOException {
+	public static Data createNewData(final long tmpUID, final String originalFileName, final String sha512) throws IOException {
 		// determine mime type:
 		Data injectedData = new Data();
 		String mimeType = "";
-        String extension = originalFileName.substring(originalFileName.lastIndexOf('.') + 1);
-        switch (extension.toLowerCase()) {
-            case "jpg":
-            case "jpeg":
-                mimeType = "image/jpeg";
-                break;
-            case "png":
-                mimeType = "image/png";
-                break;
-            case "webp":
-                mimeType = "image/webp";
-                break;
-            case "mka":
-                mimeType = "audio/x-matroska";
-                break;
-            case "mkv":
-                mimeType = "video/x-matroska";
-                break;
-            case "webm":
-                mimeType = "video/webm";
-                break;
-            default:
-                throw new IOException("Can not find the mime type of data input: '" + extension + "'");
-        }
+		final String extension = originalFileName.substring(originalFileName.lastIndexOf('.') + 1);
+		mimeType = switch (extension.toLowerCase()) {
+		case "jpg", "jpeg" -> "image/jpeg";
+		case "png" -> "image/png";
+		case "webp" -> "image/webp";
+		case "mka" -> "audio/x-matroska";
+		case "mkv" -> "video/x-matroska";
+		case "webm" -> "video/webm";
+		default -> throw new IOException("Can not find the mime type of data input: '" + extension + "'");
+		};
 		injectedData.mimeType = mimeType;
 		injectedData.sha512 = sha512;
-        String tmpPath = getTmpFileInData(tmpUID);
+		final String tmpPath = getTmpFileInData(tmpUID);
 		injectedData.size = Files.size(Paths.get(tmpPath));
 
 		try {
-        	injectedData = SqlWrapper.insert(injectedData);
-		} catch (Exception e) {
+			injectedData = DataAccess.insert(injectedData);
+		} catch (final Exception e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 			return null;
 		}
-        String mediaPath = getFileData(injectedData.id);
-        System.out.println("src = " + tmpPath);
-        System.out.println("dst = " + mediaPath);
+		final String mediaPath = getFileData(injectedData.id);
+		LOGGER.info("src = {}", tmpPath);
+		LOGGER.info("dst = {}", mediaPath);
 		Files.move(Paths.get(tmpPath), Paths.get(mediaPath), StandardCopyOption.ATOMIC_MOVE);
-        System.out.println("Move done");
+		LOGGER.info("Move done");
 		return injectedData;
 	}
 
-    public static String saveTemporaryFile(InputStream uploadedInputStream, long idData) {
+	public static String saveTemporaryFile(final InputStream uploadedInputStream, final long idData) {
 		return saveFile(uploadedInputStream, DataResource.getTmpFileInData(idData));
 	}
 
-    public static void removeTemporaryFile(long idData) {
-        String filepath = DataResource.getTmpFileInData(idData);
+	public static void removeTemporaryFile(final long idData) {
+		final String filepath = DataResource.getTmpFileInData(idData);
 		if (Files.exists(Paths.get(filepath))) {
 			try {
 				Files.delete(Paths.get(filepath));
-            } catch (IOException e) {
-                System.out.println("can not delete temporary file : " + Paths.get(filepath));
+			} catch (final IOException e) {
+				LOGGER.info("can not delete temporary file : {}", Paths.get(filepath));
 				e.printStackTrace();
 			}
 		}
 	}
 
 	// save uploaded file to a defined location on the server
-    static String saveFile(InputStream uploadedInputStream, String serverLocation) {
+	static String saveFile(final InputStream uploadedInputStream, final String serverLocation) {
 		String out = "";
 		try {
-            OutputStream outpuStream = new FileOutputStream(new File(
-                    serverLocation));
+			OutputStream outpuStream = new FileOutputStream(new File(serverLocation));
 			int read = 0;
-            byte[] bytes = new byte[CHUNK_SIZE_IN];
-            MessageDigest md = MessageDigest.getInstance("SHA-512");
+			final byte[] bytes = new byte[CHUNK_SIZE_IN];
+			final MessageDigest md = MessageDigest.getInstance("SHA-512");
 
 			outpuStream = new FileOutputStream(new File(serverLocation));
 			while ((read = uploadedInputStream.read(bytes)) != -1) {
-                //System.out.println("write " + read);
+				// logger.info("write {}", read);
 				md.update(bytes, 0, read);
 				outpuStream.write(bytes, 0, read);
 			}
-            System.out.println("Flush input stream ... " + serverLocation);
+			LOGGER.info("Flush input stream ... {}", serverLocation);
 			System.out.flush();
 			outpuStream.flush();
 			outpuStream.close();
 			// create the end of sha512
-            byte[] sha512Digest = md.digest();
+			final byte[] sha512Digest = md.digest();
 			// convert in hexadecimal
 			out = bytesToHex(sha512Digest);
 			uploadedInputStream.close();
-        } catch (IOException ex) {
-            System.out.println("Can not write in temporary file ... ");
+		} catch (final IOException ex) {
+			LOGGER.info("Can not write in temporary file ... ");
 			ex.printStackTrace();
-        } catch (NoSuchAlgorithmException ex) {
-            System.out.println("Can not find sha512 algorithms");
+		} catch (final NoSuchAlgorithmException ex) {
+			LOGGER.info("Can not find sha512 algorithms");
 			ex.printStackTrace();
 		}
 		return out;
 	}
 
-    public static String bytesToHex(byte[] bytes) {
-        StringBuilder sb = new StringBuilder();
-        for (byte b : bytes) {
+	public static String bytesToHex(final byte[] bytes) {
+		final StringBuilder sb = new StringBuilder();
+		for (final byte b : bytes) {
 			sb.append(String.format("%02x", b));
 		}
 		return sb.toString();
 	}
 
-
-    public Data getSmall(Long id) {
+	public Data getSmall(final Long id) {
 		try {
-			return SqlWrapper.get(Data.class, id);
-		} catch (Exception e) {
+			return DataAccess.get(Data.class, id);
+		} catch (final Exception e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
@@ -217,17 +219,17 @@ public class DataResource {
 	@Path("/upload/")
 	@Consumes({ MediaType.MULTIPART_FORM_DATA })
 	@RolesAllowed("ADMIN")
-    public Response uploadFile(@Context SecurityContext sc, @FormDataParam("file") InputStream fileInputStream, @FormDataParam("file") FormDataContentDisposition fileMetaData) {
-    	GenericContext gc = (GenericContext) sc.getUserPrincipal();
-        System.out.println("===================================================");
-        System.out.println("== DATA uploadFile " + (gc==null?"null":gc.user));
-        System.out.println("===================================================");
+	public Response uploadFile(@Context final SecurityContext sc, @FormDataParam("file") final InputStream fileInputStream, @FormDataParam("file") final FormDataContentDisposition fileMetaData) {
+		final GenericContext gc = (GenericContext) sc.getUserPrincipal();
+		LOGGER.info("===================================================");
+		LOGGER.info("== DATA uploadFile {}", (gc == null ? "null" : gc.userByToken));
+		LOGGER.info("===================================================");
 		// public NodeSmall uploadFile(final FormDataMultiPart form) {
-        System.out.println("Upload file: ");
-        String filePath = ConfigBaseVariable.getTmpDataFolder() + File.separator + tmpFolderId++;
+		LOGGER.info("Upload file: ");
+		final String filePath = ConfigBaseVariable.getTmpDataFolder() + File.separator + tmpFolderId++;
 		try {
 			createFolder(ConfigBaseVariable.getTmpDataFolder() + File.separator);
-        } catch (IOException e) {
+		} catch (final IOException e) {
 			e.printStackTrace();
 		}
 		saveFile(fileInputStream, filePath);
@@ -240,17 +242,15 @@ public class DataResource {
 	@PermitTokenInURI
 	@RolesAllowed("USER")
 	@Produces(MediaType.APPLICATION_OCTET_STREAM)
-    public Response retriveDataId(@Context SecurityContext sc, @QueryParam(HttpHeaders.AUTHORIZATION) String token, @HeaderParam("Range") String range, @PathParam("id") Long id) throws Exception {
-    	GenericContext gc = (GenericContext) sc.getUserPrincipal();
-        //System.out.println("===================================================");
-        System.out.println("== DATA retriveDataId ? id=" + id + " user=" + (gc==null?"null":gc.user));
-        //System.out.println("===================================================");
-        Data value = getSmall(id);
+	public Response retriveDataId(@Context final SecurityContext sc, @QueryParam(HttpHeaders.AUTHORIZATION) final String token, @HeaderParam("Range") final String range,
+			@PathParam("id") final Long id) throws Exception {
+		final GenericContext gc = (GenericContext) sc.getUserPrincipal();
+		// logger.info("===================================================");
+		LOGGER.info("== DATA retriveDataId ? id={} user={}", id, (gc == null ? "null" : gc.userByToken));
+		// logger.info("===================================================");
+		final Data value = getSmall(id);
 		if (value == null) {
-            Response.status(404).
-                    entity("media NOT FOUND: " + id).
-                    type("text/plain").
-                    build();
+			Response.status(404).entity("media NOT FOUND: " + id).type("text/plain").build();
 		}
 		return buildStream(ConfigBaseVariable.getMediaDataFolder() + File.separator + id + File.separator + "data", range, value.mimeType);
 	}
@@ -261,65 +261,50 @@ public class DataResource {
 	@PermitTokenInURI
 	@Produces(MediaType.APPLICATION_OCTET_STREAM)
 	// @CacheMaxAge(time = 10, unit = TimeUnit.DAYS)
-    public Response retriveDataThumbnailId(@Context SecurityContext sc,
-    		@QueryParam(HttpHeaders.AUTHORIZATION) String token,
-    		@HeaderParam("Range") String range,
-    		@PathParam("id") Long id) throws Exception {
-        GenericContext gc = (GenericContext) sc.getUserPrincipal();
-        //System.out.println("===================================================");
-        //System.out.println("== DATA retriveDataThumbnailId ? " + (gc==null?"null":gc.user));
-        //System.out.println("===================================================");
-        Data value = getSmall(id);
+	public Response retriveDataThumbnailId(@Context final SecurityContext sc, @QueryParam(HttpHeaders.AUTHORIZATION) final String token, @HeaderParam("Range") final String range,
+			@PathParam("id") final Long id) throws Exception {
+		// GenericContext gc = (GenericContext) sc.getUserPrincipal();
+		// logger.info("===================================================");
+		// logger.info("== DATA retriveDataThumbnailId ? {}", (gc==null?"null":gc.user));
+		// logger.info("===================================================");
+		final Data value = getSmall(id);
 		if (value == null) {
-            return Response.status(404).
-                    entity("media NOT FOUND: " + id).
-                    type("text/plain").
-                    build();
+			return Response.status(404).entity("media NOT FOUND: " + id).type("text/plain").build();
 		}
-        String filePathName = ConfigBaseVariable.getMediaDataFolder() + File.separator + id + File.separator + "data";
-        if (    value.mimeType.contentEquals("image/jpeg")
-                || value.mimeType.contentEquals("image/png")
+		final String filePathName = ConfigBaseVariable.getMediaDataFolder() + File.separator + id + File.separator + "data";
+		final File inputFile = new File(filePathName);
+		if (!inputFile.exists()) {
+			return Response.status(404).entity("{\"error\":\"media Does not exist: " + id + "\"}").type("application/json").build();
+		}
+		if (value.mimeType.contentEquals("image/jpeg") || value.mimeType.contentEquals("image/png")
 		// || value.mimeType.contentEquals("image/webp")
 		) {
 			// reads input image
-        	//System.out.println("Read path: " + filePathName);
-            File inputFile = new File(filePathName);
-        	if (!inputFile.exists()) {
-                return Response.status(500).
-                        entity("Internal Error: Media is NOT FOUNDABLE: " + id).
-                        type("text/plain").
-                        build();
-        	}
-            BufferedImage inputImage = ImageIO.read(inputFile);
-            int scaledWidth = 250;
-            int scaledHeight = (int)((float)inputImage.getHeight() / (float)inputImage.getWidth() * (float) scaledWidth);
+			final BufferedImage inputImage = ImageIO.read(inputFile);
+			final int scaledWidth = 250;
+			final int scaledHeight = (int) ((float) inputImage.getHeight() / (float) inputImage.getWidth() * scaledWidth);
 			// creates output image
-            BufferedImage outputImage = new BufferedImage(scaledWidth,
-                                        scaledHeight, inputImage.getType());
+			final BufferedImage outputImage = new BufferedImage(scaledWidth, scaledHeight, inputImage.getType());
 
 			// scales the input image to the output image
-            Graphics2D g2d = outputImage.createGraphics();
+			final Graphics2D g2d = outputImage.createGraphics();
 			g2d.drawImage(inputImage, 0, 0, scaledWidth, scaledHeight, null);
 			g2d.dispose();
 			// create the output stream:
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+			final ByteArrayOutputStream baos = new ByteArrayOutputStream();
 			try {
 				// TODO: check how to remove buffer file !!! here, it is not needed at all...
 				ImageIO.write(outputImage, "JPG", baos);
-			} catch (IOException e) {
+			} catch (final IOException e) {
 				e.printStackTrace();
-                return Response.status(500).
-                        entity("Internal Error: resize fail: " + e.getMessage()).
-                        type("text/plain").
-                        build();
+				return Response.status(500).entity("Internal Error: resize fail: " + e.getMessage()).type("text/plain").build();
 			}
-            byte[] imageData = baos.toByteArray();
+			final byte[] imageData = baos.toByteArray();
 			// Response.ok(new ByteArrayInputStream(imageData)).build();
-            Response.ResponseBuilder out = Response.ok(imageData)
-                    .header(HttpHeaders.CONTENT_LENGTH, imageData.length);
+			final Response.ResponseBuilder out = Response.ok(imageData).header(HttpHeaders.CONTENT_LENGTH, imageData.length);
 			out.type("image/jpeg");
 			// TODO: move this in a decorator !!!
-            CacheControl cc = new CacheControl();
+			final CacheControl cc = new CacheControl();
 			cc.setMaxAge(3600);
 			cc.setNoCache(false);
 			out.cacheControl(cc);
@@ -327,62 +312,58 @@ public class DataResource {
 		}
 		return buildStream(filePathName, range, value.mimeType);
 	}
+
 	// @Secured
 	@GET
 	@Path("{id}/{name}")
 	@PermitTokenInURI
 	@RolesAllowed("USER")
 	@Produces(MediaType.APPLICATION_OCTET_STREAM)
-    public Response retriveDataFull(@Context SecurityContext sc, @QueryParam(HttpHeaders.AUTHORIZATION) String token, @HeaderParam("Range") String range, @PathParam("id") Long id, @PathParam("name") String name) throws Exception {
-        GenericContext gc = (GenericContext) sc.getUserPrincipal();
-        //System.out.println("===================================================");
-        System.out.println("== DATA retriveDataFull ? id=" + id + " user=" + (gc==null?"null":gc.user));
-        //System.out.println("===================================================");
-        Data value = getSmall(id);
+	public Response retriveDataFull(@Context final SecurityContext sc, @QueryParam(HttpHeaders.AUTHORIZATION) final String token, @HeaderParam("Range") final String range,
+			@PathParam("id") final Long id, @PathParam("name") final String name) throws Exception {
+		final GenericContext gc = (GenericContext) sc.getUserPrincipal();
+		// logger.info("===================================================");
+		LOGGER.info("== DATA retriveDataFull ? id={} user={}", id, (gc == null ? "null" : gc.userByToken));
+		// logger.info("===================================================");
+		final Data value = getSmall(id);
 		if (value == null) {
-            Response.status(404).
-                    entity("media NOT FOUND: " + id).
-                    type("text/plain").
-                    build();
+			Response.status(404).entity("media NOT FOUND: " + id).type("text/plain").build();
 		}
 		return buildStream(ConfigBaseVariable.getMediaDataFolder() + File.separator + id + File.separator + "data", range, value.mimeType);
 	}
 
-    /**
-     * Adapted from http://stackoverflow.com/questions/12768812/video-streaming-to-ipad-does-not-work-with-tapestry5/12829541#12829541
+	/** 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 Exception IOException if an error occurs in streaming.
-     */
-    private Response buildStream(final String filename, final String range, String mimeType) throws Exception {
-        File file = new File(filename);
-        //System.out.println("request range : " + range);
+	 * @throws Exception IOException if an error occurs in streaming. */
+	private Response buildStream(final String filename, final String range, final String mimeType) throws Exception {
+		final File file = new File(filename);
+		// logger.info("request range : {}", range);
 		// range not requested : Firefox does not send range headers
 		if (range == null) {
 			final StreamingOutput output = new StreamingOutput() {
 				@Override
-                public void write(OutputStream out) {
+				public void write(final OutputStream out) {
 					try (FileInputStream in = new FileInputStream(file)) {
-                        byte[] buf = new byte[1024 * 1024];
+						final byte[] buf = new byte[1024 * 1024];
 						int len;
 						while ((len = in.read(buf)) != -1) {
 							try {
 								out.write(buf, 0, len);
 								out.flush();
-                                //System.out.println("---- wrote " + len + " bytes file ----");
-                            } catch (IOException ex) {
-                                System.out.println("remote close connection");
+								// logger.info("---- wrote {} bytes file ----", len);
+							} catch (final IOException ex) {
+								LOGGER.info("remote close connection");
 								break;
 							}
 						}
-                    } catch (IOException ex) {
+					} catch (final IOException ex) {
 						throw new InternalServerErrorException(ex);
 					}
 				}
 			};
-            Response.ResponseBuilder out = Response.ok(output)
-                    .header(HttpHeaders.CONTENT_LENGTH, file.length());
+			final Response.ResponseBuilder out = Response.ok(output).header(HttpHeaders.CONTENT_LENGTH, file.length());
 			if (mimeType != null) {
 				out.type(mimeType);
 			}
@@ -390,40 +371,34 @@ public class DataResource {
 
 		}
 
-        String[] ranges = range.split("=")[1].split("-");
+		final String[] ranges = range.split("=")[1].split("-");
 		final long from = Long.parseLong(ranges[0]);
 
-        //System.out.println("request range : " + ranges.length);
+		// logger.info("request range : {}", ranges.length);
 		// Chunk media if the range upper bound is unspecified. Chrome, Opera sends "bytes=0-"
 		long to = CHUNK_SIZE + from;
 		if (ranges.length == 1) {
 			to = file.length() - 1;
-        } else {
-            if (to >= file.length()) {
-                to = (long) (file.length() - 1);
-            }
+		} else if (to >= file.length()) {
+			to = file.length() - 1;
 		}
 		final String responseRange = String.format("bytes %d-%d/%d", from, to, file.length());
-        //System.out.println("responseRange : " + responseRange);
+		// logger.info("responseRange: {}", responseRange);
 		final RandomAccessFile raf = new RandomAccessFile(file, "r");
 		raf.seek(from);
 
 		final long len = to - from + 1;
 		final MediaStreamer streamer = new MediaStreamer(len, raf);
-        Response.ResponseBuilder out = Response.ok(streamer)
-                .status(Response.Status.PARTIAL_CONTENT)
-                .header("Accept-Ranges", "bytes")
-                .header("Content-Range", responseRange)
-                .header(HttpHeaders.CONTENT_LENGTH, streamer.getLenth())
-                .header(HttpHeaders.LAST_MODIFIED, new Date(file.lastModified()));
+		final Response.ResponseBuilder out = Response.ok(streamer).status(Response.Status.PARTIAL_CONTENT).header("Accept-Ranges", "bytes").header("Content-Range", responseRange)
+				.header(HttpHeaders.CONTENT_LENGTH, streamer.getLenth()).header(HttpHeaders.LAST_MODIFIED, new Date(file.lastModified()));
 		if (mimeType != null) {
 			out.type(mimeType);
 		}
 		return out.build();
 	}
 
-	public static void undelete(Long id) throws Exception {
-		SqlWrapper.unsetDelete(Data.class, id);
+	public static void undelete(final Long id) throws Exception {
+		DataAccess.unsetDelete(Data.class, id);
 	}
 
 }

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

@@ -3,30 +3,37 @@ package org.kar.archidata.api;
 import java.io.File;
 import java.util.List;
 
-import javax.ws.rs.*;
-import javax.ws.rs.core.CacheControl;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-
-import org.kar.archidata.annotation.security.PermitAll;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import jakarta.annotation.security.PermitAll;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.NotSupportedException;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.core.CacheControl;
+import jakarta.ws.rs.core.PathSegment;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.ResponseBuilder;
 
 public class FrontGeneric {
+	private static final Logger LOGGER = LoggerFactory.getLogger(FrontGeneric.class);
 
 	protected String baseFrontFolder = "/data/front";
 
-	private String getExtension(String filename) {
+	private String getExtension(final String filename) {
 		if (filename.contains(".")) {
 			return filename.substring(filename.lastIndexOf(".") + 1);
 		}
 		return "";
 	}
-    private Response retrive(String fileName) throws Exception {
-        String filePathName = baseFrontFolder + File.separator + fileName;
-    	String extention = getExtension(filePathName);
+
+	private Response retrive(final String fileName) throws Exception {
+		String filePathName = this.baseFrontFolder + File.separator + fileName;
+		final String extention = getExtension(filePathName);
 		String mineType = null;
-    	System.out.println("try retrive : '" + filePathName + "' '" + extention + "'");
+		LOGGER.debug("try retrive : '{}' '{}'", filePathName, extention);
 		if (extention.length() != 0 && extention.length() <= 5) {
 			if (extention.equalsIgnoreCase("jpg") || extention.equalsIgnoreCase("jpeg")) {
 				mineType = "image/jpeg";
@@ -48,29 +55,29 @@ public class FrontGeneric {
 				mineType = "text/html";
 			} else if (extention.equalsIgnoreCase("css")) {
 				mineType = "text/css";
+			} else if (extention.equalsIgnoreCase("mka")) {
+				mineType = "audio/x-matroska";
+			} else if (extention.equalsIgnoreCase("mkv")) {
+				mineType = "video/x-matroska";
+			} else if (extention.equalsIgnoreCase("webm")) {
+				mineType = "video/webm";
 			} else {
-	            return Response.status(403).
-	            		entity("Not supported model: '" + fileName + "'").
-	            		type("text/plain").
-	            		build();
+				throw new NotSupportedException("Not supported model: '" + fileName + "'");
 			}
 		} else {
 			mineType = "text/html";
-    		filePathName = baseFrontFolder + File.separator + "index.html";
+			filePathName = this.baseFrontFolder + File.separator + "index.html";
 		}
-    	System.out.println("    ==> '" + filePathName + "'");
+		LOGGER.debug("    ==> '[}'", filePathName);
 		// reads input image
-        File download = new File(filePathName);
+		final File download = new File(filePathName);
 		if (!download.exists()) {
-            return Response.status(404).
-            		entity("Not Found: '" + fileName + "' extension='" + extention + "'").
-            		type("text/plain").
-            		build();
+			throw new NotFoundException("Not Found: '" + fileName + "' extension='" + extention + "'");
 		}
-        ResponseBuilder response = Response.ok((Object)download);
+		final ResponseBuilder response = Response.ok(download);
 		// use this if I want to download the file:
 		// response.header("Content-Disposition", "attachment; filename=" + fileName);
-        CacheControl cc = new CacheControl();
+		final CacheControl cc = new CacheControl();
 		cc.setMaxAge(60);
 		cc.setNoCache(false);
 		response.cacheControl(cc);
@@ -92,9 +99,9 @@ public class FrontGeneric {
 	@PermitAll()
 	// @Produces(MediaType.APPLICATION_OCTET_STREAM)
 	// @CacheMaxAge(time = 10, unit = TimeUnit.DAYS)
-    public Response retrive1(@PathParam("any") List<PathSegment> segments) throws Exception {
+	public Response retrive1(@PathParam("any") final List<PathSegment> segments) throws Exception {
 		String filename = "";
-    	for (PathSegment elem: segments) {
+		for (final PathSegment elem : segments) {
 			if (!filename.isEmpty()) {
 				filename += File.separator;
 			}

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

@@ -1,20 +1,25 @@
 package org.kar.archidata.api;
 
-import javax.ws.rs.InternalServerErrorException;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.StreamingOutput;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.RandomAccessFile;
 
-public class MediaStreamer implements StreamingOutput {
-    private final int CHUNK_SIZE = 1024 * 1024; // 1MB chunks
-    final byte[] buf = new byte[CHUNK_SIZE];
-    private long length;
-    private RandomAccessFile raf;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-    public MediaStreamer(long length, RandomAccessFile raf) throws IOException {
-        //System.out.println("request stream of " + length / 1024 + " data");
+import jakarta.ws.rs.InternalServerErrorException;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.StreamingOutput;
+
+public class MediaStreamer implements StreamingOutput {
+	private static final Logger LOGGER = LoggerFactory.getLogger(MediaStreamer.class);
+	private final int CHUNK_SIZE = 1024 * 1024; // 1MB chunks
+	final byte[] buf = new byte[this.CHUNK_SIZE];
+	private long length;
+	private final RandomAccessFile raf;
+
+	public MediaStreamer(final long length, final RandomAccessFile raf) throws IOException {
+		// logger.info("request stream of {} data", length / 1024);
 		if (length < 0) {
 			throw new IOException("Wrong size of the file to stream: " + length);
 		}
@@ -23,26 +28,26 @@ public class MediaStreamer implements StreamingOutput {
 	}
 
 	@Override
-    public void write(OutputStream outputStream) {
+	public void write(final OutputStream outputStream) {
 		try {
-            while (length != 0) {
-                int read = raf.read(buf, 0, buf.length > length ? (int) length : buf.length);
+			while (this.length != 0) {
+				final int read = this.raf.read(this.buf, 0, this.buf.length > this.length ? (int) this.length : this.buf.length);
 				try {
-                    outputStream.write(buf, 0, read);
-                } catch (IOException ex) {
-                    System.out.println("remote close connection");
+					outputStream.write(this.buf, 0, read);
+				} catch (final IOException ex) {
+					LOGGER.info("remote close connection");
 					break;
 				}
-                length -= read;
+				this.length -= read;
 			}
-        } catch (IOException ex) {
+		} catch (final IOException ex) {
 			throw new InternalServerErrorException(ex);
-        } catch (WebApplicationException ex) {
+		} catch (final WebApplicationException ex) {
 			throw new InternalServerErrorException(ex);
 		} finally {
 			try {
-                raf.close();
-            } catch (IOException ex) {
+				this.raf.close();
+			} catch (final IOException ex) {
 				ex.printStackTrace();
 				throw new InternalServerErrorException(ex);
 			}
@@ -50,7 +55,7 @@ public class MediaStreamer implements StreamingOutput {
 	}
 
 	public long getLenth() {
-        return length;
+		return this.length;
 	}
 
 }

src/org/kar/archidata/backup/BackupEngine.java

@@ -0,0 +1,29 @@
+package org.kar.archidata.backup;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class BackupEngine {
+
+	public enum StoreMode {
+		JSON, SQL
+	}
+
+	private final String pathStore;
+	private final StoreMode mode;
+	private final List<Class<?>> classes = new ArrayList<>();
+
+	public BackupEngine(final String pathToStoreDB, final StoreMode mode) {
+		this.pathStore = pathToStoreDB;
+		this.mode = mode;
+	}
+
+	public void addClass(final Class<?> clazz) {
+		this.classes.add(clazz);
+	}
+
+	public void store() {
+		// TODO ...
+
+	}
+}

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

@@ -0,0 +1,26 @@
+package org.kar.archidata.catcher;
+
+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 ExceptionCatcher implements ExceptionMapper<Exception> {
+	private static final Logger LOGGER = LoggerFactory.getLogger(ExceptionCatcher.class);
+
+	@Override
+	public Response toResponse(final Exception exception) {
+		LOGGER.warn("Catch exception (not managed...):");
+		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 Unknown Exception", exception.getMessage());
+	}
+
+}

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

@@ -0,0 +1,25 @@
+package org.kar.archidata.catcher;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jakarta.ws.rs.ClientErrorException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+
+public class FailException404API implements ExceptionMapper<ClientErrorException> {
+	private static final Logger LOGGER = LoggerFactory.getLogger(FailException404API.class);
+
+	@Override
+	public Response toResponse(final ClientErrorException exception) {
+		final RestErrorResponse ret = build(exception);
+		LOGGER.error("Error UUID={}", ret.uuid);
+		return Response.status(exception.getResponse().getStatusInfo().toEnum()).entity(ret).type(MediaType.APPLICATION_JSON).build();
+	}
+
+	private RestErrorResponse build(final ClientErrorException exception) {
+		return new RestErrorResponse(exception.getResponse().getStatusInfo().toEnum(), "Catch system exception", exception.getMessage());
+	}
+
+}

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

@@ -0,0 +1,27 @@
+package org.kar.archidata.catcher;
+
+import org.kar.archidata.exception.FailException;
+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 FailExceptionCatcher implements ExceptionMapper<FailException> {
+	private static final Logger LOGGER = LoggerFactory.getLogger(FailExceptionCatcher.class);
+
+	@Override
+	public Response toResponse(final FailException exception) {
+		final RestErrorResponse ret = build(exception);
+		LOGGER.error("Error UUID={}", ret.uuid);
+		// Not display backtrace ==> this may be a normal case ...
+		// exception.printStackTrace();
+		return Response.status(exception.status).entity(ret).type(MediaType.APPLICATION_JSON).build();
+	}
+
+	private RestErrorResponse build(final FailException exception) {
+		return new RestErrorResponse(exception.status, "Request Fail", exception.getMessage());
+	}
+
+}

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

@@ -0,0 +1,26 @@
+package org.kar.archidata.catcher;
+
+import org.kar.archidata.exception.InputException;
+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 InputExceptionCatcher implements ExceptionMapper<InputException> {
+	private static final Logger LOGGER = LoggerFactory.getLogger(InputExceptionCatcher.class);
+
+	@Override
+	public Response toResponse(final InputException exception) {
+		final RestErrorResponse ret = build(exception);
+		LOGGER.error("Error UUID={}", ret.uuid);
+		exception.printStackTrace();
+		return Response.status(exception.status).entity(ret).type(MediaType.APPLICATION_JSON).build();
+	}
+
+	private RestErrorResponse build(final InputException exception) {
+		return new RestErrorResponse(exception.status, "Error on input='" + exception.missingVariable + "'", exception.getMessage());
+	}
+
+}

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

@@ -0,0 +1,38 @@
+package org.kar.archidata.catcher;
+
+import java.time.Instant;
+import java.util.UUID;
+
+import jakarta.ws.rs.core.Response;
+
+public class RestErrorResponse {
+	public UUID uuid = UUID.randomUUID();
+	public String time;
+	public String error;
+	public String message;
+	final public int status;
+	final public String statusMessage;
+
+	public RestErrorResponse(final Response.Status status, final String time, final String error, final String message) {
+		this.time = time;
+		this.error = error;
+		this.message = message;
+		this.status = status.getStatusCode();
+		this.statusMessage = status.getReasonPhrase();
+	}
+
+	public RestErrorResponse(final Response.Status status, final String error, final String message) {
+		this.time = Instant.now().toString();
+		this.error = error;
+		this.message = message;
+		this.status = status.getStatusCode();
+		this.statusMessage = status.getReasonPhrase();
+	}
+
+	public RestErrorResponse(final Response.Status status) {
+		this.time = Instant.now().toString();
+		this.status = status.getStatusCode();
+		this.statusMessage = status.getReasonPhrase();
+	}
+
+}

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

@@ -0,0 +1,26 @@
+package org.kar.archidata.catcher;
+
+import org.kar.archidata.exception.SystemException;
+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 SystemExceptionCatcher implements ExceptionMapper<SystemException> {
+	private static final Logger LOGGER = LoggerFactory.getLogger(SystemExceptionCatcher.class);
+
+	@Override
+	public Response toResponse(final SystemException exception) {
+		final RestErrorResponse ret = build(exception);
+		LOGGER.error("Error UUID={}", ret.uuid);
+		exception.printStackTrace();
+		return Response.status(exception.status).entity(ret).type(MediaType.APPLICATION_JSON).build();
+	}
+
+	private RestErrorResponse build(final SystemException exception) {
+		return new RestErrorResponse(exception.status, "System error", exception.getMessage());
+	}
+
+}

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

@@ -0,0 +1,21 @@
+package org.kar.archidata.dataAccess;
+
+/** Java does not permit to set return data (eg: integer) in the function parameter. This class permit to update a value as in/out function parameters. */
+public class CountInOut {
+	// internal value of the stream
+	public int value = 0;
+
+	/** Default constructor */
+	public CountInOut() {}
+
+	/** Constructor with the initial value.
+	 * @param i Initial Value */
+	public CountInOut(final int i) {
+		this.value = i;
+	}
+
+	/** Increment by one the value. */
+	public void inc() {
+		this.value++;
+	}
+}

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

@@ -0,0 +1,59 @@
+package org.kar.archidata.dataAccess;
+
+import java.lang.reflect.Field;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.List;
+
+import jakarta.validation.constraints.NotNull;
+
+public interface DataAccessAddOn {
+	/** Get the Class of the declaration annotation
+	 * @return The annotation class */
+	Class<?> getAnnotationClass();
+
+	/** Get the SQL type that is needed to declare for the specific Field Type.
+	 * @param elem Field to declare.
+	 * @return SQL type to create. */
+	String getSQLFieldType(Field elem) throws Exception;
+
+	/** Check if the field is manage by the local add-on
+	 * @param elem Field to inspect.
+	 * @return True of the field is manage by the current Add-on. */
+	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 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(PreparedStatement ps, final Field field, Object data, CountInOut iii) throws Exception, SQLException, IllegalArgumentException, IllegalAccessException;
+
+	// Element can insert in the single request
+	boolean canInsert(final Field field);
+
+	// Element can be retrieve with the specific mode
+	boolean canRetrieve(final Field field);
+
+	void generateQuerry(@NotNull String tableName, @NotNull Field field, @NotNull final StringBuilder querrySelect, @NotNull final StringBuilder querry, @NotNull String name,
+			@NotNull CountInOut count, QueryOptions options) throws Exception;
+
+	// Return the number of colomn read
+	void fillFromQuerry(ResultSet rs, Field field, Object data, CountInOut count, QueryOptions options, final List<LazyGetter> lazyCall)
+			throws Exception, SQLException, IllegalArgumentException, IllegalAccessException;
+
+	/** Create associated table of the specific element.
+	 * @param tableName
+	 * @param elem
+	 * @param mainTableBuilder
+	 * @param ListOtherTables
+	 * @param createIfNotExist
+	 * @param createDrop
+	 * @param fieldId
+	 * @throws Exception */
+	void createTables(String tableName, Field field, StringBuilder mainTableBuilder, List<String> preActionList, List<String> postActionList, boolean createIfNotExist, boolean createDrop, int fieldId)
+			throws Exception;
+
+}

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

@@ -0,0 +1,394 @@
+package org.kar.archidata.dataAccess;
+
+import java.lang.reflect.Field;
+import java.sql.Timestamp;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+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.options.CreateDropTable;
+import org.kar.archidata.exception.DataAccessException;
+import org.kar.archidata.tools.ConfigBaseVariable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import jakarta.persistence.GenerationType;
+
+public class DataFactory {
+	static final Logger LOGGER = LoggerFactory.getLogger(DataFactory.class);
+
+	public static String convertTypeInSQL(final Class<?> type, final String fieldName) throws Exception {
+		if (!"sqlite".equals(ConfigBaseVariable.getDBType())) {
+			if (type == Long.class || type == long.class) {
+				return "bigint";
+			}
+			if (type == Integer.class || type == int.class) {
+				return "int";
+			}
+			if (type == Boolean.class || type == boolean.class) {
+				return "tinyint(1)";
+			}
+			if (type == Float.class || type == float.class) {
+				return "float";
+			}
+			if (type == Double.class || type == double.class) {
+				return "double";
+			}
+			if (type == Date.class || type == Timestamp.class) {
+				return "timestamp(3)";
+			}
+			if (type == LocalDate.class) {
+				return "date";
+			}
+			if (type == LocalTime.class) {
+				return "time";
+			}
+			if (type == String.class) {
+				return "text";
+			}
+			if (type == JsonValue.class) {
+				return "json";
+			}
+			if (type.isEnum()) {
+				final Object[] arr = type.getEnumConstants();
+				final StringBuilder out = new StringBuilder();
+				out.append("ENUM(");
+				boolean first = true;
+				for (final Object elem : arr) {
+					if (!first) {
+						out.append(",");
+					}
+					first = false;
+					out.append("'");
+					out.append(elem.toString());
+					out.append("'");
+				}
+				out.append(")");
+				return out.toString();
+			}
+		} else {
+			if (type == Long.class || type == long.class) {
+				return "INTEGER";
+			}
+			if (type == Integer.class || type == int.class) {
+				return "INTEGER";
+			}
+			if (type == Boolean.class || type == boolean.class) {
+				return "INTEGER";
+			}
+			if (type == Float.class || type == float.class) {
+				return "REAL";
+			}
+			if (type == Double.class || type == double.class) {
+				return "REAL";
+			}
+			if (type == Date.class || type == Timestamp.class) {
+				return "DATETIME";
+			}
+			if (type == LocalDate.class) {
+				return "DATE";
+			}
+			if (type == LocalTime.class) {
+				return "TIME";
+			}
+			if (type == String.class) {
+				return "text";
+			}
+			if (type == JsonValue.class) {
+				return "text";
+			}
+			if (type.isEnum()) {
+				final Object[] arr = type.getEnumConstants();
+				final StringBuilder out = new StringBuilder();
+				out.append("TEXT CHECK(");
+				out.append(fieldName);
+				out.append(" IN (");
+				boolean first = true;
+				for (final Object elem : arr) {
+					if (!first) {
+						out.append(",");
+					}
+					first = false;
+					out.append("'");
+					out.append(elem.toString());
+					out.append("'");
+				}
+				out.append(" ) )");
+				return out.toString();
+			}
+		}
+		throw new DataAccessException("Imcompatible type of element in object for: " + type.getCanonicalName());
+	}
+
+	public static void createTablesSpecificType(final String tableName, final Field elem, final StringBuilder mainTableBuilder, final List<String> preOtherTables, final List<String> postOtherTables,
+			final boolean createIfNotExist, final boolean createDrop, final int fieldId, final Class<?> classModel) throws Exception {
+		final String name = AnnotationTools.getFieldName(elem);
+		final Integer limitSize = AnnotationTools.getLimitSize(elem);
+		final boolean notNull = AnnotationTools.getNotNull(elem);
+
+		final boolean primaryKey = AnnotationTools.isPrimaryKey(elem);
+		final GenerationType strategy = AnnotationTools.getStrategy(elem);
+
+		final boolean createTime = elem.getDeclaredAnnotationsByType(CreationTimestamp.class).length != 0;
+		final boolean updateTime = elem.getDeclaredAnnotationsByType(UpdateTimestamp.class).length != 0;
+		final String comment = AnnotationTools.getComment(elem);
+		final String defaultValue = AnnotationTools.getDefault(elem);
+
+		if (fieldId == 0) {
+			mainTableBuilder.append("\n\t\t`");
+		} else {
+			mainTableBuilder.append(",\n\t\t`");
+		}
+		mainTableBuilder.append(name);
+		mainTableBuilder.append("` ");
+		String typeValue = null;
+		typeValue = convertTypeInSQL(classModel, name);
+		if ("text".equals(typeValue) && !"sqlite".equals(ConfigBaseVariable.getDBType())) {
+			if (limitSize != null) {
+				mainTableBuilder.append("varchar(");
+				mainTableBuilder.append(limitSize);
+				mainTableBuilder.append(")");
+			} else {
+				mainTableBuilder.append("text");
+				if (!"sqlite".equals(ConfigBaseVariable.getDBType())) {
+					mainTableBuilder.append(" CHARACTER SET utf8");
+				}
+			}
+		} else {
+			mainTableBuilder.append(typeValue);
+		}
+		mainTableBuilder.append(" ");
+		if (notNull) {
+			if (!primaryKey || !"sqlite".equalsIgnoreCase(ConfigBaseVariable.getDBType())) {
+				mainTableBuilder.append("NOT NULL ");
+			}
+			if (defaultValue == null) {
+				if (updateTime || createTime) {
+					mainTableBuilder.append("DEFAULT CURRENT_TIMESTAMP");
+					if (!"sqlite".equals(ConfigBaseVariable.getDBType())) {
+						mainTableBuilder.append("(3)");
+					}
+					mainTableBuilder.append(" ");
+				}
+				if (updateTime) {
+					if (!"sqlite".equals(ConfigBaseVariable.getDBType())) {
+						mainTableBuilder.append("ON UPDATE CURRENT_TIMESTAMP");
+						mainTableBuilder.append("(3)");
+					} else {
+						// TODO: add trigger:
+						/* CREATE TRIGGER your_table_trig AFTER UPDATE ON your_table BEGIN update your_table SET updated_on = datetime('now') WHERE user_id = NEW.user_id; END; */
+						final StringBuilder triggerBuilder = new StringBuilder();
+						triggerBuilder.append("CREATE TRIGGER ");
+						triggerBuilder.append(tableName);
+						triggerBuilder.append("_update_trigger AFTER UPDATE ON ");
+						triggerBuilder.append(tableName);
+						triggerBuilder.append(" \nBEGIN \n    update ");
+						triggerBuilder.append(tableName);
+						triggerBuilder.append(" SET ");
+						triggerBuilder.append(name);
+						// triggerBuilder.append(" = datetime('now') WHERE id = NEW.id; \n");
+						triggerBuilder.append(" = strftime('%Y-%m-%d %H:%M:%f', 'now') WHERE id = NEW.id; \n");
+						triggerBuilder.append("END;");
+
+						postOtherTables.add(triggerBuilder.toString());
+					}
+
+					mainTableBuilder.append(" ");
+				}
+			} else {
+				mainTableBuilder.append("DEFAULT ");
+				if ("CURRENT_TIMESTAMP(3)".equals(defaultValue) && "sqlite".equals(ConfigBaseVariable.getDBType())) {
+					mainTableBuilder.append("CURRENT_TIMESTAMP");
+				} else {
+					mainTableBuilder.append(defaultValue);
+				}
+				mainTableBuilder.append(" ");
+				if (updateTime) {
+					if (!"sqlite".equals(ConfigBaseVariable.getDBType())) {
+						mainTableBuilder.append("ON UPDATE CURRENT_TIMESTAMP");
+						mainTableBuilder.append("(3)");
+					}
+					mainTableBuilder.append(" ");
+				}
+			}
+		} else if (defaultValue == null) {
+			if (updateTime || createTime) {
+				if ("sqlite".equals(ConfigBaseVariable.getDBType())) {
+					mainTableBuilder.append("DEFAULT CURRENT_TIMESTAMP ");
+				} else {
+					mainTableBuilder.append("DEFAULT CURRENT_TIMESTAMP(3) ");
+				}
+			} else if (primaryKey) {
+				mainTableBuilder.append("NOT NULL ");
+			} else {
+				mainTableBuilder.append("DEFAULT NULL ");
+			}
+		} else {
+			mainTableBuilder.append("DEFAULT ");
+			mainTableBuilder.append(defaultValue);
+			mainTableBuilder.append(" ");
+
+		}
+		if (primaryKey && "sqlite".equals(ConfigBaseVariable.getDBType())) {
+			mainTableBuilder.append("PRIMARY KEY ");
+
+		}
+		if (strategy == GenerationType.IDENTITY) {
+			if (!"sqlite".equals(ConfigBaseVariable.getDBType())) {
+				mainTableBuilder.append("AUTO_INCREMENT ");
+			} else {
+				mainTableBuilder.append("AUTOINCREMENT ");
+			}
+		} else if (strategy != null) {
+			throw new DataAccessException("Can not generate a stategy different of IDENTITY");
+		}
+
+		if (comment != null && !"sqlite".equals(ConfigBaseVariable.getDBType())) {
+			mainTableBuilder.append("COMMENT '");
+			mainTableBuilder.append(comment.replace('\'', '\''));
+			mainTableBuilder.append("' ");
+		}
+	}
+
+	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 List<String> createTable(final Class<?> clazz) throws Exception {
+		return createTable(clazz, null);
+	}
+
+	public static List<String> createTable(final Class<?> clazz, final QueryOptions options) throws Exception {
+		final String tableName = AnnotationTools.getTableName(clazz, options);
+
+		boolean createDrop = false;
+		if (options != null) {
+			createDrop = options.exist(CreateDropTable.class);
+		}
+
+		final boolean createIfNotExist = clazz.getDeclaredAnnotationsByType(DataIfNotExists.class).length != 0;
+		final List<String> preActionList = new ArrayList<>();
+		final List<String> postActionList = new ArrayList<>();
+		final StringBuilder out = new StringBuilder();
+		// Drop Table
+		if (createIfNotExist && createDrop) {
+			final StringBuilder tableTmp = new StringBuilder();
+			tableTmp.append("DROP TABLE IF EXISTS `");
+			tableTmp.append(tableName);
+			tableTmp.append("`;");
+			postActionList.add(tableTmp.toString());
+		}
+		// create Table:
+		out.append("CREATE TABLE `");
+		out.append(tableName);
+		out.append("` (");
+		int fieldId = 0;
+		LOGGER.debug("===> TABLE `{}`", tableName);
+		final List<String> primaryKeys = new ArrayList<>();
+
+		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));
+			}
+		}
+		// 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).
+		StringBuilder tmpOut = new StringBuilder();
+		StringBuilder reverseOut = new StringBuilder();
+		final List<String> alreadyAdded = new ArrayList<>();
+		Class<?> currentClazz = clazz;
+		while (currentClazz != null) {
+			fieldId = 0;
+			LOGGER.trace("parse class: '{}'", currentClazz.getCanonicalName());
+			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 = AnnotationTools.getFieldName(elem);
+				if (isFieldFromSuperClass(currentClazz, 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 (DataAccess.isAddOnField(elem)) {
+					final DataAccessAddOn addOn = DataAccess.findAddOnforField(elem);
+					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());
+					}
+				} else {
+					LOGGER.trace("Create type for: {} ==> {}", AnnotationTools.getFieldName(elem), elem.getType());
+					DataFactory.createTablesSpecificType(tableName, elem, tmpOut, preActionList, postActionList, createIfNotExist, createDrop, fieldId, elem.getType());
+				}
+				fieldId++;
+			}
+			final boolean dataInThisObject = tmpOut.toString().length() > 0;
+			if (dataInThisObject) {
+				final boolean dataInPreviousObject = reverseOut.toString().length() > 0;
+				if (dataInPreviousObject) {
+					tmpOut.append(", ");
+					tmpOut.append(reverseOut.toString());
+				}
+				reverseOut = tmpOut;
+				tmpOut = new StringBuilder();
+			}
+			currentClazz = currentClazz.getSuperclass();
+			if (currentClazz == Object.class) {
+				break;
+			}
+		}
+		out.append(reverseOut.toString());
+		if (primaryKeys.size() != 0 && !"sqlite".equals(ConfigBaseVariable.getDBType())) {
+			out.append(",\n\tPRIMARY KEY (`");
+			for (int iii = 0; iii < primaryKeys.size(); iii++) {
+				if (iii != 0) {
+					out.append(",");
+				}
+				out.append(primaryKeys.get(iii));
+			}
+			out.append("`)");
+		}
+		out.append("\n\t)");
+		if (!"sqlite".equals(ConfigBaseVariable.getDBType())) {
+			out.append(" ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci");
+		}
+		out.append(";");
+		preActionList.add(out.toString());
+		preActionList.addAll(postActionList);
+		return preActionList;
+	}
+
+}

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

@@ -0,0 +1,18 @@
+package org.kar.archidata.dataAccess;
+
+// Mark as deprecated while the concept is not ready ...
+@Deprecated
+public class Foreign<T> {
+	public final Long id;
+	public final T data;
+
+	public Foreign(final Long id) {
+		this.id = id;
+		this.data = null;
+	}
+
+	public Foreign(final T data) {
+		this.id = null;
+		this.data = data;
+	}
+}

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

@@ -0,0 +1,5 @@
+package org.kar.archidata.dataAccess;
+
+public interface LazyGetter {
+	void doRequest() throws Exception;
+}

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

@@ -0,0 +1,46 @@
+package org.kar.archidata.dataAccess;
+
+import java.sql.PreparedStatement;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class QueryAnd implements QueryItem {
+	protected final List<QueryItem> childs;
+
+	public QueryAnd(final List<QueryItem> childs) {
+		this.childs = childs;
+	}
+
+	public QueryAnd(final QueryItem... items) {
+		this.childs = new ArrayList<>();
+		Collections.addAll(this.childs, items);
+	}
+
+	@Override
+	public void generateQuerry(final StringBuilder querry, final String tableName) {
+		if (this.childs.size() >= 1) {
+			querry.append(" (");
+		}
+		boolean first = true;
+		for (final QueryItem elem : this.childs) {
+			if (first) {
+				first = false;
+			} else {
+				querry.append(" AND ");
+			}
+			elem.generateQuerry(querry, tableName);
+		}
+		if (this.childs.size() >= 1) {
+			querry.append(")");
+		}
+	}
+
+	@Override
+	public void injectQuerry(final PreparedStatement ps, final CountInOut iii) throws Exception {
+
+		for (final QueryItem elem : this.childs) {
+			elem.injectQuerry(ps, iii);
+		}
+	}
+}

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

@@ -0,0 +1,32 @@
+package org.kar.archidata.dataAccess;
+
+import java.sql.PreparedStatement;
+
+public class QueryCondition implements QueryItem {
+	private final String key;
+	private final String comparator;
+	private final Object value;
+
+	public QueryCondition(final String key, final String comparator, final Object value) {
+		this.key = key;
+		this.comparator = comparator;
+		this.value = value;
+	}
+
+	@Override
+	public void generateQuerry(final StringBuilder querry, final String tableName) {
+		querry.append(tableName);
+		querry.append(".");
+		querry.append(this.key);
+		querry.append(" ");
+		querry.append(this.comparator);
+		querry.append(" ?");
+
+	}
+
+	@Override
+	public void injectQuerry(final PreparedStatement ps, final CountInOut iii) throws Exception {
+		DataAccess.addElement(ps, this.value, iii);
+		iii.inc();
+	}
+}

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

@@ -0,0 +1,47 @@
+package org.kar.archidata.dataAccess;
+
+import java.sql.PreparedStatement;
+import java.util.List;
+
+public class QueryInList<T> implements QueryItem {
+	protected final String key;
+	protected final String comparator;
+	protected final List<T> value;
+
+	protected QueryInList(final String key, final String comparator, final List<T> value) {
+		this.key = key;
+		this.comparator = comparator;
+		this.value = value;
+	}
+
+	public QueryInList(final String key, final List<T> value) {
+		this(key, "IN", value);
+	}
+
+	@Override
+	public void generateQuerry(final StringBuilder querry, final String tableName) {
+		querry.append(tableName);
+		querry.append(".");
+		querry.append(this.key);
+		querry.append(" ");
+		querry.append(this.comparator);
+		querry.append(" (");
+		for (int iii = 0; iii < this.value.size(); iii++) {
+			if (iii != 0) {
+				querry.append(",?");
+			} else {
+				querry.append("?");
+			}
+		}
+		querry.append(")");
+
+	}
+
+	@Override
+	public void injectQuerry(final PreparedStatement ps, final CountInOut iii) throws Exception {
+		for (final Object elem : this.value) {
+			DataAccess.addElement(ps, elem, iii);
+			iii.inc();
+		}
+	}
+}

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

@@ -0,0 +1,9 @@
+package org.kar.archidata.dataAccess;
+
+import java.sql.PreparedStatement;
+
+public interface QueryItem {
+	void generateQuerry(StringBuilder querry, String tableName);
+
+	void injectQuerry(PreparedStatement ps, CountInOut iii) throws Exception;
+}

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

@@ -0,0 +1,9 @@
+package org.kar.archidata.dataAccess;
+
+import java.util.List;
+
+public class QueryNoInList<T> extends QueryInList<T> {
+	public QueryNoInList(final String key, final List<T> value) {
+		super(key, "NOT IN", value);
+	}
+}

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

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

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

@@ -0,0 +1,61 @@
+package org.kar.archidata.dataAccess;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.kar.archidata.dataAccess.options.AccessDeletedItems;
+import org.kar.archidata.dataAccess.options.CreateDropTable;
+import org.kar.archidata.dataAccess.options.ReadAllColumn;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class QueryOptions {
+	static final Logger LOGGER = LoggerFactory.getLogger(QueryOptions.class);
+	public static final ReadAllColumn READ_ALL_COLOMN = new ReadAllColumn();
+	public static final AccessDeletedItems ACCESS_DELETED_ITEMS = new AccessDeletedItems();
+	public static final CreateDropTable CREATE_DROP_TABLE = new CreateDropTable();
+
+	private final List<QueryOption> options = new ArrayList<>();
+
+	public QueryOptions(final QueryOption... elems) {
+		Collections.addAll(this.options, elems);
+	}
+
+	public QueryOptions() {}
+
+	public void add(final QueryOption option) {
+		this.options.add(option);
+	}
+
+	public List<QueryOption> getAll() {
+		return this.options;
+	}
+
+	@SuppressWarnings("unchecked")
+	public <T> T get(final Class<T> type) {
+		for (final QueryOption elem : this.options) {
+			if (elem.getClass() == type) {
+				return (T) elem;
+			}
+		}
+		return null;
+	}
+
+	public boolean exist(final Class<?> type) {
+		for (final QueryOption elem : this.options) {
+			if (elem.getClass() == type) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public static boolean readAllColomn(final QueryOptions options) {
+		if (options != null) {
+			return options.exist(ReadAllColumn.class);
+		}
+		return false;
+	}
+
+}

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

@@ -0,0 +1,38 @@
+package org.kar.archidata.dataAccess;
+
+import java.sql.PreparedStatement;
+import java.util.List;
+
+public class QueryOr implements QueryItem {
+	protected final List<QueryItem> childs;
+
+	public QueryOr(final List<QueryItem> childs) {
+		this.childs = childs;
+	}
+
+	@Override
+	public void generateQuerry(final StringBuilder querry, final String tableName) {
+		if (this.childs.size() >= 1) {
+			querry.append(" (");
+		}
+		boolean first = true;
+		for (final QueryItem elem : this.childs) {
+			if (first) {
+				first = false;
+			} else {
+				querry.append(" OR ");
+			}
+			elem.generateQuerry(querry, tableName);
+		}
+		if (this.childs.size() >= 1) {
+			querry.append(")");
+		}
+	}
+
+	@Override
+	public void injectQuerry(final PreparedStatement ps, final CountInOut iii) throws Exception {
+		for (final QueryItem elem : this.childs) {
+			elem.injectQuerry(ps, iii);
+		}
+	}
+}

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

@@ -0,0 +1,93 @@
+package org.kar.archidata.dataAccess.addOn;
+
+import java.lang.reflect.Field;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.Types;
+import java.util.List;
+
+import org.kar.archidata.annotation.AnnotationTools;
+import org.kar.archidata.annotation.DataJson;
+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 com.fasterxml.jackson.annotation.JsonValue;
+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 canRetrieve(final Field field) {
+		return true;
+	}
+
+	@Override
+	public void generateQuerry(@NotNull final String tableName, @NotNull final Field field, @NotNull final StringBuilder querrySelect, @NotNull final StringBuilder querry, @NotNull final String name,
+			@NotNull final CountInOut elemCount, final QueryOptions options) throws Exception {
+		querrySelect.append(" ");
+		querrySelect.append(tableName);
+		querrySelect.append(".");
+		querrySelect.append(name);
+		elemCount.inc();
+		return;
+	}
+
+	@Override
+	public void fillFromQuerry(final ResultSet rs, final Field field, final Object data, final CountInOut count, final QueryOptions options, final List<LazyGetter> lazyCall) throws Exception {
+		final String jsonData = rs.getString(count.value);
+		count.inc();
+		if (!rs.wasNull()) {
+			final ObjectMapper objectMapper = new ObjectMapper();
+			final Object dataParsed = objectMapper.readValue(jsonData, field.getType());
+			field.set(data, dataParsed);
+		}
+	}
+
+	@Override
+	public void createTables(final String tableName, final Field field, final StringBuilder mainTableBuilder, final List<String> preActionList, final List<String> postActionList,
+			final boolean createIfNotExist, final boolean createDrop, final int fieldId) throws Exception {
+		DataFactory.createTablesSpecificType(tableName, field, mainTableBuilder, preActionList, postActionList, createIfNotExist, createDrop, fieldId, JsonValue.class);
+	}
+}

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

@@ -0,0 +1,209 @@
+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 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.LinkTable;
+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 = "-";
+
+	@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) {
+		return true;
+	}
+
+	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 generateConcatQuerry(@NotNull final String tableName, @NotNull final Field field, @NotNull final StringBuilder querrySelect, @NotNull final StringBuilder querry,
+			@NotNull final String name, @NotNull final CountInOut elemCount, final QueryOptions options) {
+
+		final String linkTableName = generateLinkTableName(tableName, name);
+		final String tmpVariable = "tmp_" + Integer.toString(elemCount.value);
+		querrySelect.append(" (SELECT GROUP_CONCAT(");
+		querrySelect.append(tmpVariable);
+		querrySelect.append(".object2Id ");
+		if (ConfigBaseVariable.getDBType().equals("sqlite")) {
+			querrySelect.append(", ");
+		} else {
+			querrySelect.append("SEPARATOR ");
+		}
+		querrySelect.append("'");
+		querrySelect.append(SEPARATOR);
+		querrySelect.append("') FROM ");
+		querrySelect.append(linkTableName);
+		querrySelect.append(" ");
+		querrySelect.append(tmpVariable);
+		querrySelect.append(" WHERE ");
+		querrySelect.append(tmpVariable);
+		querrySelect.append(".deleted = false AND ");
+		querrySelect.append(tableName);
+		querrySelect.append(".id = ");
+		querrySelect.append(tmpVariable);
+		querrySelect.append(".");
+		querrySelect.append("object1Id ");
+		if (!ConfigBaseVariable.getDBType().equals("sqlite")) {
+			querrySelect.append(" GROUP BY ");
+			querrySelect.append(tmpVariable);
+			querrySelect.append(".object1Id");
+		}
+		querrySelect.append(") AS ");
+		querrySelect.append(name);
+		querrySelect.append(" ");
+		/* "              (SELECT GROUP_CONCAT(tmp.data_id SEPARATOR '-')" + "                      FROM cover_link_node tmp" + "                      WHERE tmp.deleted = false" +
+		 * "                            AND node.id = tmp.node_id" + "                      GROUP BY tmp.node_id) AS covers" + */
+		elemCount.inc();
+	}
+
+	@Override
+	public void generateQuerry(@NotNull final String tableName, @NotNull final Field field, @NotNull final StringBuilder querrySelect, @NotNull final StringBuilder querry, @NotNull final String name,
+			@NotNull final CountInOut elemCount, final QueryOptions options) throws Exception {
+		if (field.getType() != List.class) {
+			return;
+		}
+		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[0];
+		if (objectClass == Long.class) {
+			generateConcatQuerry(tableName, field, querrySelect, querry, name, elemCount, options);
+		}
+		final ManyToMany decorators = field.getDeclaredAnnotation(ManyToMany.class);
+		if (decorators == null) {
+			return;
+		}
+		if (objectClass == decorators.targetEntity()) {
+			if (decorators.fetch() == FetchType.EAGER) {
+				throw new DataAccessException("EAGER is not supported for list of element...");
+			} else {
+				generateConcatQuerry(tableName, field, querrySelect, querry, name, elemCount, options);
+			}
+		}
+	}
+
+	@Override
+	public void fillFromQuerry(final ResultSet rs, final Field field, final Object data, final CountInOut count, final QueryOptions options, final List<LazyGetter> lazyCall) throws Exception {
+		if (field.getType() != List.class) {
+			return;
+		}
+		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[0];
+		if (objectClass == Long.class) {
+			final List<Long> idList = DataAccess.getListOfIds(rs, count.value, SEPARATOR);
+			field.set(data, idList);
+			count.inc();
+		}
+		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 {
+				final List<Long> idList = DataAccess.getListOfIds(rs, count.value, SEPARATOR);
+				// 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 QueryInList<>(idField, childs), null);
+						if (foreignData == null) {
+							return;
+						}
+						field.set(data, foreignData);
+					};
+					lazyCall.add(lambda);
+				}
+			}
+		}
+	}
+
+	public static void addLink(final Class<?> clazz, final long localKey, final String column, final long remoteKey) throws Exception {
+		final String tableName = AnnotationTools.getTableName(clazz);
+		final String linkTableName = generateLinkTableName(tableName, column);
+		final LinkTable insertElement = new LinkTable(localKey, remoteKey);
+		final QueryOptions options = new QueryOptions(new OverrideTableName(linkTableName));
+		DataAccess.insert(insertElement, options);
+
+	}
+
+	public static int removeLink(final Class<?> clazz, final long localKey, final String column, final long remoteKey) throws Exception {
+		final String tableName = AnnotationTools.getTableName(clazz);
+		final String linkTableName = generateLinkTableName(tableName, column);
+		final QueryOptions options = new QueryOptions(new OverrideTableName(linkTableName));
+		final QueryAnd condition = new QueryAnd(new QueryCondition("object1Id", "=", localKey), new QueryCondition("object2Id", "=", remoteKey));
+		return DataAccess.deleteWhere(LinkTable.class, condition, options);
+	}
+
+	@Override
+	public void createTables(final String tableName, final Field field, final StringBuilder mainTableBuilder, final List<String> preActionList, final List<String> postActionList,
+			final boolean createIfNotExist, final boolean createDrop, final int fieldId) throws Exception {
+		final String linkTableName = generateLinkTableNameField(tableName, field);
+		final QueryOptions options = new QueryOptions(new OverrideTableName(linkTableName));
+		final List<String> sqlCommand = DataFactory.createTable(LinkTable.class, options);
+		postActionList.addAll(sqlCommand);
+	}
+}

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

@@ -0,0 +1,186 @@
+package org.kar.archidata.dataAccess.addOn;
+
+import java.lang.reflect.Field;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.Types;
+import java.util.List;
+
+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.QueryOptions;
+import org.kar.archidata.exception.DataAccessException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ManyToOne;
+import jakarta.validation.constraints.NotNull;
+
+public class AddOnManyToOne implements DataAccessAddOn {
+	static final Logger LOGGER = LoggerFactory.getLogger(AddOnManyToMany.class);
+
+	@Override
+	public Class<?> getAnnotationClass() {
+		return ManyToOne.class;
+	}
+
+	@Override
+	public String getSQLFieldType(final Field elem) throws Exception {
+		final String fieldName = AnnotationTools.getFieldName(elem);
+		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 elem) {
+		final ManyToOne decorators = elem.getDeclaredAnnotation(ManyToOne.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.BIGINT);
+		} else if (field.getType() == Long.class) {
+			final Long dataLong = (Long) data;
+			ps.setLong(iii.value, dataLong);
+		} else {
+			final Field idField = AnnotationTools.getFieldOfId(field.getType());
+			final Object uid = idField.get(data);
+			if (uid == null) {
+				ps.setNull(iii.value, Types.BIGINT);
+				throw new DataAccessException("Not implemented adding subClasses ==> add it manualy before...");
+			} else {
+				final Long dataLong = (Long) uid;
+				ps.setLong(iii.value, dataLong);
+			}
+		}
+		iii.inc();
+	}
+
+	@Override
+	public boolean canInsert(final Field field) {
+		if (field.getType() == Long.class) {
+			return true;
+		}
+		final ManyToOne decorators = field.getDeclaredAnnotation(ManyToOne.class);
+		if (field.getType() == decorators.targetEntity()) {
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public boolean canRetrieve(final Field field) {
+		if (field.getType() == Long.class) {
+			return true;
+		}
+		final ManyToOne decorators = field.getDeclaredAnnotation(ManyToOne.class);
+		if (field.getType() == decorators.targetEntity()) {
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public void generateQuerry(@NotNull final String tableName, @NotNull final Field field, @NotNull final StringBuilder querrySelect, @NotNull final StringBuilder querry, @NotNull final String name,
+			@NotNull final CountInOut elemCount, final QueryOptions options) throws Exception {
+		if (field.getType() == Long.class) {
+			querrySelect.append(" ");
+			querrySelect.append(tableName);
+			querrySelect.append(".");
+			querrySelect.append(name);
+			elemCount.inc();
+			return;
+		}
+		final ManyToOne decorators = field.getDeclaredAnnotation(ManyToOne.class);
+		if (field.getType() == decorators.targetEntity()) {
+			if (decorators.fetch() == FetchType.EAGER) {
+				// TODO: rework this to have a lazy mode ...
+				DataAccess.generateSelectField(querrySelect, querry, field.getType(), options, elemCount);
+				final Class<?> subType = field.getType();
+				final String subTableName = AnnotationTools.getTableName(subType);
+				final Field idField = AnnotationTools.getFieldOfId(subType);
+				querry.append("LEFT OUTER JOIN `");
+				querry.append(subTableName);
+				querry.append("` ON ");
+				querry.append(subTableName);
+				querry.append(".");
+				querry.append(AnnotationTools.getFieldName(idField));
+				querry.append(" = ");
+				querry.append(tableName);
+				querry.append(".");
+				querry.append(AnnotationTools.getFieldName(field));
+			} else {
+				querrySelect.append(" ");
+				querrySelect.append(tableName);
+				querrySelect.append(".");
+				querrySelect.append(name);
+				elemCount.inc();
+				return;
+			}
+		}
+
+		/* SELECT k.id, r.id FROM `right` k LEFT OUTER JOIN `rightDescription` r ON k.rightDescriptionId=r.id */
+	}
+
+	@Override
+	public void fillFromQuerry(final ResultSet rs, final Field field, final Object data, final CountInOut count, final QueryOptions options, final List<LazyGetter> lazyCall) throws Exception {
+		if (field.getType() == Long.class) {
+			final Long foreignKey = rs.getLong(count.value);
+			count.inc();
+			if (!rs.wasNull()) {
+				field.set(data, foreignKey);
+			}
+			return;
+		}
+		final Class<?> objectClass = field.getType();
+		final ManyToOne decorators = field.getDeclaredAnnotation(ManyToOne.class);
+		if (decorators == null) {
+			return;
+		}
+		if (objectClass == decorators.targetEntity()) {
+			if (decorators.fetch() == FetchType.EAGER) {
+				final CountInOut countNotNull = new CountInOut(0);
+				final Object dataNew = DataAccess.createObjectFromSQLRequest(rs, objectClass, count, countNotNull, options, lazyCall);
+				if (dataNew != null && countNotNull.value != 0) {
+					field.set(data, dataNew);
+				}
+			} else {
+				// 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();
+				if (!rs.wasNull()) {
+					// In the lazy mode, the request is done in asynchronous mode, they will be done after...
+					final LazyGetter lambda = () -> {
+						// TODO: update to have get with abstract types ....
+						final Object foreignData = DataAccess.get(decorators.targetEntity(), foreignKey);
+						if (foreignData == null) {
+							return;
+						}
+						field.set(data, foreignData);
+					};
+					lazyCall.add(lambda);
+				}
+			}
+		}
+	}
+
+	// TODO : refacto this table to manage a generic table with dynamic name to be serialisable with the default system
+	@Override
+	public void createTables(final String tableName, final Field field, final StringBuilder mainTableBuilder, final List<String> preActionList, final List<String> postActionList,
+			final boolean createIfNotExist, final boolean createDrop, final int fieldId) throws Exception {
+		DataFactory.createTablesSpecificType(tableName, field, mainTableBuilder, preActionList, postActionList, createIfNotExist, createDrop, fieldId, Long.class);
+	}
+}

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

@@ -0,0 +1,127 @@
+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 canRetrieve(final Field field) {
+		return false;
+	}
+
+	@Override
+	public void generateQuerry(@NotNull final String tableName, @NotNull final Field field, @NotNull final StringBuilder querrySelect, @NotNull final StringBuilder querry, @NotNull final String name,
+			@NotNull final CountInOut elemCount, final QueryOptions options) {
+		querrySelect.append(" ");
+		querrySelect.append(tableName);
+		querrySelect.append(".");
+		querrySelect.append(name);
+		elemCount.inc();
+	}
+
+	@Override
+	public void fillFromQuerry(final ResultSet rs, final Field field, final Object data, final CountInOut count, final QueryOptions options, final List<LazyGetter> lazyCall)
+			throws SQLException, IllegalArgumentException, IllegalAccessException {
+		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 field, final StringBuilder mainTableBuilder, final List<String> preActionList, final List<String> postActionList,
+			final boolean createIfNotExist, final boolean createDrop, final int fieldId) throws Exception {
+		DataFactory.createTablesSpecificType(tableName, field, mainTableBuilder, preActionList, postActionList, createIfNotExist, createDrop, fieldId, Long.class);
+	}
+}

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

@@ -0,0 +1,108 @@
+package org.kar.archidata.dataAccess.addOn;
+
+import java.lang.reflect.Field;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.kar.archidata.annotation.AnnotationTools;
+import org.kar.archidata.annotation.addOn.SQLTableExternalForeinKeyAsList;
+import org.kar.archidata.dataAccess.CountInOut;
+import org.kar.archidata.dataAccess.DataAccess;
+import org.kar.archidata.dataAccess.DataAccessAddOn;
+import org.kar.archidata.dataAccess.DataFactory;
+import org.kar.archidata.dataAccess.LazyGetter;
+import org.kar.archidata.dataAccess.QueryOptions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jakarta.validation.constraints.NotNull;
+
+public class AddOnSQLTableExternalForeinKeyAsList implements DataAccessAddOn {
+	static final Logger LOGGER = LoggerFactory.getLogger(AddOnManyToMany.class);
+	static final String SEPARATOR = "-";
+
+	/** Convert the list if external id in a string '-' separated
+	 * @param ids List of value (null are removed)
+	 * @return '-' string separated */
+	protected static String getStringOfIds(final List<Long> ids) {
+		final List<Long> tmp = new ArrayList<>(ids);
+		return tmp.stream().map(String::valueOf).collect(Collectors.joining(SEPARATOR));
+	}
+
+	@Override
+	public Class<?> getAnnotationClass() {
+		return SQLTableExternalForeinKeyAsList.class;
+	}
+
+	@Override
+	public String getSQLFieldType(final Field field) throws Exception {
+		final String fieldName = AnnotationTools.getFieldName(field);
+		try {
+			return DataFactory.convertTypeInSQL(String.class, fieldName);
+		} catch (final Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	@Override
+	public boolean isCompatibleField(final Field field) {
+		final SQLTableExternalForeinKeyAsList decorators = field.getDeclaredAnnotation(SQLTableExternalForeinKeyAsList.class);
+		return decorators != null;
+	}
+
+	@Override
+	public void insertData(final PreparedStatement ps, final Field field, final Object rootObject, final CountInOut iii) throws SQLException, IllegalArgumentException, IllegalAccessException {
+		final Object data = field.get(rootObject);
+		iii.inc();
+		if (data == null) {
+			ps.setNull(iii.value, Types.BIGINT);
+		} else {
+			@SuppressWarnings("unchecked")
+			final String dataTmp = getStringOfIds((List<Long>) data);
+			ps.setString(iii.value, dataTmp);
+		}
+	}
+
+	@Override
+	public boolean canInsert(final Field field) {
+		return false;
+	}
+
+	@Override
+	public boolean canRetrieve(final Field field) {
+		return false;
+	}
+
+	@Override
+	public void generateQuerry(@NotNull final String tableName, @NotNull final Field field, @NotNull final StringBuilder querrySelect, @NotNull final StringBuilder querry, @NotNull final String name,
+			@NotNull final CountInOut elemCount, final QueryOptions options) {
+		elemCount.inc();
+		querrySelect.append(" ");
+		querrySelect.append(tableName);
+		querrySelect.append(".");
+		querrySelect.append(name);
+	}
+
+	@Override
+	public void fillFromQuerry(final ResultSet rs, final Field field, final Object data, final CountInOut count, final QueryOptions options, final List<LazyGetter> lazyCall)
+			throws SQLException, IllegalArgumentException, IllegalAccessException {
+		final List<Long> idList = DataAccess.getListOfIds(rs, count.value, SEPARATOR);
+		field.set(data, idList);
+		count.inc();
+	}
+
+	@Override
+	public void createTables(final String tableName, final Field field, final StringBuilder mainTableBuilder, final List<String> preActionList, final List<String> postActionList,
+			final boolean createIfNotExist, final boolean createDrop, final int fieldId) throws Exception {
+		// TODO Auto-generated method stub
+
+		DataFactory.createTablesSpecificType(tableName, field, mainTableBuilder, preActionList, postActionList, createIfNotExist, createDrop, fieldId, String.class);
+	}
+}

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

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

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

@@ -0,0 +1,8 @@
+package org.kar.archidata.dataAccess.options;
+
+import org.kar.archidata.dataAccess.QueryOption;
+
+/** This option permit to access on deleted items of a table */
+public class AccessDeletedItems extends QueryOption {
+	public AccessDeletedItems() {}
+}

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

@@ -0,0 +1,16 @@
+package org.kar.archidata.dataAccess.options;
+
+import org.kar.archidata.dataAccess.QueryOption;
+
+/** By default some element are not read like createAt and UpdatedAt. This option permit to read it. */
+public class CheckFunction extends QueryOption {
+	private final CheckFunctionInterface checker;
+
+	public CheckFunction(final CheckFunctionInterface checker) {
+		this.checker = checker;
+	}
+
+	public CheckFunctionInterface getChecker() {
+		return this.checker;
+	}
+}

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

@@ -0,0 +1,13 @@
+package org.kar.archidata.dataAccess.options;
+
+import java.util.List;
+
+/** By default some element are not read like createAt and UpdatedAt. This option permit to read it. */
+public interface CheckFunctionInterface {
+	/** This function implementation is design to check if the updated class is valid of not for insertion
+	 * @param data The object that might be injected.
+	 * @param filterValue List of fields that might be check. If null, then all column must be checked.
+	 * @throws Exception Exception is generate if the data are incorrect. */
+	void check(Object data, List<String> filterValue) throws Exception;
+
+}

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

@@ -0,0 +1,8 @@
+package org.kar.archidata.dataAccess.options;
+
+import org.kar.archidata.dataAccess.QueryOption;
+
+/** This option permit to create the DROP `Table` IF EXIST in the generation of structure. */
+public class CreateDropTable extends QueryOption {
+	public CreateDropTable() {}
+}

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

@@ -0,0 +1,17 @@
+package org.kar.archidata.dataAccess.options;
+
+import org.kar.archidata.dataAccess.QueryOption;
+
+/** Option that permit to access to a table structure with an other name that is define in the structure. Note: Internal use for link tables (see:
+ * org.kar.archidata.dataAccess.addOn.model.LinkTable). */
+public class Limit extends QueryOption {
+	private final int limit;
+
+	public Limit(final int limit) {
+		this.limit = limit;
+	}
+
+	public int getLimit() {
+		return this.limit;
+	}
+}

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

@@ -0,0 +1,17 @@
+package org.kar.archidata.dataAccess.options;
+
+import org.kar.archidata.dataAccess.QueryOption;
+
+/** Option that permit to access to a table structure with an other name that is define in the structure. Note: Internal use for link tables (see:
+ * org.kar.archidata.dataAccess.addOn.model.LinkTable). */
+public class OverrideTableName extends QueryOption {
+	private final String name;
+
+	public OverrideTableName(final String name) {
+		this.name = name;
+	}
+
+	public String getName() {
+		return this.name;
+	}
+}

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

@@ -0,0 +1,8 @@
+package org.kar.archidata.dataAccess.options;
+
+import org.kar.archidata.dataAccess.QueryOption;
+
+/** By default some element are not read like createAt and UpdatedAt. This option permit to read it. */
+public class ReadAllColumn extends QueryOption {
+	public ReadAllColumn() {}
+}

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

@@ -1,13 +1,25 @@
 package org.kar.archidata.db;
 
+import org.kar.archidata.dataAccess.DataAccess;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class DBConfig {
+	static final Logger LOGGER = LoggerFactory.getLogger(DataAccess.class);
+	private final String type;
 	private final String hostname;
 	private final int port;
 	private final String login;
 	private final String password;
 	private final String dbName;
+	private final boolean keepConnected;
 
-    public DBConfig(String hostname, Integer port, String login, String password, String dbName) {
+	public DBConfig(final String type, final String hostname, final Integer port, final String login, final String password, final String dbName, final boolean keepConnected) {
+		if (type == null) {
+			this.type = "mysql";
+		} else {
+			this.type = type;
+		}
 		if (hostname == null) {
 			this.hostname = "localhost";
 		} else {
@@ -21,40 +33,56 @@ public class DBConfig {
 		this.login = login;
 		this.password = password;
 		this.dbName = dbName;
+		this.keepConnected = keepConnected;
 	}
 
 	@Override
 	public String toString() {
-        return "DBConfig{" +
-                "hostname='" + hostname + '\'' +
-                ", port=" + port +
-                ", login='" + login + '\'' +
-                ", password='" + password + '\'' +
-                ", dbName='" + dbName + '\'' +
-                '}';
+		return "DBConfig{type='" + this.type + '\'' + ", hostname='" + this.hostname + '\'' + ", port=" + this.port + ", login='" + this.login + '\'' + ", password='" + this.password + '\''
+				+ ", dbName='" + this.dbName + "' }";
 	}
 
 	public String getHostname() {
-        return hostname;
+		return this.hostname;
 	}
 
 	public int getPort() {
-        return port;
+		return this.port;
 	}
 
 	public String getLogin() {
-        return login;
+		return this.login;
 	}
 
 	public String getPassword() {
-        return password;
+		return this.password;
 	}
 
 	public String getDbName() {
-        return dbName;
+		return this.dbName;
+	}
+
+	public boolean getKeepConnected() {
+		return this.keepConnected;
 	}
 
 	public String getUrl() {
-		return "jdbc:mysql://" + this.hostname + ":" + this.port + "/" + this.dbName + "?allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=UTC";
+		return getUrl(false);
+	}
+
+	public String getUrl(final boolean isRoot) {
+		if (this.type.equals("sqlite")) {
+			if (isRoot) {
+				LOGGER.error("Can not manage root connection on SQLite...");
+			}
+			if (this.hostname.equals("memory")) {
+				return "jdbc:sqlite::memory:";
+			}
+			return "jdbc:sqlite:" + this.hostname + ".db";
+		}
+		if (isRoot) {
+			return "jdbc:" + this.type + "://" + this.hostname + ":" + this.port + "/?allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=UTC";
+		}
+		return "jdbc:" + this.type + "://" + this.hostname + ":" + this.port + "/" + this.dbName + "?allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=UTC";
 	}
 }

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

@@ -1,45 +1,92 @@
 package org.kar.archidata.db;
 
-import org.kar.archidata.model.User;
+import java.io.Closeable;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
 
-import java.sql.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-public class DBEntry {
+public class DBEntry implements Closeable {
+	final static Logger LOGGER = LoggerFactory.getLogger(DBEntry.class);
 	public DBConfig config;
 	public Connection connection;
+	private static List<DBEntry> stored = new ArrayList<>();
 
-    public DBEntry(DBConfig config) {
+	private DBEntry(final DBConfig config, final boolean root) throws IOException {
 		this.config = config;
+		if (root) {
+			connectRoot();
+		} else {
 			connect();
 		}
+	}
 
-    public void connect() {
+	public static DBEntry createInterface(final DBConfig config) throws IOException {
+		return createInterface(config, false);
+	}
+
+	public static DBEntry createInterface(final DBConfig config, final boolean root) throws IOException {
+		if (config.getKeepConnected()) {
+			for (final DBEntry elem : stored) {
+				if (elem == null) {
+					continue;
+				}
+				if (elem.config.getUrl().equals(config.getUrl())) {
+					return elem;
+				}
+			}
+			final DBEntry tmp = new DBEntry(config, root);
+			stored.add(tmp);
+			return tmp;
+		} else {
+			return new DBEntry(config, root);
+		}
+	}
+
+	public void connectRoot() throws IOException {
 		try {
-            connection = DriverManager.getConnection(config.getUrl(), config.getLogin(), config.getPassword());
-        } catch (SQLException ex) {
-            ex.printStackTrace();
+			this.connection = DriverManager.getConnection(this.config.getUrl(true), this.config.getLogin(), this.config.getPassword());
+		} catch (final SQLException ex) {
+			throw new IOException("Connection db fail: " + ex.getMessage());
 		}
 
 	}
 
-    public void disconnect() {
+	public void connect() throws IOException {
+		try {
+			this.connection = DriverManager.getConnection(this.config.getUrl(), this.config.getLogin(), this.config.getPassword());
+		} catch (final SQLException ex) {
+			throw new IOException("Connection db fail: " + ex.getMessage());
+		}
+
+	}
+
+	@Override
+	public void close() throws IOException {
+		if (this.config.getKeepConnected()) {
+			return;
+		}
+		closeForce();
+	}
+
+	public void closeForce() throws IOException {
 		try {
 			// connection.commit();
-            connection.close();
-        } catch (SQLException ex) {
-            ex.printStackTrace();
+			this.connection.close();
+		} catch (final SQLException ex) {
+			throw new IOException("Dis-connection db fail: " + ex.getMessage());
 		}
 	}
-/*
-    public void test() throws SQLException {
-        String query = "SELECT * FROM user";
-        Statement st = connection.createStatement();
-        ResultSet rs = st.executeQuery(query);
-        System.out.println("List of user:");
-        if (rs.next()) {
-            User user = new User(rs);
-            System.out.println("    - " + user);
+
+	public static void closeAllForceMode() throws IOException {
+		for (final DBEntry entry : stored) {
+			entry.closeForce();
+		}
+		stored = new ArrayList<>();
 	}
 }
-   */
-}

src/org/kar/archidata/exception/DataAccessException.java

@@ -0,0 +1,9 @@
+package org.kar.archidata.exception;
+
+public class DataAccessException extends Exception {
+	private static final long serialVersionUID = 1L;
+
+	public DataAccessException(final String message) {
+		super(message);
+	}
+}

src/org/kar/archidata/exception/FailException.java

@@ -0,0 +1,19 @@
+package org.kar.archidata.exception;
+
+import jakarta.ws.rs.core.Response;
+
+public class FailException extends Exception {
+	private static final long serialVersionUID = 1L;
+	public final Response.Status status;
+
+	public FailException(final Response.Status status, final String message) {
+		super(message);
+		this.status = status;
+	}
+
+	public FailException(final String message) {
+		super(message);
+		this.status = Response.Status.BAD_REQUEST;
+
+	}
+}

src/org/kar/archidata/exception/InputException.java

@@ -0,0 +1,21 @@
+package org.kar.archidata.exception;
+
+import jakarta.ws.rs.core.Response;
+
+public class InputException extends Exception {
+	private static final long serialVersionUID = 1L;
+	public final String missingVariable;
+	public final Response.Status status;
+
+	public InputException(final Response.Status status, final String variable, final String message) {
+		super(message);
+		this.missingVariable = variable;
+		this.status = status;
+	}
+
+	public InputException(final String variable, final String message) {
+		super(message);
+		this.missingVariable = variable;
+		this.status = Response.Status.NOT_ACCEPTABLE;
+	}
+}

src/org/kar/archidata/exception/NotFoundException.java

@@ -0,0 +1,11 @@
+package org.kar.archidata.exception;
+
+import jakarta.ws.rs.core.Response;
+
+public class NotFoundException extends FailException {
+	private static final long serialVersionUID = 1L;
+
+	public NotFoundException(final String message) {
+		super(Response.Status.NOT_FOUND, message);
+	}
+}

src/org/kar/archidata/exception/RESTErrorResponseExeption.java

@@ -0,0 +1,37 @@
+package org.kar.archidata.exception;
+
+import java.util.UUID;
+
+public class RESTErrorResponseExeption extends Exception {
+	public UUID uuid;
+	public String time;
+	public String error;
+	public String message;
+	public int status;
+	public String statusMessage;
+
+	public RESTErrorResponseExeption() {
+		this.uuid = null;
+		this.time = null;
+		this.error = null;
+		this.message = null;
+		this.status = 0;
+		this.statusMessage = null;
+	}
+
+	public RESTErrorResponseExeption(final UUID uuid, final String time, final String error, final String message, final int status, final String statusMessage) {
+		this.uuid = uuid;
+		this.time = time;
+		this.error = error;
+		this.message = message;
+		this.status = status;
+		this.statusMessage = statusMessage;
+	}
+
+	@Override
+	public String toString() {
+		return "RESTErrorResponseExeption [uuid=" + this.uuid + ", time=" + this.time + ", error=" + this.error + ", message=" + this.message + ", status=" + this.status + ", statusMessage="
+				+ this.statusMessage + "]";
+	}
+
+}

src/org/kar/archidata/exception/SystemException.java

@@ -0,0 +1,18 @@
+package org.kar.archidata.exception;
+
+import jakarta.ws.rs.core.Response;
+
+public class SystemException extends Exception {
+	private static final long serialVersionUID = 1L;
+	public final Response.Status status;
+
+	public SystemException(final Response.Status status, final String message) {
+		super(message);
+		this.status = status;
+	}
+
+	public SystemException(final String message) {
+		super(message);
+		this.status = Response.Status.INTERNAL_SERVER_ERROR;
+	}
+}

src/org/kar/archidata/exception/UnAuthorizedException.java

@@ -0,0 +1,11 @@
+package org.kar.archidata.exception;
+
+import jakarta.ws.rs.core.Response;
+
+public class UnAuthorizedException extends FailException {
+	private static final long serialVersionUID = 1L;
+
+	public UnAuthorizedException(final String message) {
+		super(Response.Status.UNAUTHORIZED, message);
+	}
+}

src/org/kar/archidata/filter/AuthenticationFilter.java

@@ -1,81 +1,86 @@
 package org.kar.archidata.filter;
 
-import java.lang.reflect.Method;
-import org.kar.archidata.annotation.security.DenyAll;
-import org.kar.archidata.annotation.security.PermitAll;
-import org.kar.archidata.annotation.security.RolesAllowed;
-
-
-import javax.annotation.Priority;
-import javax.ws.rs.Priorities;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.container.ResourceInfo;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.Provider;
-
-import org.kar.archidata.UserDB;
-import org.kar.archidata.annotation.security.PermitTokenInURI;
-import org.kar.archidata.model.User;
-import org.kar.archidata.util.JWTWrapper;
-
-import com.nimbusds.jwt.JWTClaimsSet;
-
 import java.io.IOException;
+import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 // https://stackoverflow.com/questions/26777083/best-practice-for-rest-token-based-authentication-with-jax-rs-and-jersey
 // https://stackoverflow.com/questions/26777083/best-practice-for-rest-token-based-authentication-with-jax-rs-and-jersey/45814178#45814178
 // https://stackoverflow.com/questions/32817210/how-to-access-jersey-resource-secured-by-rolesallowed
 
+import org.kar.archidata.annotation.security.PermitTokenInURI;
+import org.kar.archidata.catcher.RestErrorResponse;
+import org.kar.archidata.model.UserByToken;
+import org.kar.archidata.tools.JWTWrapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.nimbusds.jwt.JWTClaimsSet;
+
+import jakarta.annotation.Priority;
+import jakarta.annotation.security.DenyAll;
+import jakarta.annotation.security.PermitAll;
+import jakarta.annotation.security.RolesAllowed;
+import jakarta.ws.rs.Priorities;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestFilter;
+import jakarta.ws.rs.container.ResourceInfo;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.Provider;
+
 //@PreMatching
 @Provider
 @Priority(Priorities.AUTHENTICATION)
 public class AuthenticationFilter implements ContainerRequestFilter {
+	final Logger logger = LoggerFactory.getLogger(AuthenticationFilter.class);
 	@Context
 	private ResourceInfo resourceInfo;
+	protected final String applicationName;
 
 	private static final String AUTHENTICATION_SCHEME = "Yota";
+	private static final String AUTHENTICATION_TOKEN_SCHEME = "Zota";
+
+	public AuthenticationFilter(final String applicationName) {
+		this.applicationName = applicationName;
+	}
 
 	@Override
-    public void filter(ContainerRequestContext requestContext) throws IOException {
-        /*
-        System.out.println("-----------------------------------------------------");
-        System.out.println("----          Check if have authorization        ----");
-        System.out.println("-----------------------------------------------------");
-        System.out.println("   for:" + requestContext.getUriInfo().getPath());
-        */
-        Method method = resourceInfo.getResourceMethod();
+	public void filter(final ContainerRequestContext requestContext) throws IOException {
+		/* logger.debug("-----------------------------------------------------"); logger.debug("----          Check if have authorization        ----");
+		 * logger.debug("-----------------------------------------------------"); logger.debug("   for:{}", requestContext.getUriInfo().getPath()); */
+		final Method method = this.resourceInfo.getResourceMethod();
 		// Access denied for all
 		if (method.isAnnotationPresent(DenyAll.class)) {
-        	System.out.println("   ==> deny all " + requestContext.getUriInfo().getPath());
+			this.logger.debug("   ==> deny all {}", requestContext.getUriInfo().getPath());
 			requestContext.abortWith(Response.status(Response.Status.FORBIDDEN).entity("Access blocked !!!").build());
 			return;
 		}
 
 		// Access allowed for all
 		if (method.isAnnotationPresent(PermitAll.class)) {
-        	System.out.println("   ==> permit all " + requestContext.getUriInfo().getPath());
+			// logger.debug(" ==> permit all " + requestContext.getUriInfo().getPath());
 			// no control ...
 			return;
 		}
 		// this is a security guard, all the API must define their access level:
 		if (!method.isAnnotationPresent(RolesAllowed.class)) {
-        	System.out.println("   ==> missing @RolesAllowed " + requestContext.getUriInfo().getPath());
+			this.logger.error("   ==> missing @RolesAllowed {}", requestContext.getUriInfo().getPath());
 			requestContext.abortWith(Response.status(Response.Status.FORBIDDEN).entity("Access ILLEGAL !!!").build());
 			return;
 		}
 
 		// Get the Authorization header from the request
 		String authorizationHeader = requestContext.getHeaderString(HttpHeaders.AUTHORIZATION);
-        //System.out.println("authorizationHeader: " + authorizationHeader);
+		// logger.debug("authorizationHeader: {}", authorizationHeader);
 		if (authorizationHeader == null && method.isAnnotationPresent(PermitTokenInURI.class)) {
-        	MultivaluedMap<String, String> quaryparam = requestContext.getUriInfo().getQueryParameters();
-            for (Entry<String, List<String>> item: quaryparam.entrySet()) {
+			final MultivaluedMap<String, String> quaryparam = requestContext.getUriInfo().getQueryParameters();
+			for (final Entry<String, List<String>> item : quaryparam.entrySet()) {
 				if (item.getKey().equals(HttpHeaders.AUTHORIZATION)) {
 					if (!item.getValue().isEmpty()) {
 						authorizationHeader = item.getValue().get(0);
@@ -84,115 +89,131 @@ public class AuthenticationFilter implements ContainerRequestFilter {
 				}
 			}
 		}
-        //System.out.println("authorizationHeader: " + authorizationHeader);
-        
-        
-        /*
-        System.out.println("   -------------------------------");
-        // this get the parameters inside the pre-parsed element in the request ex: @Path("thumbnail/{id}") generate a map with "id"
-        MultivaluedMap<String, String> pathparam = requestContext.getUriInfo().getPathParameters(); 
-        for (Entry<String, List<String>> item: pathparam.entrySet()) {
-            System.out.println("  param: " + item.getKey() + " ==>" + item.getValue());
-        }
-        System.out.println("   -------------------------------");
-        // need to add "@QueryParam("p") String token, " in the model
-        //MultivaluedMap<String, String> quaryparam = requestContext.getUriInfo().getQueryParameters();
-        for (Entry<String, List<String>> item: quaryparam.entrySet()) {
-            System.out.println("  query: " + item.getKey() + " ==>" + item.getValue());
-        }
-        System.out.println("   -------------------------------");
-        List<PathSegment> segments = requestContext.getUriInfo().getPathSegments();
-        for (final PathSegment item: segments) {
-            System.out.println("  query: " + item.getPath() + " ==>" + item.getMatrixParameters());
-        }
-        System.out.println("   -------------------------------");
-        MultivaluedMap<String, String> headers = requestContext.getHeaders(); 
-        for (Entry<String, List<String>> item: headers.entrySet()) {
-            System.out.println("  headers: " + item.getKey() + " ==>" + item.getValue());
-        }
-        System.out.println("   -------------------------------");
-		*/
-        // Validate the Authorization header data Model "Yota userId:token"
-        if (!isTokenBasedAuthentication(authorizationHeader)) {
-        	System.out.println("REJECTED unauthorized: " + requestContext.getUriInfo().getPath());
-            abortWithUnauthorized(requestContext);
+		// logger.debug("authorizationHeader: {}", authorizationHeader);
+		final boolean isApplicationToken = isApplicationTokenBasedAuthentication(authorizationHeader);
+		final boolean isJwtToken = isTokenBasedAuthentication(authorizationHeader);
+		// Validate the Authorization header data Model "Yota jwt.to.ken" "Zota tokenId:hash(token)"
+		if (!isApplicationToken && !isJwtToken) {
+			this.logger.warn("REJECTED unauthorized: {}", requestContext.getUriInfo().getPath());
+			abortWithUnauthorized(requestContext, "REJECTED unauthorized: " + requestContext.getUriInfo().getPath());
 			return;
 		}
-        // check JWT token (basic:)
-
+		UserByToken userByToken = null;
+		if (isJwtToken) {
 			// Extract the token from the Authorization header (Remove "Yota ")
-        String token = authorizationHeader.substring(AUTHENTICATION_SCHEME.length()).trim();
-        System.out.println("token: " + token);
-        
-        
-        User user = null;
+			final String token = authorizationHeader.substring(AUTHENTICATION_SCHEME.length()).trim();
+			// logger.debug("token: {}", token);
 			try {
-            user = validateToken(token);
-        } catch (Exception e) {
-        	System.out.println("Fail to validate token: " + e.getMessage());
-            abortWithUnauthorized(requestContext);
+				userByToken = validateJwtToken(token);
+			} catch (final Exception e) {
+				this.logger.error("Fail to validate token: {}", e.getMessage());
+				abortWithUnauthorized(requestContext, "Fail to validate token: " + e.getMessage());
 				return;
 			}
-        if (user == null) {
-        	System.out.println("get a NULL user ...");
-            abortWithUnauthorized(requestContext);
+			if (userByToken == null) {
+				this.logger.warn("get a NULL user ...");
+				abortWithUnauthorized(requestContext, "get a NULL user ...");
 				return;
 			}
+		} else {
+			// Extract the token from the Authorization header (Remove "Zota ")
+			final String token = authorizationHeader.substring(AUTHENTICATION_TOKEN_SCHEME.length()).trim();
+			// logger.debug("token: {}", token);
+			try {
+				userByToken = validateToken(token);
+			} catch (final Exception e) {
+				this.logger.error("Fail to validate token: {}", e.getMessage());
+				abortWithUnauthorized(requestContext, "Fail to validate token: " + e.getMessage());
+				return;
+			}
+			if (userByToken == null) {
+				this.logger.warn("get a NULL application ...");
+				abortWithUnauthorized(requestContext, "get a NULL application ...");
+				return;
+			}
+
+		}
 		// create the security context model:
-        String scheme = requestContext.getUriInfo().getRequestUri().getScheme();
-        MySecurityContext userContext = new MySecurityContext(user, scheme);
+		final String scheme = requestContext.getUriInfo().getRequestUri().getScheme();
+		final MySecurityContext userContext = new MySecurityContext(userByToken, scheme);
 		// retrieve the allowed right:
-        RolesAllowed rolesAnnotation = method.getAnnotation(RolesAllowed.class);
-        List<String> roles = Arrays.asList(rolesAnnotation.value());
+		final RolesAllowed rolesAnnotation = method.getAnnotation(RolesAllowed.class);
+		final List<String> roles = Arrays.asList(rolesAnnotation.value());
 		// check if the user have the right:
 		boolean haveRight = false;
-        for (String role : roles) {
+		for (final String role : roles) {
 			if (userContext.isUserInRole(role)) {
 				haveRight = true;
 				break;
 			}
 		}
-        
 		// Is user valid?
 		if (!haveRight) {
-        	System.out.println("REJECTED not enought right : " + requestContext.getUriInfo().getPath() + " require: " + roles);
+			this.logger.error("REJECTED not enought right : {} require: {}", requestContext.getUriInfo().getPath(), roles);
 			requestContext.abortWith(Response.status(Response.Status.UNAUTHORIZED).entity("Not enought RIGHT !!!").build());
 			return;
 		}
 		requestContext.setSecurityContext(userContext);
-        System.out.println("Get local user : " + user);
+		// logger.debug("Get local user : {} / {}", user, userByToken);
 	}
 
-    private boolean isTokenBasedAuthentication(String authorizationHeader) {
+	private boolean isTokenBasedAuthentication(final String authorizationHeader) {
 		// Check if the Authorization header is valid
 		// It must not be null and must be prefixed with "Bearer" plus a whitespace
 		// The authentication scheme comparison must be case-insensitive
 		return authorizationHeader != null && authorizationHeader.toLowerCase().startsWith(AUTHENTICATION_SCHEME.toLowerCase() + " ");
 	}
 
-    private void abortWithUnauthorized(ContainerRequestContext requestContext) {
+	private boolean isApplicationTokenBasedAuthentication(final String authorizationHeader) {
+		// Check if the Authorization header is valid
+		// It must not be null and must be prefixed with "Bearer" plus a whitespace
+		// The authentication scheme comparison must be case-insensitive
+		return authorizationHeader != null && authorizationHeader.toLowerCase().startsWith(AUTHENTICATION_TOKEN_SCHEME.toLowerCase() + " ");
+	}
+
+	private void abortWithUnauthorized(final ContainerRequestContext requestContext, final String message) {
 
 		// Abort the filter chain with a 401 status code response
 		// The WWW-Authenticate header is sent along with the response
-        requestContext.abortWith(
-                Response.status(Response.Status.UNAUTHORIZED)
-                        .header(HttpHeaders.WWW_AUTHENTICATE,
-                                AUTHENTICATION_SCHEME + " base64(HEADER).base64(CONTENT).base64(KEY)")
-                        .build());
+		this.logger.warn("abortWithUnauthorized:");
+		final RestErrorResponse ret = new RestErrorResponse(Response.Status.UNAUTHORIZED, "Unauthorized", message);
+		this.logger.error("Error UUID={}", ret.uuid);
+		requestContext.abortWith(Response.status(ret.status).header(HttpHeaders.WWW_AUTHENTICATE, AUTHENTICATION_SCHEME + " base64(HEADER).base64(CONTENT).base64(KEY)").entity(ret)
+				.type(MediaType.APPLICATION_JSON).build());
 	}
 
-    private User validateToken(String authorization) throws Exception {
-        System.out.println(" validate token : " + authorization);
-        JWTClaimsSet ret = JWTWrapper.validateToken(authorization, "KarAuth", null);
+	protected UserByToken validateToken(final String authorization) throws Exception {
+		this.logger.info("Must be Override by the application implmentation, otherwise it dose not work");
+		return null;
+	}
+
+	// must be override to be good implementation
+	protected UserByToken validateJwtToken(final String authorization) throws Exception {
+		// logger.debug(" validate token : " + authorization);
+		final JWTClaimsSet ret = JWTWrapper.validateToken(authorization, "KarAuth", null);
 		// check the token is valid !!! (signed and coherent issuer...
 		if (ret == null) {
-            System.out.println("The token is not valid: '" + authorization + "'");
+			this.logger.error("The token is not valid: '{}'", authorization);
 			return null;
 		}
 		// check userID
-        String userUID = ret.getSubject();
-        long id = Long.parseLong(userUID);
-        System.out.println("request user: '" + userUID + "'");
-        return UserDB.getUserOrCreate(id, (String)ret.getClaim("login") );
+		final String userUID = ret.getSubject();
+		final long id = Long.parseLong(userUID);
+		final UserByToken user = new UserByToken();
+		user.id = id;
+		user.name = (String) ret.getClaim("login");
+		user.type = UserByToken.TYPE_USER;
+		final Object rowRight = ret.getClaim("right");
+		if (rowRight != null) {
+			final Map<String, Map<String, Object>> rights = (Map<String, Map<String, Object>>) ret.getClaim("right");
+			if (rights.containsKey(this.applicationName)) {
+				user.right = rights.get(this.applicationName);
+			} else {
+				this.logger.error("Connect with no right for this application='{}' full Right='{}'", this.applicationName, rights);
+			}
+		}
+		// logger.debug("request user: '{}' right: '{}' row='{}'", userUID, user.right, rowRight);
+		return user;
+		// return UserDB.getUserOrCreate(id, (String)ret.getClaim("login") );
 	}
 }

src/org/kar/archidata/filter/CORSFilter.java

@@ -1,25 +1,23 @@
 package org.kar.archidata.filter;
 
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerResponseContext;
-import javax.ws.rs.container.ContainerResponseFilter;
-import javax.ws.rs.ext.Provider;
 import java.io.IOException;
 
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerResponseContext;
+import jakarta.ws.rs.container.ContainerResponseFilter;
+import jakarta.ws.rs.ext.Provider;
 
 @Provider
 public class CORSFilter implements ContainerResponseFilter {
 
 	@Override
-    public void filter(ContainerRequestContext request,
-                       ContainerResponseContext response) throws IOException {
+	public void filter(final ContainerRequestContext request, final ContainerResponseContext response) throws IOException {
 		// System.err.println("filter cors ..." + request.toString());
 
 		response.getHeaders().add("Access-Control-Allow-Origin", "*");
 		response.getHeaders().add("Access-Control-Allow-Headers", "*");
 		// "Origin, content-type, Content-type, Accept, authorization, mime-type, filename");
 		response.getHeaders().add("Access-Control-Allow-Credentials", "true");
-        response.getHeaders().add("Access-Control-Allow-Methods",
-                "GET, POST, PUT, DELETE, OPTIONS, HEAD");
+		response.getHeaders().add("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS, HEAD");
 	}
 }

src/org/kar/archidata/filter/GenericContext.java

@@ -1,22 +1,22 @@
 package org.kar.archidata.filter;
 
-import org.kar.archidata.model.User;
-
 import java.security.Principal;
 
+import org.kar.archidata.model.UserByToken;
+
 public class GenericContext implements Principal {
 
-    public User user;
+	public UserByToken userByToken;
 
-    public GenericContext(User user) {
-        this.user = user;
+	public GenericContext(final UserByToken userByToken) {
+		this.userByToken = userByToken;
 	}
 
 	@Override
 	public String getName() {
-        if (user == null) {
+		if (this.userByToken == null) {
 			return "???";
 		}
-        return user.login;
+		return this.userByToken.name;
 	}
 }

src/org/kar/archidata/filter/MySecurityContext.java

@@ -1,47 +1,49 @@
 package org.kar.archidata.filter;
 
-
-import org.kar.archidata.model.User;
-
-import javax.ws.rs.core.SecurityContext;
 import java.security.Principal;
 
+import org.kar.archidata.model.UserByToken;
+
+import jakarta.ws.rs.core.SecurityContext;
+
 // https://simplapi.wordpress.com/2015/09/19/jersey-jax-rs-securitycontext-in-action/
 class MySecurityContext implements SecurityContext {
 
 	private final GenericContext contextPrincipale;
 	private final String sheme;
 
-    public MySecurityContext(User user, String sheme) {
-        this.contextPrincipale = new GenericContext(user);
+	public MySecurityContext(final UserByToken userByToken, final String sheme) {
+		this.contextPrincipale = new GenericContext(userByToken);
 		this.sheme = sheme;
 	}
 
 	@Override
 	public Principal getUserPrincipal() {
-        return contextPrincipale;
+		return this.contextPrincipale;
 	}
 
 	@Override
-    public boolean isUserInRole(String role) {
-        if (role.contentEquals("ADMIN")) {
-            return contextPrincipale.user.admin == true;
+	public boolean isUserInRole(final String role) {
+		if (this.contextPrincipale.userByToken != null) {
+			final Object value = this.contextPrincipale.userByToken.right.get(role);
+			if (value instanceof final Boolean ret) {
+				return ret;
 			}
-        if (role.contentEquals("USER")) {
-        	// if not an admin, this is a user...
-            return true; //contextPrincipale.user.admin == false;
 		}
 		return false;
 	}
 
 	@Override
 	public boolean isSecure() {
-        return true;
+		return this.sheme.equalsIgnoreCase("https");
 	}
 
 	@Override
 	public String getAuthenticationScheme() {
-        return "Yota";
+		if (this.contextPrincipale.userByToken != null) {
+			return "Zota";
+		}
+		return null;
 	}
 
 }

src/org/kar/archidata/filter/OptionFilter.java

@@ -1,21 +1,20 @@
 package org.kar.archidata.filter;
 
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.container.PreMatching;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.Provider;
 import java.io.IOException;
 
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestFilter;
+import jakarta.ws.rs.container.PreMatching;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.Provider;
+
 @Provider
 @PreMatching
 public class OptionFilter implements ContainerRequestFilter {
 	@Override
-    public void filter(ContainerRequestContext requestContext) throws IOException {
+	public void filter(final ContainerRequestContext requestContext) throws IOException {
 		if (requestContext.getMethod().contentEquals("OPTIONS")) {
 			requestContext.abortWith(Response.status(Response.Status.NO_CONTENT).build());
 		}
 	}
 }
-
-

src/org/kar/archidata/internal/Log.java

@@ -1,60 +0,0 @@
-package org.kar.archidata.internal;
-
-//import io.scenarium.logger.LogLevel;
-//import io.scenarium.logger.Logger;
-
-public class Log {
-//	private static final String LIB_NAME = "logger";
-//	private static final String LIB_NAME_DRAW = Logger.getDrawableName(LIB_NAME);
-//	private static final boolean PRINT_CRITICAL = Logger.getNeedPrint(LIB_NAME, LogLevel.CRITICAL);
-//	private static final boolean PRINT_ERROR = Logger.getNeedPrint(LIB_NAME, LogLevel.ERROR);
-//	private static final boolean PRINT_WARNING = Logger.getNeedPrint(LIB_NAME, LogLevel.WARNING);
-//	private static final boolean PRINT_INFO = Logger.getNeedPrint(LIB_NAME, LogLevel.INFO);
-//	private static final boolean PRINT_DEBUG = Logger.getNeedPrint(LIB_NAME, LogLevel.DEBUG);
-//	private static final boolean PRINT_VERBOSE = Logger.getNeedPrint(LIB_NAME, LogLevel.VERBOSE);
-//	private static final boolean PRINT_TODO = Logger.getNeedPrint(LIB_NAME, LogLevel.TODO);
-//	private static final boolean PRINT_PRINT = Logger.getNeedPrint(LIB_NAME, LogLevel.PRINT);
-//
-//	private Log() {}
-//
-//	public static void print(String data) {
-//		if (PRINT_PRINT)
-//			Logger.print(LIB_NAME_DRAW, data);
-//	}
-//
-//	public static void todo(String data) {
-//		if (PRINT_TODO)
-//			Logger.todo(LIB_NAME_DRAW, data);
-//	}
-//
-//	public static void critical(String data) {
-//		if (PRINT_CRITICAL)
-//			Logger.critical(LIB_NAME_DRAW, data);
-//	}
-//
-//	public static void error(String data) {
-//		if (PRINT_ERROR)
-//			Logger.error(LIB_NAME_DRAW, data);
-//	}
-//
-//	public static void warning(String data) {
-//		if (PRINT_WARNING)
-//			Logger.warning(LIB_NAME_DRAW, data);
-//	}
-//
-//	public static void info(String data) {
-//		if (PRINT_INFO)
-//			Logger.info(LIB_NAME_DRAW, data);
-//	}
-//
-//	public static void debug(String data) {
-//		if (PRINT_DEBUG)
-//			Logger.debug(LIB_NAME_DRAW, data);
-//	}
-//
-//	public static void verbose(String data) {
-//		if (PRINT_VERBOSE)
-//			Logger.verbose(LIB_NAME_DRAW, data);
-//	}
-
-}

src/org/kar/archidata/migration/MigrationEngine.java

@@ -0,0 +1,332 @@
+package org.kar.archidata.migration;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.kar.archidata.dataAccess.DataAccess;
+import org.kar.archidata.dataAccess.DataFactory;
+import org.kar.archidata.dataAccess.QueryOptions;
+import org.kar.archidata.db.DBConfig;
+import org.kar.archidata.db.DBEntry;
+import org.kar.archidata.migration.model.Migration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class MigrationEngine {
+	final static Logger LOGGER = LoggerFactory.getLogger(MigrationEngine.class);
+
+	// List of order migrations
+	private final List<MigrationInterface> datas;
+	// initialization of the migration if the DB is not present...
+	private MigrationInterface init;
+
+	/** Migration engine constructor (empty). */
+	public MigrationEngine() {
+		this(new ArrayList<>(), null);
+	}
+
+	/** Migration engine constructor (specific mode).
+	 * @param datas All the migration ordered.
+	 * @param init Initialization migration model. */
+	public MigrationEngine(final List<MigrationInterface> datas, final MigrationInterface init) {
+		this.datas = datas;
+		this.init = init;
+	}
+
+	/** Add a Migration in the list
+	 * @param migration Migration to add. */
+	public void add(final MigrationInterface migration) {
+		this.datas.add(migration);
+	}
+
+	/** Set first initialization class
+	 * @param migration migration class for first init. */
+	public void setInit(final MigrationInterface migration) {
+		this.init = migration;
+	}
+
+	/** Get the current version/migration name
+	 * @return Model represent the last migration. If null then no migration has been done.
+	 * @throws MigrationException */
+	public Migration getCurrentVersion() throws MigrationException {
+		if (!DataAccess.isTableExist("KAR_migration")) {
+			return null;
+		}
+		try {
+			List<Migration> data = null;
+			try {
+				data = DataAccess.gets(Migration.class, new QueryOptions(QueryOptions.READ_ALL_COLOMN));
+			} catch (final Exception e) {
+				// Previous version does not have the same timeCode...
+				data = DataAccess.gets(Migration.class);
+			}
+			if (data == null) {
+				LOGGER.error("Can not collect the migration table in the DB:{}");
+				return null;
+			}
+			if (data.size() == 0) {
+				LOGGER.error("Fail to Request migration table in the DB: empty size");
+				return null;
+			}
+			LOGGER.info("List of migrations:");
+			for (final Migration elem : data) {
+				LOGGER.info("    - date={} name={} end={}", elem.updatedAt, elem.name, elem.terminated);
+			}
+			return data.get(data.size() - 1);
+		} catch (final Exception ex) {
+			LOGGER.error("Fail to Request migration table in the DB:{}", ex.getMessage());
+			ex.printStackTrace();
+		}
+		throw new MigrationException("Can not retreive Migration model");
+	}
+
+	/** Process the automatic migration of the system The function wait the Administrator intervention to correct the bug.
+	 * @param config SQL connection for the migration.
+	 * @throws InterruptedException user interrupt the migration */
+	public void migrateWaitAdmin(final DBConfig config) throws InterruptedException {
+		try {
+			migrateErrorThrow(config);
+		} catch (final Exception ex) {
+			ex.printStackTrace();
+			while (true) {
+				LOGGER.error("ERROR: {}", ex.getMessage());
+				LOGGER.error("========================================================================");
+				LOGGER.error("== Fail to migrate ==> wait administrator interventions               ==");
+				LOGGER.error("========================================================================");
+				Thread.sleep(60 * 60 * 1000);
+			}
+		}
+	}
+
+	/** Process the automatic migration of the system
+	 * @param config SQL connection for the migration
+	 * @throws IOException Error if access on the DB */
+	public void migrateErrorThrow(final DBConfig config) throws MigrationException {
+		LOGGER.info("Execute migration ... [BEGIN]");
+		// check the integrity of the migrations:
+		LOGGER.info("List of availlable Migration: ");
+		for (final MigrationInterface elem : this.datas) {
+			if (elem == null) {
+				LOGGER.info("  - null");
+				throw new MigrationException("Add a null migration");
+			}
+			LOGGER.info("  - {}", elem.getName());
+			if (elem == this.init) {
+				throw new MigrationException("Add a migration that is the initialization migration");
+			}
+			if (this.init != null && elem.getName().equals(this.init.getName())) {
+				throw new MigrationException("Two migration have the same name as initilaisation: " + elem.getName());
+			}
+			for (final MigrationInterface elemCheck : this.datas) {
+				if (elem == elemCheck) {
+					continue;
+				}
+				if (elem.getName().equals(elemCheck.getName())) {
+					throw new MigrationException("Two migration have the same name...: " + elem.getName());
+				}
+			}
+		}
+
+		// STEP 1: Check the DB exist:
+		LOGGER.info("Verify existance of '{}'", config.getDbName());
+		boolean exist = DataAccess.isDBExist(config.getDbName());
+		if (!exist) {
+			LOGGER.warn("DB: '{}' DOES NOT EXIST ==> create one", config.getDbName());
+			// create the local DB:
+			DataAccess.createDB(config.getDbName());
+		}
+		exist = DataAccess.isDBExist(config.getDbName());
+		while (!exist) {
+			LOGGER.error("DB: '{}' DOES NOT EXIST after trying to create one ", config.getDbName());
+			LOGGER.error("Waiting administrator create a new one, we check after 30 seconds...");
+			try {
+				Thread.sleep(30000);
+			} catch (final InterruptedException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+			exist = DataAccess.isDBExist(config.getDbName());
+		}
+		LOGGER.info("DB '{}' exist.", config.getDbName());
+		// STEP 2: Check migration table exist:
+		LOGGER.info("Verify existance of migration table '{}'", "KAR_migration");
+		// TODO: set the class in parameters instead of string...
+		exist = DataAccess.isTableExist("KAR_migration");
+		if (!exist) {
+			LOGGER.info("'{}' Does not exist create a new one...", "KAR_migration");
+			// create the table:
+			List<String> sqlQuery;
+			try {
+				sqlQuery = DataFactory.createTable(Migration.class);
+			} catch (final Exception ex) {
+				ex.printStackTrace();
+				throw new MigrationException("Fail to create the local DB SQL model for migaration ==> wait administrator interventions");
+			}
+			LOGGER.info("Create Table with : {}", sqlQuery.get(0));
+			try {
+				DataAccess.executeQuerry(sqlQuery.get(0));
+			} catch (SQLException | IOException ex) {
+				ex.printStackTrace();
+				throw new MigrationException("Fail to create the local DB model for migaration ==> wait administrator interventions");
+			}
+		}
+		final Migration currentVersion = getCurrentVersion();
+		List<MigrationInterface> toApply = new ArrayList<>();
+		boolean needPlaceholder = false;
+		if (currentVersion == null) {
+			// This is a first migration
+			LOGGER.info("First installation of the system ==> Create the DB");
+			if (this.init == null) {
+				// No initialization class ==> manage a historical creation mode...
+				toApply = this.datas;
+			} else {
+				// Select Initialization class if it exist
+				toApply.add(this.init);
+				needPlaceholder = true;
+			}
+		} else {
+			if (!currentVersion.terminated) {
+				throw new MigrationException("An error occured in the last migration: '" + currentVersion.name + "' defect @" + currentVersion.stepId + "/" + currentVersion.count);
+			}
+			LOGGER.info("Upgrade the system Current version: {}", currentVersion.name);
+			boolean find = this.init != null && this.init.getName().equals(currentVersion.name);
+			if (find) {
+				toApply = this.datas;
+			} else {
+				LOGGER.info(" ===> Check what must be apply:");
+				for (final MigrationInterface elem : this.datas) {
+					LOGGER.info("     - {}", elem.getName());
+					if (!find) {
+						if (currentVersion.name.equals(elem.getName())) {
+							LOGGER.info("        == current version");
+							find = true;
+						}
+						continue;
+					}
+					LOGGER.info("        ++ add ");
+					toApply.add(elem);
+				}
+			}
+		}
+		DBEntry entry;
+		try {
+			entry = DBEntry.createInterface(config);
+			final int id = 0;
+			final int count = toApply.size();
+			for (final MigrationInterface elem : toApply) {
+				migrateSingle(entry, elem, id, count);
+			}
+		} catch (final IOException e) {
+			e.printStackTrace();
+			throw new MigrationException("An error occured in the migration (can not access to the DB): '" + currentVersion.name + "' defect @" + currentVersion.stepId + "/" + currentVersion.count);
+		}
+		if (needPlaceholder) {
+			if (this.datas.size() == 0) {
+				// No placeholder needed, the model have no migration in the current version...
+			} else {
+				// we insert a placeholder to simulate the last migration is well done.
+				final String placeholderName = this.datas.get(this.datas.size() - 1).getName();
+				Migration migrationResult = new Migration();
+				migrationResult.id = 1000L;
+				migrationResult.name = placeholderName;
+				migrationResult.stepId = 0;
+				migrationResult.terminated = true;
+				migrationResult.count = 0;
+				migrationResult.log = "Place-holder for first initialization";
+				try {
+					migrationResult = DataAccess.insert(migrationResult);
+				} catch (final Exception e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+		}
+		LOGGER.info("Execute migration ... [ END ]");
+	}
+
+	public void migrateSingle(final DBEntry entry, final MigrationInterface elem, final int id, final int count) throws MigrationException {
+		LOGGER.info("---------------------------------------------------------");
+		LOGGER.info("-- Migrate: [{}/{}] {} [BEGIN]", id, count, elem.getName());
+		LOGGER.info("---------------------------------------------------------");
+		final StringBuilder log = new StringBuilder();
+		log.append("Start migration\n");
+		Migration migrationResult = new Migration();
+		migrationResult.name = elem.getName();
+		migrationResult.stepId = 0;
+		migrationResult.terminated = false;
+		try {
+			migrationResult.count = elem.getNumberOfStep();
+		} catch (final Exception e) {
+			e.printStackTrace();
+			throw new MigrationException("Fail to get number of migration step (maybe generation fail): " + e.getLocalizedMessage());
+		}
+		migrationResult.log = log.toString();
+		try {
+			migrationResult = DataAccess.insert(migrationResult);
+		} catch (final Exception e) {
+			e.printStackTrace();
+			throw new MigrationException("Fail to insert migration Log in the migration table: " + e.getLocalizedMessage());
+		}
+		boolean ret = true;
+		try {
+			ret = elem.applyMigration(entry, log, migrationResult);
+		} catch (final Exception e) {
+			log.append("\nFail in the migration apply ");
+			log.append(e.getLocalizedMessage());
+			e.printStackTrace();
+			throw new MigrationException("Migration fail: '" + migrationResult.name + "' defect @" + migrationResult.stepId + "/" + migrationResult.count);
+		}
+		if (ret) {
+			migrationResult.terminated = true;
+			try {
+				DataAccess.update(migrationResult, migrationResult.id, List.of("terminated"));
+			} catch (final Exception e) {
+				e.printStackTrace();
+				throw new MigrationException("Fail to update migration Log in the migration table: " + e.getLocalizedMessage());
+			}
+		} else {
+			try {
+				log.append("Fail in the migration engine...");
+				migrationResult.log = log.toString();
+				DataAccess.update(migrationResult, migrationResult.id, List.of("log"));
+			} catch (final Exception e) {
+				e.printStackTrace();
+				throw new MigrationException("Fail to update migration Log in the migration table: " + e.getLocalizedMessage() + " WITH: An error occured in the migration (OUTSIDE detection): '"
+						+ migrationResult.name + "' defect @" + migrationResult.stepId + "/" + migrationResult.count);
+			}
+			throw new MigrationException("An error occured in the migration (OUTSIDE detection): '" + migrationResult.name + "' defect @" + migrationResult.stepId + "/" + migrationResult.count);
+		}
+		LOGGER.info("Migrate: [{}/{}] {} [ END ]", id, count, elem.getName());
+	}
+
+	public void revertTo(final DBEntry entry, final String migrationName) throws MigrationException {
+		final Migration currentVersion = getCurrentVersion();
+		final List<MigrationInterface> toApply = new ArrayList<>();
+		boolean find = false;
+		for (int iii = this.datas.size() - 1; iii >= 0; iii--) {
+			if (!find) {
+				if (this.datas.get(iii).getName() == currentVersion.name) {
+					find = true;
+				}
+				continue;
+			}
+			if (this.datas.get(iii).getName() == currentVersion.name) {
+				break;
+			}
+			toApply.add(this.datas.get(iii));
+		}
+		final int id = 0;
+		final int count = toApply.size();
+		for (final MigrationInterface elem : toApply) {
+			revertSingle(entry, elem, id, count);
+		}
+	}
+
+	public void revertSingle(final DBEntry entry, final MigrationInterface elem, final int id, final int count) {
+		LOGGER.info("Revert migration: {} [BEGIN]", elem.getName());
+
+		LOGGER.info("Revert migration: {} [ END ]", elem.getName());
+	}
+}

src/org/kar/archidata/migration/MigrationException.java

@@ -0,0 +1,10 @@
+package org.kar.archidata.migration;
+
+public class MigrationException extends Exception {
+
+	private static final long serialVersionUID = 20230502L;
+
+	public MigrationException(final String message) {
+		super(message);
+	}
+}

src/org/kar/archidata/migration/MigrationInterface.java

@@ -0,0 +1,27 @@
+package org.kar.archidata.migration;
+
+import org.kar.archidata.db.DBEntry;
+import org.kar.archidata.migration.model.Migration;
+
+public interface MigrationInterface {
+	/** Get Name of the migration
+	 * @return Migration name */
+	String getName();
+
+	/** Migrate the system to a new version.
+	 * @param entry DB interface for the migration.
+	 * @param log Stored data in the BDD for the migration progression.
+	 * @param migration Migration post data on each step...
+	 * @return true if migration is finished. */
+	boolean applyMigration(DBEntry entry, StringBuilder log, Migration model) throws Exception;
+
+	/** Remove a migration the system to the previous version.
+	 * @param entry DB interface for the migration.
+	 * @param log Stored data in the BDD for the migration progression.
+	 * @return true if migration is finished. */
+	boolean revertMigration(DBEntry entry, StringBuilder log) throws Exception;
+
+	/** Get the number of step in the migration process.
+	 * @return count of SQL access. */
+	int getNumberOfStep() throws Exception;
+}

src/org/kar/archidata/migration/MigrationSqlStep.java

@@ -0,0 +1,147 @@
+package org.kar.archidata.migration;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.kar.archidata.dataAccess.DataAccess;
+import org.kar.archidata.dataAccess.DataFactory;
+import org.kar.archidata.db.DBEntry;
+import org.kar.archidata.migration.model.Migration;
+import org.kar.archidata.tools.ConfigBaseVariable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+record Action(String action, List<String> filterDB) {
+	public Action(final String action) {
+		this(action, List.of());
+	}
+
+	public Action(final String action, final String filterDB) {
+		this(action, List.of(filterDB));
+	}
+}
+
+public class MigrationSqlStep implements MigrationInterface {
+	final static Logger LOGGER = LoggerFactory.getLogger(MigrationSqlStep.class);
+	private final List<Action> actions = new ArrayList<>();
+	private boolean isGenerated = false;
+
+	@Override
+	public String getName() {
+		return getClass().getCanonicalName();
+	}
+
+	public void display() throws Exception {
+		if (!this.isGenerated) {
+			this.isGenerated = true;
+			generateStep();
+		}
+		for (int iii = 0; iii < this.actions.size(); iii++) {
+			final Action action = this.actions.get(iii);
+			LOGGER.info(" >>>> SQL ACTION : {}/{} ==> filter='{}'\n{}", iii, this.actions.size(), action.filterDB(), action.action());
+		}
+	}
+
+	public void generateStep() throws Exception {
+		throw new Exception("Forward is not implemented");
+	}
+
+	public void generateRevertStep() throws Exception {
+		throw new Exception("Backward is not implemented");
+	}
+
+	@Override
+	public boolean applyMigration(final DBEntry entry, final StringBuilder log, final Migration model) throws Exception {
+		if (!this.isGenerated) {
+			this.isGenerated = true;
+			generateStep();
+		}
+		for (int iii = 0; iii < this.actions.size(); iii++) {
+			log.append("action [" + (iii + 1) + "/" + this.actions.size() + "]\n");
+			LOGGER.info(" >>>> SQL ACTION : {}/{}", iii + 1, this.actions.size());
+			final Action action = this.actions.get(iii);
+
+			LOGGER.info("SQL request: ```{}``` on '{}' current={}", action.action(), action.filterDB(), ConfigBaseVariable.getDBType());
+			log.append("SQL: " + action.action() + " on " + action.filterDB() + "\n");
+			boolean isValid = true;
+			if (action.filterDB() != null && action.filterDB().size() > 0) {
+				isValid = false;
+				for (final String elem : action.filterDB()) {
+					if (ConfigBaseVariable.getDBType().equals(elem)) {
+						isValid = true;
+					}
+				}
+			}
+			if (!isValid) {
+				log.append("==> Skip (DB is not compatible: " + ConfigBaseVariable.getDBType() + ")\n");
+				LOGGER.info(" >>>> SQL ACTION : {}/{} ==> SKIP", iii + 1, this.actions.size());
+				continue;
+			}
+			try {
+				DataAccess.executeQuerry(action.action());
+			} catch (SQLException | IOException ex) {
+				ex.printStackTrace();
+				LOGGER.info("SQL request ERROR: ", ex.getMessage());
+				log.append("SQL request ERROR: " + ex.getMessage() + "\n");
+				model.stepId = iii + 1;
+				model.log = log.toString();
+				try {
+					DataAccess.update(model, model.id, List.of("stepId", "log"));
+				} catch (final Exception e) {
+					e.printStackTrace();
+				}
+				return false;
+			}
+			log.append("action [" + (iii + 1) + "/" + this.actions.size() + "] ==> DONE\n");
+			LOGGER.info(" >>>> SQL ACTION : {}/{} ==> DONE", iii + 1, this.actions.size());
+			model.stepId = iii + 1;
+			model.log = log.toString();
+			try {
+				DataAccess.update(model, model.id, List.of("stepId", "log"));
+			} catch (final Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+			try {
+				Thread.sleep(100);
+			} catch (final InterruptedException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		return true;
+	}
+
+	@Override
+	public boolean revertMigration(final DBEntry entry, final StringBuilder log) throws Exception {
+		generateRevertStep();
+		return false;
+	}
+
+	public void addAction(final String action) {
+		this.actions.add(new Action(action));
+	}
+
+	public void addAction(final String action, final String filterdBType) {
+		this.actions.add(new Action(action, filterdBType));
+	}
+
+	public void addClass(final Class<?> clazz) throws Exception {
+		final List<String> tmp = DataFactory.createTable(clazz);
+		for (final String elem : tmp) {
+			this.actions.add(new Action(elem));
+		}
+	}
+
+	@Override
+	public int getNumberOfStep() throws Exception {
+		if (!this.isGenerated) {
+			this.isGenerated = true;
+			generateStep();
+		}
+		return this.actions.size();
+	}
+
+}

src/org/kar/archidata/migration/model/Migration.java

@@ -0,0 +1,34 @@
+package org.kar.archidata.migration.model;
+
+import org.kar.archidata.annotation.DataComment;
+import org.kar.archidata.annotation.DataDefault;
+import org.kar.archidata.annotation.DataIfNotExists;
+import org.kar.archidata.model.GenericDataSoftDelete;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Table;
+
+// For logs only
+//public static final String TABLE_NAME = "KAR_migration";
+
+@Table(name = "KAR_migration")
+@DataIfNotExists
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class Migration extends GenericDataSoftDelete {
+	@DataComment("Name of the migration")
+	@Column(length = 256)
+	public String name;
+	@Column(nullable = false)
+	@DataDefault("'0'")
+	@DataComment("if the migration is well terminated or not")
+	public Boolean terminated = false;
+	@DataComment("index in the migration progression")
+	public Integer stepId = 0;
+	@DataComment("number of element in the migration")
+	public Integer count;
+	@DataComment("Log generate by the migration")
+	@Column(length = 0)
+	public String log = "";
+}

src/org/kar/archidata/model/Data.java

@@ -1,31 +1,25 @@
 package org.kar.archidata.model;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
+import org.kar.archidata.annotation.DataComment;
+import org.kar.archidata.annotation.DataIfNotExists;
 
-import org.kar.archidata.annotation.SQLComment;
-import org.kar.archidata.annotation.SQLIfNotExists;
-import org.kar.archidata.annotation.SQLLimitSize;
-import org.kar.archidata.annotation.SQLNotNull;
-import org.kar.archidata.annotation.SQLTableName;
-import org.kar.archidata.model.GenericTable;
+import com.fasterxml.jackson.annotation.JsonInclude;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import jakarta.persistence.Column;
+import jakarta.persistence.Table;
 
-@SQLTableName ("data")
-@SQLIfNotExists
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
-public class Data extends GenericTable {
+@Table(name = "data")
+@DataIfNotExists
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class Data extends GenericDataSoftDelete {
 
-    @SQLNotNull
-    @SQLLimitSize(128)
-    @SQLComment("Sha512 of the data")
+	@Column(length = 128, nullable = false)
+	@DataComment("Sha512 of the data")
 	public String sha512;
-    @SQLNotNull
-    @SQLLimitSize(128)
-    @SQLComment("Mime -type of the media")
+	@Column(length = 128, nullable = false)
+	@DataComment("Mime -type of the media")
 	public String mimeType;
-    @SQLNotNull
-    @SQLComment("Size in Byte of the data")
+	@Column(nullable = false)
+	@DataComment("Size in Byte of the data")
 	public Long size;
 }

src/org/kar/archidata/model/GenericData.java

@@ -0,0 +1,35 @@
+package org.kar.archidata.model;
+
+import java.util.Date;
+
+import org.kar.archidata.annotation.CreationTimestamp;
+import org.kar.archidata.annotation.DataComment;
+import org.kar.archidata.annotation.DataNotRead;
+import org.kar.archidata.annotation.UpdateTimestamp;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
+
+public class GenericData {
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(nullable = false, unique = true)
+	@DataComment("Primary key of the base")
+	public Long id = null;
+	@DataNotRead
+	@CreationTimestamp
+	@Column(nullable = false)
+	@Temporal(TemporalType.TIMESTAMP)
+	@DataComment("Create time of the object")
+	public Date createdAt = null;
+	@DataNotRead
+	@UpdateTimestamp
+	@Column(nullable = false)
+	@Temporal(TemporalType.TIMESTAMP)
+	@DataComment("When update the object")
+	public Date updatedAt = null;
+}

src/org/kar/archidata/model/GenericDataSoftDelete.java

@@ -0,0 +1,17 @@
+package org.kar.archidata.model;
+
+import org.kar.archidata.annotation.DataComment;
+import org.kar.archidata.annotation.DataDefault;
+import org.kar.archidata.annotation.DataDeleted;
+import org.kar.archidata.annotation.DataNotRead;
+
+import jakarta.persistence.Column;
+
+public class GenericDataSoftDelete extends GenericData {
+	@DataNotRead
+	@Column(nullable = false)
+	@DataDefault("'0'")
+	@DataDeleted
+	@DataComment("When delete, they are not removed, they are just set in a deleted state")
+	public Boolean deleted = null;
+}

src/org/kar/archidata/model/GenericTable.java

@@ -1,35 +0,0 @@
-package org.kar.archidata.model;
-
-import java.sql.Timestamp;
-
-import org.kar.archidata.annotation.SQLAutoIncrement;
-import org.kar.archidata.annotation.SQLComment;
-import org.kar.archidata.annotation.SQLCreateTime;
-import org.kar.archidata.annotation.SQLDefault;
-import org.kar.archidata.annotation.SQLNotNull;
-import org.kar.archidata.annotation.SQLNotRead;
-import org.kar.archidata.annotation.SQLPrimaryKey;
-import org.kar.archidata.annotation.SQLUpdateTime;
-
-public class GenericTable {
-    @SQLAutoIncrement // Add AUTO_INCREMENT modifier
-    @SQLPrimaryKey // Create a PRIMARY KEY based on this field
-    @SQLNotNull
-    @SQLComment("Primary key of the base")
-	public Long id = null;
-    @SQLNotRead
-    @SQLNotNull
-    @SQLDefault("'0'")
-    @SQLComment("When delete, they are not removed, they are just set in a deleted state")
-	public Boolean deleted = null;
-    @SQLNotRead
-    @SQLCreateTime
-    @SQLNotNull
-    @SQLComment("Create time of the object")
-	public Timestamp create_date = null;
-    @SQLNotRead
-    @SQLUpdateTime
-    @SQLNotNull
-    @SQLComment("When update the object")
-	public Timestamp modify_date = null;
-}

src/org/kar/archidata/model/GenericToken.java

@@ -0,0 +1,24 @@
+package org.kar.archidata.model;
+
+import java.sql.Timestamp;
+
+import org.kar.archidata.annotation.DataIfNotExists;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Table;
+
+@Table(name = "applicationToken")
+@DataIfNotExists
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class GenericToken extends GenericDataSoftDelete {
+	@Column(nullable = false)
+	public Long parentId;
+	@Column(nullable = false, length = 0)
+	public String name;
+	@Column(nullable = false)
+	public Timestamp endValidityTime = null;
+	@Column(nullable = false, length = 0)
+	public String token;
+}

src/org/kar/archidata/model/GetToken.java

@@ -0,0 +1,7 @@
+package org.kar.archidata.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public record GetToken(String jwt) {
+}

src/org/kar/archidata/model/State.java

@@ -1,12 +0,0 @@
-package org.kar.archidata.model;
-
-public enum State {
-	// User has remove his account
-	REMOVED,
-	// User has been blocked his account
-	BLOCKED,
-	// generic user
-	USER,
-	// Administrator
-	ADMIN
-}

src/org/kar/archidata/model/Token.java

@@ -3,16 +3,6 @@ package org.kar.archidata.model;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-/*
-CREATE TABLE `token` (
-  `id` bigint NOT NULL COMMENT 'Unique ID of the TOKEN' AUTO_INCREMENT PRIMARY KEY,
-  `userId` bigint NOT NULL COMMENT 'Unique ID of the user',
-  `token` varchar(128) COLLATE 'latin1_bin' NOT NULL COMMENT 'Token (can be not unique)',
-  `createTime` datetime NOT NULL COMMENT 'Time the token has been created',
-  `endValidityTime` datetime NOT NULL COMMENT 'Time of the token end validity'
-) AUTO_INCREMENT=10;
-
- */
 public class Token {
 	public Long id;
 	public Long userId;
@@ -20,10 +10,9 @@ public class Token {
 	public String createTime;
 	public String endValidityTime;
 
-    public Token() {
-    }
+	public Token() {}
 
-    public Token(long id, long userId, String token, String createTime, String endValidityTime) {
+	public Token(final long id, final long userId, final String token, final String createTime, final String endValidityTime) {
 		this.id = id;
 		this.userId = userId;
 		this.token = token;
@@ -31,7 +20,7 @@ public class Token {
 		this.endValidityTime = endValidityTime;
 	}
 
-    public Token(ResultSet rs) {
+	public Token(final ResultSet rs) {
 		int iii = 1;
 		try {
 			this.id = rs.getLong(iii++);
@@ -39,19 +28,13 @@ public class Token {
 			this.token = rs.getString(iii++);
 			this.createTime = rs.getString(iii++);
 			this.endValidityTime = rs.getString(iii++);
-        } catch (SQLException ex) {
+		} catch (final SQLException ex) {
 			ex.printStackTrace();
 		}
 	}
 
 	@Override
 	public String toString() {
-        return "Token{" +
-                "id=" + id +
-                ", userId=" + userId +
-                ", token='" + token + '\'' +
-                ", createTime=" + createTime +
-                ", endValidityTime=" + endValidityTime +
-                '}';
+		return "Token{" + "id=" + this.id + ", userId=" + this.userId + ", token='" + this.token + '\'' + ", createTime=" + this.createTime + ", endValidityTime=" + this.endValidityTime + '}';
 	}
 }

src/org/kar/archidata/model/User.java

@@ -15,38 +15,42 @@ CREATE TABLE `user` (
  */
 
 import java.sql.Timestamp;
+import java.util.List;
 
-import org.kar.archidata.annotation.SQLAutoIncrement;
-import org.kar.archidata.annotation.SQLComment;
-import org.kar.archidata.annotation.SQLDefault;
-import org.kar.archidata.annotation.SQLIfNotExists;
-import org.kar.archidata.annotation.SQLLimitSize;
-import org.kar.archidata.annotation.SQLNotNull;
-import org.kar.archidata.annotation.SQLPrimaryKey;
-import org.kar.archidata.annotation.SQLTableName;
+import org.kar.archidata.annotation.DataDefault;
+import org.kar.archidata.annotation.DataIfNotExists;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.annotation.JsonInclude;
 
-@SQLTableName ("user")
-@SQLIfNotExists
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL)
-public class User extends GenericTable {
-    @SQLLimitSize(128)
+import jakarta.persistence.Column;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.Table;
+
+@Table(name = "user")
+@DataIfNotExists
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class User extends GenericDataSoftDelete {
+	@Column(length = 128)
 	public String login = null;
 
 	public Timestamp lastConnection = null;
-    @SQLDefault("'0'")
-    @SQLNotNull
+	@DataDefault("'0'")
+	@Column(nullable = false)
 	public boolean admin = false;
-    @SQLDefault("'0'")
-    @SQLNotNull
+	@DataDefault("'0'")
+	@Column(nullable = false)
 	public boolean blocked = false;
-    @SQLDefault("'0'")
-    @SQLNotNull
+	@DataDefault("'0'")
+	@Column(nullable = false)
 	public boolean removed = false;
+
+	@ManyToMany(fetch = FetchType.LAZY, targetEntity = Data.class)
+	public List<Long> covers;
+
 	@Override
 	public String toString() {
-		return "User [login=" + login + ", last=" + lastConnection + ", admin=" + admin + "]";
+		return "User [login=" + this.login + ", last=" + this.lastConnection + ", admin=" + this.admin + "]";
 	}
 
 }

src/org/kar/archidata/model/UserByToken.java

@@ -0,0 +1,58 @@
+package org.kar.archidata.model;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class UserByToken {
+	public static final int TYPE_USER = -1;
+	public static final int TYPE_APPLICATION = -2;
+	// application internal management type: an application generic Id
+	public Integer type = null;
+
+	public Long id = null;
+	public Long parentId = null; // FOr application, this is the id of the application, and of user token, this is the USERID
+	public String name = null;
+	// Right map
+	public Map<String, Object> right = new HashMap<>();
+
+	public boolean hasRight(final String key, final Object value) {
+		if (!this.right.containsKey(key)) {
+			return false;
+		}
+		final Object data = this.right.get(key);
+		if (data instanceof final Boolean elem) {
+			if (value instanceof final Boolean castVal) {
+				if (elem == castVal) {
+					return true;
+				}
+			}
+			return false;
+		}
+		if (data instanceof final String elem) {
+			if (value instanceof final String castVal) {
+				if (elem.equals(castVal)) {
+					return true;
+				}
+			}
+			return false;
+		}
+		if (data instanceof final Long elem) {
+			if (value instanceof final Long castVal) {
+				if (elem == castVal) {
+					return true;
+				}
+			}
+			return false;
+		}
+		if (data instanceof final Double elem) {
+			if (value instanceof final Double castVal) {
+				if (elem == castVal) {
+					return true;
+				}
+			}
+			return false;
+		}
+		return false;
+	}
+
+}

src/org/kar/archidata/model/UserExtern.java

@@ -1,36 +0,0 @@
-package org.kar.archidata.model;
-
-/*
-CREATE TABLE `user` (
-  `id` bigint NOT NULL COMMENT 'table ID' AUTO_INCREMENT PRIMARY KEY,
-  `login` varchar(128) COLLATE 'utf8_general_ci' NOT NULL COMMENT 'login of the user',
-  `email` varchar(512) COLLATE 'utf8_general_ci' NOT NULL COMMENT 'email of the user',
-  `lastConnection` datetime NOT NULL COMMENT 'last connection time',
-  `admin` enum("TRUE", "FALSE") NOT NULL DEFAULT 'FALSE',
-  `blocked` enum("TRUE", "FALSE") NOT NULL DEFAULT 'FALSE',
-  `removed` enum("TRUE", "FALSE") NOT NULL DEFAULT 'FALSE'
-) AUTO_INCREMENT=10;
-
- */
-
-
-public class UserExtern {
-    public Long id;
-    public String login;
-    public boolean admin;
-
-    public UserExtern(User other) {
-        this.id = other.id;
-        this.login = other.login;
-        this.admin = other.admin;
-    }
-
-    @Override
-    public String toString() {
-        return "User{" +
-                "id=" + id +
-                ", login='" + login + '\'' +
-                ", admin=" + admin +
-                '}';
-    }
-}

src/org/kar/archidata/model/UserPerso.java

@@ -1,42 +0,0 @@
-package org.kar.archidata.model;
-
-/*
-CREATE TABLE `user` (
-  `id` bigint NOT NULL COMMENT 'table ID' AUTO_INCREMENT PRIMARY KEY,
-  `login` varchar(128) COLLATE 'utf8_general_ci' NOT NULL COMMENT 'login of the user',
-  `email` varchar(512) COLLATE 'utf8_general_ci' NOT NULL COMMENT 'email of the user',
-  `lastConnection` datetime NOT NULL COMMENT 'last connection time',
-  `admin` enum("TRUE", "FALSE") NOT NULL DEFAULT 'FALSE',
-  `blocked` enum("TRUE", "FALSE") NOT NULL DEFAULT 'FALSE',
-  `removed` enum("TRUE", "FALSE") NOT NULL DEFAULT 'FALSE'
-) AUTO_INCREMENT=10;
-
- */
-
-
-public class UserPerso {
-    public Long id;
-    public String login;
-    public boolean admin;
-    public boolean blocked;
-    public boolean removed;
-
-    public UserPerso(User other) {
-        this.id = other.id;
-        this.login = other.login;
-        this.admin = other.admin;
-        this.blocked = other.blocked;
-        this.removed = other.removed;
-    }
-
-    @Override
-    public String toString() {
-        return "User{" +
-                "id=" + id +
-                ", login='" + login + '\'' +
-                ", admin=" + admin +
-                ", blocked=" + blocked +
-                ", removed=" + removed +
-                '}';
-    }
-}

src/org/kar/archidata/tools/ConfigBaseVariable.java

@@ -0,0 +1,123 @@
+package org.kar.archidata.tools;
+
+public class ConfigBaseVariable {
+	static public String tmpDataFolder;
+	static public String dataFolder;
+	static public String dbType;
+	static public String dbHost;
+	static public String dbPort;
+	static public String dbUser;
+	static public String dbKeepConnected;
+	static public String dbPassword;
+	static public String bdDatabase;
+	static public String apiAdress;
+	static public String ssoAdress;
+	static public String ssoToken;
+	static public String testMode;
+
+	// For test only
+	public static void clearAllValue() {
+		tmpDataFolder = System.getenv("DATA_TMP_FOLDER");
+		dataFolder = System.getenv("DATA_FOLDER");
+		dbType = System.getenv("DB_TYPE");
+		dbHost = System.getenv("DB_HOST");
+		dbPort = System.getenv("DB_PORT");
+		dbUser = System.getenv("DB_USER");
+		dbKeepConnected = System.getenv("DB_KEEP_CONNECTED");
+		dbPassword = System.getenv("DB_PASSWORD");
+		bdDatabase = System.getenv("DB_DATABASE");
+		apiAdress = System.getenv("API_ADDRESS");
+		ssoAdress = System.getenv("SSO_ADDRESS");
+		ssoToken = System.getenv("SSO_TOKEN");
+		testMode = System.getenv("TEST_MODE");
+	}
+
+	static {
+		clearAllValue();
+	}
+
+	public static String getTmpDataFolder() {
+		if (tmpDataFolder == null) {
+			return "/application/data/tmp";
+		}
+		return tmpDataFolder;
+	}
+
+	public static String getMediaDataFolder() {
+		if (dataFolder == null) {
+			return "/application/data/media";
+		}
+		return dataFolder;
+	}
+
+	public static String getDBType() {
+		if (dbType == null) {
+			return "mysql";
+		}
+		return dbType;
+	}
+
+	public static String getDBHost() {
+		if (dbHost == null) {
+			return "localhost";
+		}
+		return dbHost;
+	}
+
+	public static String getDBPort() {
+		if (dbPort == null) {
+			return "3306";
+		}
+		return dbPort;
+	}
+
+	public static String getDBLogin() {
+		if (dbUser == null) {
+			return "root";
+		}
+		return dbUser;
+	}
+
+	public static String getDBPassword() {
+		if (dbPassword == null) {
+			return "base_db_password";
+		}
+		return dbPassword;
+	}
+
+	public static String getDBName() {
+		if (bdDatabase == null) {
+			return "unknown";
+		}
+		return bdDatabase;
+	}
+
+	public static boolean getDBKeepConnected() {
+		if (dbKeepConnected == null) {
+			return false;
+		}
+		return Boolean.parseBoolean(dbKeepConnected);
+	}
+
+	public static String getlocalAddress() {
+		if (apiAdress == null) {
+			return "http://0.0.0.0:80/api/";
+		}
+		return apiAdress;
+	}
+
+	public static String getSSOAddress() {
+		return ssoAdress;
+	}
+
+	public static String ssoToken() {
+		return ssoToken;
+	}
+
+	public static boolean getTestMode() {
+		if (testMode == null) {
+			return false;
+		}
+		return Boolean.parseBoolean(testMode);
+	}
+}