add compatibility other wrapper

pom.xml

@@ -188,6 +188,29 @@
 			<version>4.8.6</version>
 			<scope>compile</scope>
 		</dependency>
+		<!-- Morphia -->
+		<dependency>
+			<groupId>dev.morphia.morphia</groupId>
+			<artifactId>morphia-core</artifactId>
+			<version>2.3.0</version>
+		</dependency>
+		<!-- MongoDB Java Driver -->
+		<dependency>
+			<groupId>org.mongodb</groupId>
+			<artifactId>mongodb-driver-sync</artifactId>
+			<version>4.3.0</version>
+		</dependency>
+		<!-- Bean Validation (JSR 303 / 380) -->
+		<dependency>
+			<groupId>org.hibernate.validator</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<version>7.0.0.Final</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.validation</groupId>
+			<artifactId>validation-api</artifactId>
+			<version>2.0.1.Final</version>
+		</dependency>
 		<!--
 		************************************************************ 
 		** TEST dependency                                        **

src/org/kar/archidata/GlobalConfiguration.java

@@ -1,15 +1,28 @@
 package org.kar.archidata;
 
 import org.kar.archidata.db.DBConfig;
+import org.kar.archidata.exception.DataAccessException;
 import org.kar.archidata.tools.ConfigBaseVariable;
 
 public class GlobalConfiguration {
-	public static final DBConfig dbConfig;
+	private static final DBConfig dbConfig;
 
 	static {
-		dbConfig = new DBConfig(ConfigBaseVariable.getDBType(), ConfigBaseVariable.getDBHost(),
+		DBConfig dbConfigTmp = null;
+		try {
+			dbConfigTmp = new DBConfig(ConfigBaseVariable.getDBType(), ConfigBaseVariable.getDBHost(),
 					Integer.parseInt(ConfigBaseVariable.getDBPort()), ConfigBaseVariable.getDBLogin(),
 					ConfigBaseVariable.getDBPassword(), ConfigBaseVariable.getDBName(),
 					ConfigBaseVariable.getDBKeepConnected());
+		} catch (NumberFormatException | DataAccessException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			System.out.println("Fail to configure db access ... in static GlobalConfiguration");
+		}
+		dbConfig = dbConfigTmp;
+	}
+
+	public static DBConfig getDbconfig() {
+		return dbConfig;
 	}
 }

src/org/kar/archidata/UserDB.java

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

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

@@ -0,0 +1,19 @@
+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;
+
+import jakarta.ws.rs.HttpMethod;
+
+/**
+* Indicates that the annotated method responds to HTTP ARCHIVE requests.
+*
+* @author Edouard DUPIN
+* @see HttpMethod
+*/
+@Target({ ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@HttpMethod("ARCHIVE")
+public @interface ARCHIVE {}

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

@@ -11,6 +11,8 @@ import org.kar.archidata.exception.DataAccessException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import dev.morphia.annotations.Entity;
+import dev.morphia.mapping.Mapper;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.annotation.Nullable;
 import jakarta.persistence.Column;
@@ -31,6 +33,7 @@ import jakarta.ws.rs.DefaultValue;
 public class AnnotationTools {
 	static final Logger LOGGER = LoggerFactory.getLogger(AnnotationTools.class);
 
+	// For SQL declaration table Name
 	public static String getTableName(final Class<?> clazz, final QueryOptions options) throws DataAccessException {
 		if (options != null) {
 			final List<OverrideTableName> data = options.get(OverrideTableName.class);
@@ -41,16 +44,13 @@ public class AnnotationTools {
 		return AnnotationTools.getTableName(clazz);
 	}
 
-	public static String getTableName(final Class<?> element) throws DataAccessException {
+	// For SQL declaration table Name
+	public static String getTableName(final Class<?> element) {
 		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Table.class);
 		if (annotation.length == 0) {
 			// when no annotation is detected, then the table name is the class name
 			return element.getSimpleName();
 		}
-		if (annotation.length > 1) {
-			throw new DataAccessException(
-					"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();
@@ -58,6 +58,31 @@ public class AnnotationTools {
 		return tmp;
 	}
 
+	public static String getCollectionName(final Class<?> clazz, final QueryOptions options) {
+		if (options != null) {
+			// TODO: maybe change OverrideTableName with OverrideCollectionName
+			final List<OverrideTableName> data = options.get(OverrideTableName.class);
+			if (data.size() == 1) {
+				return data.get(0).getName();
+			}
+		}
+		return AnnotationTools.getCollectionName(clazz);
+	}
+
+	// For No-SQL Table/Collection Name
+	public static String getCollectionName(final Class<?> clazz) {
+		final Annotation[] annotation = clazz.getDeclaredAnnotationsByType(Entity.class);
+		if (annotation.length == 0) {
+			// when no annotation is detected, then the table name is the class name
+			return clazz.getSimpleName();
+		}
+		final String tmp = ((Entity) annotation[0]).value();
+		if (tmp == null || tmp.length() == 0 || Mapper.IGNORED_FIELDNAME.equals(tmp)) {
+			return clazz.getSimpleName();
+		}
+		return tmp;
+	}
+
 	public static boolean getSchemaReadOnly(final Field element) throws DataAccessException {
 		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Schema.class);
 		if (annotation.length == 0) {

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

@@ -0,0 +1,19 @@
+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;
+
+import jakarta.ws.rs.HttpMethod;
+
+/**
+* Indicates that the annotated method responds to HTTP RESTORE requests.
+*
+* @author Edouard DUPIN
+* @see HttpMethod
+*/
+@Target({ ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@HttpMethod("RESTORE")
+public @interface RESTORE {}

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

@@ -24,7 +24,7 @@ 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.DBAccess;
 import org.kar.archidata.dataAccess.QueryCondition;
 import org.kar.archidata.dataAccess.options.Condition;
 import org.kar.archidata.exception.FailException;
@@ -56,7 +56,7 @@ 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")
+// TODO: must be inherited and set the default dataAccess interface @Path("/data")
 @Produces(MediaType.APPLICATION_JSON)
 public class DataResource {
 	private static final Logger LOGGER = LoggerFactory.getLogger(DataResource.class);
@@ -64,6 +64,7 @@ public class DataResource {
 	private final static int CHUNK_SIZE_IN = 50 * 1024 * 1024; // 1MB chunks
 	/** Upload some datas */
 	private static long tmpFolderId = 1;
+	protected final DBAccess da = DBAccess.createInterface();
 
 	private static void createFolder(final String path) throws IOException {
 		if (!Files.exists(java.nio.file.Path.of(path))) {
@@ -118,10 +119,10 @@ public class DataResource {
 		return getFileData(uuid) + ".json";
 	}
 
-	public static Data getWithSha512(final String sha512) {
+	public Data getWithSha512(final String sha512) {
 		LOGGER.info("find sha512 = {}", sha512);
 		try {
-			return DataAccess.getWhere(Data.class, new Condition(new QueryCondition("sha512", "=", sha512)));
+			return this.da.getWhere(Data.class, new Condition(new QueryCondition("sha512", "=", sha512)));
 		} catch (final Exception e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
@@ -129,10 +130,10 @@ public class DataResource {
 		return null;
 	}
 
-	public static Data getWithId(final long id) {
+	public Data getWithId(final long id) {
 		LOGGER.info("find id = {}", id);
 		try {
-			return DataAccess.get(Data.class, id);
+			return this.da.get(Data.class, id);
 		} catch (final Exception e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
@@ -140,7 +141,7 @@ public class DataResource {
 		return null;
 	}
 
-	public static Data createNewData(final long tmpUID, final String originalFileName, final String sha512)
+	public Data createNewData(final long tmpUID, final String originalFileName, final String sha512)
 			throws IOException {
 		// determine mime type:
 		Data injectedData = new Data();
@@ -161,7 +162,7 @@ public class DataResource {
 		injectedData.size = Files.size(Paths.get(tmpPath));
 
 		try {
-			injectedData = DataAccess.insert(injectedData);
+			injectedData = this.da.insert(injectedData);
 		} catch (final Exception e) {
 			e.printStackTrace();
 			return null;
@@ -254,7 +255,7 @@ public class DataResource {
 
 	public Data getSmall(final UUID id) {
 		try {
-			return DataAccess.get(Data.class, id);
+			return this.da.get(Data.class, id);
 		} catch (final Exception e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
@@ -500,8 +501,8 @@ public class DataResource {
 		}
 	}
 
-	public static void undelete(final Long id) throws Exception {
+	public void undelete(final Long id) throws Exception {
-		DataAccess.unsetDelete(Data.class, id);
+		this.da.unsetDelete(Data.class, id);
 	}
 
 }

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

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

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

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

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

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

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

@@ -19,12 +19,10 @@ import java.util.UUID;
 import org.kar.archidata.dataAccess.exportTools.TableQuery;
 import org.kar.archidata.dataAccess.exportTools.TableQueryTypes;
 import org.kar.archidata.dataAccess.options.Condition;
-import org.kar.archidata.dataAccess.options.DBInterfaceOption;
 import org.kar.archidata.dataAccess.options.GroupBy;
 import org.kar.archidata.dataAccess.options.Limit;
 import org.kar.archidata.dataAccess.options.OrderBy;
 import org.kar.archidata.dataAccess.options.QueryOption;
-import org.kar.archidata.db.DBEntry;
 import org.kar.archidata.exception.DataAccessException;
 import org.kar.archidata.tools.DateTools;
 import org.slf4j.Logger;
@@ -246,24 +244,24 @@ public class DataExport {
 	}
 
 	public static TableQuery queryTable(
+			final DBAccessSQL ioDb,
 			final List<TableQueryTypes> headers,
 			final String query,
 			final List<Object> parameters,
 			final QueryOption... option) throws Exception {
 		final QueryOptions options = new QueryOptions(option);
-		return queryTable(headers, query, parameters, options);
+		return queryTable(ioDb, headers, query, parameters, options);
 	}
 
 	public static TableQuery queryTable(
+			final DBAccessSQL ioDb,
 			final List<TableQueryTypes> headers,
 			final String queryBase,
 			final List<Object> parameters,
 			final QueryOptions options) throws Exception {
 		final List<LazyGetter> lazyCall = new ArrayList<>();
-		// TODO ... final String deletedFieldName = AnnotationTools.getDeletedFieldName(clazz);
-		final DBEntry entry = DBInterfaceOption.getAutoEntry(options);
 
-		final Condition condition = DataAccess.conditionFusionOrEmpty(options, false);
+		final Condition condition = ioDb.conditionFusionOrEmpty(options, false);
 		final StringBuilder query = new StringBuilder(queryBase);
 		final TableQuery out = new TableQuery(headers);
 		// real add in the BDD:
@@ -286,18 +284,18 @@ public class DataExport {
 			}
 			LOGGER.warn("generate the query: '{}'", query.toString());
 			// prepare the request:
-			final PreparedStatement ps = entry.connection.prepareStatement(query.toString(),
+			final PreparedStatement ps = ioDb.getConnection().prepareStatement(query.toString(),
 					Statement.RETURN_GENERATED_KEYS);
 			final CountInOut iii = new CountInOut(1);
 			if (parameters != null) {
 				for (final Object elem : parameters) {
-					DataAccess.addElement(ps, elem, iii);
+					ioDb.addElement(ps, elem, iii);
 				}
 				iii.inc();
 			}
-			condition.injectQuery(ps, iii);
+			condition.injectQuery(ioDb, ps, iii);
 			if (limits.size() == 1) {
-				limits.get(0).injectQuery(ps, iii);
+				limits.get(0).injectQuery(ioDb, ps, iii);
 			}
 			// execute the request
 			final ResultSet rs = ps.executeQuery();
@@ -332,8 +330,6 @@ public class DataExport {
 			throw ex;
 		} catch (final Exception ex) {
 			ex.printStackTrace();
-		} finally {
-			entry.close();
 		}
 		return out;
 	}

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

@@ -14,6 +14,7 @@ import org.kar.archidata.annotation.AnnotationTools;
 import org.kar.archidata.annotation.CreationTimestamp;
 import org.kar.archidata.annotation.DataIfNotExists;
 import org.kar.archidata.annotation.UpdateTimestamp;
+import org.kar.archidata.dataAccess.addOnSQL.DataAccessAddOn;
 import org.kar.archidata.dataAccess.options.CreateDropTable;
 import org.kar.archidata.exception.DataAccessException;
 import org.kar.archidata.tools.ConfigBaseVariable;
@@ -28,7 +29,7 @@ public class DataFactory {
 	static final Logger LOGGER = LoggerFactory.getLogger(DataFactory.class);
 
 	public static String convertTypeInSQL(final Class<?> type, final String fieldName) throws DataAccessException {
-		if (!"sqlite".equals(ConfigBaseVariable.getDBType())) {
+		if ("sql".equals(ConfigBaseVariable.getDBType())) {
 			if (type == UUID.class) {
 				return "binary(16)";
 			}
@@ -82,7 +83,7 @@ public class DataFactory {
 				out.append(")");
 				return out.toString();
 			}
-		} else {
+		} else if ("sqlite".equals(ConfigBaseVariable.getDBType())) {
 			if (type == UUID.class) {
 				return "BINARY(16)";
 			}
@@ -138,6 +139,9 @@ public class DataFactory {
 				out.append(" ) )");
 				return out.toString();
 			}
+		} else if ("mongo".equals(ConfigBaseVariable.getDBType())) {
+			// no importance for mango ...
+			return "text";
 		}
 		throw new DataAccessException("Imcompatible type of element in object for: " + type.getCanonicalName());
 	}
@@ -383,8 +387,8 @@ public class DataFactory {
 				}
 				alreadyAdded.add(dataName);
 				LOGGER.trace("        + '{}'", elem.getName());
-				if (DataAccess.isAddOnField(elem)) {
+				if (DBAccessSQL.isAddOnField(elem)) {
-					final DataAccessAddOn addOn = DataAccess.findAddOnforField(elem);
+					final DataAccessAddOn addOn = DBAccessSQL.findAddOnforField(elem);
 					LOGGER.trace("Create type for: {} ==> {} (ADD-ON)", AnnotationTools.getFieldName(elem),
 							elem.getType());
 					if (addOn != null) {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,341 +0,0 @@
-package org.kar.archidata.dataAccess.addOn;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.ParameterizedType;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-import org.kar.archidata.annotation.AnnotationTools;
-import org.kar.archidata.annotation.DataJson;
-import org.kar.archidata.dataAccess.CountInOut;
-import org.kar.archidata.dataAccess.DataAccess;
-import org.kar.archidata.dataAccess.DataAccessAddOn;
-import org.kar.archidata.dataAccess.DataFactory;
-import org.kar.archidata.dataAccess.LazyGetter;
-import org.kar.archidata.dataAccess.QueryOptions;
-import org.kar.archidata.dataAccess.addOn.model.TableCoversLongLong;
-import org.kar.archidata.dataAccess.addOn.model.TableCoversLongUUID;
-import org.kar.archidata.dataAccess.addOn.model.TableCoversUUIDLong;
-import org.kar.archidata.dataAccess.addOn.model.TableCoversUUIDUUID;
-import org.kar.archidata.dataAccess.options.OverrideTableName;
-import org.kar.archidata.exception.DataAccessException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import jakarta.validation.constraints.NotNull;
-
-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 DataAccessException {
-		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 IllegalArgumentException, IllegalAccessException, SQLException, JsonProcessingException {
-		final Object data = field.get(rootObject);
-		if (data == null) {
-			ps.setNull(iii.value, Types.VARCHAR);
-		}
-		final ObjectMapper objectMapper = new ObjectMapper();
-		final String dataString = objectMapper.writeValueAsString(data);
-		ps.setString(iii.value, dataString);
-		iii.inc();
-	}
-
-	@Override
-	public boolean canInsert(final Field field) {
-		return true;
-	}
-
-	@Override
-	public boolean isInsertAsync(final Field field) {
-		return false;
-	}
-
-	@Override
-	public boolean canRetrieve(final Field field) {
-		return true;
-	}
-
-	@Override
-	public void generateQuery(
-			@NotNull final String tableName,
-			@NotNull final String primaryKey,
-			@NotNull final Field field,
-			@NotNull final StringBuilder querySelect,
-			@NotNull final StringBuilder query,
-			@NotNull final String name,
-			@NotNull final CountInOut count,
-			final QueryOptions options) throws Exception {
-		querySelect.append(" ");
-		querySelect.append(tableName);
-		querySelect.append(".");
-		querySelect.append(name);
-		count.inc();
-		return;
-	}
-
-	@Override
-	public void fillFromQuery(
-			final ResultSet rs,
-			final Field field,
-			final Object data,
-			final CountInOut count,
-			final QueryOptions options,
-			final List<LazyGetter> lazyCall) throws Exception {
-		final String jsonData = rs.getString(count.value);
-		count.inc();
-		if (!rs.wasNull()) {
-			final ObjectMapper objectMapper = new ObjectMapper();
-			if (field.getType() == List.class) {
-				final ParameterizedType listType = (ParameterizedType) field.getGenericType();
-				final Class<?> listClass = (Class<?>) listType.getActualTypeArguments()[0];
-				if (listClass == Long.class) {
-					final Object dataParsed = objectMapper.readValue(jsonData, new TypeReference<List<Long>>() {});// field.getType());
-					field.set(data, dataParsed);
-					return;
-				}
-				if (listClass == Float.class) {
-					final Object dataParsed = objectMapper.readValue(jsonData, new TypeReference<List<Float>>() {});// field.getType());
-					field.set(data, dataParsed);
-					return;
-				}
-				if (listClass == Double.class) {
-					final Object dataParsed = objectMapper.readValue(jsonData, new TypeReference<List<Double>>() {});// field.getType());
-					field.set(data, dataParsed);
-					return;
-				}
-				if (listClass == Integer.class) {
-					final Object dataParsed = objectMapper.readValue(jsonData, new TypeReference<List<Integer>>() {});// field.getType());
-					field.set(data, dataParsed);
-					return;
-				}
-				if (listClass == Short.class) {
-					final Object dataParsed = objectMapper.readValue(jsonData, new TypeReference<List<Short>>() {});// field.getType());
-					field.set(data, dataParsed);
-					return;
-				}
-				if (listClass == String.class) {
-					final Object dataParsed = objectMapper.readValue(jsonData, new TypeReference<List<String>>() {});// field.getType());
-					field.set(data, dataParsed);
-					return;
-				}
-				if (listClass == UUID.class) {
-					final Object dataParsed = objectMapper.readValue(jsonData, new TypeReference<List<UUID>>() {});// field.getType());
-					field.set(data, dataParsed);
-					return;
-				}
-				LOGGER.warn("Maybe fail to translate Model in datajson list: List<{}>", listClass.getCanonicalName());
-			}
-			final Object dataParsed = objectMapper.readValue(jsonData, field.getType());
-			field.set(data, dataParsed);
-		}
-	}
-
-	@Override
-	public void createTables(
-			final String tableName,
-			final Field primaryField,
-			final Field field,
-			final StringBuilder mainTableBuilder,
-			final List<String> preActionList,
-			final List<String> postActionList,
-			final boolean createIfNotExist,
-			final boolean createDrop,
-			final int fieldId) throws Exception {
-		DataFactory.createTablesSpecificType(tableName, primaryField, field, mainTableBuilder, preActionList,
-				postActionList, createIfNotExist, createDrop, fieldId, JsonValue.class);
-	}
-
-	public static void addLink(final Class<?> clazz, final Long id, final String column, final Long remoteKey)
-			throws Exception {
-		final String tableName = AnnotationTools.getTableName(clazz);
-		final TableCoversLongLong data = DataAccess.get(TableCoversLongLong.class, id,
-				new OverrideTableName(tableName));
-		if (data.covers == null) {
-			data.covers = new ArrayList<>();
-		}
-		for (final Long elem : data.covers) {
-			if (elem.equals(remoteKey)) {
-				return;
-			}
-		}
-		data.covers.add(remoteKey);
-		DataAccess.update(data, data.id, List.of("covers"), new OverrideTableName(tableName));
-	}
-
-	/**
-	 * Adds a remoteKey to the covers list of a data entry identified by the given class type and ID.
-	 * If the covers list is null, it initializes it. If the remoteKey already exists in the list,
-	 * the method returns without making any changes.
-	 *
-	 * @param clazz     The class type to retrieve the table name from.
-	 * @param id        The ID of the data object to fetch.
-	 * @param column    The name of the column (currently not used, but may be used for specifying a field name).
-	 * @param remoteKey The UUID to add to the covers list.
-	 * @throws Exception If an error occurs during data retrieval or update.
-	 */
-	public static void addLink(final Class<?> clazz, final Long id, final String column, final UUID remoteKey)
-			throws Exception {
-		final String tableName = AnnotationTools.getTableName(clazz);
-		// TODO: Get primary key name
-		final TableCoversLongUUID data = DataAccess.get(TableCoversLongUUID.class, id,
-				new OverrideTableName(tableName));
-		if (data.covers == null) {
-			data.covers = new ArrayList<>();
-		}
-		for (final UUID elem : data.covers) {
-			if (elem.equals(remoteKey)) {
-				return;
-			}
-		}
-		data.covers.add(remoteKey);
-		DataAccess.update(data, data.id, List.of("covers"), new OverrideTableName(tableName));// TODO:  ,new OverrideFieldName("covers", column));
-	}
-
-	/**
-	 * Adds a remoteKey to the covers list of a data entry identified by the given class type and ID.
-	 * If the covers list is null, it initializes it. If the remoteKey already exists in the list,
-	 * the method returns without making any changes.
-	 *
-	 * @param clazz     The class type to retrieve the table name from.
-	 * @param id        The ID of the data object to fetch.
-	 * @param column    The name of the column (currently not used, but may be used for specifying a field name).
-	 * @param remoteKey The UUID to add to the covers list.
-	 * @throws Exception If an error occurs during data retrieval or update.
-	 */
-	public static void addLink(final Class<?> clazz, final UUID uuid, final String column, final UUID remoteKey)
-			throws Exception {
-		final String tableName = AnnotationTools.getTableName(clazz);
-		final TableCoversUUIDUUID data = DataAccess.get(TableCoversUUIDUUID.class, uuid,
-				new OverrideTableName(tableName));
-		if (data.covers == null) {
-			data.covers = new ArrayList<>();
-		}
-		for (final UUID elem : data.covers) {
-			if (elem.equals(remoteKey)) {
-				return;
-			}
-		}
-		data.covers.add(remoteKey);
-		DataAccess.update(data, data.uuid, List.of("covers"), new OverrideTableName(tableName));
-	}
-
-	public static void addLink(final Class<?> clazz, final UUID uuid, final String column, final Long remoteKey)
-			throws Exception {
-		final String tableName = AnnotationTools.getTableName(clazz);
-		final TableCoversUUIDLong data = DataAccess.get(TableCoversUUIDLong.class, uuid,
-				new OverrideTableName(tableName));
-		if (data.covers == null) {
-			data.covers = new ArrayList<>();
-		}
-		for (final Long elem : data.covers) {
-			if (elem.equals(remoteKey)) {
-				return;
-			}
-		}
-		data.covers.add(remoteKey);
-		DataAccess.update(data, data.uuid, List.of("covers"), new OverrideTableName(tableName));
-	}
-
-	public static void removeLink(final Class<?> clazz, final UUID uuid, final String column, final Long remoteKey)
-			throws Exception {
-		final String tableName = AnnotationTools.getTableName(clazz);
-		final TableCoversUUIDLong data = DataAccess.get(TableCoversUUIDLong.class, uuid,
-				new OverrideTableName(tableName));
-		if (data.covers == null) {
-			return;
-		}
-		final List<Long> newList = new ArrayList<>();
-		for (final Long elem : data.covers) {
-			if (elem.equals(remoteKey)) {
-				continue;
-			}
-			newList.add(elem);
-		}
-		data.covers = newList;
-		DataAccess.update(data, data.uuid, List.of("covers"), new OverrideTableName(tableName));
-	}
-
-	public static void removeLink(final Class<?> clazz, final UUID uuid, final String column, final UUID remoteKey)
-			throws Exception {
-		final String tableName = AnnotationTools.getTableName(clazz);
-		final TableCoversUUIDUUID data = DataAccess.get(TableCoversUUIDUUID.class, uuid,
-				new OverrideTableName(tableName));
-		if (data.covers == null) {
-			return;
-		}
-		final List<UUID> newList = new ArrayList<>();
-		for (final UUID elem : data.covers) {
-			if (elem.equals(remoteKey)) {
-				continue;
-			}
-			newList.add(elem);
-		}
-		data.covers = newList;
-		DataAccess.update(data, data.uuid, List.of("covers"), new OverrideTableName(tableName));
-	}
-
-	public static void removeLink(final Class<?> clazz, final Long id, final String column, final Long remoteKey)
-			throws Exception {
-		final String tableName = AnnotationTools.getTableName(clazz);
-		final TableCoversLongLong data = DataAccess.get(TableCoversLongLong.class, id,
-				new OverrideTableName(tableName));
-		if (data.covers == null) {
-			return;
-		}
-		final List<Long> newList = new ArrayList<>();
-		for (final Long elem : data.covers) {
-			if (elem.equals(remoteKey)) {
-				continue;
-			}
-			newList.add(elem);
-		}
-		data.covers = newList;
-		DataAccess.update(data, data.id, List.of("covers"), new OverrideTableName(tableName));
-	}
-
-	public static void removeLink(final Class<?> clazz, final Long id, final String column, final UUID remoteKey)
-			throws Exception {
-		final String tableName = AnnotationTools.getTableName(clazz);
-		final TableCoversLongUUID data = DataAccess.get(TableCoversLongUUID.class, id,
-				new OverrideTableName(tableName));
-		if (data.covers == null) {
-			return;
-		}
-		final List<UUID> newList = new ArrayList<>();
-		for (final UUID elem : data.covers) {
-			if (elem.equals(remoteKey)) {
-				continue;
-			}
-			newList.add(elem);
-		}
-		data.covers = newList;
-		DataAccess.update(data, data.id, List.of("covers"), new OverrideTableName(tableName));
-	}
-}

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

@@ -0,0 +1,458 @@
+package org.kar.archidata.dataAccess.addOnMongo;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.ParameterizedType;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import org.bson.Document;
+import org.kar.archidata.annotation.AnnotationTools;
+import org.kar.archidata.annotation.DataJson;
+import org.kar.archidata.dataAccess.CountInOut;
+import org.kar.archidata.dataAccess.DBAccess;
+import org.kar.archidata.dataAccess.DBAccessMorphia;
+import org.kar.archidata.dataAccess.DataFactory;
+import org.kar.archidata.dataAccess.LazyGetter;
+import org.kar.archidata.dataAccess.QueryOptions;
+import org.kar.archidata.dataAccess.addOnSQL.model.TableCoversLongLong;
+import org.kar.archidata.dataAccess.addOnSQL.model.TableCoversLongUUID;
+import org.kar.archidata.dataAccess.addOnSQL.model.TableCoversUUIDLong;
+import org.kar.archidata.dataAccess.addOnSQL.model.TableCoversUUIDUUID;
+import org.kar.archidata.dataAccess.options.OverrideTableName;
+import org.kar.archidata.exception.DataAccessException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.model.Filters;
+
+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 DataAccessException {
+		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 DBAccessMorphia ioDb,
+			final Field field,
+			final Object rootObject,
+			final Document docSet,
+			final Document docUnSet) throws Exception {
+		final Object data = field.get(rootObject);
+		if (data == null) {
+			ps.setNull(iii.value, Types.VARCHAR);
+		}
+		final ObjectMapper objectMapper = new ObjectMapper();
+		final String dataString = objectMapper.writeValueAsString(data);
+		ps.setString(iii.value, dataString);
+		iii.inc();
+	}
+
+	@Override
+	public boolean canInsert(final Field field) {
+		return true;
+	}
+
+	@Override
+	public boolean isInsertAsync(final Field field) {
+		return false;
+	}
+
+	@Override
+	public boolean canRetrieve(final Field field) {
+		return true;
+	}
+
+	@Override
+	public void generateQuery(
+			@NotNull final String tableName,
+			@NotNull final String primaryKey,
+			@NotNull final Field field,
+			@NotNull final StringBuilder querySelect,
+			@NotNull final StringBuilder query,
+			@NotNull final String name,
+			@NotNull final CountInOut count,
+			final QueryOptions options) throws Exception {
+		querySelect.append(" ");
+		querySelect.append(tableName);
+		querySelect.append(".");
+		querySelect.append(name);
+		count.inc();
+		return;
+	}
+
+	@Override
+	public void fillFromDoc(
+			final DBAccessMorphia ioDb,
+			final Document doc,
+			final Field field,
+			final Object data,
+			final QueryOptions options,
+			final List<LazyGetter> lazyCall) throws Exception {
+
+		final String fieldName = AnnotationTools.getFieldName(field);
+		if (!doc.containsKey(fieldName)) {
+			field.set(data, null);
+			return;
+		}
+		final String jsonData = rs.getString(count.value);
+		if (!rs.wasNull()) {
+			final ObjectMapper objectMapper = new ObjectMapper();
+			if (field.getType() == List.class) {
+				final ParameterizedType listType = (ParameterizedType) field.getGenericType();
+				final Class<?> listClass = (Class<?>) listType.getActualTypeArguments()[0];
+				if (listClass == Long.class) {
+					final Object dataParsed = objectMapper.readValue(jsonData, new TypeReference<List<Long>>() {});// field.getType());
+					field.set(data, dataParsed);
+					return;
+				}
+				if (listClass == Float.class) {
+					final Object dataParsed = objectMapper.readValue(jsonData, new TypeReference<List<Float>>() {});// field.getType());
+					field.set(data, dataParsed);
+					return;
+				}
+				if (listClass == Double.class) {
+					final Object dataParsed = objectMapper.readValue(jsonData, new TypeReference<List<Double>>() {});// field.getType());
+					field.set(data, dataParsed);
+					return;
+				}
+				if (listClass == Integer.class) {
+					final Object dataParsed = objectMapper.readValue(jsonData, new TypeReference<List<Integer>>() {});// field.getType());
+					field.set(data, dataParsed);
+					return;
+				}
+				if (listClass == Short.class) {
+					final Object dataParsed = objectMapper.readValue(jsonData, new TypeReference<List<Short>>() {});// field.getType());
+					field.set(data, dataParsed);
+					return;
+				}
+				if (listClass == String.class) {
+					final Object dataParsed = objectMapper.readValue(jsonData, new TypeReference<List<String>>() {});// field.getType());
+					field.set(data, dataParsed);
+					return;
+				}
+				if (listClass == UUID.class) {
+					final Object dataParsed = objectMapper.readValue(jsonData, new TypeReference<List<UUID>>() {});// field.getType());
+					field.set(data, dataParsed);
+					return;
+				}
+				LOGGER.warn("Maybe fail to translate Model in datajson list: List<{}>", listClass.getCanonicalName());
+			}
+			final Object dataParsed = objectMapper.readValue(jsonData, field.getType());
+			field.set(data, dataParsed);
+		}
+	}
+
+	@Override
+	public void createTables(
+			final String tableName,
+			final Field primaryField,
+			final Field field,
+			final StringBuilder mainTableBuilder,
+			final List<String> preActionList,
+			final List<String> postActionList,
+			final boolean createIfNotExist,
+			final boolean createDrop,
+			final int fieldId) throws Exception {
+		DataFactory.createTablesSpecificType(tableName, primaryField, field, mainTableBuilder, preActionList,
+				postActionList, createIfNotExist, createDrop, fieldId, JsonValue.class);
+	}
+
+	public static void addLink(
+			final DBAccess ioDb,
+			final Class<?> clazz,
+			final Long id,
+			final String column,
+			final Long remoteKey) throws Exception {
+		final String tableName = AnnotationTools.getTableName(clazz);
+		final TableCoversLongLong data = ioDb.get(TableCoversLongLong.class, id, new OverrideTableName(tableName));
+		if (data.covers == null) {
+			data.covers = new ArrayList<>();
+		}
+		for (final Long elem : data.covers) {
+			if (elem.equals(remoteKey)) {
+				return;
+			}
+		}
+		data.covers.add(remoteKey);
+		ioDb.update(data, data.id, List.of("covers"), new OverrideTableName(tableName));
+	}
+
+	/**
+	 * Adds a remoteKey to the covers list of a data entry identified by the given class type and ID.
+	 * If the covers list is null, it initializes it. If the remoteKey already exists in the list,
+	 * the method returns without making any changes.
+	 *
+	 * @param clazz     The class type to retrieve the table name from.
+	 * @param id        The ID of the data object to fetch.
+	 * @param column    The name of the column (currently not used, but may be used for specifying a field name).
+	 * @param remoteKey The UUID to add to the covers list.
+	 * @throws Exception If an error occurs during data retrieval or update.
+	 */
+	public static void addLink(
+			final DBAccess ioDb,
+			final Class<?> clazz,
+			final Long id,
+			final String column,
+			final UUID remoteKey) throws Exception {
+		if (ioDb instanceof final DBAccessMorphia daSQL) {
+			final String tableName = AnnotationTools.getTableName(clazz);
+			// TODO: Get primary key name
+			final TableCoversLongUUID data = ioDb.get(TableCoversLongUUID.class, id, new OverrideTableName(tableName));
+			if (data.covers == null) {
+				data.covers = new ArrayList<>();
+			}
+			for (final UUID elem : data.covers) {
+				if (elem.equals(remoteKey)) {
+					return;
+				}
+			}
+			data.covers.add(remoteKey);
+			ioDb.update(data, data.id, List.of("covers"), new OverrideTableName(tableName));// TODO:  ,new OverrideFieldName("covers", column));
+		} else if (ioDb instanceof final DBAccessMorphia dam) {
+
+		} else {
+			throw new DataAccessException("DataAccess Not managed");
+		}
+	}
+
+	/**
+	 * Adds a remoteKey to the covers list of a data entry identified by the given class type and ID.
+	 * If the covers list is null, it initializes it. If the remoteKey already exists in the list,
+	 * the method returns without making any changes.
+	 *
+	 * @param clazz     The class type to retrieve the table name from.
+	 * @param id        The ID of the data object to fetch.
+	 * @param column    The name of the column (currently not used, but may be used for specifying a field name).
+	 * @param remoteKey The UUID to add to the covers list.
+	 * @throws Exception If an error occurs during data retrieval or update.
+	 */
+	public static void addLink(
+			final DBAccess ioDb,
+			final Class<?> clazz,
+			final UUID uuid,
+			final String column,
+			final UUID remoteKey) throws Exception {
+		if (ioDb instanceof final DBAccessMorphia daSQL) {
+			final String tableName = AnnotationTools.getTableName(clazz);
+			final TableCoversUUIDUUID data = ioDb.get(TableCoversUUIDUUID.class, uuid,
+					new OverrideTableName(tableName));
+			if (data.covers == null) {
+				data.covers = new ArrayList<>();
+			}
+			for (final UUID elem : data.covers) {
+				if (elem.equals(remoteKey)) {
+					return;
+				}
+			}
+			data.covers.add(remoteKey);
+			ioDb.update(data, data.uuid, List.of("covers"), new OverrideTableName(tableName));
+		} else if (ioDb instanceof final DBAccessMorphia dam) {
+
+		} else {
+			throw new DataAccessException("DataAccess Not managed");
+		}
+	}
+
+	public static void addLink(
+			final DBAccess ioDb,
+			final Class<?> clazz,
+			final UUID uuid,
+			final String column,
+			final Long remoteKey) throws Exception {
+		if (ioDb instanceof final DBAccessMorphia daSQL) {
+			final String tableName = AnnotationTools.getTableName(clazz);
+			final TableCoversUUIDLong data = ioDb.get(TableCoversUUIDLong.class, uuid,
+					new OverrideTableName(tableName));
+			if (data.covers == null) {
+				data.covers = new ArrayList<>();
+			}
+			for (final Long elem : data.covers) {
+				if (elem.equals(remoteKey)) {
+					return;
+				}
+			}
+			data.covers.add(remoteKey);
+			ioDb.update(data, data.uuid, List.of("covers"), new OverrideTableName(tableName));
+		} else if (ioDb instanceof final DBAccessMorphia dam) {
+
+		} else {
+			throw new DataAccessException("DataAccess Not managed");
+		}
+	}
+
+	public static void removeLink(
+			final DBAccess ioDb,
+			final Class<?> clazz,
+			final UUID uuid,
+			final String column,
+			final Long remoteKey) throws Exception {
+		if (ioDb instanceof final DBAccessMorphia daSQL) {
+			final String tableName = AnnotationTools.getTableName(clazz);
+			final TableCoversUUIDLong data = ioDb.get(TableCoversUUIDLong.class, uuid,
+					new OverrideTableName(tableName));
+			if (data.covers == null) {
+				return;
+			}
+			final List<Long> newList = new ArrayList<>();
+			for (final Long elem : data.covers) {
+				if (elem.equals(remoteKey)) {
+					continue;
+				}
+				newList.add(elem);
+			}
+			data.covers = newList;
+			ioDb.update(data, data.uuid, List.of("covers"), new OverrideTableName(tableName));
+		} else if (ioDb instanceof final DBAccessMorphia dam) {
+
+		} else {
+			throw new DataAccessException("DataAccess Not managed");
+		}
+	}
+
+	public static void removeLink(
+			final DBAccess ioDb,
+			final Class<?> clazz,
+			final UUID uuid,
+			final String column,
+			final UUID remoteKey) throws Exception {
+		if (ioDb instanceof final DBAccessMorphia daSQL) {
+			final String tableName = AnnotationTools.getTableName(clazz);
+			final TableCoversUUIDUUID data = ioDb.get(TableCoversUUIDUUID.class, uuid,
+					new OverrideTableName(tableName));
+			if (data.covers == null) {
+				return;
+			}
+			final List<UUID> newList = new ArrayList<>();
+			for (final UUID elem : data.covers) {
+				if (elem.equals(remoteKey)) {
+					continue;
+				}
+				newList.add(elem);
+			}
+			data.covers = newList;
+			ioDb.update(data, data.uuid, List.of("covers"), new OverrideTableName(tableName));
+		} else if (ioDb instanceof final DBAccessMorphia dam) {
+
+		} else {
+			throw new DataAccessException("DataAccess Not managed");
+		}
+	}
+
+	public static void removeLink(
+			final DBAccess ioDb,
+			final Class<?> clazz,
+			final Long id,
+			final String column,
+			final Long remoteKey) throws Exception {
+		if (ioDb instanceof final DBAccessMorphia daSQL) {
+			final String tableName = AnnotationTools.getTableName(clazz);
+			final TableCoversLongLong data = ioDb.get(TableCoversLongLong.class, id, new OverrideTableName(tableName));
+			if (data.covers == null) {
+				return;
+			}
+			final List<Long> newList = new ArrayList<>();
+			for (final Long elem : data.covers) {
+				if (elem.equals(remoteKey)) {
+					continue;
+				}
+				newList.add(elem);
+			}
+			data.covers = newList;
+			ioDb.update(data, data.id, List.of("covers"), new OverrideTableName(tableName));
+		} else if (ioDb instanceof final DBAccessMorphia dam) {
+
+		} else {
+			throw new DataAccessException("DataAccess Not managed");
+		}
+	}
+
+	public static void removeLink(
+			final DBAccess ioDb,
+			final Class<?> clazz,
+			final Long id,
+			final String column,
+			final UUID remoteKey) throws Exception {
+		if (ioDb instanceof final DBAccessMorphia daSQL) {
+			final String tableName = AnnotationTools.getTableName(clazz);
+			final TableCoversLongUUID data = ioDb.get(TableCoversLongUUID.class, id, new OverrideTableName(tableName));
+			if (data.covers == null) {
+				return;
+			}
+			final List<UUID> newList = new ArrayList<>();
+			for (final UUID elem : data.covers) {
+				if (elem.equals(remoteKey)) {
+					continue;
+				}
+				newList.add(elem);
+			}
+			data.covers = newList;
+		} else if (ioDb instanceof final DBAccessMorphia dam) {
+			final String collectionName = AnnotationTools.getCollectionName(clazz);
+			final Field primaryfield = AnnotationTools.getPrimaryKeyField(clazz);
+			final String primaryFieldName = AnnotationTools.getFieldName(primaryfield);
+
+			final MongoCollection<Document> collection = dam.getInterface().getDatastore().getDatabase()
+					.getCollection(collectionName);
+			// retrieve previous value:
+			final Document ret = collection.find(Filters.eq(primaryFieldName, id)).first();
+			if (ret == null) {
+				throw new DataAccessException("Element does not exist ...");
+			}
+			final List<UUID> newList = new ArrayList<>();
+			final List listValues = ret.get(remoteKey, newList.getClass());
+			/*
+			final Document actions = new Document();
+
+			// update value:
+			final Document actions = new Document();
+			if (!docSet.isEmpty()) {
+				actions.append("$set", docSet);
+			}
+			if (!docUnSet.isEmpty()) {
+				actions.append("$unset", docUnSet);
+			}
+			LOGGER.info("update some values: {}", actions.toJson());
+			final UpdateResult ret = collection.updateMany(filters, actions);
+			return ret.getModifiedCount();
+
+			final TableCoversLongUUID data = ioDb.getDocument(tableName, id);
+			if (data.covers == null) {
+				return;
+			}
+			final List<UUID> newList = new ArrayList<>();
+			for (final UUID elem : data.covers) {
+				if (elem.equals(remoteKey)) {
+					continue;
+				}
+				newList.add(elem);
+			}
+			data.covers = newList;
+			*/
+		} else {
+			throw new DataAccessException("DataAccess Not managed");
+		}
+	}
+}

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

@@ -0,0 +1,589 @@
+package org.kar.archidata.dataAccess.addOnMongo;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.ParameterizedType;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import org.bson.Document;
+import org.kar.archidata.annotation.AnnotationTools;
+import org.kar.archidata.dataAccess.CountInOut;
+import org.kar.archidata.dataAccess.DBAccess;
+import org.kar.archidata.dataAccess.DBAccessMorphia;
+import org.kar.archidata.dataAccess.DataFactory;
+import org.kar.archidata.dataAccess.LazyGetter;
+import org.kar.archidata.dataAccess.QueryAnd;
+import org.kar.archidata.dataAccess.QueryCondition;
+import org.kar.archidata.dataAccess.QueryInList;
+import org.kar.archidata.dataAccess.QueryOptions;
+import org.kar.archidata.dataAccess.addOnSQL.model.LinkTableLongLong;
+import org.kar.archidata.dataAccess.addOnSQL.model.LinkTableLongUUID;
+import org.kar.archidata.dataAccess.addOnSQL.model.LinkTableUUIDLong;
+import org.kar.archidata.dataAccess.addOnSQL.model.LinkTableUUIDUUID;
+import org.kar.archidata.dataAccess.options.Condition;
+import org.kar.archidata.dataAccess.options.OverrideTableName;
+import org.kar.archidata.exception.DataAccessException;
+import org.kar.archidata.tools.ConfigBaseVariable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jakarta.persistence.ManyToMany;
+import jakarta.validation.constraints.NotNull;
+
+public class AddOnManyToMany implements DataAccessAddOn {
+	static final Logger LOGGER = LoggerFactory.getLogger(AddOnManyToMany.class);
+	static final String SEPARATOR_LONG = "-";
+	static final String SEPARATOR_UUID = "_";
+
+	@Override
+	public Class<?> getAnnotationClass() {
+		return ManyToMany.class;
+	}
+
+	@Override
+	public String getSQLFieldType(final Field elem) {
+		return null;
+	}
+
+	@Override
+	public boolean isCompatibleField(final Field elem) {
+		final ManyToMany decorators = elem.getDeclaredAnnotation(ManyToMany.class);
+		return decorators != null;
+	}
+
+	@Override
+	public void insertData(
+			final DBAccessMorphia ioDb,
+			final Field field,
+			final Object rootObject,
+			final Document docSet,
+			final Document docUnSet) throws Exception {
+
+	}
+
+	@Override
+	public boolean canInsert(final Field field) {
+		return false;
+	}
+
+	@Override
+	public boolean canRetrieve(final Field field) {
+		if (field.getType() != List.class) {
+			return false;
+		}
+		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
+				.getActualTypeArguments()[0];
+		if (objectClass == Long.class || objectClass == UUID.class) {
+			return true;
+		}
+		final ManyToMany decorators = field.getDeclaredAnnotation(ManyToMany.class);
+		if (decorators == null) {
+			return false;
+		}
+		if (decorators.targetEntity() == objectClass) {
+			return true;
+		}
+		return false;
+	}
+
+	public static String generateLinkTableNameField(final String tableName, final Field field) throws Exception {
+		final String name = AnnotationTools.getFieldName(field);
+		return generateLinkTableName(tableName, name);
+	}
+
+	public static String generateLinkTableName(final String tableName, final String name) {
+		String localName = name;
+		if (name.endsWith("s")) {
+			localName = name.substring(0, name.length() - 1);
+		}
+		return tableName + "_link_" + localName;
+	}
+
+	public void generateConcatQuery(
+			@NotNull final String tableName,
+			@NotNull final String primaryKey,
+			@NotNull final Field field,
+			@NotNull final StringBuilder querySelect,
+			@NotNull final StringBuilder query,
+			@NotNull final String name,
+			@NotNull final CountInOut count,
+			final QueryOptions options) throws Exception {
+		final ManyToMany manyToMany = AnnotationTools.getManyToMany(field);
+		String linkTableName = generateLinkTableName(tableName, name);
+		if (manyToMany.mappedBy() != null && manyToMany.mappedBy().length() != 0) {
+			// TODO:  get the remote table name .....
+			final String remoteTableName = AnnotationTools.getTableName(manyToMany.targetEntity());
+			linkTableName = generateLinkTableName(remoteTableName, manyToMany.mappedBy());
+		}
+		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
+				.getActualTypeArguments()[0];
+		final String tmpVariable = "tmp_" + Integer.toString(count.value);
+		querySelect.append(" (SELECT GROUP_CONCAT(");
+		querySelect.append(tmpVariable);
+		if (manyToMany.mappedBy() == null || manyToMany.mappedBy().length() == 0) {
+			querySelect.append(".object2Id ");
+		} else {
+			querySelect.append(".object1Id ");
+		}
+		if ("sqlite".equals(ConfigBaseVariable.getDBType())) {
+			querySelect.append(", ");
+		} else {
+			querySelect.append("SEPARATOR ");
+		}
+		querySelect.append("'");
+		if (objectClass == Long.class) {
+			querySelect.append(SEPARATOR_LONG);
+		} else if (objectClass == UUID.class) {} else {
+			final Class<?> foreignKeyType = AnnotationTools.getPrimaryKeyField(objectClass).getType();
+			if (foreignKeyType == Long.class) {
+				querySelect.append(SEPARATOR_LONG);
+			}
+		}
+		querySelect.append("') FROM ");
+		querySelect.append(linkTableName);
+		querySelect.append(" ");
+		querySelect.append(tmpVariable);
+		querySelect.append(" WHERE ");
+		querySelect.append(tmpVariable);
+		querySelect.append(".deleted = false");
+		querySelect.append(" AND ");
+		querySelect.append(tableName);
+		querySelect.append(".");
+		querySelect.append(primaryKey);
+		querySelect.append(" = ");
+		querySelect.append(tmpVariable);
+		querySelect.append(".");
+		if (manyToMany.mappedBy() == null || manyToMany.mappedBy().length() == 0) {
+			querySelect.append("object1Id ");
+		} else {
+			querySelect.append("object2Id ");
+		}
+		if (!"sqlite".equals(ConfigBaseVariable.getDBType())) {
+			querySelect.append(" GROUP BY ");
+			querySelect.append(tmpVariable);
+			if (manyToMany.mappedBy() == null || manyToMany.mappedBy().length() == 0) {
+				querySelect.append(".object1Id");
+			} else {
+				querySelect.append(".object2Id");
+			}
+		}
+		querySelect.append(") AS ");
+		querySelect.append(name);
+		querySelect.append(" ");
+		/* "              (SELECT GROUP_CONCAT(tmp.data_id SEPARATOR '-')" + "                      FROM cover_link_node tmp" + "                      WHERE tmp.deleted = false" +
+		 * "                            AND node.id = tmp.node_id" + "                      GROUP BY tmp.node_id) AS covers" + */
+		count.inc();
+	}
+
+	@Override
+	public void generateQuery(
+			@NotNull final String tableName,
+			@NotNull final String primaryKey,
+			@NotNull final Field field,
+			@NotNull final StringBuilder querySelect,
+			@NotNull final StringBuilder query,
+			@NotNull final String name,
+			@NotNull final CountInOut count,
+			final QueryOptions options) throws Exception {
+		if (field.getType() != List.class) {
+			return;
+		}
+		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
+				.getActualTypeArguments()[0];
+		if (objectClass == Long.class || objectClass == UUID.class) {
+			generateConcatQuery(tableName, primaryKey, field, querySelect, query, name, count, options);
+		}
+		final ManyToMany decorators = field.getDeclaredAnnotation(ManyToMany.class);
+		if (decorators == null) {
+			return;
+		}
+		if (objectClass == decorators.targetEntity()) {
+			generateConcatQuery(tableName, primaryKey, field, querySelect, query, name, count, options);
+
+		}
+	}
+
+	@Override
+	public void fillFromDoc(
+			final DBAccessMorphia ioDb,
+			final Document doc,
+			final Field field,
+			final Object data,
+			final QueryOptions options,
+			final List<LazyGetter> lazyCall) throws Exception {
+		if (field.getType() != List.class) {
+			LOGGER.error("Can not ManyToMany with other than List Model: {}", field.getType().getCanonicalName());
+			return;
+		}
+
+		final String fieldName = AnnotationTools.getFieldName(field);
+		if (!doc.containsKey(fieldName)) {
+			field.set(data, null);
+			return;
+		}
+		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
+				.getActualTypeArguments()[0];
+		if (objectClass == Long.class) {
+			final List<Long> idList = ioDb.getListOfIds(rs, count.value, SEPARATOR_LONG);
+			field.set(data, idList);
+			count.inc();
+			return;
+		} else if (objectClass == UUID.class) {
+			final List<UUID> idList = ioDb.getListOfRawUUIDs(rs, count.value);
+			field.set(data, idList);
+			count.inc();
+			return;
+		}
+		final ManyToMany decorators = field.getDeclaredAnnotation(ManyToMany.class);
+		if (decorators == null) {
+			return;
+		}
+		if (objectClass == decorators.targetEntity()) {
+			final Class<?> foreignKeyType = AnnotationTools.getPrimaryKeyField(objectClass).getType();
+			if (foreignKeyType == Long.class) {
+				final List<Long> idList = ioDb.getListOfIds(rs, count.value, SEPARATOR_LONG);
+				// field.set(data, idList);
+				count.inc();
+				if (idList != null && idList.size() > 0) {
+					final String idField = AnnotationTools.getFieldName(AnnotationTools.getIdField(objectClass));
+					// In the lazy mode, the request is done in asynchronous mode, they will be done after...
+					final LazyGetter lambda = () -> {
+						final List<Long> childs = new ArrayList<>(idList);
+						// TODO: update to have get with abstract types ....
+						@SuppressWarnings("unchecked")
+						final Object foreignData = ioDb.getsWhere(decorators.targetEntity(),
+								new Condition(new QueryInList<>(idField, childs)));
+						if (foreignData == null) {
+							return;
+						}
+						field.set(data, foreignData);
+					};
+					lazyCall.add(lambda);
+				}
+			} else if (foreignKeyType == UUID.class) {
+				final List<UUID> idList = ioDb.getListOfRawUUIDs(rs, count.value);
+				// field.set(data, idList);
+				count.inc();
+				if (idList != null && idList.size() > 0) {
+					final String idField = AnnotationTools.getFieldName(AnnotationTools.getIdField(objectClass));
+					// In the lazy mode, the request is done in asynchronous mode, they will be done after...
+					final LazyGetter lambda = () -> {
+						final List<UUID> childs = new ArrayList<>(idList);
+						// TODO: update to have get with abstract types ....
+						@SuppressWarnings("unchecked")
+						final Object foreignData = ioDb.getsWhere(decorators.targetEntity(),
+								new Condition(new QueryInList<>(idField, childs)));
+						if (foreignData == null) {
+							return;
+						}
+						field.set(data, foreignData);
+					};
+					lazyCall.add(lambda);
+				}
+			}
+		}
+	}
+
+	@Override
+	public boolean isUpdateAsync(final Field field) {
+		return true;
+	}
+
+	@Override
+	public void asyncUpdate(
+			final DBAccessMorphia ioDb,
+			final String tableName,
+			final Object localKey,
+			final Field field,
+			final Object data,
+			final List<LazyGetter> actions) throws Exception {
+		if (field.getType() != List.class) {
+			LOGGER.error("Can not ManyToMany with other than List Model: {}", field.getType().getCanonicalName());
+			return;
+		}
+		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
+				.getActualTypeArguments()[0];
+		if (objectClass != Long.class && objectClass != UUID.class) {
+			throw new DataAccessException("Can not ManyToMany with other than List<Long> or List<UUID> Model: List<"
+					+ objectClass.getCanonicalName() + ">");
+		}
+		final String columnName = AnnotationTools.getFieldName(field);
+		final String linkTableName = generateLinkTableName(tableName, columnName);
+
+		if (localKey instanceof final Long localKeyLong) {
+			if (objectClass == Long.class) {
+				actions.add(() -> {
+					ioDb.deleteWhere(LinkTableLongLong.class, new OverrideTableName(linkTableName),
+							new Condition(new QueryCondition("object1Id", "=", localKeyLong)));
+				});
+				asyncInsert(ioDb, tableName, localKey, field, data, actions);
+			} else {
+				actions.add(() -> {
+					ioDb.deleteWhere(LinkTableLongUUID.class, new OverrideTableName(linkTableName),
+							new Condition(new QueryCondition("object1Id", "=", localKeyLong)));
+				});
+				asyncInsert(ioDb, tableName, localKey, field, data, actions);
+			}
+		} else if (localKey instanceof final UUID localKeyUUID) {
+			if (objectClass == Long.class) {
+				actions.add(() -> {
+					ioDb.deleteWhere(LinkTableUUIDLong.class, new OverrideTableName(linkTableName),
+							new Condition(new QueryCondition("object1Id", "=", localKeyUUID)));
+				});
+				asyncInsert(ioDb, tableName, localKey, field, data, actions);
+			} else {
+				actions.add(() -> {
+					ioDb.deleteWhere(LinkTableUUIDUUID.class, new OverrideTableName(linkTableName),
+							new Condition(new QueryCondition("object1Id", "=", localKeyUUID)));
+				});
+				asyncInsert(ioDb, tableName, localKey, field, data, actions);
+			}
+		}
+	}
+
+	@Override
+	public boolean isInsertAsync(final Field field) {
+		return true;
+	}
+
+	@Override
+	public void asyncInsert(
+			final DBAccessMorphia ioDb,
+			final String tableName,
+			final Object localKey,
+			final Field field,
+			final Object data,
+			final List<LazyGetter> actions) throws Exception {
+		if (data == null) {
+			return;
+		}
+		if (field.getType() != List.class) {
+			LOGGER.error("Can not ManyToMany with other than List Model: {}", field.getType().getCanonicalName());
+			return;
+		}
+		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
+				.getActualTypeArguments()[0];
+		if (objectClass != Long.class && objectClass != UUID.class) {
+			throw new DataAccessException("Can not ManyToMany with other than List<Long> or List<UUID> Model: List<"
+					+ objectClass.getCanonicalName() + ">");
+		}
+		final String columnName = AnnotationTools.getFieldName(field);
+		final String linkTableName = generateLinkTableName(tableName, columnName);
+		if (localKey instanceof final Long localKeyLong) {
+			if (objectClass == Long.class) {
+				// ========================================================
+				// == Link a "Long" primary Key with List<Long>
+				// ========================================================
+				@SuppressWarnings("unchecked")
+				final List<Long> dataCasted = (List<Long>) data;
+				if (dataCasted.size() == 0) {
+					return;
+				}
+				final List<LinkTableLongLong> insertElements = new ArrayList<>();
+				for (final Long remoteKey : dataCasted) {
+					if (remoteKey == null) {
+						throw new DataAccessException("Try to insert remote key with null value");
+					}
+					insertElements.add(new LinkTableLongLong(localKeyLong, remoteKey));
+				}
+				if (insertElements.size() == 0) {
+					LOGGER.warn("Insert multiple link without any value (may have null in the list): {}", dataCasted);
+					return;
+				}
+				actions.add(() -> {
+					ioDb.insertMultiple(insertElements, new OverrideTableName(linkTableName));
+				});
+			} else {
+				// ========================================================
+				// == Link a "Long" primary Key with List<UUID>
+				// ========================================================
+				@SuppressWarnings("unchecked")
+				final List<UUID> dataCasted = (List<UUID>) data;
+				if (dataCasted.size() == 0) {
+					return;
+				}
+				final List<LinkTableLongUUID> insertElements = new ArrayList<>();
+				for (final UUID remoteKey : dataCasted) {
+					if (remoteKey == null) {
+						throw new DataAccessException("Try to insert remote key with null value");
+					}
+					insertElements.add(new LinkTableLongUUID(localKeyLong, remoteKey));
+				}
+				if (insertElements.size() == 0) {
+					LOGGER.warn("Insert multiple link without any value (may have null in the list): {}", dataCasted);
+					return;
+				}
+				actions.add(() -> {
+					ioDb.insertMultiple(insertElements, new OverrideTableName(linkTableName));
+				});
+			}
+		} else if (localKey instanceof final UUID localKeyUUID) {
+			if (objectClass == Long.class) {
+				// ========================================================
+				// == Link a "UUID" primary Key with List<Long>
+				// ========================================================
+				@SuppressWarnings("unchecked")
+				final List<Long> dataCasted = (List<Long>) data;
+				if (dataCasted.size() == 0) {
+					return;
+				}
+				final List<LinkTableUUIDLong> insertElements = new ArrayList<>();
+				for (final Long remoteKey : dataCasted) {
+					if (remoteKey == null) {
+						throw new DataAccessException("Try to insert remote key with null value");
+					}
+					insertElements.add(new LinkTableUUIDLong(localKeyUUID, remoteKey));
+				}
+				if (insertElements.size() == 0) {
+					LOGGER.warn("Insert multiple link without any value (may have null in the list): {}", dataCasted);
+					return;
+				}
+				actions.add(() -> {
+					ioDb.insertMultiple(insertElements, new OverrideTableName(linkTableName));
+				});
+			} else {
+				// ========================================================
+				// == Link a "UUID" primary Key with List<UUID>
+				// ========================================================
+				@SuppressWarnings("unchecked")
+				final List<UUID> dataCasted = (List<UUID>) data;
+				if (dataCasted.size() == 0) {
+					return;
+				}
+				final List<LinkTableUUIDUUID> insertElements = new ArrayList<>();
+				for (final UUID remoteKey : dataCasted) {
+					if (remoteKey == null) {
+						throw new DataAccessException("Try to insert remote key with null value");
+					}
+					insertElements.add(new LinkTableUUIDUUID(localKeyUUID, remoteKey));
+				}
+				if (insertElements.size() == 0) {
+					LOGGER.warn("Insert multiple link without any value (may have null in the list): {}", dataCasted);
+					return;
+				}
+				actions.add(() -> {
+					ioDb.insertMultiple(insertElements, new OverrideTableName(linkTableName));
+				});
+			}
+		} else {
+			throw new DataAccessException("Not manage access of remte key like ManyToMany other than Long or UUID: "
+					+ localKey.getClass().getCanonicalName());
+		}
+
+	}
+
+	@Override
+	public void drop(final DBAccessMorphia ioDb, final String tableName, final Field field) throws Exception {
+		final String columnName = AnnotationTools.getFieldName(field);
+		final String linkTableName = generateLinkTableName(tableName, columnName);
+		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
+				.getActualTypeArguments()[0];
+		if (objectClass != Long.class && objectClass != UUID.class) {
+			throw new DataAccessException("Can not ManyToMany with other than List<Long> or List<UUID> Model: List<"
+					+ objectClass.getCanonicalName() + ">");
+		}
+		ioDb.drop(LinkTableLongLong.class, new OverrideTableName(linkTableName));
+	}
+
+	@Override
+	public void cleanAll(final DBAccessMorphia ioDb, final String tableName, final Field field) throws Exception {
+		final String columnName = AnnotationTools.getFieldName(field);
+		final String linkTableName = generateLinkTableName(tableName, columnName);
+		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
+				.getActualTypeArguments()[0];
+		if (objectClass != Long.class && objectClass != UUID.class) {
+			throw new DataAccessException("Can not ManyToMany with other than List<Long> or List<UUID> Model: List<"
+					+ objectClass.getCanonicalName() + ">");
+		}
+		ioDb.cleanAll(LinkTableLongLong.class, new OverrideTableName(linkTableName));
+	}
+
+	public static void addLink(
+			final DBAccess ioDb,
+			final Class<?> clazz,
+			final long localKey,
+			final String column,
+			final long remoteKey) throws Exception {
+		if (ioDb instanceof final DBAccessMorphia daSQL) {
+			final String tableName = AnnotationTools.getTableName(clazz);
+			final String linkTableName = generateLinkTableName(tableName, column);
+			/* final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[0]; if (objectClass != Long.class && objectClass != UUID.class) { throw new
+			 * DataAccessException("Can not ManyToMany with other than List<Long> or List<UUID> Model: List<" + objectClass.getCanonicalName() + ">"); } */
+			final LinkTableLongLong insertElement = new LinkTableLongLong(localKey, remoteKey);
+			daSQL.insert(insertElement, new OverrideTableName(linkTableName));
+		} else if (ioDb instanceof final DBAccessMorphia dam) {
+
+		} else {
+			throw new DataAccessException("DataAccess Not managed");
+		}
+
+	}
+
+	public static long removeLink(
+			final DBAccess ioDb,
+			final Class<?> clazz,
+			final long localKey,
+			final String column,
+			final long remoteKey) throws Exception {
+		if (ioDb instanceof final DBAccessMorphia daSQL) {
+			final String tableName = AnnotationTools.getTableName(clazz);
+			final String linkTableName = generateLinkTableName(tableName, column);
+			return daSQL.deleteWhere(LinkTableLongLong.class, new OverrideTableName(linkTableName),
+					new Condition(new QueryAnd(new QueryCondition("object1Id", "=", localKey),
+							new QueryCondition("object2Id", "=", remoteKey))));
+		} else if (ioDb instanceof final DBAccessMorphia dam) {
+			return 0L;
+		} else {
+			throw new DataAccessException("DataAccess Not managed");
+		}
+	}
+
+	@Override
+	public void createTables(
+			final String tableName,
+			final Field primaryField,
+			final Field field,
+			final StringBuilder mainTableBuilder,
+			final List<String> preActionList,
+			final List<String> postActionList,
+			final boolean createIfNotExist,
+			final boolean createDrop,
+			final int fieldId) throws Exception {
+
+		final ManyToMany manyToMany = AnnotationTools.getManyToMany(field);
+		if (manyToMany.mappedBy() != null && manyToMany.mappedBy().length() != 0) {
+			// not the reference model to create base:
+			return;
+		}
+		final String linkTableName = generateLinkTableNameField(tableName, field);
+		final QueryOptions options = new QueryOptions(new OverrideTableName(linkTableName));
+		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
+				.getActualTypeArguments()[0];
+		if (objectClass != Long.class && objectClass != UUID.class) {
+			throw new DataAccessException("Can not ManyToMany with other than List<Long> or List<UUID> Model: List<"
+					+ objectClass.getCanonicalName() + ">");
+		}
+		final Class<?> primaryType = primaryField.getType();
+		if (primaryType == Long.class) {
+			if (objectClass == Long.class) {
+				final List<String> sqlCommand = DataFactory.createTable(LinkTableLongLong.class, options);
+				postActionList.addAll(sqlCommand);
+			} else {
+				final List<String> sqlCommand = DataFactory.createTable(LinkTableLongUUID.class, options);
+				postActionList.addAll(sqlCommand);
+			}
+		} else if (primaryType == UUID.class) {
+			if (objectClass == Long.class) {
+				final List<String> sqlCommand = DataFactory.createTable(LinkTableUUIDLong.class, options);
+				postActionList.addAll(sqlCommand);
+			} else {
+				final List<String> sqlCommand = DataFactory.createTable(LinkTableUUIDUUID.class, options);
+				postActionList.addAll(sqlCommand);
+			}
+		} else {
+			throw new DataAccessException("Can not ManyToMany with other than primary key type Long or UUID Model: "
+					+ primaryType.getCanonicalName());
+		}
+	}
+}

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

@@ -0,0 +1,230 @@
+package org.kar.archidata.dataAccess.addOnMongo;
+
+import java.lang.reflect.Field;
+import java.util.List;
+import java.util.UUID;
+
+import org.bson.Document;
+import org.kar.archidata.annotation.AnnotationTools;
+import org.kar.archidata.dataAccess.CountInOut;
+import org.kar.archidata.dataAccess.DBAccessMorphia;
+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.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 field) throws Exception {
+		final String fieldName = AnnotationTools.getFieldName(field);
+		try {
+			return DataFactory.convertTypeInSQL(field.getType(), fieldName);
+		} catch (final Exception e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	@Override
+	public boolean isCompatibleField(final Field elem) {
+		return elem.getDeclaredAnnotation(ManyToOne.class) != null;
+	}
+
+	@Override
+	public void insertData(
+			final DBAccessMorphia ioDb,
+			final Field field,
+			final Object rootObject,
+			final Document docSet,
+			final Document docUnSet) throws Exception {
+		final String fieldName = AnnotationTools.getFieldName(field);
+		final Object data = field.get(rootObject);
+		if (field.get(data) == null) {
+			docUnSet.append(fieldName, "");
+			return;
+		} else if (field.getType() == Long.class) {
+			final Long dataTyped = (Long) data;
+			docSet.append(fieldName, dataTyped);
+		} else if (field.getType() == Integer.class) {
+			final Integer dataTyped = (Integer) data;
+			docSet.append(fieldName, dataTyped);
+		} else if (field.getType() == Short.class) {
+			final Short dataTyped = (Short) data;
+			docSet.append(fieldName, dataTyped);
+		} else if (field.getType() == String.class) {
+			final String dataTyped = (String) data;
+			docSet.append(fieldName, dataTyped);
+		} else if (field.getType() == UUID.class) {
+			final UUID dataTyped = (UUID) data;
+			docSet.append(fieldName, dataTyped);
+		} else {
+			final Field idField = AnnotationTools.getFieldOfId(field.getType());
+			final Object uid = idField.get(data);
+			if (uid == null) {
+				docUnSet.append(fieldName, "");
+			} else {
+				docSet.append(fieldName, uid);
+			}
+		}
+	}
+
+	@Override
+	public boolean canInsert(final Field field) {
+		if (field.getType() == Long.class || field.getType() == Integer.class || field.getType() == Short.class
+				|| field.getType() == String.class || field.getType() == UUID.class) {
+			return true;
+		}
+		final ManyToOne decorators = field.getDeclaredAnnotation(ManyToOne.class);
+		if (field.getType() == decorators.targetEntity()) {
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public boolean isInsertAsync(final Field field) throws Exception {
+		return false;
+	}
+
+	@Override
+	public boolean canRetrieve(final Field field) {
+		final Class<?> classType = field.getType();
+		if (classType == Long.class || classType == Integer.class || classType == Short.class
+				|| classType == String.class || classType == UUID.class) {
+			return true;
+		}
+		final ManyToOne decorators = field.getDeclaredAnnotation(ManyToOne.class);
+		if (field.getType() == decorators.targetEntity()) {
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public void generateQuery(
+			@NotNull final String tableName,
+			@NotNull final String primaryKey,
+			@NotNull final Field field,
+			@NotNull final StringBuilder querySelect,
+			@NotNull final StringBuilder query,
+			@NotNull final String name,
+			@NotNull final CountInOut count,
+			final QueryOptions options) throws Exception {
+		if (field.getType() == Long.class || field.getType() == Integer.class || field.getType() == Short.class
+				|| field.getType() == String.class || field.getType() == UUID.class) {
+			querySelect.append(" ");
+			querySelect.append(tableName);
+			querySelect.append(".");
+			querySelect.append(name);
+			count.inc();
+			return;
+		}
+		final ManyToOne decorators = field.getDeclaredAnnotation(ManyToOne.class);
+		if (field.getType() == decorators.targetEntity()) {
+			// no eager possible for no sql
+			querySelect.append(" ");
+			querySelect.append(tableName);
+			querySelect.append(".");
+			querySelect.append(name);
+			count.inc();
+		}
+	}
+
+	@Override
+	public void fillFromDoc(
+			final DBAccessMorphia ioDb,
+			final Document doc,
+			final Field field,
+			final Object data,
+			final QueryOptions options,
+			final List<LazyGetter> lazyCall) throws Exception {
+
+		final String fieldName = AnnotationTools.getFieldName(field);
+		if (!doc.containsKey(fieldName)) {
+			field.set(data, null);
+			return;
+		}
+		// local field to manage no remote object to retrieve.
+		if (field.getType() == Long.class || field.getType() == Integer.class || field.getType() == Short.class
+				|| field.getType() == String.class || field.getType() == UUID.class) {
+			ioDb.setValueFromDoc(field.getType(), data, field, doc, lazyCall);
+			return;
+		}
+		final Class<?> objectClass = field.getType();
+		final ManyToOne decorators = field.getDeclaredAnnotation(ManyToOne.class);
+		if (decorators == null) {
+			return;
+		}
+		if (objectClass == decorators.targetEntity()) {
+
+			final Field remotePrimaryKeyField = AnnotationTools.getFieldOfId(objectClass);
+			final Class<?> remotePrimaryKeyType = remotePrimaryKeyField.getType();
+			if (remotePrimaryKeyType == Long.class) {
+				// here we have the field, the data and the the remote value ==> can create callback that generate the update of the value ...
+				final Long foreignKey = doc.getLong(fieldName);
+				if (foreignKey != null) {
+					// In the lazy mode, the request is done in asynchronous mode, they will be done after...
+					final LazyGetter lambda = () -> {
+						// TODO: update to have get with abstract types ....
+						final Object foreignData = ioDb.get(decorators.targetEntity(), foreignKey);
+						if (foreignData == null) {
+							return;
+						}
+						field.set(data, foreignData);
+					};
+					lazyCall.add(lambda);
+				}
+			} else if (remotePrimaryKeyType == UUID.class) {
+				// here we have the field, the data and the the remote value ==> can create callback that generate the update of the value ...
+				final UUID foreignKey = doc.get(fieldName, UUID.class);
+				if (foreignKey != null) {
+					// In the lazy mode, the request is done in asynchronous mode, they will be done after...
+					final LazyGetter lambda = () -> {
+						// TODO: update to have get with abstract types ....
+						final Object foreignData = ioDb.get(decorators.targetEntity(), foreignKey);
+						if (foreignData == null) {
+							return;
+						}
+						field.set(data, foreignData);
+					};
+					lazyCall.add(lambda);
+				}
+			}
+		}
+	}
+
+	// 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 primaryField,
+			final Field field,
+			final StringBuilder mainTableBuilder,
+			final List<String> preActionList,
+			final List<String> postActionList,
+			final boolean createIfNotExist,
+			final boolean createDrop,
+			final int fieldId) throws Exception {
+		final Class<?> classType = field.getType();
+		if (classType == Long.class || classType == Integer.class || classType == Short.class
+				|| classType == String.class || classType == UUID.class) {
+			DataFactory.createTablesSpecificType(tableName, primaryField, field, mainTableBuilder, preActionList,
+					postActionList, createIfNotExist, createDrop, fieldId, classType);
+		} else {
+			LOGGER.error("Support only the Long remote field of ecternal primary keys...");
+			DataFactory.createTablesSpecificType(tableName, primaryField, field, mainTableBuilder, preActionList,
+					postActionList, createIfNotExist, createDrop, fieldId, Long.class);
+		}
+	}
+}

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

@@ -0,0 +1,322 @@
+package org.kar.archidata.dataAccess.addOnMongo;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.ParameterizedType;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+import org.bson.Document;
+import org.kar.archidata.annotation.AnnotationTools;
+import org.kar.archidata.dataAccess.CountInOut;
+import org.kar.archidata.dataAccess.DBAccessMorphia;
+import org.kar.archidata.dataAccess.DataFactory;
+import org.kar.archidata.dataAccess.LazyGetter;
+import org.kar.archidata.dataAccess.QueryCondition;
+import org.kar.archidata.dataAccess.QueryOptions;
+import org.kar.archidata.dataAccess.options.Condition;
+import org.kar.archidata.exception.DataAccessException;
+import org.kar.archidata.tools.ConfigBaseVariable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jakarta.persistence.FetchType;
+import jakarta.persistence.OneToMany;
+import jakarta.validation.constraints.NotNull;
+
+public class AddOnOneToMany implements DataAccessAddOn {
+	static final Logger LOGGER = LoggerFactory.getLogger(AddOnOneToMany.class);
+	static final String SEPARATOR_LONG = "-";
+
+	/** Convert the list if external id in a string '-' separated
+	 * @param ids List of value (null are removed)
+	 * @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 DBAccessMorphia ioDb,
+			final Field field,
+			final Object rootObject,
+			final Document docSet,
+			final Document docUnSet) throws Exception {
+		throw new IllegalAccessException("Can not generate an inset of @OneToMany");
+	}
+
+	@Override
+	public boolean canInsert(final Field field) {
+		return false;
+	}
+
+	@Override
+	public boolean isInsertAsync(final Field field) throws Exception {
+		// TODO: can be implemented later...
+		return false;
+	}
+
+	@Override
+	public boolean canRetrieve(final Field field) {
+		if (field.getType() != List.class) {
+			return false;
+		}
+		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
+				.getActualTypeArguments()[0];
+		if (objectClass == Long.class || objectClass == UUID.class) {
+			return true;
+		}
+		final OneToMany decorators = field.getDeclaredAnnotation(OneToMany.class);
+		if (decorators == null) {
+			return false;
+		}
+		if (decorators.targetEntity() == objectClass) {
+			return true;
+		}
+		return false;
+	}
+
+	public void generateConcatQuery(
+			@NotNull final String tableName,
+			@NotNull final String primaryKey,
+			@NotNull final Field field,
+			@NotNull final StringBuilder querySelect,
+			@NotNull final StringBuilder query,
+			@NotNull final String name,
+			@NotNull final CountInOut count,
+			final QueryOptions options,
+			final Class<?> targetEntity,
+			final String mappedBy) throws Exception {
+		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
+				.getActualTypeArguments()[0];
+		final String remoteTableName = AnnotationTools.getTableName(targetEntity);
+		final String remoteTablePrimaryKeyName = AnnotationTools
+				.getFieldName(AnnotationTools.getPrimaryKeyField(targetEntity));
+		final String tmpRemoteVariable = "tmp_" + Integer.toString(count.value);
+		final String remoteDeletedFieldName = AnnotationTools.getDeletedFieldName(targetEntity);
+
+		querySelect.append(" (SELECT GROUP_CONCAT(");
+		querySelect.append(tmpRemoteVariable);
+		querySelect.append(".");
+		querySelect.append(remoteTablePrimaryKeyName);
+		querySelect.append(" ");
+		if ("sqlite".equals(ConfigBaseVariable.getDBType())) {
+			querySelect.append(", ");
+		} else {
+			querySelect.append("SEPARATOR ");
+		}
+		querySelect.append("'");
+		if (objectClass == Long.class) {
+			querySelect.append(SEPARATOR_LONG);
+		}
+		querySelect.append("') FROM ");
+		querySelect.append(remoteTableName);
+		querySelect.append(" ");
+		querySelect.append(tmpRemoteVariable);
+		querySelect.append(" WHERE ");
+		if (remoteDeletedFieldName != null) {
+			querySelect.append(tmpRemoteVariable);
+			querySelect.append(".");
+			querySelect.append(remoteDeletedFieldName);
+			querySelect.append(" = false");
+			querySelect.append(" AND ");
+		}
+		querySelect.append(tableName);
+		querySelect.append(".");
+		querySelect.append(primaryKey);
+		querySelect.append(" = ");
+		querySelect.append(tmpRemoteVariable);
+		querySelect.append(".");
+		querySelect.append(mappedBy);
+		querySelect.append(" ");
+		querySelect.append(") AS ");
+		querySelect.append(name);
+		querySelect.append(" ");
+	}
+
+	@Override
+	public void generateQuery(
+			@NotNull final String tableName,
+			@NotNull final String primaryKey,
+			@NotNull final Field field,
+			@NotNull final StringBuilder querySelect,
+			@NotNull final StringBuilder query,
+			@NotNull final String name,
+			@NotNull final CountInOut count,
+			final QueryOptions options) throws Exception {
+		if (field.getType() != List.class) {
+			return;
+		}
+		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
+				.getActualTypeArguments()[0];
+		final OneToMany decorators = field.getDeclaredAnnotation(OneToMany.class);
+		if (decorators == null) {
+			return;
+		}
+		// TODO: manage better the eager and lazy !!
+		if (objectClass == Long.class || objectClass == UUID.class) {
+			generateConcatQuery(tableName, primaryKey, field, querySelect, query, name, count, options,
+					decorators.targetEntity(), decorators.mappedBy());
+			return;
+		}
+		if (objectClass == decorators.targetEntity()) {
+			if (decorators.fetch() == FetchType.EAGER) {
+				throw new DataAccessException("EAGER is not supported for list of element...");
+			} else {
+				// Force a copy of the primaryKey to permit the async retrieve of the data
+				querySelect.append(" ");
+				querySelect.append(tableName);
+				querySelect.append(".");
+				querySelect.append(primaryKey);
+				querySelect.append(" AS tmp_");
+				querySelect.append(Integer.toString(count.value));
+			}
+		}
+	}
+
+	@Override
+	public void fillFromDoc(
+			final DBAccessMorphia ioDb,
+			final Document doc,
+			final Field field,
+			final Object data,
+			final QueryOptions options,
+			final List<LazyGetter> lazyCall) throws Exception {
+		if (field.getType() != List.class) {
+			LOGGER.error("Can not OneToMany with other than List Model: {}", field.getType().getCanonicalName());
+			return;
+		}
+
+		final String fieldName = AnnotationTools.getFieldName(field);
+		if (!doc.containsKey(fieldName)) {
+			field.set(data, null);
+			return;
+		}
+
+		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
+				.getActualTypeArguments()[0];
+		final OneToMany decorators = field.getDeclaredAnnotation(OneToMany.class);
+		if (decorators == null) {
+			return;
+		}
+		if (objectClass == Long.class || objectClass == UUID.class) {
+			final Object value = doc.get(fieldName, field.getType());
+			field.set(data, value);
+			return;
+		}
+		if (objectClass == decorators.targetEntity()) {
+
+			Long parentIdTmp = null;
+			UUID parendUuidTmp = null;
+			try {
+				final Object value = doc.get(fieldName);
+				if (value instanceof final Long valueCasted) {
+					parentIdTmp = valueCasted;
+				} else if (value instanceof final UUID valueCasted) {
+					parendUuidTmp = valueCasted;
+				}
+			} catch (final Exception ex) {
+				LOGGER.error("fail to find the correct type... {}", ex.getMessage());
+			}
+			final Long parentId = parentIdTmp;
+			final UUID parendUuid = parendUuidTmp;
+			final String mappingKey = decorators.mappedBy();
+			// We get the parent ID ... ==> need to request the list of elements
+			if (objectClass == Long.class) {
+				LOGGER.error("Need to retreive all primary key of all elements");
+				//field.set(data, idList);
+				return;
+			} else if (objectClass == UUID.class) {
+				LOGGER.error("Need to retreive all primary key of all elements");
+				//field.set(data, idList);
+				return;
+			}
+			if (objectClass == decorators.targetEntity()) {
+				if (parentId != null) {
+					final LazyGetter lambda = () -> {
+						@SuppressWarnings("unchecked")
+						final Object foreignData = ioDb.getsWhere(decorators.targetEntity(),
+								new Condition(new QueryCondition(mappingKey, "=", parentId)));
+						if (foreignData == null) {
+							return;
+						}
+						field.set(data, foreignData);
+					};
+					lazyCall.add(lambda);
+				} else if (parendUuid != null) {
+					final LazyGetter lambda = () -> {
+						@SuppressWarnings("unchecked")
+						final Object foreignData = ioDb.getsWhere(decorators.targetEntity(),
+								new Condition(new QueryCondition(mappingKey, "=", parendUuid)));
+						if (foreignData == null) {
+							return;
+						}
+						field.set(data, foreignData);
+					};
+					lazyCall.add(lambda);
+				}
+			}
+		}
+	}
+
+	// TODO : refacto this table to manage a generic table with dynamic name to be serialize with the default system
+	@Override
+	public void createTables(
+			final String tableName,
+			final Field primaryField,
+			final Field field,
+			final StringBuilder mainTableBuilder,
+			final List<String> preActionList,
+			final List<String> postActionList,
+			final boolean createIfNotExist,
+			final boolean createDrop,
+			final int fieldId) throws Exception {
+		// This is a remote field ==> nothing to generate (it is stored in the remote object
+	}
+}

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

@@ -0,0 +1,151 @@
+package org.kar.archidata.dataAccess.addOnMongo;
+
+import java.lang.reflect.Field;
+import java.sql.SQLException;
+import java.util.List;
+
+import org.bson.Document;
+import org.kar.archidata.dataAccess.CountInOut;
+import org.kar.archidata.dataAccess.DBAccessMorphia;
+import org.kar.archidata.dataAccess.LazyGetter;
+import org.kar.archidata.dataAccess.QueryOptions;
+
+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(
+			final DBAccessMorphia ioDb,
+			final Field field,
+			final Object rootObject,
+			final Document docSet,
+			final Document docUnSet) throws Exception;
+
+	/** Element can insert in the single request
+	 * @param field
+	 * @return */
+	default boolean canInsert(final Field field) {
+		return false;
+	}
+
+	/** Element can be retrieve with the specific mode
+	 * @param field
+	 * @return */
+	default boolean canRetrieve(final Field field) {
+		return false;
+	}
+
+	void generateQuery(
+			@NotNull String tableName,
+			@NotNull final String primaryKey,
+			@NotNull Field field,
+			@NotNull final StringBuilder querySelect,
+			@NotNull final StringBuilder query,
+			@NotNull String name,
+			@NotNull CountInOut count,
+			QueryOptions options) throws Exception;
+
+	// Return the number of colomn read
+	void fillFromDoc(
+			final DBAccessMorphia ioDb,
+			Document doc,
+			Field field,
+			Object data,
+			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,
+			final Field primaryField,
+			Field field,
+			StringBuilder mainTableBuilder,
+			List<String> preActionList,
+			List<String> postActionList,
+			boolean createIfNotExist,
+			boolean createDrop,
+			int fieldId) throws Exception;
+
+	/** Some action must be done asynchronously for update or remove element
+	 * @param field
+	 * @return */
+	default boolean isInsertAsync(final Field field) throws Exception {
+		return false;
+	}
+
+	/** When insert is mark async, this function permit to create or update the data
+	 * @param tableName Name of the Table.
+	 * @param localId Local ID of the current table
+	 * @param field Field that is updated.
+	 * @param data Data that might be inserted.
+	 * @param actions Asynchronous action to do after main request. */
+	default void asyncInsert(
+			final DBAccessMorphia ioDb,
+			final String tableName,
+			final Object localId,
+			final Field field,
+			final Object data,
+			final List<LazyGetter> actions) throws Exception {
+
+	}
+
+	/** Some action must be done asynchronously for update or remove element
+	 * @param field
+	 * @return */
+	default boolean isUpdateAsync(final Field field) throws Exception {
+		return false;
+	}
+
+	/** When insert is mark async, this function permit to create or update the data
+	 * @param tableName Name of the Table.
+	 * @param localId Local ID of the current table
+	 * @param field Field that is updated.
+	 * @param data Data that might be inserted.
+	 * @param actions Asynchronous action to do after main request. */
+	default void asyncUpdate(
+			final DBAccessMorphia ioDb,
+			final String tableName,
+			final Object localId,
+			final Field field,
+			final Object data,
+			final List<LazyGetter> actions) throws Exception {
+
+	}
+
+	default void drop(final DBAccessMorphia ioDb, final String tableName, final Field field) throws Exception {
+
+	}
+
+	default void cleanAll(final DBAccessMorphia ioDb, final String tableName, final Field field) throws Exception {
+
+	}
+
+}

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

@@ -0,0 +1,460 @@
+package org.kar.archidata.dataAccess.addOnSQL;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.ParameterizedType;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import org.bson.Document;
+import org.kar.archidata.annotation.AnnotationTools;
+import org.kar.archidata.annotation.DataJson;
+import org.kar.archidata.dataAccess.CountInOut;
+import org.kar.archidata.dataAccess.DBAccess;
+import org.kar.archidata.dataAccess.DBAccessMorphia;
+import org.kar.archidata.dataAccess.DBAccessSQL;
+import org.kar.archidata.dataAccess.DataFactory;
+import org.kar.archidata.dataAccess.LazyGetter;
+import org.kar.archidata.dataAccess.QueryOptions;
+import org.kar.archidata.dataAccess.addOnSQL.model.TableCoversLongLong;
+import org.kar.archidata.dataAccess.addOnSQL.model.TableCoversLongUUID;
+import org.kar.archidata.dataAccess.addOnSQL.model.TableCoversUUIDLong;
+import org.kar.archidata.dataAccess.addOnSQL.model.TableCoversUUIDUUID;
+import org.kar.archidata.dataAccess.options.OverrideTableName;
+import org.kar.archidata.exception.DataAccessException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.model.Filters;
+
+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 DataAccessException {
+		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 DBAccessSQL ioDb,
+			final PreparedStatement ps,
+			final Field field,
+			final Object rootObject,
+			final CountInOut iii)
+			throws IllegalArgumentException, IllegalAccessException, SQLException, JsonProcessingException {
+		final Object data = field.get(rootObject);
+		if (data == null) {
+			ps.setNull(iii.value, Types.VARCHAR);
+		}
+		final ObjectMapper objectMapper = new ObjectMapper();
+		final String dataString = objectMapper.writeValueAsString(data);
+		ps.setString(iii.value, dataString);
+		iii.inc();
+	}
+
+	@Override
+	public boolean canInsert(final Field field) {
+		return true;
+	}
+
+	@Override
+	public boolean isInsertAsync(final Field field) {
+		return false;
+	}
+
+	@Override
+	public boolean canRetrieve(final Field field) {
+		return true;
+	}
+
+	@Override
+	public void generateQuery(
+			@NotNull final String tableName,
+			@NotNull final String primaryKey,
+			@NotNull final Field field,
+			@NotNull final StringBuilder querySelect,
+			@NotNull final StringBuilder query,
+			@NotNull final String name,
+			@NotNull final CountInOut count,
+			final QueryOptions options) throws Exception {
+		querySelect.append(" ");
+		querySelect.append(tableName);
+		querySelect.append(".");
+		querySelect.append(name);
+		count.inc();
+		return;
+	}
+
+	@Override
+	public void fillFromQuery(
+			final DBAccessSQL ioDb,
+			final ResultSet rs,
+			final Field field,
+			final Object data,
+			final CountInOut count,
+			final QueryOptions options,
+			final List<LazyGetter> lazyCall) throws Exception {
+		final String jsonData = rs.getString(count.value);
+		count.inc();
+		if (!rs.wasNull()) {
+			final ObjectMapper objectMapper = new ObjectMapper();
+			if (field.getType() == List.class) {
+				final ParameterizedType listType = (ParameterizedType) field.getGenericType();
+				final Class<?> listClass = (Class<?>) listType.getActualTypeArguments()[0];
+				if (listClass == Long.class) {
+					final Object dataParsed = objectMapper.readValue(jsonData, new TypeReference<List<Long>>() {});// field.getType());
+					field.set(data, dataParsed);
+					return;
+				}
+				if (listClass == Float.class) {
+					final Object dataParsed = objectMapper.readValue(jsonData, new TypeReference<List<Float>>() {});// field.getType());
+					field.set(data, dataParsed);
+					return;
+				}
+				if (listClass == Double.class) {
+					final Object dataParsed = objectMapper.readValue(jsonData, new TypeReference<List<Double>>() {});// field.getType());
+					field.set(data, dataParsed);
+					return;
+				}
+				if (listClass == Integer.class) {
+					final Object dataParsed = objectMapper.readValue(jsonData, new TypeReference<List<Integer>>() {});// field.getType());
+					field.set(data, dataParsed);
+					return;
+				}
+				if (listClass == Short.class) {
+					final Object dataParsed = objectMapper.readValue(jsonData, new TypeReference<List<Short>>() {});// field.getType());
+					field.set(data, dataParsed);
+					return;
+				}
+				if (listClass == String.class) {
+					final Object dataParsed = objectMapper.readValue(jsonData, new TypeReference<List<String>>() {});// field.getType());
+					field.set(data, dataParsed);
+					return;
+				}
+				if (listClass == UUID.class) {
+					final Object dataParsed = objectMapper.readValue(jsonData, new TypeReference<List<UUID>>() {});// field.getType());
+					field.set(data, dataParsed);
+					return;
+				}
+				LOGGER.warn("Maybe fail to translate Model in datajson list: List<{}>", listClass.getCanonicalName());
+			}
+			final Object dataParsed = objectMapper.readValue(jsonData, field.getType());
+			field.set(data, dataParsed);
+		}
+	}
+
+	@Override
+	public void createTables(
+			final String tableName,
+			final Field primaryField,
+			final Field field,
+			final StringBuilder mainTableBuilder,
+			final List<String> preActionList,
+			final List<String> postActionList,
+			final boolean createIfNotExist,
+			final boolean createDrop,
+			final int fieldId) throws Exception {
+		DataFactory.createTablesSpecificType(tableName, primaryField, field, mainTableBuilder, preActionList,
+				postActionList, createIfNotExist, createDrop, fieldId, JsonValue.class);
+	}
+
+	public static void addLink(
+			final DBAccess ioDb,
+			final Class<?> clazz,
+			final Long id,
+			final String column,
+			final Long remoteKey) throws Exception {
+		final String tableName = AnnotationTools.getTableName(clazz);
+		final TableCoversLongLong data = ioDb.get(TableCoversLongLong.class, id, new OverrideTableName(tableName));
+		if (data.covers == null) {
+			data.covers = new ArrayList<>();
+		}
+		for (final Long elem : data.covers) {
+			if (elem.equals(remoteKey)) {
+				return;
+			}
+		}
+		data.covers.add(remoteKey);
+		ioDb.update(data, data.id, List.of("covers"), new OverrideTableName(tableName));
+	}
+
+	/**
+	 * Adds a remoteKey to the covers list of a data entry identified by the given class type and ID.
+	 * If the covers list is null, it initializes it. If the remoteKey already exists in the list,
+	 * the method returns without making any changes.
+	 *
+	 * @param clazz     The class type to retrieve the table name from.
+	 * @param id        The ID of the data object to fetch.
+	 * @param column    The name of the column (currently not used, but may be used for specifying a field name).
+	 * @param remoteKey The UUID to add to the covers list.
+	 * @throws Exception If an error occurs during data retrieval or update.
+	 */
+	public static void addLink(
+			final DBAccess ioDb,
+			final Class<?> clazz,
+			final Long id,
+			final String column,
+			final UUID remoteKey) throws Exception {
+		if (ioDb instanceof final DBAccessSQL daSQL) {
+			final String tableName = AnnotationTools.getTableName(clazz);
+			// TODO: Get primary key name
+			final TableCoversLongUUID data = ioDb.get(TableCoversLongUUID.class, id, new OverrideTableName(tableName));
+			if (data.covers == null) {
+				data.covers = new ArrayList<>();
+			}
+			for (final UUID elem : data.covers) {
+				if (elem.equals(remoteKey)) {
+					return;
+				}
+			}
+			data.covers.add(remoteKey);
+			ioDb.update(data, data.id, List.of("covers"), new OverrideTableName(tableName));// TODO:  ,new OverrideFieldName("covers", column));
+		} else if (ioDb instanceof final DBAccessMorphia dam) {
+
+		} else {
+			throw new DataAccessException("DataAccess Not managed");
+		}
+	}
+
+	/**
+	 * Adds a remoteKey to the covers list of a data entry identified by the given class type and ID.
+	 * If the covers list is null, it initializes it. If the remoteKey already exists in the list,
+	 * the method returns without making any changes.
+	 *
+	 * @param clazz     The class type to retrieve the table name from.
+	 * @param id        The ID of the data object to fetch.
+	 * @param column    The name of the column (currently not used, but may be used for specifying a field name).
+	 * @param remoteKey The UUID to add to the covers list.
+	 * @throws Exception If an error occurs during data retrieval or update.
+	 */
+	public static void addLink(
+			final DBAccess ioDb,
+			final Class<?> clazz,
+			final UUID uuid,
+			final String column,
+			final UUID remoteKey) throws Exception {
+		if (ioDb instanceof final DBAccessSQL daSQL) {
+			final String tableName = AnnotationTools.getTableName(clazz);
+			final TableCoversUUIDUUID data = ioDb.get(TableCoversUUIDUUID.class, uuid,
+					new OverrideTableName(tableName));
+			if (data.covers == null) {
+				data.covers = new ArrayList<>();
+			}
+			for (final UUID elem : data.covers) {
+				if (elem.equals(remoteKey)) {
+					return;
+				}
+			}
+			data.covers.add(remoteKey);
+			ioDb.update(data, data.uuid, List.of("covers"), new OverrideTableName(tableName));
+		} else if (ioDb instanceof final DBAccessMorphia dam) {
+
+		} else {
+			throw new DataAccessException("DataAccess Not managed");
+		}
+	}
+
+	public static void addLink(
+			final DBAccess ioDb,
+			final Class<?> clazz,
+			final UUID uuid,
+			final String column,
+			final Long remoteKey) throws Exception {
+		if (ioDb instanceof final DBAccessSQL daSQL) {
+			final String tableName = AnnotationTools.getTableName(clazz);
+			final TableCoversUUIDLong data = ioDb.get(TableCoversUUIDLong.class, uuid,
+					new OverrideTableName(tableName));
+			if (data.covers == null) {
+				data.covers = new ArrayList<>();
+			}
+			for (final Long elem : data.covers) {
+				if (elem.equals(remoteKey)) {
+					return;
+				}
+			}
+			data.covers.add(remoteKey);
+			ioDb.update(data, data.uuid, List.of("covers"), new OverrideTableName(tableName));
+		} else if (ioDb instanceof final DBAccessMorphia dam) {
+
+		} else {
+			throw new DataAccessException("DataAccess Not managed");
+		}
+	}
+
+	public static void removeLink(
+			final DBAccess ioDb,
+			final Class<?> clazz,
+			final UUID uuid,
+			final String column,
+			final Long remoteKey) throws Exception {
+		if (ioDb instanceof final DBAccessSQL daSQL) {
+			final String tableName = AnnotationTools.getTableName(clazz);
+			final TableCoversUUIDLong data = ioDb.get(TableCoversUUIDLong.class, uuid,
+					new OverrideTableName(tableName));
+			if (data.covers == null) {
+				return;
+			}
+			final List<Long> newList = new ArrayList<>();
+			for (final Long elem : data.covers) {
+				if (elem.equals(remoteKey)) {
+					continue;
+				}
+				newList.add(elem);
+			}
+			data.covers = newList;
+			ioDb.update(data, data.uuid, List.of("covers"), new OverrideTableName(tableName));
+		} else if (ioDb instanceof final DBAccessMorphia dam) {
+
+		} else {
+			throw new DataAccessException("DataAccess Not managed");
+		}
+	}
+
+	public static void removeLink(
+			final DBAccess ioDb,
+			final Class<?> clazz,
+			final UUID uuid,
+			final String column,
+			final UUID remoteKey) throws Exception {
+		if (ioDb instanceof final DBAccessSQL daSQL) {
+			final String tableName = AnnotationTools.getTableName(clazz);
+			final TableCoversUUIDUUID data = ioDb.get(TableCoversUUIDUUID.class, uuid,
+					new OverrideTableName(tableName));
+			if (data.covers == null) {
+				return;
+			}
+			final List<UUID> newList = new ArrayList<>();
+			for (final UUID elem : data.covers) {
+				if (elem.equals(remoteKey)) {
+					continue;
+				}
+				newList.add(elem);
+			}
+			data.covers = newList;
+			ioDb.update(data, data.uuid, List.of("covers"), new OverrideTableName(tableName));
+		} else if (ioDb instanceof final DBAccessMorphia dam) {
+
+		} else {
+			throw new DataAccessException("DataAccess Not managed");
+		}
+	}
+
+	public static void removeLink(
+			final DBAccess ioDb,
+			final Class<?> clazz,
+			final Long id,
+			final String column,
+			final Long remoteKey) throws Exception {
+		if (ioDb instanceof final DBAccessSQL daSQL) {
+			final String tableName = AnnotationTools.getTableName(clazz);
+			final TableCoversLongLong data = ioDb.get(TableCoversLongLong.class, id, new OverrideTableName(tableName));
+			if (data.covers == null) {
+				return;
+			}
+			final List<Long> newList = new ArrayList<>();
+			for (final Long elem : data.covers) {
+				if (elem.equals(remoteKey)) {
+					continue;
+				}
+				newList.add(elem);
+			}
+			data.covers = newList;
+			ioDb.update(data, data.id, List.of("covers"), new OverrideTableName(tableName));
+		} else if (ioDb instanceof final DBAccessMorphia dam) {
+
+		} else {
+			throw new DataAccessException("DataAccess Not managed");
+		}
+	}
+
+	public static void removeLink(
+			final DBAccess ioDb,
+			final Class<?> clazz,
+			final Long id,
+			final String column,
+			final UUID remoteKey) throws Exception {
+		if (ioDb instanceof final DBAccessSQL daSQL) {
+			final String tableName = AnnotationTools.getTableName(clazz);
+			final TableCoversLongUUID data = ioDb.get(TableCoversLongUUID.class, id, new OverrideTableName(tableName));
+			if (data.covers == null) {
+				return;
+			}
+			final List<UUID> newList = new ArrayList<>();
+			for (final UUID elem : data.covers) {
+				if (elem.equals(remoteKey)) {
+					continue;
+				}
+				newList.add(elem);
+			}
+			data.covers = newList;
+		} else if (ioDb instanceof final DBAccessMorphia dam) {
+			final String collectionName = AnnotationTools.getCollectionName(clazz);
+			final Field primaryfield = AnnotationTools.getPrimaryKeyField(clazz);
+			final String primaryFieldName = AnnotationTools.getFieldName(primaryfield);
+
+			final MongoCollection<Document> collection = dam.getInterface().getDatastore().getDatabase()
+					.getCollection(collectionName);
+			// retrieve previous value:
+			final Document ret = collection.find(Filters.eq(primaryFieldName, id)).first();
+			if (ret == null) {
+				throw new DataAccessException("Element does not exist ...");
+			}
+			final List<UUID> newList = new ArrayList<>();
+			final List listValues = ret.get(remoteKey, newList.getClass());
+			/*
+			final Document actions = new Document();
+
+			// update value:
+			final Document actions = new Document();
+			if (!docSet.isEmpty()) {
+				actions.append("$set", docSet);
+			}
+			if (!docUnSet.isEmpty()) {
+				actions.append("$unset", docUnSet);
+			}
+			LOGGER.info("update some values: {}", actions.toJson());
+			final UpdateResult ret = collection.updateMany(filters, actions);
+			return ret.getModifiedCount();
+
+			final TableCoversLongUUID data = ioDb.getDocument(tableName, id);
+			if (data.covers == null) {
+				return;
+			}
+			final List<UUID> newList = new ArrayList<>();
+			for (final UUID elem : data.covers) {
+				if (elem.equals(remoteKey)) {
+					continue;
+				}
+				newList.add(elem);
+			}
+			data.covers = newList;
+			*/
+		} else {
+			throw new DataAccessException("DataAccess Not managed");
+		}
+	}
+}

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

@@ -1,4 +1,4 @@
-package org.kar.archidata.dataAccess.addOn;
+package org.kar.archidata.dataAccess.addOnSQL;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
@@ -11,18 +11,19 @@ import java.util.UUID;
 
 import org.kar.archidata.annotation.AnnotationTools;
 import org.kar.archidata.dataAccess.CountInOut;
-import org.kar.archidata.dataAccess.DataAccess;
+import org.kar.archidata.dataAccess.DBAccess;
-import org.kar.archidata.dataAccess.DataAccessAddOn;
+import org.kar.archidata.dataAccess.DBAccessMorphia;
+import org.kar.archidata.dataAccess.DBAccessSQL;
 import org.kar.archidata.dataAccess.DataFactory;
 import org.kar.archidata.dataAccess.LazyGetter;
 import org.kar.archidata.dataAccess.QueryAnd;
 import org.kar.archidata.dataAccess.QueryCondition;
 import org.kar.archidata.dataAccess.QueryInList;
 import org.kar.archidata.dataAccess.QueryOptions;
-import org.kar.archidata.dataAccess.addOn.model.LinkTableLongLong;
+import org.kar.archidata.dataAccess.addOnSQL.model.LinkTableLongLong;
-import org.kar.archidata.dataAccess.addOn.model.LinkTableLongUUID;
+import org.kar.archidata.dataAccess.addOnSQL.model.LinkTableLongUUID;
-import org.kar.archidata.dataAccess.addOn.model.LinkTableUUIDLong;
+import org.kar.archidata.dataAccess.addOnSQL.model.LinkTableUUIDLong;
-import org.kar.archidata.dataAccess.addOn.model.LinkTableUUIDUUID;
+import org.kar.archidata.dataAccess.addOnSQL.model.LinkTableUUIDUUID;
 import org.kar.archidata.dataAccess.options.Condition;
 import org.kar.archidata.dataAccess.options.OverrideTableName;
 import org.kar.archidata.exception.DataAccessException;
@@ -56,8 +57,12 @@ public class AddOnManyToMany implements DataAccessAddOn {
 	}
 
 	@Override
-	public void insertData(final PreparedStatement ps, final Field field, final Object rootObject, final CountInOut iii)
+	public void insertData(
-			throws SQLException, IllegalArgumentException, IllegalAccessException {
+			final DBAccessSQL ioDb,
+			final PreparedStatement ps,
+			final Field field,
+			final Object rootObject,
+			final CountInOut iii) throws SQLException, IllegalArgumentException, IllegalAccessException {
 
 	}
 
@@ -209,6 +214,7 @@ public class AddOnManyToMany implements DataAccessAddOn {
 
 	@Override
 	public void fillFromQuery(
+			final DBAccessSQL ioDb,
 			final ResultSet rs,
 			final Field field,
 			final Object data,
@@ -222,12 +228,12 @@ public class AddOnManyToMany implements DataAccessAddOn {
 		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
 				.getActualTypeArguments()[0];
 		if (objectClass == Long.class) {
-			final List<Long> idList = DataAccess.getListOfIds(rs, count.value, SEPARATOR_LONG);
+			final List<Long> idList = ioDb.getListOfIds(rs, count.value, SEPARATOR_LONG);
 			field.set(data, idList);
 			count.inc();
 			return;
 		} else if (objectClass == UUID.class) {
-			final List<UUID> idList = DataAccess.getListOfRawUUIDs(rs, count.value);
+			final List<UUID> idList = ioDb.getListOfRawUUIDs(rs, count.value);
 			field.set(data, idList);
 			count.inc();
 			return;
@@ -241,7 +247,7 @@ public class AddOnManyToMany implements DataAccessAddOn {
 			if (decorators.fetch() == FetchType.EAGER) {
 				throw new DataAccessException("EAGER is not supported for list of element...");
 			} else if (foreignKeyType == Long.class) {
-				final List<Long> idList = DataAccess.getListOfIds(rs, count.value, SEPARATOR_LONG);
+				final List<Long> idList = ioDb.getListOfIds(rs, count.value, SEPARATOR_LONG);
 				// field.set(data, idList);
 				count.inc();
 				if (idList != null && idList.size() > 0) {
@@ -251,7 +257,7 @@ public class AddOnManyToMany implements DataAccessAddOn {
 						final List<Long> childs = new ArrayList<>(idList);
 						// TODO: update to have get with abstract types ....
 						@SuppressWarnings("unchecked")
-						final Object foreignData = DataAccess.getsWhere(decorators.targetEntity(),
+						final Object foreignData = ioDb.getsWhere(decorators.targetEntity(),
 								new Condition(new QueryInList<>(idField, childs)));
 						if (foreignData == null) {
 							return;
@@ -261,7 +267,7 @@ public class AddOnManyToMany implements DataAccessAddOn {
 					lazyCall.add(lambda);
 				}
 			} else if (foreignKeyType == UUID.class) {
-				final List<UUID> idList = DataAccess.getListOfRawUUIDs(rs, count.value);
+				final List<UUID> idList = ioDb.getListOfRawUUIDs(rs, count.value);
 				// field.set(data, idList);
 				count.inc();
 				if (idList != null && idList.size() > 0) {
@@ -271,7 +277,7 @@ public class AddOnManyToMany implements DataAccessAddOn {
 						final List<UUID> childs = new ArrayList<>(idList);
 						// TODO: update to have get with abstract types ....
 						@SuppressWarnings("unchecked")
-						final Object foreignData = DataAccess.getsWhere(decorators.targetEntity(),
+						final Object foreignData = ioDb.getsWhere(decorators.targetEntity(),
 								new Condition(new QueryInList<>(idField, childs)));
 						if (foreignData == null) {
 							return;
@@ -291,6 +297,7 @@ public class AddOnManyToMany implements DataAccessAddOn {
 
 	@Override
 	public void asyncUpdate(
+			final DBAccessSQL ioDb,
 			final String tableName,
 			final Object localKey,
 			final Field field,
@@ -312,30 +319,30 @@ public class AddOnManyToMany implements DataAccessAddOn {
 		if (localKey instanceof final Long localKeyLong) {
 			if (objectClass == Long.class) {
 				actions.add(() -> {
-					DataAccess.deleteWhere(LinkTableLongLong.class, new OverrideTableName(linkTableName),
+					ioDb.deleteWhere(LinkTableLongLong.class, new OverrideTableName(linkTableName),
 							new Condition(new QueryCondition("object1Id", "=", localKeyLong)));
 				});
-				asyncInsert(tableName, localKey, field, data, actions);
+				asyncInsert(ioDb, tableName, localKey, field, data, actions);
 			} else {
 				actions.add(() -> {
-					DataAccess.deleteWhere(LinkTableLongUUID.class, new OverrideTableName(linkTableName),
+					ioDb.deleteWhere(LinkTableLongUUID.class, new OverrideTableName(linkTableName),
 							new Condition(new QueryCondition("object1Id", "=", localKeyLong)));
 				});
-				asyncInsert(tableName, localKey, field, data, actions);
+				asyncInsert(ioDb, tableName, localKey, field, data, actions);
 			}
 		} else if (localKey instanceof final UUID localKeyUUID) {
 			if (objectClass == Long.class) {
 				actions.add(() -> {
-					DataAccess.deleteWhere(LinkTableUUIDLong.class, new OverrideTableName(linkTableName),
+					ioDb.deleteWhere(LinkTableUUIDLong.class, new OverrideTableName(linkTableName),
 							new Condition(new QueryCondition("object1Id", "=", localKeyUUID)));
 				});
-				asyncInsert(tableName, localKey, field, data, actions);
+				asyncInsert(ioDb, tableName, localKey, field, data, actions);
 			} else {
 				actions.add(() -> {
-					DataAccess.deleteWhere(LinkTableUUIDUUID.class, new OverrideTableName(linkTableName),
+					ioDb.deleteWhere(LinkTableUUIDUUID.class, new OverrideTableName(linkTableName),
 							new Condition(new QueryCondition("object1Id", "=", localKeyUUID)));
 				});
-				asyncInsert(tableName, localKey, field, data, actions);
+				asyncInsert(ioDb, tableName, localKey, field, data, actions);
 			}
 		}
 	}
@@ -347,6 +354,7 @@ public class AddOnManyToMany implements DataAccessAddOn {
 
 	@Override
 	public void asyncInsert(
+			final DBAccessSQL ioDb,
 			final String tableName,
 			final Object localKey,
 			final Field field,
@@ -389,7 +397,7 @@ public class AddOnManyToMany implements DataAccessAddOn {
 					return;
 				}
 				actions.add(() -> {
-					DataAccess.insertMultiple(insertElements, new OverrideTableName(linkTableName));
+					ioDb.insertMultiple(insertElements, new OverrideTableName(linkTableName));
 				});
 			} else {
 				// ========================================================
@@ -412,7 +420,7 @@ public class AddOnManyToMany implements DataAccessAddOn {
 					return;
 				}
 				actions.add(() -> {
-					DataAccess.insertMultiple(insertElements, new OverrideTableName(linkTableName));
+					ioDb.insertMultiple(insertElements, new OverrideTableName(linkTableName));
 				});
 			}
 		} else if (localKey instanceof final UUID localKeyUUID) {
@@ -437,7 +445,7 @@ public class AddOnManyToMany implements DataAccessAddOn {
 					return;
 				}
 				actions.add(() -> {
-					DataAccess.insertMultiple(insertElements, new OverrideTableName(linkTableName));
+					ioDb.insertMultiple(insertElements, new OverrideTableName(linkTableName));
 				});
 			} else {
 				// ========================================================
@@ -460,7 +468,7 @@ public class AddOnManyToMany implements DataAccessAddOn {
 					return;
 				}
 				actions.add(() -> {
-					DataAccess.insertMultiple(insertElements, new OverrideTableName(linkTableName));
+					ioDb.insertMultiple(insertElements, new OverrideTableName(linkTableName));
 				});
 			}
 		} else {
@@ -471,7 +479,7 @@ public class AddOnManyToMany implements DataAccessAddOn {
 	}
 
 	@Override
-	public void drop(final String tableName, final Field field) throws Exception {
+	public void drop(final DBAccessSQL ioDb, final String tableName, final Field field) throws Exception {
 		final String columnName = AnnotationTools.getFieldName(field);
 		final String linkTableName = generateLinkTableName(tableName, columnName);
 		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
@@ -480,11 +488,11 @@ public class AddOnManyToMany implements DataAccessAddOn {
 			throw new DataAccessException("Can not ManyToMany with other than List<Long> or List<UUID> Model: List<"
 					+ objectClass.getCanonicalName() + ">");
 		}
-		DataAccess.drop(LinkTableLongLong.class, new OverrideTableName(linkTableName));
+		ioDb.drop(LinkTableLongLong.class, new OverrideTableName(linkTableName));
 	}
 
 	@Override
-	public void cleanAll(final String tableName, final Field field) throws Exception {
+	public void cleanAll(final DBAccessSQL ioDb, final String tableName, final Field field) throws Exception {
 		final String columnName = AnnotationTools.getFieldName(field);
 		final String linkTableName = generateLinkTableName(tableName, columnName);
 		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType())
@@ -493,27 +501,47 @@ public class AddOnManyToMany implements DataAccessAddOn {
 			throw new DataAccessException("Can not ManyToMany with other than List<Long> or List<UUID> Model: List<"
 					+ objectClass.getCanonicalName() + ">");
 		}
-		DataAccess.cleanAll(LinkTableLongLong.class, new OverrideTableName(linkTableName));
+		ioDb.cleanAll(LinkTableLongLong.class, new OverrideTableName(linkTableName));
 	}
 
-	public static void addLink(final Class<?> clazz, final long localKey, final String column, final long remoteKey)
+	public static void addLink(
-			throws Exception {
+			final DBAccess ioDb,
+			final Class<?> clazz,
+			final long localKey,
+			final String column,
+			final long remoteKey) throws Exception {
+		if (ioDb instanceof final DBAccessSQL daSQL) {
 			final String tableName = AnnotationTools.getTableName(clazz);
 			final String linkTableName = generateLinkTableName(tableName, column);
 			/* final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[0]; if (objectClass != Long.class && objectClass != UUID.class) { throw new
 			 * DataAccessException("Can not ManyToMany with other than List<Long> or List<UUID> Model: List<" + objectClass.getCanonicalName() + ">"); } */
 			final LinkTableLongLong insertElement = new LinkTableLongLong(localKey, remoteKey);
-		DataAccess.insert(insertElement, new OverrideTableName(linkTableName));
+			daSQL.insert(insertElement, new OverrideTableName(linkTableName));
+		} else if (ioDb instanceof final DBAccessMorphia dam) {
+
+		} else {
+			throw new DataAccessException("DataAccess Not managed");
+		}
 
 	}
 
-	public static int removeLink(final Class<?> clazz, final long localKey, final String column, final long remoteKey)
+	public static long removeLink(
-			throws Exception {
+			final DBAccess ioDb,
+			final Class<?> clazz,
+			final long localKey,
+			final String column,
+			final long remoteKey) throws Exception {
+		if (ioDb instanceof final DBAccessSQL daSQL) {
 			final String tableName = AnnotationTools.getTableName(clazz);
 			final String linkTableName = generateLinkTableName(tableName, column);
-		return DataAccess.deleteWhere(LinkTableLongLong.class, new OverrideTableName(linkTableName),
+			return daSQL.deleteWhere(LinkTableLongLong.class, new OverrideTableName(linkTableName),
 					new Condition(new QueryAnd(new QueryCondition("object1Id", "=", localKey),
 							new QueryCondition("object2Id", "=", remoteKey))));
+		} else if (ioDb instanceof final DBAccessMorphia dam) {
+			return 0L;
+		} else {
+			throw new DataAccessException("DataAccess Not managed");
+		}
 	}
 
 	@Override

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

@@ -1,4 +1,4 @@
-package org.kar.archidata.dataAccess.addOn;
+package org.kar.archidata.dataAccess.addOnSQL;
 
 import java.lang.reflect.Field;
 import java.sql.PreparedStatement;
@@ -9,8 +9,7 @@ import java.util.UUID;
 
 import org.kar.archidata.annotation.AnnotationTools;
 import org.kar.archidata.dataAccess.CountInOut;
-import org.kar.archidata.dataAccess.DataAccess;
+import org.kar.archidata.dataAccess.DBAccessSQL;
-import org.kar.archidata.dataAccess.DataAccessAddOn;
 import org.kar.archidata.dataAccess.DataFactory;
 import org.kar.archidata.dataAccess.LazyGetter;
 import org.kar.archidata.dataAccess.QueryOptions;
@@ -48,8 +47,12 @@ public class AddOnManyToOne implements DataAccessAddOn {
 	}
 
 	@Override
-	public void insertData(final PreparedStatement ps, final Field field, final Object rootObject, final CountInOut iii)
+	public void insertData(
-			throws Exception {
+			final DBAccessSQL ioDb,
+			final PreparedStatement ps,
+			final Field field,
+			final Object rootObject,
+			final CountInOut iii) throws Exception {
 		final Object data = field.get(rootObject);
 		if (data == null) {
 			if (field.getType() == Long.class) {
@@ -149,7 +152,7 @@ public class AddOnManyToOne implements DataAccessAddOn {
 		if (field.getType() == decorators.targetEntity()) {
 			if (decorators.fetch() == FetchType.EAGER) {
 				// TODO: rework this to have a lazy mode ...
-				DataAccess.generateSelectField(querySelect, query, field.getType(), options, count);
+				DBAccessSQL.generateSelectField(querySelect, query, field.getType(), options, count);
 				final Class<?> subType = field.getType();
 				final String subTableName = AnnotationTools.getTableName(subType);
 				final Field idField = AnnotationTools.getFieldOfId(subType);
@@ -178,6 +181,7 @@ public class AddOnManyToOne implements DataAccessAddOn {
 
 	@Override
 	public void fillFromQuery(
+			final DBAccessSQL ioDb,
 			final ResultSet rs,
 			final Field field,
 			final Object data,
@@ -233,8 +237,8 @@ public class AddOnManyToOne implements DataAccessAddOn {
 		if (objectClass == decorators.targetEntity()) {
 			if (decorators.fetch() == FetchType.EAGER) {
 				final CountInOut countNotNull = new CountInOut(0);
-				final Object dataNew = DataAccess.createObjectFromSQLRequest(rs, objectClass, count, countNotNull,
+				final Object dataNew = ioDb.createObjectFromSQLRequest(rs, objectClass, count, countNotNull, options,
-						options, lazyCall);
+						lazyCall);
 				if (dataNew != null && countNotNull.value != 0) {
 					field.set(data, dataNew);
 				}
@@ -250,7 +254,7 @@ public class AddOnManyToOne implements DataAccessAddOn {
 					// In the lazy mode, the request is done in asynchronous mode, they will be done after...
 					final LazyGetter lambda = () -> {
 						// TODO: update to have get with abstract types ....
-						final Object foreignData = DataAccess.get(decorators.targetEntity(), foreignKey);
+						final Object foreignData = ioDb.get(decorators.targetEntity(), foreignKey);
 						if (foreignData == null) {
 							return;
 						}
@@ -260,13 +264,13 @@ public class AddOnManyToOne implements DataAccessAddOn {
 				}
 			} else if (remotePrimaryKeyType == UUID.class) {
 				// here we have the field, the data and the the remote value ==> can create callback that generate the update of the value ...
-				final UUID foreignKey = DataAccess.getListOfRawUUID(rs, count.value);
+				final UUID foreignKey = ioDb.getListOfRawUUID(rs, count.value);
 				count.inc();
 				if (foreignKey != null) {
 					// In the lazy mode, the request is done in asynchronous mode, they will be done after...
 					final LazyGetter lambda = () -> {
 						// TODO: update to have get with abstract types ....
-						final Object foreignData = DataAccess.get(decorators.targetEntity(), foreignKey);
+						final Object foreignData = ioDb.get(decorators.targetEntity(), foreignKey);
 						if (foreignData == null) {
 							return;
 						}

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

@@ -1,4 +1,4 @@
-package org.kar.archidata.dataAccess.addOn;
+package org.kar.archidata.dataAccess.addOnSQL;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
@@ -12,8 +12,7 @@ import java.util.stream.Collectors;
 
 import org.kar.archidata.annotation.AnnotationTools;
 import org.kar.archidata.dataAccess.CountInOut;
-import org.kar.archidata.dataAccess.DataAccess;
+import org.kar.archidata.dataAccess.DBAccessSQL;
-import org.kar.archidata.dataAccess.DataAccessAddOn;
 import org.kar.archidata.dataAccess.DataFactory;
 import org.kar.archidata.dataAccess.LazyGetter;
 import org.kar.archidata.dataAccess.QueryCondition;
@@ -83,8 +82,12 @@ public class AddOnOneToMany implements DataAccessAddOn {
 	}
 
 	@Override
-	public void insertData(final PreparedStatement ps, final Field field, final Object rootObject, final CountInOut iii)
+	public void insertData(
-			throws SQLException, IllegalArgumentException, IllegalAccessException {
+			final DBAccessSQL ioDb,
+			final PreparedStatement ps,
+			final Field field,
+			final Object rootObject,
+			final CountInOut iii) throws SQLException, IllegalArgumentException, IllegalAccessException {
 		throw new IllegalAccessException("Can not generate an inset of @OneToMany");
 	}
 
@@ -219,6 +222,7 @@ public class AddOnOneToMany implements DataAccessAddOn {
 
 	@Override
 	public void fillFromQuery(
+			final DBAccessSQL ioDb,
 			final ResultSet rs,
 			final Field field,
 			final Object data,
@@ -236,12 +240,12 @@ public class AddOnOneToMany implements DataAccessAddOn {
 			return;
 		}
 		if (objectClass == Long.class) {
-			final List<Long> idList = DataAccess.getListOfIds(rs, count.value, SEPARATOR_LONG);
+			final List<Long> idList = ioDb.getListOfIds(rs, count.value, SEPARATOR_LONG);
 			field.set(data, idList);
 			count.inc();
 			return;
 		} else if (objectClass == UUID.class) {
-			final List<UUID> idList = DataAccess.getListOfRawUUIDs(rs, count.value);
+			final List<UUID> idList = ioDb.getListOfRawUUIDs(rs, count.value);
 			field.set(data, idList);
 			count.inc();
 			return;
@@ -255,7 +259,7 @@ public class AddOnOneToMany implements DataAccessAddOn {
 				parentIdTmp = Long.valueOf(modelData);
 				count.inc();
 			} catch (final NumberFormatException ex) {
-				final List<UUID> idList = DataAccess.getListOfRawUUIDs(rs, count.value);
+				final List<UUID> idList = ioDb.getListOfRawUUIDs(rs, count.value);
 				parendUuidTmp = idList.get(0);
 				count.inc();
 			}
@@ -279,7 +283,7 @@ public class AddOnOneToMany implements DataAccessAddOn {
 					// In the lazy mode, the request is done in asynchronous mode, they will be done after...
 					final LazyGetter lambda = () -> {
 						@SuppressWarnings("unchecked")
-						final Object foreignData = DataAccess.getsWhere(decorators.targetEntity(),
+						final Object foreignData = ioDb.getsWhere(decorators.targetEntity(),
 								new Condition(new QueryCondition(mappingKey, "=", parentId)));
 						if (foreignData == null) {
 							return;
@@ -290,7 +294,7 @@ public class AddOnOneToMany implements DataAccessAddOn {
 				} else if (parendUuid != null) {
 					final LazyGetter lambda = () -> {
 						@SuppressWarnings("unchecked")
-						final Object foreignData = DataAccess.getsWhere(decorators.targetEntity(),
+						final Object foreignData = ioDb.getsWhere(decorators.targetEntity(),
 								new Condition(new QueryCondition(mappingKey, "=", parendUuid)));
 						if (foreignData == null) {
 							return;

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

@@ -1,4 +1,4 @@
-package org.kar.archidata.dataAccess;
+package org.kar.archidata.dataAccess.addOnSQL;
 
 import java.lang.reflect.Field;
 import java.sql.PreparedStatement;
@@ -6,6 +6,11 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
 
+import org.kar.archidata.dataAccess.CountInOut;
+import org.kar.archidata.dataAccess.DBAccessSQL;
+import org.kar.archidata.dataAccess.LazyGetter;
+import org.kar.archidata.dataAccess.QueryOptions;
+
 import jakarta.validation.constraints.NotNull;
 
 public interface DataAccessAddOn {
@@ -29,7 +34,7 @@ public interface DataAccessAddOn {
 	 * @param iii The index of injection
 	 * @return the new index of injection in case of multiple value management
 	 * @throws SQLException */
-	void insertData(PreparedStatement ps, final Field field, Object data, CountInOut iii)
+	void insertData(final DBAccessSQL ioDb, PreparedStatement ps, final Field field, Object data, CountInOut iii)
 			throws Exception, SQLException, IllegalArgumentException, IllegalAccessException;
 
 	/** Element can insert in the single request
@@ -58,6 +63,7 @@ public interface DataAccessAddOn {
 
 	// Return the number of colomn read
 	void fillFromQuery(
+			final DBAccessSQL ioDb,
 			ResultSet rs,
 			Field field,
 			Object data,
@@ -100,6 +106,7 @@ public interface DataAccessAddOn {
 	 * @param data Data that might be inserted.
 	 * @param actions Asynchronous action to do after main request. */
 	default void asyncInsert(
+			final DBAccessSQL ioDb,
 			final String tableName,
 			final Object localId,
 			final Field field,
@@ -122,6 +129,7 @@ public interface DataAccessAddOn {
 	 * @param data Data that might be inserted.
 	 * @param actions Asynchronous action to do after main request. */
 	default void asyncUpdate(
+			final DBAccessSQL ioDb,
 			final String tableName,
 			final Object localId,
 			final Field field,
@@ -130,11 +138,11 @@ public interface DataAccessAddOn {
 
 	}
 
-	default void drop(final String tableName, final Field field) throws Exception {
+	default void drop(final DBAccessSQL ioDb, final String tableName, final Field field) throws Exception {
 
 	}
 
-	default void cleanAll(final String tableName, final Field field) throws Exception {
+	default void cleanAll(final DBAccessSQL ioDb, final String tableName, final Field field) throws Exception {
 
 	}
 

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

@@ -1,4 +1,4 @@
-package org.kar.archidata.dataAccess.addOn.model;
+package org.kar.archidata.dataAccess.addOnSQL.model;
 
 import org.kar.archidata.model.UUIDGenericDataSoftDelete;
 

src/org/kar/archidata/dataAccess/addOnSQL/model/LinkTableLongUUID.java

@@ -1,4 +1,4 @@
-package org.kar.archidata.dataAccess.addOn.model;
+package org.kar.archidata.dataAccess.addOnSQL.model;
 
 import java.util.UUID;
 

src/org/kar/archidata/dataAccess/addOnSQL/model/LinkTableUUIDLong.java

@@ -1,4 +1,4 @@
-package org.kar.archidata.dataAccess.addOn.model;
+package org.kar.archidata.dataAccess.addOnSQL.model;
 
 import java.util.UUID;
 

src/org/kar/archidata/dataAccess/addOnSQL/model/LinkTableUUIDUUID.java

@@ -1,4 +1,4 @@
-package org.kar.archidata.dataAccess.addOn.model;
+package org.kar.archidata.dataAccess.addOnSQL.model;
 
 import java.util.UUID;
 

src/org/kar/archidata/dataAccess/addOnSQL/model/TableCoversLongLong.java

@@ -1,4 +1,4 @@
-package org.kar.archidata.dataAccess.addOn.model;
+package org.kar.archidata.dataAccess.addOnSQL.model;
 
 import java.util.List;
 

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

@@ -1,4 +1,4 @@
-package org.kar.archidata.dataAccess.addOn.model;
+package org.kar.archidata.dataAccess.addOnSQL.model;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package org.kar.archidata.dataAccess.addOn.model;
+package org.kar.archidata.dataAccess.addOnSQL.model;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package org.kar.archidata.dataAccess.addOn.model;
+package org.kar.archidata.dataAccess.addOnSQL.model;
 
 import java.util.List;
 import java.util.UUID;

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

@@ -3,6 +3,7 @@ package org.kar.archidata.dataAccess.options;
 import java.util.List;
 
 import org.kar.archidata.annotation.AnnotationTools;
+import org.kar.archidata.dataAccess.DBAccess;
 import org.kar.archidata.dataAccess.QueryOptions;
 
 /** By default some element are not read like createAt and UpdatedAt. This option permit to read it. */
@@ -12,11 +13,16 @@ public interface CheckFunctionInterface {
 	 * @param data The object that might be injected.
 	 * @param filterValue List of fields that might be check. If null, then all column must be checked.
 	 * @throws Exception Exception is generate if the data are incorrect. */
-	void check(final String baseName, Object data, List<String> filterValue, final QueryOptions options)
+	void check(
-			throws Exception;
+			final DBAccess ioDb,
+			final String baseName,
+			Object data,
+			List<String> filterValue,
+			final QueryOptions options) throws Exception;
 
-	default void checkAll(final String baseName, final Object data, final QueryOptions options) throws Exception {
+	default void checkAll(final DBAccess ioDb, final String baseName, final Object data, final QueryOptions options)
-		check(baseName, data, AnnotationTools.getAllFieldsNames(data.getClass()), options);
+			throws Exception {
+		check(ioDb, baseName, data, AnnotationTools.getAllFieldsNames(data.getClass()), options);
 	}
 
 }

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

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

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

@@ -14,7 +14,7 @@ import java.util.regex.Pattern;
 
 import org.kar.archidata.annotation.AnnotationTools;
 import org.kar.archidata.annotation.DataJson;
-import org.kar.archidata.dataAccess.DataAccess;
+import org.kar.archidata.dataAccess.DBAccess;
 import org.kar.archidata.dataAccess.QueryCondition;
 import org.kar.archidata.dataAccess.QueryOptions;
 import org.kar.archidata.exception.DataAccessException;
@@ -38,7 +38,7 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 		 * @param data The object that might be injected.
 		 * @param filterValue List of fields that might be check. If null, then all column must be checked.
 		 * @throws Exception Exception is generate if the data are incorrect. */
-		void check(final String baseName, final K data, final QueryOptions options) throws Exception;
+		void check(DBAccess ioDb, final String baseName, final K data, final QueryOptions options) throws Exception;
 	}
 
 	protected Map<String, List<CheckInterface<T>>> checking = null;
@@ -67,20 +67,35 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 			for (final Field field : this.clazz.getFields()) {
 				final String fieldName = field.getName(); // AnnotationTools.getFieldName(field);
 				if (AnnotationTools.isPrimaryKey(field)) {
-					add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
+					add(fieldName,
+							(
+									final DBAccess ioDb,
+									final String baseName,
+									final T data,
+									final QueryOptions options) -> {
 								throw new InputException(baseName + fieldName,
 										"This is a '@Id' (primaryKey) ==> can not be change");
 							});
 				}
 				if (AnnotationTools.getConstraintsNotNull(field)) {
-					add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
+					add(fieldName,
+							(
+									final DBAccess ioDb,
+									final String baseName,
+									final T data,
+									final QueryOptions options) -> {
 								if (field.get(data) == null) {
 									throw new InputException(baseName + fieldName, "Can not be null");
 								}
 							});
 				}
 				if (AnnotationTools.isCreatedAtField(field) || AnnotationTools.isUpdateAtField(field)) {
-					add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
+					add(fieldName,
+							(
+									final DBAccess ioDb,
+									final String baseName,
+									final T data,
+									final QueryOptions options) -> {
 								throw new InputException(baseName + fieldName, "It is forbidden to change this field");
 							});
 				}
@@ -89,33 +104,50 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 				if (type == Long.class || type == long.class) {
 					final Long maxValue = AnnotationTools.getConstraintsMax(field);
 					if (maxValue != null) {
-						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
+						add(fieldName,
+								(
+										final DBAccess ioDb,
+										final String baseName,
+										final T data,
+										final QueryOptions options) -> {
 									final Object elem = field.get(data);
 									if (elem == null) {
 										return;
 									}
 									final Long elemTyped = (Long) elem;
 									if (elemTyped > maxValue) {
-								throw new InputException(baseName + fieldName, "Value too height max: " + maxValue);
+										throw new InputException(baseName + fieldName,
+												"Value too height max: " + maxValue);
 									}
 								});
 					}
 					final Long minValue = AnnotationTools.getConstraintsMin(field);
 					if (minValue != null) {
-						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
+						add(fieldName,
+								(
+										final DBAccess ioDb,
+										final String baseName,
+										final T data,
+										final QueryOptions options) -> {
 									final Object elem = field.get(data);
 									if (elem == null) {
 										return;
 									}
 									final Long elemTyped = (Long) elem;
 									if (elemTyped < minValue) {
-								throw new InputException(baseName + fieldName, "Value too Low min: " + minValue);
+										throw new InputException(baseName + fieldName,
+												"Value too Low min: " + minValue);
 									}
 								});
 					}
 					final ManyToOne annotationManyToOne = AnnotationTools.getManyToOne(field);
 					if (annotationManyToOne != null && annotationManyToOne.targetEntity() != null) {
-						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
+						add(fieldName,
+								(
+										final DBAccess ioDb,
+										final String baseName,
+										final T data,
+										final QueryOptions options) -> {
 									final Object elem = field.get(data);
 									if (elem == null) {
 										return;
@@ -123,7 +155,7 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 									final List<ConditionChecker> condCheckers = options.get(ConditionChecker.class);
 									final Condition conditionCheck = condCheckers.isEmpty() ? null
 											: condCheckers.get(0).toCondition();
-							final long count = DataAccess.count(annotationManyToOne.targetEntity(), elem,
+									final long count = ioDb.count(annotationManyToOne.targetEntity(), elem,
 											conditionCheck);
 									if (count == 0) {
 										throw new InputException(baseName + fieldName,
@@ -136,39 +168,56 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 					final Long maxValueRoot = AnnotationTools.getConstraintsMax(field);
 					if (maxValueRoot != null) {
 						final int maxValue = maxValueRoot.intValue();
-						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
+						add(fieldName,
+								(
+										final DBAccess ioDb,
+										final String baseName,
+										final T data,
+										final QueryOptions options) -> {
 									final Object elem = field.get(data);
 									if (elem == null) {
 										return;
 									}
 									final Integer elemTyped = (Integer) elem;
 									if (elemTyped > maxValue) {
-								throw new InputException(baseName + fieldName, "Value too height max: " + maxValue);
+										throw new InputException(baseName + fieldName,
+												"Value too height max: " + maxValue);
 									}
 								});
 					}
 					final Long minValueRoot = AnnotationTools.getConstraintsMin(field);
 					if (minValueRoot != null) {
 						final int minValue = minValueRoot.intValue();
-						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
+						add(fieldName,
+								(
+										final DBAccess ioDb,
+										final String baseName,
+										final T data,
+										final QueryOptions options) -> {
 									final Object elem = field.get(data);
 									if (elem == null) {
 										return;
 									}
 									final Integer elemTyped = (Integer) elem;
 									if (elemTyped < minValue) {
-								throw new InputException(baseName + fieldName, "Value too Low min: " + minValue);
+										throw new InputException(baseName + fieldName,
+												"Value too Low min: " + minValue);
 									}
 								});
 					}
 					final ManyToOne annotationManyToOne = AnnotationTools.getManyToOne(field);
 					if (annotationManyToOne != null && annotationManyToOne.targetEntity() != null) {
-						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
+						add(fieldName,
+								(
+										final DBAccess ioDb,
+										final String baseName,
+										final T data,
+										final QueryOptions options) -> {
 									final Object elem = field.get(data);
 									if (elem == null) {
 										return;
 									}
-							final long count = DataAccess.count(annotationManyToOne.targetEntity(), elem);
+									final long count = ioDb.count(annotationManyToOne.targetEntity(), elem);
 									if (count == 0) {
 										throw new InputException(baseName + fieldName,
 												"Foreign element does not exist in the DB:" + elem);
@@ -178,12 +227,17 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 				} else if (type == UUID.class) {
 					final ManyToOne annotationManyToOne = AnnotationTools.getManyToOne(field);
 					if (annotationManyToOne != null && annotationManyToOne.targetEntity() != null) {
-						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
+						add(fieldName,
+								(
+										final DBAccess ioDb,
+										final String baseName,
+										final T data,
+										final QueryOptions options) -> {
 									final Object elem = field.get(data);
 									if (elem == null) {
 										return;
 									}
-							final long count = DataAccess.count(annotationManyToOne.targetEntity(), elem);
+									final long count = ioDb.count(annotationManyToOne.targetEntity(), elem);
 									if (count == 0) {
 										throw new InputException(baseName + fieldName,
 												"Foreign element does not exist in the DB:" + elem);
@@ -196,28 +250,40 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 					final Long maxValueRoot = AnnotationTools.getConstraintsMax(field);
 					if (maxValueRoot != null) {
 						final float maxValue = maxValueRoot.floatValue();
-						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
+						add(fieldName,
+								(
+										final DBAccess ioDb,
+										final String baseName,
+										final T data,
+										final QueryOptions options) -> {
 									final Object elem = field.get(data);
 									if (elem == null) {
 										return;
 									}
 									final Float elemTyped = (Float) elem;
 									if (elemTyped > maxValue) {
-								throw new InputException(baseName + fieldName, "Value too height max: " + maxValue);
+										throw new InputException(baseName + fieldName,
+												"Value too height max: " + maxValue);
 									}
 								});
 					}
 					final Long minValueRoot = AnnotationTools.getConstraintsMin(field);
 					if (minValueRoot != null) {
 						final float minValue = minValueRoot.floatValue();
-						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
+						add(fieldName,
+								(
+										final DBAccess ioDb,
+										final String baseName,
+										final T data,
+										final QueryOptions options) -> {
 									final Object elem = field.get(data);
 									if (elem == null) {
 										return;
 									}
 									final Float elemTyped = (Float) elem;
 									if (elemTyped < minValue) {
-								throw new InputException(baseName + fieldName, "Value too Low min: " + minValue);
+										throw new InputException(baseName + fieldName,
+												"Value too Low min: " + minValue);
 									}
 								});
 					}
@@ -225,28 +291,40 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 					final Long maxValueRoot = AnnotationTools.getConstraintsMax(field);
 					if (maxValueRoot != null) {
 						final double maxValue = maxValueRoot.doubleValue();
-						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
+						add(fieldName,
+								(
+										final DBAccess ioDb,
+										final String baseName,
+										final T data,
+										final QueryOptions options) -> {
 									final Object elem = field.get(data);
 									if (elem == null) {
 										return;
 									}
 									final Double elemTyped = (Double) elem;
 									if (elemTyped > maxValue) {
-								throw new InputException(baseName + fieldName, "Value too height max: " + maxValue);
+										throw new InputException(baseName + fieldName,
+												"Value too height max: " + maxValue);
 									}
 								});
 					}
 					final Long minValueRoot = AnnotationTools.getConstraintsMin(field);
 					if (minValueRoot != null) {
 						final double minValue = minValueRoot.doubleValue();
-						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
+						add(fieldName,
+								(
+										final DBAccess ioDb,
+										final String baseName,
+										final T data,
+										final QueryOptions options) -> {
 									final Object elem = field.get(data);
 									if (elem == null) {
 										return;
 									}
 									final Double elemTyped = (Double) elem;
 									if (elemTyped < minValue) {
-								throw new InputException(baseName + fieldName, "Value too Low min: " + minValue);
+										throw new InputException(baseName + fieldName,
+												"Value too Low min: " + minValue);
 									}
 								});
 					}
@@ -259,7 +337,12 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 				} else if (type == String.class) {
 					final int maxSizeString = AnnotationTools.getLimitSize(field);
 					if (maxSizeString > 0) {
-						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
+						add(fieldName,
+								(
+										final DBAccess ioDb,
+										final String baseName,
+										final T data,
+										final QueryOptions options) -> {
 									final Object elem = field.get(data);
 									if (elem == null) {
 										return;
@@ -273,7 +356,12 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 					}
 					final Size limitSize = AnnotationTools.getConstraintsSize(field);
 					if (limitSize != null) {
-						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
+						add(fieldName,
+								(
+										final DBAccess ioDb,
+										final String baseName,
+										final T data,
+										final QueryOptions options) -> {
 									final Object elem = field.get(data);
 									if (elem == null) {
 										return;
@@ -292,7 +380,12 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 					final String patternString = AnnotationTools.getConstraintsPattern(field);
 					if (patternString != null) {
 						final Pattern pattern = Pattern.compile(patternString);
-						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
+						add(fieldName,
+								(
+										final DBAccess ioDb,
+										final String baseName,
+										final T data,
+										final QueryOptions options) -> {
 									final Object elem = field.get(data);
 									if (elem == null) {
 										return;
@@ -300,8 +393,8 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 									final String elemTyped = (String) elem;
 									if (!pattern.matcher(elemTyped).find()) {
 										throw new InputException(baseName + fieldName,
-										"does not match the required pattern (constraints) must be '" + patternString
+												"does not match the required pattern (constraints) must be '"
-												+ "'");
+														+ patternString + "'");
 									}
 								});
 					}
@@ -311,8 +404,13 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 						// Here if we have an error it crash at start and no new instance after creation...
 						final CheckFunctionInterface instance = jsonAnnotation.checker().getDeclaredConstructor()
 								.newInstance();
-						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
+						add(fieldName,
-							instance.checkAll(baseName + fieldName + ".", field.get(data), options);
+								(
+										final DBAccess ioDb,
+										final String baseName,
+										final T data,
+										final QueryOptions options) -> {
+									instance.checkAll(ioDb, baseName + fieldName + ".", field.get(data), options);
 								});
 					}
 				} else if (type.isEnum()) {
@@ -321,14 +419,19 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 				// keep this is last ==> take more time...
 				if (AnnotationTools.isUnique(field)) {
 					// Create the request ...
-					add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
+					add(fieldName,
+							(
+									final DBAccess ioDb,
+									final String baseName,
+									final T data,
+									final QueryOptions options) -> {
 								final List<ConditionChecker> condCheckers = options.get(ConditionChecker.class);
 								Object other = null;
 								if (condCheckers.isEmpty()) {
-							other = DataAccess.getWhere(this.clazz,
+									other = ioDb.getWhere(this.clazz,
 											new Condition(new QueryCondition(fieldName, "==", field.get(data))));
 								} else {
-							other = DataAccess.getWhere(this.clazz,
+									other = ioDb.getWhere(this.clazz,
 											new Condition(new QueryCondition(fieldName, "==", field.get(data))),
 											condCheckers.get(0).toCondition());
 								}
@@ -345,8 +448,18 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 		}
 	}
 
+	public void check(final DBAccess ioDb, final String baseName, final Object data) throws Exception {
+		check(ioDb, baseName, data, null, null);
+	}
+
+	public void check(final DBAccess ioDb, final String baseName, final Object data, final List<String> filterValue)
+			throws Exception {
+		check(ioDb, baseName, data, filterValue, null);
+	}
+
 	@Override
 	public void check(
+			final DBAccess ioDb,
 			final String baseName,
 			final Object data,
 			final List<String> filterValue,
@@ -365,7 +478,7 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 				continue;
 			}
 			for (final CheckInterface<T> action : actions) {
-				action.check(baseName, dataCasted, options);
+				action.check(ioDb, baseName, dataCasted, options);
 			}
 		}
 		checkTyped(dataCasted, filterValue, options);

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

@@ -1,11 +1,17 @@
 package org.kar.archidata.dataAccess.options;
 
 import java.sql.PreparedStatement;
+import java.util.ArrayList;
+import java.util.List;
 
+import org.bson.conversions.Bson;
 import org.kar.archidata.dataAccess.CountInOut;
+import org.kar.archidata.dataAccess.DBAccessSQL;
 import org.kar.archidata.dataAccess.QueryItem;
 import org.kar.archidata.dataAccess.QueryOptions;
 
+import com.mongodb.client.model.Filters;
+
 /** By default some element are not read like createAt and UpdatedAt. This option permit to read it. */
 public class Condition extends QueryOption {
 	public final QueryItem condition;
@@ -24,9 +30,10 @@ public class Condition extends QueryOption {
 		}
 	}
 
-	public void injectQuery(final PreparedStatement ps, final CountInOut iii) throws Exception {
+	public void injectQuery(final DBAccessSQL ioDb, final PreparedStatement ps, final CountInOut iii)
+			throws Exception {
 		if (this.condition != null) {
-			this.condition.injectQuery(ps, iii);
+			this.condition.injectQuery(ioDb, ps, iii);
 		}
 	}
 
@@ -62,4 +69,26 @@ public class Condition extends QueryOption {
 		}
 		query.append("\n");
 	}
+
+	public Bson getFilter(final String collectionName, final QueryOptions options, final String deletedFieldName) {
+		boolean exclude_deleted = true;
+		if (options != null) {
+			exclude_deleted = !options.exist(AccessDeletedItems.class);
+		}
+		final List<Bson> filter = new ArrayList<>();
+		if (exclude_deleted && deletedFieldName != null) {
+			filter.add(Filters.eq(deletedFieldName, false));
+		}
+		// Check if we have a condition to generate
+		if (this.condition != null) {
+			this.condition.generateFilter(filter);
+		}
+		if (filter.size() == 0) {
+			return null;
+		}
+		if (filter.size() == 1) {
+			return filter.get(0);
+		}
+		return Filters.and(filter.toArray(new Bson[0]));
+	}
 }

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

@@ -1,14 +1,8 @@
 package org.kar.archidata.dataAccess.options;
 
-import java.io.IOException;
+@Deprecated
-import java.util.List;
-
-import org.kar.archidata.GlobalConfiguration;
-import org.kar.archidata.dataAccess.QueryOptions;
-import org.kar.archidata.db.DBConfig;
-import org.kar.archidata.db.DBEntry;
-
 public class DBInterfaceOption extends QueryOption {
+	/*
 	private DBEntry entry = null;
 	private final DBConfig config;
 	private final boolean root;
@@ -47,5 +41,6 @@ public class DBInterfaceOption extends QueryOption {
 			return dbOption.get(0).getEntry(options);
 		}
 	}
+	*/
 
 }

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

@@ -3,7 +3,7 @@ package org.kar.archidata.dataAccess.options;
 import java.sql.PreparedStatement;
 
 import org.kar.archidata.dataAccess.CountInOut;
-import org.kar.archidata.dataAccess.DataAccess;
+import org.kar.archidata.dataAccess.DBAccessSQL;
 
 public class Limit extends QueryOption {
 	protected final long limit;
@@ -16,8 +16,13 @@ public class Limit extends QueryOption {
 		query.append(" LIMIT ? \n");
 	}
 
-	public void injectQuery(final PreparedStatement ps, final CountInOut iii) throws Exception {
+	public void injectQuery(final DBAccessSQL ioDb, final PreparedStatement ps, final CountInOut iii)
-		DataAccess.addElement(ps, this.limit, iii);
+			throws Exception {
+		ioDb.addElement(ps, this.limit, iii);
 		iii.inc();
 	}
+
+	public long getValue() {
+		return this.limit;
+	}
 }

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

@@ -3,7 +3,9 @@ package org.kar.archidata.dataAccess.options;
 import java.sql.PreparedStatement;
 import java.util.List;
 
+import org.bson.Document;
 import org.kar.archidata.dataAccess.CountInOut;
+import org.kar.archidata.dataAccess.options.OrderItem.Order;
 
 public class OrderBy extends QueryOption {
 	protected final List<OrderItem> childs;
@@ -40,4 +42,10 @@ public class OrderBy extends QueryOption {
 	public void injectQuery(final PreparedStatement ps, final CountInOut iii) throws Exception {
 		// nothing to add.
 	}
+
+	public void generateSort(final Document data) {
+		for (final OrderItem elem : this.childs) {
+			data.append(elem.value, elem.order == Order.ASC ? 1 : -1);
+		}
+	}
 }

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

@@ -1,11 +1,12 @@
 package org.kar.archidata.db;
 
-import org.kar.archidata.dataAccess.DataAccess;
+import org.kar.archidata.dataAccess.DBAccess;
+import org.kar.archidata.exception.DataAccessException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class DBConfig {
-	static final Logger LOGGER = LoggerFactory.getLogger(DataAccess.class);
+	static final Logger LOGGER = LoggerFactory.getLogger(DBAccess.class);
 	private final String type;
 	private final String hostname;
 	private final int port;
@@ -15,10 +16,13 @@ public class DBConfig {
 	private final boolean keepConnected;
 
 	public DBConfig(final String type, final String hostname, final Integer port, final String login,
-			final String password, final String dbName, final boolean keepConnected) {
+			final String password, final String dbName, final boolean keepConnected) throws DataAccessException {
 		if (type == null) {
 			this.type = "mysql";
 		} else {
+			if (!"mysql".equals(type) && !"sqlite".equals(type) && !"mongo".equals(type)) {
+				throw new DataAccessException("unexpected DB type: '" + type + "'");
+			}
 			this.type = type;
 		}
 		if (hostname == null) {
@@ -27,7 +31,11 @@ public class DBConfig {
 			this.hostname = hostname;
 		}
 		if (port == null) {
+			if ("mysql".equals(this.type)) {
 				this.port = 3306;
+			} else {
+				this.port = 27017;
+			}
 		} else {
 			this.port = port;
 		}
@@ -35,6 +43,7 @@ public class DBConfig {
 		this.password = password;
 		this.dbName = dbName;
 		this.keepConnected = keepConnected;
+
 	}
 
 	@Override
@@ -48,6 +57,10 @@ public class DBConfig {
 		return this.hostname;
 	}
 
+	public String getType() {
+		return this.type;
+	}
+
 	public int getPort() {
 		return this.port;
 	}
@@ -82,6 +95,10 @@ public class DBConfig {
 			}
 			return "jdbc:sqlite:" + this.hostname + ".db";
 		}
+		if ("mongo".equals(this.type)) {
+			return "mongodb://" + getLogin() + ":" + getPassword() + "@" + this.hostname + ":" + this.port;
+		}
+		if ("mysql".equals(this.type)) {
 			if (isRoot) {
 				return "jdbc:" + this.type + "://" + this.hostname + ":" + this.port
 						+ "/?allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=UTC";
@@ -89,4 +106,6 @@ public class DBConfig {
 			return "jdbc:" + this.type + "://" + this.hostname + ":" + this.port + "/" + this.dbName
 					+ "?allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=UTC";
 		}
+		return "dead_code";
+	}
 }

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

@@ -1,95 +0,0 @@
-package org.kar.archidata.db;
-
-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 org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-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<>();
-
-	private DBEntry(final DBConfig config, final boolean root) throws IOException {
-		this.config = config;
-		if (root) {
-			connectRoot();
-		} else {
-			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 {
-			this.connection = DriverManager.getConnection(this.config.getUrl(true), this.config.getLogin(),
-					this.config.getPassword());
-		} catch (final SQLException ex) {
-			throw new IOException("Connection db fail: " + ex.getMessage() + " On URL: " + this.config.getUrl(true));
-		}
-
-	}
-
-	public void connect() throws IOException {
-		try {
-			this.connection = DriverManager.getConnection(this.config.getUrl(), this.config.getLogin(),
-					this.config.getPassword());
-		} catch (final SQLException ex) {
-			LOGGER.error("Connection db fail: " + ex.getMessage() + " On URL: " + this.config.getUrl(true));
-			throw new IOException("Connection db fail: " + ex.getMessage() + " On URL: " + this.config.getUrl(true));
-		}
-
-	}
-
-	@Override
-	public void close() throws IOException {
-		if (this.config.getKeepConnected()) {
-			return;
-		}
-		closeForce();
-	}
-
-	public void closeForce() throws IOException {
-		try {
-			// connection.commit();
-			this.connection.close();
-		} catch (final SQLException ex) {
-			throw new IOException("Dis-connection db fail: " + ex.getMessage());
-		}
-	}
-
-	public static void closeAllForceMode() throws IOException {
-		for (final DBEntry entry : stored) {
-			entry.closeForce();
-		}
-		stored = new ArrayList<>();
-	}
-}

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

@@ -0,0 +1,76 @@
+package org.kar.archidata.db;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DBInterfaceFactory implements Closeable {
+	final static Logger LOGGER = LoggerFactory.getLogger(DBInterfaceFactory.class);
+	private final DBConfig config;
+	private DbInterface ioDb;
+	private Class<?> classes[] = {};
+	private static List<DBInterfaceFactory> stored = new ArrayList<>();
+
+	private DBInterfaceFactory(final DBConfig config, final Class<?>... classes) throws IOException {
+		this.config = config;
+		this.classes = classes;
+		connect();
+	}
+
+	public static DBInterfaceFactory create(final DBConfig config, final Class<?>... classes) throws IOException {
+		if (config.getKeepConnected()) {
+			for (final DBInterfaceFactory elem : stored) {
+				if (elem == null) {
+					continue;
+				}
+				if (elem.config.getUrl().equals(config.getUrl())) {
+					return elem;
+				}
+			}
+			final DBInterfaceFactory tmp = new DBInterfaceFactory(config);
+			stored.add(tmp);
+			return tmp;
+		} else {
+			return new DBInterfaceFactory(config, classes);
+		}
+	}
+
+	public void connect() throws IOException {
+		if ("mysql".equals(this.config.getType())) {
+			this.ioDb = new DbInterfaceSQL(this.config);
+		} else if ("sqlite".equals(this.config.getType())) {
+			this.ioDb = new DbInterfaceSQL(this.config);
+		} else if ("mongo".equals(this.config.getType())) {
+			this.ioDb = new DbInterfaceMorphia(this.config, this.classes);
+		} else {
+			throw new IOException("DB type: '" + this.config.getType() + "'is not managed");
+		}
+	}
+
+	@Override
+	public void close() throws IOException {
+		if (this.config.getKeepConnected()) {
+			return;
+		}
+		closeForce();
+	}
+
+	public void closeForce() throws IOException {
+		this.ioDb.close();
+	}
+
+	public DbInterface getDbInterface() {
+		return this.ioDb;
+	}
+
+	public static void closeAllForceMode() throws IOException {
+		for (final DBInterfaceFactory entry : stored) {
+			entry.closeForce();
+		}
+		stored = new ArrayList<>();
+	}
+}

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

@@ -0,0 +1,16 @@
+package org.kar.archidata.db;
+
+import java.io.Closeable;
+import java.io.IOException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DbInterface implements Closeable {
+	private final static Logger LOGGER = LoggerFactory.getLogger(DbInterface.class);
+
+	@Override
+	public void close() throws IOException {
+		LOGGER.error("Check db interface close implementation !!! " + this.getClass().getCanonicalName());
+	}
+}

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

@@ -0,0 +1,78 @@
+package org.kar.archidata.db;
+
+import java.io.Closeable;
+import java.io.IOException;
+
+import org.bson.UuidRepresentation;
+import org.bson.codecs.configuration.CodecRegistries;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.codecs.pojo.PojoCodecProvider;
+import org.kar.archidata.converter.morphia.SqlTimestampCodec;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.mongodb.ConnectionString;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+
+import dev.morphia.Datastore;
+import dev.morphia.Morphia;
+
+public class DbInterfaceMorphia extends DbInterface implements Closeable {
+	private final static Logger LOGGER = LoggerFactory.getLogger(DbInterfaceMorphia.class);
+	private final MongoClient mongoClient;
+	private final Datastore datastore;
+
+	public DbInterfaceMorphia(final DBConfig config, final Class<?>... classes) throws IOException {
+		this(config.getUrl(), config.getDbName(), classes);
+	}
+
+	public DbInterfaceMorphia(final String dbUrl, final String dbName, final Class<?>... classes) {
+		// Connect to MongoDB (simple form):
+		// final MongoClient mongoClient = MongoClients.create(dbUrl);
+		LOGGER.info("Connect on the DB: {}", dbUrl);
+		// Connect to MongoDB (complex form):
+		final ConnectionString connectionString = new ConnectionString(dbUrl);
+		// Créer un CodecRegistry pour UUID
+		//final CodecRegistry uuidCodecRegistry = CodecRegistries.fromCodecs(new UUIDCodec());
+		final CodecRegistry SqlTimestampCodecRegistry = CodecRegistries.fromCodecs(new SqlTimestampCodec());
+		// Créer un CodecRegistry pour POJOs
+		final CodecRegistry pojoCodecRegistry = CodecRegistries
+				.fromProviders(PojoCodecProvider.builder().automatic(true).build());
+		// Ajouter le CodecRegistry par défaut, le codec UUID et celui pour POJOs
+		//final CodecRegistry codecRegistry = CodecRegistries.fromRegistries(
+		//		MongoClientSettings.getDefaultCodecRegistry(), /*uuidCodecRegistry, */ pojoCodecRegistry);
+
+		final CodecRegistry codecRegistry = CodecRegistries.fromRegistries(
+				MongoClientSettings.getDefaultCodecRegistry(),
+				CodecRegistries.fromCodecs(new org.bson.codecs.UuidCodec(UuidRepresentation.STANDARD)),
+				pojoCodecRegistry, SqlTimestampCodecRegistry);
+		// Configurer MongoClientSettings
+		final MongoClientSettings clientSettings = MongoClientSettings.builder() //
+				.applyConnectionString(connectionString)//
+				.codecRegistry(codecRegistry) //
+				.uuidRepresentation(UuidRepresentation.STANDARD)//
+				.build();
+		this.mongoClient = MongoClients.create(clientSettings);
+		this.datastore = Morphia.createDatastore(this.mongoClient, dbName);
+		// Map entities
+		this.datastore.getMapper().map(classes);
+		// Ensure indexes
+		this.datastore.ensureIndexes();
+	}
+
+	public Datastore getDatastore() {
+		return this.datastore;
+	}
+
+	public MongoClient getClient() {
+		return this.mongoClient;
+	}
+
+	@Override
+	public void close() throws IOException {
+		this.mongoClient.close();
+
+	}
+}

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

@@ -0,0 +1,43 @@
+package org.kar.archidata.db;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DbInterfaceSQL extends DbInterface implements Closeable {
+	final static Logger LOGGER = LoggerFactory.getLogger(DbInterfaceSQL.class);
+
+	private Connection connection = null;
+
+	public DbInterfaceSQL(final DBConfig config) throws IOException {
+		this(config.getUrl(), config.getLogin(), config.getPassword());
+	}
+
+	public DbInterfaceSQL(final String dbUrl, final String login, final String password) throws IOException {
+		try {
+			this.connection = DriverManager.getConnection(dbUrl, login, password);
+		} catch (final SQLException ex) {
+			LOGGER.error("Connection db fail: " + ex.getMessage() + " On URL: " + dbUrl);
+			throw new IOException("Connection db fail: " + ex.getMessage() + " On URL: " + dbUrl);
+		}
+	}
+
+	public Connection getConnection() {
+		return this.connection;
+	}
+
+	@Override
+	public void close() throws IOException {
+		try {
+			this.connection.close();
+			this.connection = null;
+		} catch (final SQLException ex) {
+			throw new IOException("Dis-connection db fail: " + ex.getMessage());
+		}
+	}
+}

src/org/kar/archidata/externalRestApi/model/ApiTool.java

@@ -7,8 +7,10 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.kar.archidata.annotation.ARCHIVE;
 import org.kar.archidata.annotation.AsyncType;
 import org.kar.archidata.annotation.FormDataOptional;
+import org.kar.archidata.annotation.RESTORE;
 import org.kar.archidata.annotation.TypeScriptProgress;
 
 import io.swagger.v3.oas.annotations.Operation;
@@ -107,6 +109,12 @@ public class ApiTool {
 		if (element.getDeclaredAnnotationsByType(DELETE.class).length == 1) {
 			return "DELETE";
 		}
+		if (element.getDeclaredAnnotationsByType(RESTORE.class).length == 1) {
+			return "RESTORE";
+		}
+		if (element.getDeclaredAnnotationsByType(ARCHIVE.class).length == 1) {
+			return "ARCHIVE";
+		}
 		return null;
 	}
 
@@ -126,6 +134,12 @@ public class ApiTool {
 		if (element.getDeclaredAnnotationsByType(DELETE.class).length == 1) {
 			return RestTypeRequest.DELETE;
 		}
+		if (element.getDeclaredAnnotationsByType(RESTORE.class).length == 1) {
+			return RestTypeRequest.RESTORE;
+		}
+		if (element.getDeclaredAnnotationsByType(ARCHIVE.class).length == 1) {
+			return RestTypeRequest.ARCHIVE;
+		}
 		return null;
 	}
 

src/org/kar/archidata/externalRestApi/model/RestTypeRequest.java

@@ -1,5 +1,5 @@
 package org.kar.archidata.externalRestApi.model;
 
 public enum RestTypeRequest {
-	GET, POST, PUT, PATCH, DELETE
+	GET, POST, PUT, PATCH, DELETE, RESTORE, ARCHIVE
 }

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

@@ -1,5 +1,7 @@
 package org.kar.archidata.migration;
 
+import org.kar.archidata.dataAccess.DBAccess;
+
 public interface AsyncCall {
-	void doRequest() throws Exception;
+	void doRequest(DBAccess da) throws Exception;
 }

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

@@ -5,11 +5,11 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.kar.archidata.dataAccess.DataAccess;
+import org.kar.archidata.dataAccess.DBAccess;
+import org.kar.archidata.dataAccess.DBAccessSQL;
 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;
@@ -24,17 +24,20 @@ public class MigrationEngine {
 	// initialization of the migration if the DB is not present...
 	private MigrationInterface init;
 
+	protected final DBAccess da;
+
 	/** Migration engine constructor (empty). */
-	public MigrationEngine() {
+	public MigrationEngine(final DBAccess da) {
-		this(new ArrayList<>(), null);
+		this(da, 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) {
+	public MigrationEngine(final DBAccess da, final List<MigrationInterface> datas, final MigrationInterface init) {
 		this.datas = datas;
 		this.init = init;
+		this.da = da;
 	}
 
 	/** Add a Migration in the list
@@ -53,16 +56,16 @@ public class MigrationEngine {
 	 * @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")) {
+		if (!this.da.isTableExist("KAR_migration")) {
 			return null;
 		}
 		try {
 			List<Migration> data = null;
 			try {
-				data = DataAccess.gets(Migration.class, QueryOptions.READ_ALL_COLOMN);
+				data = this.da.gets(Migration.class, QueryOptions.READ_ALL_COLOMN);
 			} catch (final Exception e) {
 				// Previous version does not have the same timeCode...
-				data = DataAccess.gets(Migration.class);
+				data = this.da.gets(Migration.class);
 			}
 			if (data == null) {
 				LOGGER.error("Can not collect the migration table in the DB:{}");
@@ -135,13 +138,13 @@ public class MigrationEngine {
 
 		// STEP 1: Check the DB exist:
 		LOGGER.info("Verify existance of '{}'", config.getDbName());
-		boolean exist = DataAccess.isDBExist(config.getDbName());
+		boolean exist = this.da.isDBExist(config.getDbName());
 		if (!exist) {
 			LOGGER.warn("DB: '{}' DOES NOT EXIST ==> create one", config.getDbName());
 			// create the local DB:
-			DataAccess.createDB(config.getDbName());
+			this.da.createDB(config.getDbName());
 		}
-		exist = DataAccess.isDBExist(config.getDbName());
+		exist = this.da.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...");
@@ -151,13 +154,13 @@ public class MigrationEngine {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
-			exist = DataAccess.isDBExist(config.getDbName());
+			exist = this.da.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...
+		if (this.da instanceof final DBAccessSQL daSQL) {
-		exist = DataAccess.isTableExist("KAR_migration");
+			exist = this.da.isTableExist("KAR_migration");
 			if (!exist) {
 				LOGGER.info("'{}' Does not exist create a new one...", "KAR_migration");
 				// create the table:
@@ -171,13 +174,14 @@ public class MigrationEngine {
 				}
 				LOGGER.info("Create Table with : {}", sqlQuery.get(0));
 				try {
-				DataAccess.executeQuery(sqlQuery.get(0));
+					daSQL.executeQuery(sqlQuery.get(0));
 				} catch (SQLException | IOException ex) {
 					ex.printStackTrace();
 					throw new MigrationException(
 							"Fail to create the local DB model for migaration ==> wait administrator interventions");
 				}
 			}
+		}
 		final Migration currentVersion = getCurrentVersion();
 		List<MigrationInterface> toApply = new ArrayList<>();
 		boolean needPlaceholder = false;
@@ -217,18 +221,10 @@ public class MigrationEngine {
 				}
 			}
 		}
-		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);
+			migrateSingle(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) {
@@ -244,7 +240,7 @@ public class MigrationEngine {
 				migrationResult.count = 0;
 				migrationResult.log = "Place-holder for first initialization";
 				try {
-					migrationResult = DataAccess.insert(migrationResult);
+					migrationResult = this.da.insert(migrationResult);
 				} catch (final Exception e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
@@ -254,8 +250,7 @@ public class MigrationEngine {
 		LOGGER.info("Execute migration ... [ END ]");
 	}
 
-	public void migrateSingle(final DBEntry entry, final MigrationInterface elem, final int id, final int count)
+	public void migrateSingle(final MigrationInterface elem, final int id, final int count) throws MigrationException {
-			throws MigrationException {
 		LOGGER.info("---------------------------------------------------------");
 		LOGGER.info("-- Migrate: [{}/{}] {} [BEGIN]", id, count, elem.getName());
 		LOGGER.info("---------------------------------------------------------");
@@ -274,7 +269,7 @@ public class MigrationEngine {
 		}
 		migrationResult.log = log.toString();
 		try {
-			migrationResult = DataAccess.insert(migrationResult);
+			migrationResult = this.da.insert(migrationResult);
 		} catch (final Exception e) {
 			e.printStackTrace();
 			throw new MigrationException(
@@ -282,7 +277,7 @@ public class MigrationEngine {
 		}
 		boolean ret = true;
 		try {
-			ret = elem.applyMigration(entry, log, migrationResult);
+			ret = elem.applyMigration(this.da, log, migrationResult);
 		} catch (final Exception e) {
 			log.append("\nFail in the migration apply ");
 			log.append(e.getLocalizedMessage());
@@ -293,7 +288,7 @@ public class MigrationEngine {
 		if (ret) {
 			migrationResult.terminated = true;
 			try {
-				DataAccess.update(migrationResult, migrationResult.id, List.of("terminated"));
+				this.da.update(migrationResult, migrationResult.id, List.of("terminated"));
 			} catch (final Exception e) {
 				e.printStackTrace();
 				throw new MigrationException(
@@ -303,7 +298,7 @@ public class MigrationEngine {
 			try {
 				log.append("Fail in the migration engine...");
 				migrationResult.log = log.toString();
-				DataAccess.update(migrationResult, migrationResult.id, List.of("log"));
+				this.da.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: "
@@ -316,7 +311,7 @@ public class MigrationEngine {
 		LOGGER.info("Migrate: [{}/{}] {} [ END ]", id, count, elem.getName());
 	}
 
-	public void revertTo(final DBEntry entry, final String migrationName) throws MigrationException {
+	public void revertTo(final String migrationName) throws MigrationException {
 		final Migration currentVersion = getCurrentVersion();
 		final List<MigrationInterface> toApply = new ArrayList<>();
 		boolean find = false;
@@ -335,11 +330,11 @@ public class MigrationEngine {
 		final int id = 0;
 		final int count = toApply.size();
 		for (final MigrationInterface elem : toApply) {
-			revertSingle(entry, elem, id, count);
+			revertSingle(elem, id, count);
 		}
 	}
 
-	public void revertSingle(final DBEntry entry, final MigrationInterface elem, final int id, final int count) {
+	public void revertSingle(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/MigrationInterface.java

@@ -1,6 +1,6 @@
 package org.kar.archidata.migration;
 
-import org.kar.archidata.db.DBEntry;
+import org.kar.archidata.dataAccess.DBAccess;
 import org.kar.archidata.migration.model.Migration;
 
 public interface MigrationInterface {
@@ -13,13 +13,13 @@ public interface MigrationInterface {
 	 * @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;
+	boolean applyMigration(DBAccess 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;
+	boolean revertMigration(DBAccess entry, StringBuilder log) throws Exception;
 
 	/** Get the number of step in the migration process.
 	 * @return count of SQL access. */

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

@@ -5,9 +5,9 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.kar.archidata.dataAccess.DataAccess;
+import org.kar.archidata.dataAccess.DBAccess;
+import org.kar.archidata.dataAccess.DBAccessSQL;
 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;
@@ -70,7 +70,7 @@ public class MigrationSqlStep implements MigrationInterface {
 	}
 
 	@Override
-	public boolean applyMigration(final DBEntry entry, final StringBuilder log, final Migration model)
+	public boolean applyMigration(final DBAccess da, final StringBuilder log, final Migration model)
 			throws Exception {
 		if (!this.isGenerated) {
 			this.isGenerated = true;
@@ -106,9 +106,11 @@ public class MigrationSqlStep implements MigrationInterface {
 			}
 			try {
 				if (action.action() != null) {
-					DataAccess.executeQuery(action.action());
+					if (da instanceof final DBAccessSQL ioDBSQL) {
+						ioDBSQL.executeQuery(action.action());
+					}
 				} else {
-					action.async().doRequest();
+					action.async().doRequest(da);
 				}
 			} catch (SQLException | IOException ex) {
 				ex.printStackTrace();
@@ -117,7 +119,7 @@ public class MigrationSqlStep implements MigrationInterface {
 				model.stepId = iii + 1;
 				model.log = log.toString();
 				try {
-					DataAccess.update(model, model.id, List.of("stepId", "log"));
+					da.update(model, model.id, List.of("stepId", "log"));
 				} catch (final Exception e) {
 					e.printStackTrace();
 				}
@@ -128,7 +130,7 @@ public class MigrationSqlStep implements MigrationInterface {
 			model.stepId = iii + 1;
 			model.log = log.toString();
 			try {
-				DataAccess.update(model, model.id, List.of("stepId", "log"));
+				da.update(model, model.id, List.of("stepId", "log"));
 			} catch (final Exception e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -143,7 +145,7 @@ public class MigrationSqlStep implements MigrationInterface {
 	}
 
 	@Override
-	public boolean revertMigration(final DBEntry entry, final StringBuilder log) throws Exception {
+	public boolean revertMigration(final DBAccess da, final StringBuilder log) throws Exception {
 		generateRevertStep();
 		return false;
 	}

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

@@ -6,6 +6,7 @@ import org.kar.archidata.model.GenericDataSoftDelete;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
+import dev.morphia.annotations.Entity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.Column;
 import jakarta.persistence.Table;
@@ -16,6 +17,7 @@ import jakarta.ws.rs.DefaultValue;
 
 // TODO: Add a migration Hash to be sure that the current migration init is correct and has not change...
 @Table(name = "KAR_migration")
+@Entity("KAR_migration")
 @DataIfNotExists
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class Migration extends GenericDataSoftDelete {

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

@@ -1,5 +1,7 @@
 package org.kar.archidata.model;
 
+import org.bson.types.ObjectId;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.Column;
 import jakarta.persistence.GeneratedValue;
@@ -7,6 +9,8 @@ import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 
 public class GenericData extends GenericTiming {
+	@dev.morphia.annotations.Id
+	private ObjectId _id;
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	@Column(nullable = false, unique = true)

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

@@ -10,6 +10,7 @@ import jakarta.ws.rs.DefaultValue;
 
 public class UUIDGenericData extends GenericTiming {
 	@Id
+
 	@DefaultValue("(UUID_TO_BIN(UUID(), TRUE))")
 	@Column(nullable = false, unique = true)
 	@Schema(description = "Unique UUID of the object", required = false, readOnly = true, example = "e6b33c1c-d24d-11ee-b616-02420a030102")

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

@@ -72,6 +72,9 @@ public class ConfigBaseVariable {
 
 	public static String getDBPort() {
 		if (dbPort == null) {
+			if (getDBType().equals("mongo")) {
+				return "27017";
+			}
 			return "3306";
 		}
 		return dbPort;

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

@@ -18,10 +18,10 @@ import java.util.UUID;
 import org.apache.tika.Tika;
 import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 import org.kar.archidata.api.DataResource;
-import org.kar.archidata.dataAccess.DataAccess;
+import org.kar.archidata.dataAccess.DBAccess;
 import org.kar.archidata.dataAccess.QueryAnd;
 import org.kar.archidata.dataAccess.QueryCondition;
-import org.kar.archidata.dataAccess.addOn.AddOnDataJson;
+import org.kar.archidata.dataAccess.addOnSQL.AddOnDataJson;
 import org.kar.archidata.dataAccess.options.Condition;
 import org.kar.archidata.dataAccess.options.ReadAllColumn;
 import org.kar.archidata.exception.FailException;
@@ -77,9 +77,9 @@ public class DataTools {
 		return filePath;
 	}
 
-	public static Data getWithSha512(final String sha512) {
+	public static Data getWithSha512(final DBAccess ioDb, final String sha512) {
 		try {
-			return DataAccess.getWhere(Data.class, new Condition(new QueryCondition("sha512", "=", sha512)),
+			return ioDb.getWhere(Data.class, new Condition(new QueryCondition("sha512", "=", sha512)),
 					new ReadAllColumn());
 		} catch (final Exception e) {
 			// TODO Auto-generated catch block
@@ -88,9 +88,9 @@ public class DataTools {
 		return null;
 	}
 
-	public static Data getWithId(final long id) {
+	public static Data getWithId(final DBAccess ioDb, final long id) {
 		try {
-			return DataAccess.getWhere(Data.class, new Condition(new QueryAnd(
+			return ioDb.getWhere(Data.class, new Condition(new QueryAnd(
 					List.of(new QueryCondition("deleted", "=", false), new QueryCondition("id", "=", id)))));
 		} catch (final Exception e) {
 			// TODO Auto-generated catch block
@@ -100,6 +100,7 @@ public class DataTools {
 	}
 
 	public static Data createNewData(
+			final DBAccess ioDb,
 			final long tmpUID,
 			final String originalFileName,
 			final String sha512,
@@ -113,7 +114,7 @@ public class DataTools {
 			out.sha512 = sha512;
 			out.mimeType = mimeType;
 			out.size = fileSize;
-			out = DataAccess.insert(out);
+			out = ioDb.insert(out);
 		} catch (final Exception e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
@@ -130,8 +131,11 @@ public class DataTools {
 		return out;
 	}
 
-	public static Data createNewData(final long tmpUID, final String originalFileName, final String sha512)
+	public static Data createNewData(
-			throws IOException, SQLException {
+			final DBAccess ioDb,
+			final long tmpUID,
+			final String originalFileName,
+			final String sha512) throws IOException, SQLException {
 		// determine mime type:
 		String mimeType = "";
 		final String extension = originalFileName.substring(originalFileName.lastIndexOf('.') + 1);
@@ -144,12 +148,12 @@ public class DataTools {
 			case "webm" -> "video/webm";
 			default -> throw new IOException("Can not find the mime type of data input: '" + extension + "'");
 		};
-		return createNewData(tmpUID, originalFileName, sha512, mimeType);
+		return createNewData(ioDb, tmpUID, originalFileName, sha512, mimeType);
 	}
 
-	public static void undelete(final UUID id) {
+	public static void undelete(final DBAccess ioDb, final UUID id) {
 		try {
-			DataAccess.unsetDelete(Data.class, id);
+			ioDb.unsetDelete(Data.class, id);
 		} catch (final Exception e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
@@ -259,6 +263,9 @@ public class DataTools {
 		if (data.contentEquals("null")) {
 			return null;
 		}
+		if (data.contentEquals("undefined")) {
+			return null;
+		}
 		return data;
 	}
 
@@ -269,13 +276,14 @@ public class DataTools {
 	}
 
 	public static <CLASS_TYPE, ID_TYPE> void uploadCoverFromUri(
+			final DBAccess ioDb,
 			final Class<CLASS_TYPE> clazz,
 			final ID_TYPE id,
 			final String url) throws Exception {
 
 		LOGGER.info("    - id: {}", id);
 		LOGGER.info("    - url: {} ", url);
-		final CLASS_TYPE media = DataAccess.get(clazz, id);
+		final CLASS_TYPE media = ioDb.get(clazz, id);
 		if (media == null) {
 			throw new InputException(clazz.getCanonicalName(),
 					"[" + id.toString() + "] Id does not exist or removed...");
@@ -307,7 +315,7 @@ public class DataTools {
 
 		final long tmpUID = getTmpDataId();
 		final String sha512 = saveTemporaryFile(dataResponse, tmpUID);
-		Data data = getWithSha512(sha512);
+		Data data = getWithSha512(ioDb, sha512);
 		final String mimeType = getMimeType(dataResponse);
 		if (!Arrays.asList(SUPPORTED_IMAGE_MIME_TYPE).contains(mimeType)) {
 			throw new FailException(Response.Status.NOT_ACCEPTABLE,
@@ -318,7 +326,7 @@ public class DataTools {
 		if (data == null) {
 			LOGGER.info("Need to add the data in the BDD ... ");
 			try {
-				data = createNewData(tmpUID, url, sha512, mimeType);
+				data = createNewData(ioDb, tmpUID, url, sha512, mimeType);
 			} catch (final IOException ex) {
 				removeTemporaryFile(tmpUID);
 				throw new FailException(Response.Status.NOT_MODIFIED,
@@ -330,7 +338,7 @@ public class DataTools {
 			}
 		} else if (data.deleted) {
 			LOGGER.error("Data already exist but deleted");
-			undelete(data.uuid);
+			undelete(ioDb, data.uuid);
 			data.deleted = false;
 		} else {
 			LOGGER.error("Data already exist ... all good");
@@ -338,15 +346,16 @@ public class DataTools {
 		// Fist step: retrieve all the Id of each parents:...
 		LOGGER.info("Find typeNode");
 		if (id instanceof final Long idLong) {
-			AddOnDataJson.addLink(clazz, idLong, "covers", data.uuid);
+			AddOnDataJson.addLink(ioDb, clazz, idLong, "covers", data.uuid);
 		} else if (id instanceof final UUID idUUID) {
-			AddOnDataJson.addLink(clazz, idUUID, "covers", data.uuid);
+			AddOnDataJson.addLink(ioDb, clazz, idUUID, "covers", data.uuid);
 		} else {
 			throw new IOException("Fail to add Cover can not detect type...");
 		}
 	}
 
 	public static <CLASS_TYPE, ID_TYPE> void uploadCover(
+			final DBAccess ioDb,
 			final Class<CLASS_TYPE> clazz,
 			final ID_TYPE id,
 			final InputStream fileInputStream,
@@ -357,7 +366,7 @@ public class DataTools {
 		LOGGER.info("    - file_name: {} ", fileMetaData.getFileName());
 		LOGGER.info("    - fileInputStream: {}", fileInputStream);
 		LOGGER.info("    - fileMetaData: {}", fileMetaData);
-		final CLASS_TYPE media = DataAccess.get(clazz, id);
+		final CLASS_TYPE media = ioDb.get(clazz, id);
 		if (media == null) {
 			throw new InputException(clazz.getCanonicalName(),
 					"[" + id.toString() + "] Id does not exist or removed...");
@@ -365,11 +374,11 @@ public class DataTools {
 
 		final long tmpUID = getTmpDataId();
 		final String sha512 = saveTemporaryFile(fileInputStream, tmpUID);
-		Data data = getWithSha512(sha512);
+		Data data = getWithSha512(ioDb, sha512);
 		if (data == null) {
 			LOGGER.info("Need to add the data in the BDD ... ");
 			try {
-				data = createNewData(tmpUID, fileMetaData.getFileName(), sha512);
+				data = createNewData(ioDb, tmpUID, fileMetaData.getFileName(), sha512);
 			} catch (final IOException ex) {
 				removeTemporaryFile(tmpUID);
 				throw new FailException(Response.Status.NOT_MODIFIED,
@@ -381,7 +390,7 @@ public class DataTools {
 			}
 		} else if (data.deleted) {
 			LOGGER.error("Data already exist but deleted");
-			undelete(data.uuid);
+			undelete(ioDb, data.uuid);
 			data.deleted = false;
 		} else {
 			LOGGER.error("Data already exist ... all good");
@@ -389,9 +398,9 @@ public class DataTools {
 		// Fist step: retrieve all the Id of each parents:...
 		LOGGER.info("Find typeNode");
 		if (id instanceof final Long idLong) {
-			AddOnDataJson.addLink(clazz, idLong, "covers", data.uuid);
+			AddOnDataJson.addLink(ioDb, clazz, idLong, "covers", data.uuid);
 		} else if (id instanceof final UUID idUUID) {
-			AddOnDataJson.addLink(clazz, idUUID, "covers", data.uuid);
+			AddOnDataJson.addLink(ioDb, clazz, idUUID, "covers", data.uuid);
 		} else {
 			throw new IOException("Fail to add Cover can not detect type...");
 		}

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

@@ -222,13 +222,66 @@ public class RESTApi {
 	 */
 	public <T> T delete(final Class<T> clazz, final String urlOffset)
 			throws RESTErrorResponseExeption, IOException, InterruptedException {
+		return simpleRequest("DELETE", clazz, urlOffset);
+	}
+
+	/**
+	 * Call an ARCHIVE on a REST API
+	 * @param urlOffset Offset to call the API
+	 */
+	public void archive(final String urlOffset) throws RESTErrorResponseExeption, IOException, InterruptedException {
+		archive(Void.class, urlOffset);
+	}
+
+	/**
+	 * Call a ARCHIVE on a REST API with retrieving some data
+	 * @param <T> Type of data that might be received.
+	 * @param clazz Class model of the data that might be parsed.
+	 * @param urlOffset Offset to call the API
+	 * @return The parsed object received.
+	 */
+	public <T> T archive(final Class<T> clazz, final String urlOffset)
+			throws RESTErrorResponseExeption, IOException, InterruptedException {
+		return simpleRequest("ARCHIVE", clazz, urlOffset);
+	}
+
+	/**
+	 * Call an RESTORE on a REST API
+	 * @param urlOffset Offset to call the API
+	 */
+	public void restore(final String urlOffset) throws RESTErrorResponseExeption, IOException, InterruptedException {
+		restore(Void.class, urlOffset);
+	}
+
+	/**
+	 * Call a RESTORE on a REST API with retrieving some data
+	 * @param <T> Type of data that might be received.
+	 * @param clazz Class model of the data that might be parsed.
+	 * @param urlOffset Offset to call the API
+	 * @return The parsed object received.
+	 */
+	public <T> T restore(final Class<T> clazz, final String urlOffset)
+			throws RESTErrorResponseExeption, IOException, InterruptedException {
+		return simpleRequest("RESTORE", clazz, urlOffset);
+	}
+
+	/**
+	 * Call a key on a REST API with retrieving some data
+	 * @param <T> Type of data that might be received.
+	 * @param model name of the key for the REST call
+	 * @param clazz Class model of the data that might be parsed.
+	 * @param urlOffset Offset to call the API
+	 * @return The parsed object received.
+	 */
+	public <T> T simpleRequest(final String model, final Class<T> clazz, final String urlOffset)
+			throws RESTErrorResponseExeption, IOException, InterruptedException {
 		final HttpClient client = HttpClient.newHttpClient();
 		Builder requestBuilding = HttpRequest.newBuilder().version(Version.HTTP_1_1)
 				.uri(URI.create(this.baseUrl + urlOffset));
 		if (this.token != null) {
 			requestBuilding = requestBuilding.header(HttpHeaders.AUTHORIZATION, "Bearer " + this.token);
 		}
-		final HttpRequest request = requestBuilding.DELETE().build();
+		final HttpRequest request = requestBuilding.method(model, BodyPublishers.ofString("")).build();
 		final HttpResponse<String> httpResponse = client.send(request, HttpResponse.BodyHandlers.ofString());
 		if (httpResponse.statusCode() < 200 || httpResponse.statusCode() >= 300) {
 			try {

test/src/test/kar/archidata/ConfigureDb.java

@@ -1,39 +1,138 @@
 package test.kar.archidata;
 
 import java.io.IOException;
+import java.util.List;
 
 import org.kar.archidata.GlobalConfiguration;
-import org.kar.archidata.db.DBEntry;
+import org.kar.archidata.dataAccess.DBAccess;
+import org.kar.archidata.db.DBInterfaceFactory;
 import org.kar.archidata.tools.ConfigBaseVariable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import test.kar.archidata.dataAccess.model.SerializeAsJson;
+import test.kar.archidata.dataAccess.model.SerializeListAsJson;
+import test.kar.archidata.dataAccess.model.SimpleTable;
+import test.kar.archidata.dataAccess.model.SimpleTableSoftDelete;
+import test.kar.archidata.dataAccess.model.TypeManyToManyRemote;
+import test.kar.archidata.dataAccess.model.TypeManyToManyRoot;
+import test.kar.archidata.dataAccess.model.TypeManyToManyRootExpand;
+import test.kar.archidata.dataAccess.model.TypeManyToOneRemote;
+import test.kar.archidata.dataAccess.model.TypeManyToOneRoot;
+import test.kar.archidata.dataAccess.model.TypeManyToOneRootExpand;
+import test.kar.archidata.dataAccess.model.TypeManyToOneUUIDRemote;
+import test.kar.archidata.dataAccess.model.TypeManyToOneUUIDRoot;
+import test.kar.archidata.dataAccess.model.TypeManyToOneUUIDRootExpand;
+import test.kar.archidata.dataAccess.model.TypeOneToManyRemote;
+import test.kar.archidata.dataAccess.model.TypeOneToManyRoot;
+import test.kar.archidata.dataAccess.model.TypeOneToManyRootExpand;
+import test.kar.archidata.dataAccess.model.TypeOneToManyUUIDRemote;
+import test.kar.archidata.dataAccess.model.TypeOneToManyUUIDRoot;
+import test.kar.archidata.dataAccess.model.TypeOneToManyUUIDRootExpand;
+import test.kar.archidata.dataAccess.model.TypesEnum1;
+import test.kar.archidata.dataAccess.model.TypesEnum2;
+import test.kar.archidata.dataAccess.model.TypesTable;
+
 public class ConfigureDb {
 	final static private Logger LOGGER = LoggerFactory.getLogger(ConfigureDb.class);
+	final static private String modeTestForced = null;//"MONGO";
 	
 	public static void configure() throws IOException {
-		if (true) {
+		String modeTest = System.getenv("TEST_E2E_MODE");
-			if (!"true".equalsIgnoreCase(System.getenv("TEST_E2E_MODE"))) {
+		if (modeTest == null || modeTest.isEmpty() || "false".equalsIgnoreCase(modeTest)) {
+			modeTest = "SQLITE-MEMORY";
+		} else if ("true".equalsIgnoreCase(modeTest)) {
+			modeTest = "MY-SQL";
+		}
+		// override the local test:
+		if (modeTestForced != null) {
+			modeTest = modeTestForced;
+		}
+		final List<Class<?>> listObject = List.of( //
+				SerializeAsJson.class, //
+				SerializeListAsJson.class, //
+				SimpleTable.class, //
+				SimpleTableSoftDelete.class, //
+				TypeManyToManyRemote.class, //
+				TypeManyToManyRoot.class, //
+				TypeManyToManyRootExpand.class, //
+				TypeManyToOneRemote.class, //
+				TypeManyToOneRoot.class, //
+				TypeManyToOneRootExpand.class, //
+				TypeManyToOneUUIDRemote.class, //
+				TypeManyToOneUUIDRoot.class, //
+				TypeManyToOneUUIDRootExpand.class, //
+				TypeOneToManyRemote.class, //
+				TypeOneToManyRoot.class, //
+				TypeOneToManyRootExpand.class, //
+				TypeOneToManyUUIDRemote.class, //
+				TypeOneToManyUUIDRoot.class, //
+				TypeOneToManyUUIDRootExpand.class, //
+				TypesEnum1.class, //
+				TypesEnum2.class, //
+				TypesTable.class);
+		if ("SQLITE-MEMORY".equalsIgnoreCase(modeTest)) {
 			ConfigBaseVariable.dbType = "sqlite";
+			ConfigBaseVariable.bdDatabase = null;
 			ConfigBaseVariable.dbHost = "memory";
 			// for test we need to connect all time the DB
 			ConfigBaseVariable.dbKeepConnected = "true";
-			}
+		} else if ("SQLITE".equalsIgnoreCase(modeTest)) {
-		} else {
+			ConfigBaseVariable.dbType = "sqlite";
-			// Enable this if you want to access to a local MySQL base to test with an adminer
+			ConfigBaseVariable.bdDatabase = null;
+			ConfigBaseVariable.dbKeepConnected = "true";
+		} else if ("MY-SQL".equalsIgnoreCase(modeTest)) {
+			ConfigBaseVariable.dbType = "mysql";
+			ConfigBaseVariable.bdDatabase = "test_db";
+			ConfigBaseVariable.dbPort = "3906";
+			ConfigBaseVariable.dbUser = "root";
+		} else if ("MONGO".equalsIgnoreCase(modeTest)) {
+			ConfigBaseVariable.dbType = "mongo";
+			ConfigBaseVariable.bdDatabase = "test_db";
+			ConfigBaseVariable.bdDatabase = "test_mongo_db";
+		} else {
+			// User local modification ...
 			ConfigBaseVariable.bdDatabase = "test_db";
 			ConfigBaseVariable.dbPort = "3906";
 			ConfigBaseVariable.dbUser = "root";
-			//ConfigBaseVariable.dbPassword = "password";
 		}
 		// Connect the dataBase...
-		final DBEntry entry = DBEntry.createInterface(GlobalConfiguration.dbConfig);
+		final DBInterfaceFactory entry = DBInterfaceFactory.create(GlobalConfiguration.getDbconfig(),
+				listObject.toArray(new Class<?>[0]));
 		entry.connect();
+		
+		removeDB();
+	}
+	
+	public static void removeDB() {
+		
+		final DBAccess da = DBAccess.createInterface();
+		
+		String modeTest = System.getenv("TEST_E2E_MODE");
+		if (modeTest == null || modeTest.isEmpty() || "false".equalsIgnoreCase(modeTest)) {
+			modeTest = "SQLITE-MEMORY";
+		} else if ("true".equalsIgnoreCase(modeTest)) {
+			modeTest = "MY-SQL";
+		}
+		// override the local test:
+		if (modeTestForced != null) {
+			modeTest = modeTestForced;
+		}
+		if ("SQLITE-MEMORY".equalsIgnoreCase(modeTest)) {
+			// nothing to do ...
+		} else if ("SQLITE".equalsIgnoreCase(modeTest)) {
+			da.deleteDB(ConfigBaseVariable.bdDatabase);
+		} else if ("MY-SQL".equalsIgnoreCase(modeTest)) {
+			da.deleteDB(ConfigBaseVariable.bdDatabase);
+		} else if ("MONGO".equalsIgnoreCase(modeTest)) {
+			da.deleteDB(ConfigBaseVariable.bdDatabase);
+		} else {}
 	}
 	
 	public static void clear() throws IOException {
 		LOGGER.info("Remove the test db");
-		DBEntry.closeAllForceMode();
+		removeDB();
+		DBInterfaceFactory.closeAllForceMode();
 		ConfigBaseVariable.clearAllValue();
 		
 	}

test/src/test/kar/archidata/TestRawQuery.java

@@ -1,108 +0,0 @@
-package test.kar.archidata;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.MethodOrderer;
-import org.junit.jupiter.api.Order;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestMethodOrder;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.kar.archidata.dataAccess.DataAccess;
-import org.kar.archidata.dataAccess.DataFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import test.kar.archidata.model.TypesTable;
-
-@ExtendWith(StepwiseExtension.class)
-@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
-public class TestRawQuery {
-	final static private Logger LOGGER = LoggerFactory.getLogger(TestTypes.class);
-
-	@BeforeAll
-	public static void configureWebServer() throws Exception {
-		ConfigureDb.configure();
-	}
-
-	@AfterAll
-	public static void removeDataBase() throws IOException {
-		ConfigureDb.clear();
-	}
-
-	@Order(1)
-	@Test
-	public void testCreateTable() throws Exception {
-		final List<String> sqlCommand = DataFactory.createTable(TypesTable.class);
-		for (final String elem : sqlCommand) {
-			LOGGER.debug("request: '{}'", elem);
-			DataAccess.executeSimpleQuery(elem);
-		}
-	}
-
-	@Order(2)
-	@Test
-	public void testGet() throws Exception {
-
-		final TypesTable test = new TypesTable();
-		test.intData = 95;
-		test.floatData = 1.0F;
-		DataAccess.insert(test);
-		test.intData = 96;
-		test.floatData = 2.0F;
-		DataAccess.insert(test);
-		test.intData = 97;
-		test.floatData = 3.0F;
-		DataAccess.insert(test);
-		test.intData = 98;
-		test.floatData = 4.0F;
-		DataAccess.insert(test);
-		test.intData = 99;
-		test.floatData = 5.0F;
-		DataAccess.insert(test);
-		test.intData = 99;
-		test.floatData = 6.0F;
-		DataAccess.insert(test);
-		test.intData = 99;
-		test.floatData = 7.0F;
-		DataAccess.insert(test);
-		{
-			final String query = """
-					SELECT *
-					FROM TypesTable
-					WHERE `intData` = ?
-					ORDER BY id DESC
-					""";
-			final List<Object> parameters = List.of(Integer.valueOf(99));
-			// Try to retrieve all the data:
-			final List<TypesTable> retrieve = DataAccess.query(TypesTable.class, query, parameters);
-
-			Assertions.assertNotNull(retrieve);
-			Assertions.assertEquals(3, retrieve.size());
-			Assertions.assertEquals(99, retrieve.get(0).intData);
-			Assertions.assertEquals(7.0F, retrieve.get(0).floatData);
-			Assertions.assertEquals(6.0F, retrieve.get(1).floatData);
-			Assertions.assertEquals(5.0F, retrieve.get(2).floatData);
-		}
-		{
-
-			final String query = """
-					SELECT DISTINCT intData
-					FROM TypesTable
-					WHERE `intData` = ?
-					ORDER BY id DESC
-					""";
-			final List<Object> parameters = List.of(Integer.valueOf(99));
-			// Try to retrieve all the data:
-			final List<TypesTable> retrieve = DataAccess.query(TypesTable.class, query, parameters);
-
-			Assertions.assertNotNull(retrieve);
-			Assertions.assertEquals(1, retrieve.size());
-			Assertions.assertEquals(99, retrieve.get(0).intData);
-		}
-	}
-
-}

test/src/test/kar/archidata/apiExtern/Common.java

@@ -0,0 +1,34 @@
+package test.kar.archidata.apiExtern;
+
+import java.util.Map;
+import java.util.UUID;
+
+import org.junit.jupiter.api.Assertions;
+import org.kar.archidata.tools.JWTWrapper;
+
+public class Common {
+	public static final String USER_TOKEN = JWTWrapper.createJwtTestToken(16512, "test_user_login", "KarAuth",
+			"farm.neo.back", //
+			Map.of("farm.neo.back", Map.of("USER", Boolean.TRUE)));
+	public static final String ADMIN_TOKEN = JWTWrapper.createJwtTestToken(16512, "test_admin_login", "KarAuth",
+			"farm.neo.back", Map.of("farm.neo.back", Map.of("USER", Boolean.TRUE, "ADMIN", Boolean.TRUE)));
+
+	public static String RandGeneratedStr(final int length) {
+		final String base = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvxyz0123456789éàê_- '()";
+		final StringBuilder out = new StringBuilder(length);
+		for (int iii = 0; iii < length; iii++) {
+			final int chId = (int) (base.length() * Math.random());
+			out.append(base.charAt(chId));
+		}
+		return out.toString();
+	}
+
+	public static void checkUUID(final UUID id) {
+		final String data = id.toString();
+		Assertions.assertFalse(data.equals("00000000-0000-0000-0000-000000000000"));
+		final String[] elems = data.split("-");
+		Assertions.assertEquals(elems.length, 5);
+		Assertions.assertTrue(elems[3].equals("0001"));
+
+	}
+}

test/src/test/kar/archidata/apiExtern/TestAPI.java

@@ -0,0 +1,96 @@
+package test.kar.archidata.apiExtern;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.kar.archidata.tools.ConfigBaseVariable;
+import org.kar.archidata.tools.RESTApi;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import test.kar.archidata.ConfigureDb;
+import test.kar.archidata.StepwiseExtension;
+import test.kar.archidata.apiExtern.model.SimpleArchiveTable;
+
+@ExtendWith(StepwiseExtension.class)
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
+public class TestAPI {
+	private final static Logger LOGGER = LoggerFactory.getLogger(TestAPI.class);
+	public final static String ENDPOINT_NAME = "TestResource";
+
+	static WebLauncherTest webInterface = null;
+	static RESTApi api = null;
+
+	private static Long idTest = 0L;
+
+	@BeforeAll
+	public static void configureWebServer() throws Exception {
+		ConfigureDb.configure();
+		LOGGER.info("configure server ...");
+		webInterface = new WebLauncherTest();
+		LOGGER.info("Clean previous table");
+
+		LOGGER.info("Start REST (BEGIN)");
+		webInterface.process();
+		LOGGER.info("Start REST (DONE)");
+		api = new RESTApi(ConfigBaseVariable.apiAdress);
+		api.setToken(Common.ADMIN_TOKEN);
+	}
+
+	@AfterAll
+	public static void stopWebServer() throws Exception {
+		LOGGER.info("Kill the web server");
+		webInterface.stop();
+		webInterface = null;
+		ConfigureDb.clear();
+	}
+
+	@Order(1)
+	@Test
+	public void insertValue() throws Exception {
+
+		final SimpleArchiveTable data = new SimpleArchiveTable();
+		data.name = "Test name";
+
+		final SimpleArchiveTable inserted = api.post(SimpleArchiveTable.class, TestAPI.ENDPOINT_NAME, data);
+		Assertions.assertNotNull(inserted);
+		Assertions.assertNotNull(inserted.id);
+		Assertions.assertNotNull(inserted.name);
+		Assertions.assertEquals(data.name, inserted.name);
+
+		TestAPI.idTest = inserted.id;
+		final SimpleArchiveTable retrieve = api.get(SimpleArchiveTable.class,
+				TestAPI.ENDPOINT_NAME + "/" + TestAPI.idTest);
+		Assertions.assertNotNull(retrieve);
+		Assertions.assertEquals(TestAPI.idTest, retrieve.id);
+		Assertions.assertNotNull(retrieve.name);
+		Assertions.assertEquals(data.name, retrieve.name);
+	}
+
+	@Order(2)
+	@Test
+	public void archiveValue() throws Exception {
+		final SimpleArchiveTable archivedData = api.archive(SimpleArchiveTable.class,
+				TestAPI.ENDPOINT_NAME + "/" + TestAPI.idTest);
+		Assertions.assertNotNull(archivedData);
+		Assertions.assertEquals(TestAPI.idTest, archivedData.id);
+		Assertions.assertNotNull(archivedData.name);
+		Assertions.assertNotNull(archivedData.archive);
+	}
+
+	@Order(2)
+	@Test
+	public void restoreValue() throws Exception {
+		final SimpleArchiveTable archivedData = api.restore(SimpleArchiveTable.class,
+				TestAPI.ENDPOINT_NAME + "/" + TestAPI.idTest);
+		Assertions.assertNotNull(archivedData);
+		Assertions.assertEquals(TestAPI.idTest, archivedData.id);
+		Assertions.assertNotNull(archivedData.name);
+		Assertions.assertNull(archivedData.archive);
+	}
+}

test/src/test/kar/archidata/apiExtern/TestAuthenticationFilter.java

@@ -0,0 +1,23 @@
+package test.kar.archidata.apiExtern;
+
+import org.kar.archidata.filter.AuthenticationFilter;
+
+import jakarta.ws.rs.Priorities;
+import jakarta.ws.rs.ext.Provider;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jakarta.annotation.Priority;
+
+//@PreMatching
+@Provider
+@Priority(Priorities.AUTHENTICATION)
+public class TestAuthenticationFilter extends AuthenticationFilter {
+	final Logger logger = LoggerFactory.getLogger(TestAuthenticationFilter.class);
+
+	public TestAuthenticationFilter() {
+		super("karusic");
+	}
+
+}

test/src/test/kar/archidata/apiExtern/WebLauncher.java

@@ -0,0 +1,176 @@
+package test.kar.archidata.apiExtern;
+
+import java.net.URI;
+import java.util.Iterator;
+
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReader;
+import javax.imageio.ImageWriter;
+
+import org.glassfish.grizzly.http.server.HttpServer;
+import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory;
+import org.glassfish.jersey.jackson.JacksonFeature;
+import org.glassfish.jersey.media.multipart.MultiPartFeature;
+import org.glassfish.jersey.server.ResourceConfig;
+import org.kar.archidata.GlobalConfiguration;
+import org.kar.archidata.UpdateJwtPublicKey;
+import org.kar.archidata.api.DataResource;
+import org.kar.archidata.api.ProxyResource;
+import org.kar.archidata.catcher.GenericCatcher;
+import org.kar.archidata.dataAccess.DBAccess;
+import org.kar.archidata.filter.CORSFilter;
+import org.kar.archidata.filter.OptionFilter;
+import org.kar.archidata.migration.MigrationEngine;
+import org.kar.archidata.tools.ConfigBaseVariable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jakarta.ws.rs.core.UriBuilder;
+import test.kar.archidata.apiExtern.resource.TestResource;
+
+public class WebLauncher {
+	final static Logger LOGGER = LoggerFactory.getLogger(WebLauncher.class);
+	protected UpdateJwtPublicKey keyUpdater = null;
+	protected HttpServer server = null;
+
+	private final DBAccess da;
+
+	public WebLauncher() {
+		this.da = DBAccess.createInterface();
+	}
+
+	private static URI getBaseURI() {
+		return UriBuilder.fromUri(ConfigBaseVariable.getlocalAddress()).build();
+	}
+
+	public void migrateDB() throws Exception {
+		WebLauncher.LOGGER.info("Create migration engine");
+		final MigrationEngine migrationEngine = new MigrationEngine(this.da);
+		WebLauncher.LOGGER.info("Add initialization");
+		//migrationEngine.setInit(new Initialization());
+		WebLauncher.LOGGER.info("Add migration since last version");
+		//migrationEngine.add(new Migration20231126());
+		WebLauncher.LOGGER.info("Migrate the DB [START]");
+		migrationEngine.migrateWaitAdmin(GlobalConfiguration.getDbconfig());
+		WebLauncher.LOGGER.info("Migrate the DB [STOP]");
+	}
+
+	public static void main(final String[] args) throws Exception {
+		WebLauncher.LOGGER.info("[START] application wake UP");
+		final WebLauncher launcher = new WebLauncher();
+		launcher.migrateDB();
+
+		launcher.process();
+		WebLauncher.LOGGER.info("end-configure the server & wait finish process:");
+		Thread.currentThread().join();
+		WebLauncher.LOGGER.info("STOP Key updater");
+		launcher.stopOther();
+		WebLauncher.LOGGER.info("STOP the REST server:");
+	}
+
+	public void plop(final String aaa) {
+		// List available Image Readers
+		System.out.println("Available Image Readers:");
+		final Iterator<ImageReader> readers = ImageIO.getImageReadersByFormatName(aaa);
+		while (readers.hasNext()) {
+			final ImageReader reader = readers.next();
+			System.out.println("Reader: " + reader.getOriginatingProvider().getDescription(null));
+			System.out.println("Reader CN: " + reader.getOriginatingProvider().getPluginClassName());
+			// ImageIO.deregisterServiceProvider(reader.getOriginatingProvider());
+		}
+
+		// List available Image Writers
+		System.out.println("\nAvailable Image Writers:");
+		final Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName(aaa);
+		while (writers.hasNext()) {
+			final ImageWriter writer = writers.next();
+			System.out.println("Writer: " + writer.getOriginatingProvider().getDescription(null));
+			System.out.println("Writer CN: " + writer.getOriginatingProvider().getPluginClassName());
+		}
+	}
+
+	public void process() throws InterruptedException {
+
+		ImageIO.scanForPlugins();
+		plop("jpeg");
+		plop("png");
+		plop("webmp");
+		plop("webp");
+		// ===================================================================
+		// Configure resources
+		// ===================================================================
+		final ResourceConfig rc = new ResourceConfig();
+
+		// add multipart models ..
+		rc.register(MultiPartFeature.class);
+		// global authentication system
+		rc.register(OptionFilter.class);
+		// remove cors ==> all time called by an other system...
+		rc.register(CORSFilter.class);
+		// global authentication system
+		rc.register(TestAuthenticationFilter.class);
+		// register exception catcher
+		GenericCatcher.addAll(rc);
+		// add default resource:
+		rc.register(TestResource.class);
+		rc.register(DataResource.class);
+		rc.register(ProxyResource.class);
+
+		// add jackson to be discover when we are ins standalone server
+		rc.register(JacksonFeature.class);
+		// enable this to show low level request
+		// rc.property(LoggingFeature.LOGGING_FEATURE_LOGGER_LEVEL_SERVER, Level.WARNING.getName());
+
+		// System.out.println("Connect on the BDD:");
+		// System.out.println(" getDBHost: '" + ConfigVariable.getDBHost() + "'");
+		// System.out.println(" getDBPort: '" + ConfigVariable.getDBPort() + "'");
+		// System.out.println(" getDBLogin: '" + ConfigVariable.getDBLogin() + "'");
+		// System.out.println(" getDBPassword: '" + ConfigVariable.getDBPassword() + "'");
+		// System.out.println(" getDBName: '" + ConfigVariable.getDBName() + "'");
+		System.out.println(" ==> " + GlobalConfiguration.getDbconfig());
+		System.out.println("OAuth service " + getBaseURI());
+		this.server = GrizzlyHttpServerFactory.createHttpServer(getBaseURI(), rc);
+		final HttpServer serverLink = this.server;
+		Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
+			@Override
+			public void run() {
+				System.out.println("Stopping server..");
+				serverLink.shutdownNow();
+			}
+		}, "shutdownHook"));
+
+		// ===================================================================
+		// start periodic update of the token ...
+		// ===================================================================
+		this.keyUpdater = new UpdateJwtPublicKey();
+		this.keyUpdater.start();
+
+		// ===================================================================
+		// run JERSEY
+		// ===================================================================
+		try {
+			this.server.start();
+			LOGGER.info("Jersey app started at {}", getBaseURI());
+		} catch (final Exception e) {
+			LOGGER.error("There was an error while starting Grizzly HTTP server.");
+			e.printStackTrace();
+		}
+	}
+
+	public void stop() {
+		if (this.server != null) {
+			this.server.shutdownNow();
+			this.server = null;
+		}
+	}
+
+	public void stopOther() {
+		this.keyUpdater.kill();
+		try {
+			this.keyUpdater.join(4000, 0);
+		} catch (final InterruptedException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+}

test/src/test/kar/archidata/apiExtern/WebLauncherTest.java

@@ -0,0 +1,29 @@
+
+package test.kar.archidata.apiExtern;
+
+import java.io.IOException;
+
+import org.kar.archidata.tools.ConfigBaseVariable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import test.kar.archidata.ConfigureDb;
+
+public class WebLauncherTest extends WebLauncher {
+	final private static Logger LOGGER = LoggerFactory.getLogger(WebLauncherTest.class);
+
+	public WebLauncherTest() {
+		LOGGER.debug("Configure REST system");
+		// for local test:
+		ConfigBaseVariable.apiAdress = "http://127.0.0.1:12345/test/api/";
+		// Enable the test mode permit to access to the test token (never use it in production).
+		ConfigBaseVariable.testMode = "true";
+		// ConfigBaseVariable.dbPort = "3306";
+		try {
+			ConfigureDb.configure();
+		} catch (final IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+}

test/src/test/kar/archidata/apiExtern/model/SimpleArchiveTable.java

@@ -0,0 +1,14 @@
+package test.kar.archidata.apiExtern.model;
+
+import java.util.Date;
+
+import org.kar.archidata.model.GenericData;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+public class SimpleArchiveTable extends GenericData {
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+	public Date archive;
+	public String name;
+
+}

test/src/test/kar/archidata/apiExtern/resource/TestResource.java

@@ -0,0 +1,121 @@
+package test.kar.archidata.apiExtern.resource;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.kar.archidata.annotation.ARCHIVE;
+import org.kar.archidata.annotation.AsyncType;
+import org.kar.archidata.annotation.RESTORE;
+import org.kar.archidata.exception.NotFoundException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jakarta.annotation.security.PermitAll;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.PATCH;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import test.kar.archidata.apiExtern.model.SimpleArchiveTable;
+
+@Path("/TestResource")
+@Produces({ MediaType.APPLICATION_JSON })
+public class TestResource {
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(TestResource.class);
+	private static final List<SimpleArchiveTable> data = new ArrayList<>();
+	private static long uniqueId = 330;
+
+	@GET
+	@PermitAll
+	public List<SimpleArchiveTable> gets() throws Exception {
+		return this.data;
+	}
+
+	@GET
+	@Path("{id}")
+	@PermitAll
+	public SimpleArchiveTable get(@PathParam("id") final Long id) throws Exception {
+		LOGGER.info("get({})", id);
+		for (final SimpleArchiveTable elem : this.data) {
+			if (elem.id.equals(id)) {
+				return elem;
+			}
+		}
+		throw new NotFoundException("element does not exist: " + id);
+	}
+
+	@ARCHIVE
+	@Path("{id}")
+	@PermitAll
+	public SimpleArchiveTable archive(@PathParam("id") final Long id) throws Exception {
+		LOGGER.info("archive({})", id);
+		for (final SimpleArchiveTable elem : this.data) {
+			if (elem.id.equals(id)) {
+				elem.archive = new Date();
+				return elem;
+			}
+		}
+		throw new NotFoundException("element does not exist: " + id);
+	}
+
+	@RESTORE
+	@Path("{id}")
+	@PermitAll
+	public SimpleArchiveTable restore(@PathParam("id") final Long id) throws Exception {
+		LOGGER.info("restore({})", id);
+		for (final SimpleArchiveTable elem : this.data) {
+			if (elem.id.equals(id)) {
+				elem.archive = null;
+				return elem;
+			}
+		}
+		throw new NotFoundException("element does not exist: " + id);
+	}
+
+	@POST
+	@PermitAll
+	@Consumes(MediaType.APPLICATION_JSON)
+	public SimpleArchiveTable post(final SimpleArchiveTable data) throws Exception {
+		LOGGER.info("post(...)");
+		data.id = this.uniqueId;
+		this.uniqueId += 5;
+		this.data.add(data);
+		return data;
+	}
+
+	@PATCH
+	@Path("{id}")
+	@PermitAll
+	@Consumes(MediaType.APPLICATION_JSON)
+	public SimpleArchiveTable patch(
+			@PathParam("id") final Long id,
+			@AsyncType(SimpleArchiveTable.class) final String jsonRequest) throws Exception {
+		LOGGER.info("patch({})", id);
+		throw new NotFoundException("element does not exist: " + id);
+	}
+
+	@PUT
+	@Path("{id}")
+	@PermitAll
+	@Consumes(MediaType.APPLICATION_JSON)
+	public SimpleArchiveTable put(@PathParam("id") final Long id, final SimpleArchiveTable data) throws Exception {
+		LOGGER.info("put({})", id);
+		throw new NotFoundException("element does not exist: " + id);
+	}
+
+	@DELETE
+	@Path("{id}")
+	@PermitAll
+	public void remove(@PathParam("id") final Long id) throws Exception {
+		LOGGER.info("remove({})", id);
+		this.data.removeIf(e -> e.id.equals(id));
+	}
+
+}

test/src/test/kar/archidata/apiExtern/resource/TestResourceSample.java

@@ -0,0 +1,92 @@
+package test.kar.archidata.apiExtern.resource;
+
+import java.util.List;
+
+import org.kar.archidata.annotation.ARCHIVE;
+import org.kar.archidata.annotation.AsyncType;
+import org.kar.archidata.annotation.RESTORE;
+import org.kar.archidata.dataAccess.DBAccess;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jakarta.annotation.security.PermitAll;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.PATCH;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import test.kar.archidata.dataAccess.model.SimpleTable;
+
+@Path("/TestResourceSample")
+@Produces({ MediaType.APPLICATION_JSON })
+public class TestResourceSample {
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(TestResource.class);
+	private final DBAccess da = DBAccess.createInterface();
+
+	@GET
+	@PermitAll
+	public List<SimpleTable> gets() throws Exception {
+		return this.da.gets(SimpleTable.class);
+	}
+
+	@GET
+	@Path("{id}")
+	@PermitAll
+	public SimpleTable get(@PathParam("id") final Long id) throws Exception {
+		return this.da.get(SimpleTable.class, id);
+	}
+
+	@ARCHIVE
+	@Path("{id}")
+	@PermitAll
+	public SimpleTable archive(@PathParam("id") final Long id) throws Exception {
+		return this.da.get(SimpleTable.class, id);
+	}
+
+	@RESTORE
+	@Path("{id}")
+	@PermitAll
+	public SimpleTable restore(@PathParam("id") final Long id) throws Exception {
+		return this.da.get(SimpleTable.class, id);
+	}
+
+	@POST
+	@PermitAll
+	@Consumes(MediaType.APPLICATION_JSON)
+	public SimpleTable post(final SimpleTable data) throws Exception {
+		return this.da.insert(data);
+	}
+
+	@PATCH
+	@Path("{id}")
+	@PermitAll
+	@Consumes(MediaType.APPLICATION_JSON)
+	public SimpleTable patch(@PathParam("id") final Long id, @AsyncType(SimpleTable.class) final String jsonRequest)
+			throws Exception {
+		this.da.updateWithJson(SimpleTable.class, id, jsonRequest);
+		return this.da.get(SimpleTable.class, id);
+	}
+
+	@PUT
+	@Path("{id}")
+	@PermitAll
+	@Consumes(MediaType.APPLICATION_JSON)
+	public SimpleTable put(@PathParam("id") final Long id, final SimpleTable data) throws Exception {
+		this.da.update(data, id);
+		return this.da.get(SimpleTable.class, id);
+	}
+
+	@DELETE
+	@Path("{id}")
+	@PermitAll
+	public void remove(@PathParam("id") final Long id) throws Exception {
+		this.da.delete(SimpleTable.class, id);
+	}
+
+}

test/src/test/kar/archidata/dataAccess/TestJson.java

@@ -1,4 +1,4 @@
-package test.kar.archidata;
+package test.kar.archidata.dataAccess;
 
 import java.io.IOException;
 import java.util.List;
@@ -11,19 +11,24 @@ import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.kar.archidata.dataAccess.DataAccess;
+import org.kar.archidata.dataAccess.DBAccess;
+import org.kar.archidata.dataAccess.DBAccessSQL;
 import org.kar.archidata.dataAccess.DataFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import test.kar.archidata.model.SerializeAsJson;
+import test.kar.archidata.ConfigureDb;
-import test.kar.archidata.model.SimpleTable;
+import test.kar.archidata.StepwiseExtension;
+import test.kar.archidata.dataAccess.model.SerializeAsJson;
+import test.kar.archidata.dataAccess.model.SimpleTable;
 
 @ExtendWith(StepwiseExtension.class)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class TestJson {
 	final static private Logger LOGGER = LoggerFactory.getLogger(TestJson.class);
 
+	private DBAccess da = null;
+
 	@BeforeAll
 	public static void configureWebServer() throws Exception {
 		ConfigureDb.configure();
@@ -34,13 +39,19 @@ public class TestJson {
 		ConfigureDb.clear();
 	}
 
+	public TestJson() {
+		this.da = DBAccess.createInterface();
+	}
+
 	@Order(1)
 	@Test
-	public void testTableInsertAndRetrieve() throws Exception {
+	public void testTableFactory() throws Exception {
 		final List<String> sqlCommand = DataFactory.createTable(SerializeAsJson.class);
+		if (this.da instanceof final DBAccessSQL daSQL) {
 			for (final String elem : sqlCommand) {
 				LOGGER.debug("request: '{}'", elem);
-			DataAccess.executeSimpleQuery(elem);
+				daSQL.executeSimpleQuery(elem);
+			}
 		}
 	}
 
@@ -51,7 +62,7 @@ public class TestJson {
 		test.data = new SimpleTable();
 		test.data.data = "plopppopql";
 
-		final SerializeAsJson insertedData = DataAccess.insert(test);
+		final SerializeAsJson insertedData = this.da.insert(test);
 
 		Assertions.assertNotNull(insertedData);
 		Assertions.assertNotNull(insertedData.id);
@@ -61,7 +72,7 @@ public class TestJson {
 		Assertions.assertEquals(test.data.data, insertedData.data.data);
 
 		// Try to retrieve all the data:
-		final SerializeAsJson retrieve = DataAccess.get(SerializeAsJson.class, insertedData.id);
+		final SerializeAsJson retrieve = this.da.get(SerializeAsJson.class, insertedData.id);
 
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.id);

test/src/test/kar/archidata/dataAccess/TestListJson.java

@@ -1,4 +1,4 @@
-package test.kar.archidata;
+package test.kar.archidata.dataAccess;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -12,18 +12,23 @@ import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.kar.archidata.dataAccess.DataAccess;
+import org.kar.archidata.dataAccess.DBAccess;
+import org.kar.archidata.dataAccess.DBAccessSQL;
 import org.kar.archidata.dataAccess.DataFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import test.kar.archidata.model.SerializeListAsJson;
+import test.kar.archidata.ConfigureDb;
+import test.kar.archidata.StepwiseExtension;
+import test.kar.archidata.dataAccess.model.SerializeListAsJson;
 
 @ExtendWith(StepwiseExtension.class)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class TestListJson {
 	final static private Logger LOGGER = LoggerFactory.getLogger(TestListJson.class);
 
+	private DBAccess da = null;
+
 	@BeforeAll
 	public static void configureWebServer() throws Exception {
 		ConfigureDb.configure();
@@ -34,13 +39,19 @@ public class TestListJson {
 		ConfigureDb.clear();
 	}
 
+	public TestListJson() {
+		this.da = DBAccess.createInterface();
+	}
+
 	@Order(1)
 	@Test
 	public void testTableInsertAndRetrieve() throws Exception {
 		final List<String> sqlCommand = DataFactory.createTable(SerializeListAsJson.class);
+		if (this.da instanceof final DBAccessSQL daSQL) {
 			for (final String elem : sqlCommand) {
 				LOGGER.debug("request: '{}'", elem);
-			DataAccess.executeSimpleQuery(elem);
+				daSQL.executeSimpleQuery(elem);
+			}
 		}
 	}
 
@@ -55,7 +66,7 @@ public class TestListJson {
 		test.data.add(6);
 		test.data.add(51);
 
-		final SerializeListAsJson insertedData = DataAccess.insert(test);
+		final SerializeListAsJson insertedData = this.da.insert(test);
 
 		Assertions.assertNotNull(insertedData);
 		Assertions.assertNotNull(insertedData.id);
@@ -69,7 +80,7 @@ public class TestListJson {
 		Assertions.assertEquals(test.data.get(4), insertedData.data.get(4));
 
 		// Try to retrieve all the data:
-		final SerializeListAsJson retrieve = DataAccess.get(SerializeListAsJson.class, insertedData.id);
+		final SerializeListAsJson retrieve = this.da.get(SerializeListAsJson.class, insertedData.id);
 
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.id);

test/src/test/kar/archidata/dataAccess/TestManyToMany.java

@@ -1,4 +1,4 @@
-package test.kar.archidata;
+package test.kar.archidata.dataAccess;
 
 import java.io.IOException;
 import java.util.List;
@@ -11,21 +11,26 @@ import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.kar.archidata.dataAccess.DataAccess;
+import org.kar.archidata.dataAccess.DBAccess;
+import org.kar.archidata.dataAccess.DBAccessSQL;
 import org.kar.archidata.dataAccess.DataFactory;
-import org.kar.archidata.dataAccess.addOn.AddOnManyToMany;
+import org.kar.archidata.dataAccess.addOnSQL.AddOnManyToMany;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import test.kar.archidata.model.TypeManyToManyRemote;
+import test.kar.archidata.ConfigureDb;
-import test.kar.archidata.model.TypeManyToManyRoot;
+import test.kar.archidata.StepwiseExtension;
-import test.kar.archidata.model.TypeManyToManyRootExpand;
+import test.kar.archidata.dataAccess.model.TypeManyToManyRemote;
+import test.kar.archidata.dataAccess.model.TypeManyToManyRoot;
+import test.kar.archidata.dataAccess.model.TypeManyToManyRootExpand;
 
 @ExtendWith(StepwiseExtension.class)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class TestManyToMany {
 	final static private Logger LOGGER = LoggerFactory.getLogger(TestManyToMany.class);
 
+	private DBAccess da = null;
+
 	@BeforeAll
 	public static void configureWebServer() throws Exception {
 		ConfigureDb.configure();
@@ -36,15 +41,21 @@ public class TestManyToMany {
 		ConfigureDb.clear();
 	}
 
+	public TestManyToMany() {
+		this.da = DBAccess.createInterface();
+	}
+
 	@Order(1)
 	@Test
 	public void testCreateTable() throws Exception {
 		final List<String> sqlCommand2 = DataFactory.createTable(TypeManyToManyRoot.class);
 		final List<String> sqlCommand = DataFactory.createTable(TypeManyToManyRemote.class);
 		sqlCommand.addAll(sqlCommand2);
+		if (this.da instanceof final DBAccessSQL daSQL) {
 			for (final String elem : sqlCommand) {
 				LOGGER.debug("request: '{}'", elem);
-			DataAccess.executeSimpleQuery(elem);
+				daSQL.executeSimpleQuery(elem);
+			}
 		}
 	}
 
@@ -53,14 +64,14 @@ public class TestManyToMany {
 	public void testSimpleInsertAndRetieve() throws Exception {
 		final TypeManyToManyRoot test = new TypeManyToManyRoot();
 		test.otherData = "kjhlkjlkj";
-		final TypeManyToManyRoot insertedData = DataAccess.insert(test);
+		final TypeManyToManyRoot insertedData = this.da.insert(test);
 		Assertions.assertNotNull(insertedData);
 		Assertions.assertNotNull(insertedData.id);
 		Assertions.assertTrue(insertedData.id >= 0);
 		Assertions.assertNull(insertedData.remote);
 
 		// Try to retrieve all the data:
-		final TypeManyToManyRoot retrieve = DataAccess.get(TypeManyToManyRoot.class, insertedData.id);
+		final TypeManyToManyRoot retrieve = this.da.get(TypeManyToManyRoot.class, insertedData.id);
 
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.id);
@@ -69,7 +80,7 @@ public class TestManyToMany {
 		Assertions.assertEquals(insertedData.otherData, retrieve.otherData);
 		Assertions.assertNull(retrieve.remote);
 
-		DataAccess.delete(TypeManyToManyRoot.class, insertedData.id);
+		this.da.delete(TypeManyToManyRoot.class, insertedData.id);
 	}
 
 	@Order(3)
@@ -78,24 +89,24 @@ public class TestManyToMany {
 
 		TypeManyToManyRemote remote = new TypeManyToManyRemote();
 		remote.data = "remote1";
-		final TypeManyToManyRemote insertedRemote1 = DataAccess.insert(remote);
+		final TypeManyToManyRemote insertedRemote1 = this.da.insert(remote);
 		Assertions.assertEquals(insertedRemote1.data, remote.data);
 
 		remote = new TypeManyToManyRemote();
 		remote.data = "remote2";
-		final TypeManyToManyRemote insertedRemote2 = DataAccess.insert(remote);
+		final TypeManyToManyRemote insertedRemote2 = this.da.insert(remote);
 		Assertions.assertEquals(insertedRemote2.data, remote.data);
 
 		final TypeManyToManyRoot test = new TypeManyToManyRoot();
 		test.otherData = "kjhlkjlkj";
-		final TypeManyToManyRoot insertedData = DataAccess.insert(test);
+		final TypeManyToManyRoot insertedData = this.da.insert(test);
 		Assertions.assertNotNull(insertedData);
 		Assertions.assertNotNull(insertedData.id);
 		Assertions.assertTrue(insertedData.id >= 0);
 		Assertions.assertNull(insertedData.remote);
 
 		// Try to retrieve all the data:
-		TypeManyToManyRoot retrieve = DataAccess.get(TypeManyToManyRoot.class, insertedData.id);
+		TypeManyToManyRoot retrieve = this.da.get(TypeManyToManyRoot.class, insertedData.id);
 
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.id);
@@ -105,10 +116,10 @@ public class TestManyToMany {
 		Assertions.assertNull(retrieve.remote);
 
 		// Add remote elements
-		AddOnManyToMany.addLink(TypeManyToManyRoot.class, retrieve.id, "remote", insertedRemote1.id);
+		AddOnManyToMany.addLink(this.da, TypeManyToManyRoot.class, retrieve.id, "remote", insertedRemote1.id);
-		AddOnManyToMany.addLink(TypeManyToManyRoot.class, retrieve.id, "remote", insertedRemote2.id);
+		AddOnManyToMany.addLink(this.da, TypeManyToManyRoot.class, retrieve.id, "remote", insertedRemote2.id);
 
-		retrieve = DataAccess.get(TypeManyToManyRoot.class, insertedData.id);
+		retrieve = this.da.get(TypeManyToManyRoot.class, insertedData.id);
 
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.id);
@@ -120,7 +131,7 @@ public class TestManyToMany {
 		Assertions.assertEquals(retrieve.remote.get(0), insertedRemote1.id);
 		Assertions.assertEquals(retrieve.remote.get(1), insertedRemote2.id);
 
-		final TypeManyToManyRootExpand retrieveExpand = DataAccess.get(TypeManyToManyRootExpand.class, insertedData.id);
+		final TypeManyToManyRootExpand retrieveExpand = this.da.get(TypeManyToManyRootExpand.class, insertedData.id);
 
 		Assertions.assertNotNull(retrieveExpand);
 		Assertions.assertNotNull(retrieveExpand.id);
@@ -133,10 +144,11 @@ public class TestManyToMany {
 		Assertions.assertEquals(retrieveExpand.remote.get(1).id, insertedRemote2.id);
 
 		// Remove an element
-		int count = AddOnManyToMany.removeLink(TypeManyToManyRoot.class, retrieve.id, "remote", insertedRemote1.id);
+		long count = AddOnManyToMany.removeLink(this.da, TypeManyToManyRoot.class, retrieve.id, "remote",
+				insertedRemote1.id);
 		Assertions.assertEquals(1, count);
 
-		retrieve = DataAccess.get(TypeManyToManyRoot.class, insertedData.id);
+		retrieve = this.da.get(TypeManyToManyRoot.class, insertedData.id);
 
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.id);
@@ -148,10 +160,11 @@ public class TestManyToMany {
 		Assertions.assertEquals(retrieve.remote.get(0), insertedRemote2.id);
 
 		// Remove the second element
-		count = AddOnManyToMany.removeLink(TypeManyToManyRoot.class, retrieve.id, "remote", insertedRemote2.id);
+		count = AddOnManyToMany.removeLink(this.da, TypeManyToManyRoot.class, retrieve.id, "remote",
+				insertedRemote2.id);
 		Assertions.assertEquals(1, count);
 
-		retrieve = DataAccess.get(TypeManyToManyRoot.class, insertedData.id);
+		retrieve = this.da.get(TypeManyToManyRoot.class, insertedData.id);
 
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.id);
@@ -160,7 +173,7 @@ public class TestManyToMany {
 		Assertions.assertEquals(insertedData.otherData, retrieve.otherData);
 		Assertions.assertNull(retrieve.remote);
 
-		DataAccess.delete(TypeManyToManyRoot.class, insertedData.id);
+		this.da.delete(TypeManyToManyRoot.class, insertedData.id);
 	}
 
 	/* API TODO: - Replace list (permet de les ordonnées) - remove all links - delete en cascade .... (compliqué...) */

test/src/test/kar/archidata/dataAccess/TestManyToOne.java

@@ -1,4 +1,4 @@
-package test.kar.archidata;
+package test.kar.archidata.dataAccess;
 
 import java.io.IOException;
 import java.util.List;
@@ -11,23 +11,28 @@ import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.kar.archidata.dataAccess.DataAccess;
+import org.kar.archidata.dataAccess.DBAccess;
+import org.kar.archidata.dataAccess.DBAccessSQL;
 import org.kar.archidata.dataAccess.DataFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import test.kar.archidata.model.TypeManyToOneRemote;
+import test.kar.archidata.ConfigureDb;
-import test.kar.archidata.model.TypeManyToOneRoot;
+import test.kar.archidata.StepwiseExtension;
-import test.kar.archidata.model.TypeManyToOneRootExpand;
+import test.kar.archidata.dataAccess.model.TypeManyToOneRemote;
-import test.kar.archidata.model.TypeManyToOneUUIDRemote;
+import test.kar.archidata.dataAccess.model.TypeManyToOneRoot;
-import test.kar.archidata.model.TypeManyToOneUUIDRoot;
+import test.kar.archidata.dataAccess.model.TypeManyToOneRootExpand;
-import test.kar.archidata.model.TypeManyToOneUUIDRootExpand;
+import test.kar.archidata.dataAccess.model.TypeManyToOneUUIDRemote;
+import test.kar.archidata.dataAccess.model.TypeManyToOneUUIDRoot;
+import test.kar.archidata.dataAccess.model.TypeManyToOneUUIDRootExpand;
 
 @ExtendWith(StepwiseExtension.class)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class TestManyToOne {
 	final static private Logger LOGGER = LoggerFactory.getLogger(TestManyToOne.class);
 
+	private DBAccess da = null;
+
 	@BeforeAll
 	public static void configureWebServer() throws Exception {
 		ConfigureDb.configure();
@@ -38,6 +43,10 @@ public class TestManyToOne {
 		ConfigureDb.clear();
 	}
 
+	public TestManyToOne() {
+		this.da = DBAccess.createInterface();
+	}
+
 	@Order(1)
 	@Test
 	public void testCreateTable() throws Exception {
@@ -45,9 +54,11 @@ public class TestManyToOne {
 		sqlCommand.addAll(DataFactory.createTable(TypeManyToOneRoot.class));
 		sqlCommand.addAll(DataFactory.createTable(TypeManyToOneUUIDRoot.class));
 		sqlCommand.addAll(DataFactory.createTable(TypeManyToOneUUIDRemote.class));
+		if (this.da instanceof final DBAccessSQL daSQL) {
 			for (final String elem : sqlCommand) {
 				LOGGER.debug("request: '{}'", elem);
-			DataAccess.executeSimpleQuery(elem);
+				daSQL.executeSimpleQuery(elem);
+			}
 		}
 	}
 
@@ -56,32 +67,32 @@ public class TestManyToOne {
 	public void testRemoteLong() throws Exception {
 		TypeManyToOneRemote remote = new TypeManyToOneRemote();
 		remote.data = "remote1";
-		final TypeManyToOneRemote insertedRemote1 = DataAccess.insert(remote);
+		final TypeManyToOneRemote insertedRemote1 = this.da.insert(remote);
 		Assertions.assertEquals(insertedRemote1.data, remote.data);
 
 		remote = new TypeManyToOneRemote();
 		remote.data = "remote2";
-		final TypeManyToOneRemote insertedRemote2 = DataAccess.insert(remote);
+		final TypeManyToOneRemote insertedRemote2 = this.da.insert(remote);
 		Assertions.assertEquals(insertedRemote2.data, remote.data);
 
 		final TypeManyToOneRoot test = new TypeManyToOneRoot();
 		test.otherData = "kjhlkjlkj";
 		test.remoteId = insertedRemote2.id;
-		final TypeManyToOneRoot insertedData = DataAccess.insert(test);
+		final TypeManyToOneRoot insertedData = this.da.insert(test);
 		Assertions.assertNotNull(insertedData);
 		Assertions.assertNotNull(insertedData.id);
 		Assertions.assertTrue(insertedData.id >= 0);
 		Assertions.assertEquals(test.otherData, insertedData.otherData);
 		Assertions.assertEquals(insertedRemote2.id, insertedData.remoteId);
 
-		TypeManyToOneRoot retrieve = DataAccess.get(TypeManyToOneRoot.class, insertedData.id);
+		TypeManyToOneRoot retrieve = this.da.get(TypeManyToOneRoot.class, insertedData.id);
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.id);
 		Assertions.assertEquals(insertedData.id, retrieve.id);
 		Assertions.assertEquals(insertedData.otherData, retrieve.otherData);
 		Assertions.assertEquals(insertedRemote2.id, retrieve.remoteId);
 
-		TypeManyToOneRootExpand retrieve2 = DataAccess.get(TypeManyToOneRootExpand.class, insertedData.id);
+		TypeManyToOneRootExpand retrieve2 = this.da.get(TypeManyToOneRootExpand.class, insertedData.id);
 		Assertions.assertNotNull(retrieve2);
 		Assertions.assertNotNull(retrieve2.id);
 		Assertions.assertEquals(insertedData.id, retrieve2.id);
@@ -91,19 +102,22 @@ public class TestManyToOne {
 		Assertions.assertEquals(insertedRemote2.data, retrieve2.remote.data);
 
 		// remove values:
-		final int count = DataAccess.delete(TypeManyToOneRemote.class, remote.id);
+		try {
-		Assertions.assertEquals(1, count);
+			final long count = this.da.delete(TypeManyToOneRemote.class, insertedRemote2.id);
-
+			Assertions.assertEquals(1L, count);
+		} catch (final Exception ex) {
+			ex.printStackTrace();
+		}
 		// check fail:
 
-		retrieve = DataAccess.get(TypeManyToOneRoot.class, insertedData.id);
+		retrieve = this.da.get(TypeManyToOneRoot.class, insertedData.id);
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.id);
 		Assertions.assertEquals(insertedData.id, retrieve.id);
 		Assertions.assertEquals(insertedData.otherData, retrieve.otherData);
 		Assertions.assertEquals(insertedRemote2.id, retrieve.remoteId);
 
-		retrieve2 = DataAccess.get(TypeManyToOneRootExpand.class, insertedData.id);
+		retrieve2 = this.da.get(TypeManyToOneRootExpand.class, insertedData.id);
 		Assertions.assertNotNull(retrieve2);
 		Assertions.assertNotNull(retrieve2.id);
 		Assertions.assertEquals(insertedData.id, retrieve2.id);
@@ -116,31 +130,31 @@ public class TestManyToOne {
 	public void testRemoteUUID() throws Exception {
 		TypeManyToOneUUIDRemote remote = new TypeManyToOneUUIDRemote();
 		remote.data = "remote1";
-		final TypeManyToOneUUIDRemote insertedRemote1 = DataAccess.insert(remote);
+		final TypeManyToOneUUIDRemote insertedRemote1 = this.da.insert(remote);
 		Assertions.assertEquals(insertedRemote1.data, remote.data);
 
 		remote = new TypeManyToOneUUIDRemote();
 		remote.data = "remote2";
-		final TypeManyToOneUUIDRemote insertedRemote2 = DataAccess.insert(remote);
+		final TypeManyToOneUUIDRemote insertedRemote2 = this.da.insert(remote);
 		Assertions.assertEquals(insertedRemote2.data, remote.data);
 
 		final TypeManyToOneUUIDRoot test = new TypeManyToOneUUIDRoot();
 		test.otherData = "kjhlkjlkj";
 		test.remoteUuid = insertedRemote2.uuid;
-		final TypeManyToOneUUIDRoot insertedData = DataAccess.insert(test);
+		final TypeManyToOneUUIDRoot insertedData = this.da.insert(test);
 		Assertions.assertNotNull(insertedData);
 		Assertions.assertNotNull(insertedData.uuid);
 		Assertions.assertEquals(test.otherData, insertedData.otherData);
 		Assertions.assertEquals(insertedRemote2.uuid, insertedData.remoteUuid);
 
-		TypeManyToOneUUIDRoot retrieve = DataAccess.get(TypeManyToOneUUIDRoot.class, insertedData.uuid);
+		TypeManyToOneUUIDRoot retrieve = this.da.get(TypeManyToOneUUIDRoot.class, insertedData.uuid);
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.uuid);
 		Assertions.assertEquals(insertedData.uuid, retrieve.uuid);
 		Assertions.assertEquals(insertedData.otherData, retrieve.otherData);
 		Assertions.assertEquals(insertedRemote2.uuid, retrieve.remoteUuid);
 
-		TypeManyToOneUUIDRootExpand retrieve2 = DataAccess.get(TypeManyToOneUUIDRootExpand.class, insertedData.uuid);
+		TypeManyToOneUUIDRootExpand retrieve2 = this.da.get(TypeManyToOneUUIDRootExpand.class, insertedData.uuid);
 		Assertions.assertNotNull(retrieve2);
 		Assertions.assertNotNull(retrieve2.uuid);
 		Assertions.assertEquals(insertedData.uuid, retrieve2.uuid);
@@ -150,19 +164,19 @@ public class TestManyToOne {
 		Assertions.assertEquals(insertedRemote2.data, retrieve2.remote.data);
 
 		// remove values:
-		final int count = DataAccess.delete(TypeManyToOneUUIDRemote.class, remote.uuid);
+		final long count = this.da.delete(TypeManyToOneUUIDRemote.class, insertedRemote2.uuid);
 		Assertions.assertEquals(1, count);
 
 		// check fail:
 
-		retrieve = DataAccess.get(TypeManyToOneUUIDRoot.class, insertedData.uuid);
+		retrieve = this.da.get(TypeManyToOneUUIDRoot.class, insertedData.uuid);
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.uuid);
 		Assertions.assertEquals(insertedData.uuid, retrieve.uuid);
 		Assertions.assertEquals(insertedData.otherData, retrieve.otherData);
 		Assertions.assertEquals(insertedRemote2.uuid, retrieve.remoteUuid);
 
-		retrieve2 = DataAccess.get(TypeManyToOneUUIDRootExpand.class, insertedData.uuid);
+		retrieve2 = this.da.get(TypeManyToOneUUIDRootExpand.class, insertedData.uuid);
 		Assertions.assertNotNull(retrieve2);
 		Assertions.assertNotNull(retrieve2.uuid);
 		Assertions.assertEquals(insertedData.uuid, retrieve2.uuid);

test/src/test/kar/archidata/dataAccess/TestOneToMany.java

@@ -1,4 +1,4 @@
-package test.kar.archidata;
+package test.kar.archidata.dataAccess;
 
 import java.io.IOException;
 import java.util.List;
@@ -11,23 +11,28 @@ import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.kar.archidata.dataAccess.DataAccess;
+import org.kar.archidata.dataAccess.DBAccess;
+import org.kar.archidata.dataAccess.DBAccessSQL;
 import org.kar.archidata.dataAccess.DataFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import test.kar.archidata.model.TypeOneToManyRemote;
+import test.kar.archidata.ConfigureDb;
-import test.kar.archidata.model.TypeOneToManyRoot;
+import test.kar.archidata.StepwiseExtension;
-import test.kar.archidata.model.TypeOneToManyRootExpand;
+import test.kar.archidata.dataAccess.model.TypeOneToManyRemote;
-import test.kar.archidata.model.TypeOneToManyUUIDRemote;
+import test.kar.archidata.dataAccess.model.TypeOneToManyRoot;
-import test.kar.archidata.model.TypeOneToManyUUIDRoot;
+import test.kar.archidata.dataAccess.model.TypeOneToManyRootExpand;
-import test.kar.archidata.model.TypeOneToManyUUIDRootExpand;
+import test.kar.archidata.dataAccess.model.TypeOneToManyUUIDRemote;
+import test.kar.archidata.dataAccess.model.TypeOneToManyUUIDRoot;
+import test.kar.archidata.dataAccess.model.TypeOneToManyUUIDRootExpand;
 
 @ExtendWith(StepwiseExtension.class)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class TestOneToMany {
 	final static private Logger LOGGER = LoggerFactory.getLogger(TestOneToMany.class);
 
+	private DBAccess da = null;
+
 	@BeforeAll
 	public static void configureWebServer() throws Exception {
 		ConfigureDb.configure();
@@ -38,6 +43,10 @@ public class TestOneToMany {
 		ConfigureDb.clear();
 	}
 
+	public TestOneToMany() {
+		this.da = DBAccess.createInterface();
+	}
+
 	@Order(1)
 	@Test
 	public void testCreateTable() throws Exception {
@@ -45,9 +54,11 @@ public class TestOneToMany {
 		sqlCommand.addAll(DataFactory.createTable(TypeOneToManyRoot.class));
 		sqlCommand.addAll(DataFactory.createTable(TypeOneToManyUUIDRemote.class));
 		sqlCommand.addAll(DataFactory.createTable(TypeOneToManyUUIDRoot.class));
+		if (this.da instanceof final DBAccessSQL daSQL) {
 			for (final String elem : sqlCommand) {
 				LOGGER.debug("request: '{}'", elem);
-			DataAccess.executeSimpleQuery(elem);
+				daSQL.executeSimpleQuery(elem);
+			}
 		}
 	}
 
@@ -58,13 +69,13 @@ public class TestOneToMany {
 
 		final TypeOneToManyRoot root = new TypeOneToManyRoot();
 		root.otherData = "plouf";
-		final TypeOneToManyRoot insertedRoot = DataAccess.insert(root);
+		final TypeOneToManyRoot insertedRoot = this.da.insert(root);
 		Assertions.assertEquals(insertedRoot.otherData, root.otherData);
 		Assertions.assertNull(insertedRoot.remoteIds);
 
 		final TypeOneToManyRoot root2 = new TypeOneToManyRoot();
 		root2.otherData = "plouf 2";
-		final TypeOneToManyRoot insertedRoot2 = DataAccess.insert(root2);
+		final TypeOneToManyRoot insertedRoot2 = this.da.insert(root2);
 		Assertions.assertEquals(insertedRoot2.otherData, root2.otherData);
 		Assertions.assertNull(insertedRoot2.remoteIds);
 
@@ -73,34 +84,34 @@ public class TestOneToMany {
 		final TypeOneToManyRemote remote10 = new TypeOneToManyRemote();
 		remote10.data = "remote10";
 		remote10.rootId = insertedRoot.id;
-		final TypeOneToManyRemote insertedRemote10 = DataAccess.insert(remote10);
+		final TypeOneToManyRemote insertedRemote10 = this.da.insert(remote10);
 		Assertions.assertEquals(insertedRemote10.data, remote10.data);
 		Assertions.assertEquals(insertedRemote10.rootId, remote10.rootId);
 
 		final TypeOneToManyRemote remote11 = new TypeOneToManyRemote();
 		remote11.data = "remote11";
 		remote11.rootId = insertedRoot.id;
-		final TypeOneToManyRemote insertedRemote11 = DataAccess.insert(remote11);
+		final TypeOneToManyRemote insertedRemote11 = this.da.insert(remote11);
 		Assertions.assertEquals(insertedRemote11.data, remote11.data);
 		Assertions.assertEquals(insertedRemote11.rootId, remote11.rootId);
 
 		final TypeOneToManyRemote remote20 = new TypeOneToManyRemote();
 		remote20.data = "remote20";
 		remote20.rootId = insertedRoot2.id;
-		final TypeOneToManyRemote insertedRemote20 = DataAccess.insert(remote20);
+		final TypeOneToManyRemote insertedRemote20 = this.da.insert(remote20);
 		Assertions.assertEquals(insertedRemote20.data, remote20.data);
 		Assertions.assertEquals(insertedRemote20.rootId, remote20.rootId);
 
 		// Check remote are inserted
 
-		final TypeOneToManyRoot retreiveRoot1 = DataAccess.get(TypeOneToManyRoot.class, insertedRoot.id);
+		final TypeOneToManyRoot retreiveRoot1 = this.da.get(TypeOneToManyRoot.class, insertedRoot.id);
 		Assertions.assertEquals(retreiveRoot1.otherData, insertedRoot.otherData);
 		Assertions.assertNotNull(retreiveRoot1.remoteIds);
 		Assertions.assertEquals(2, retreiveRoot1.remoteIds.size());
 		Assertions.assertEquals(insertedRemote10.id, retreiveRoot1.remoteIds.get(0));
 		Assertions.assertEquals(insertedRemote11.id, retreiveRoot1.remoteIds.get(1));
 
-		final TypeOneToManyRoot retreiveRoot2 = DataAccess.get(TypeOneToManyRoot.class, insertedRoot2.id);
+		final TypeOneToManyRoot retreiveRoot2 = this.da.get(TypeOneToManyRoot.class, insertedRoot2.id);
 		Assertions.assertEquals(retreiveRoot2.otherData, insertedRoot2.otherData);
 		Assertions.assertNotNull(retreiveRoot2.remoteIds);
 		Assertions.assertEquals(1, retreiveRoot2.remoteIds.size());
@@ -108,8 +119,7 @@ public class TestOneToMany {
 
 		// Check remote are inserted and expandable
 
-		final TypeOneToManyRootExpand retreiveRootExpand1 = DataAccess.get(TypeOneToManyRootExpand.class,
+		final TypeOneToManyRootExpand retreiveRootExpand1 = this.da.get(TypeOneToManyRootExpand.class, insertedRoot.id);
-				insertedRoot.id);
 		Assertions.assertEquals(retreiveRootExpand1.otherData, insertedRoot.otherData);
 		Assertions.assertNotNull(retreiveRootExpand1.remotes);
 		Assertions.assertEquals(2, retreiveRootExpand1.remotes.size());
@@ -120,7 +130,7 @@ public class TestOneToMany {
 		Assertions.assertEquals(insertedRemote11.rootId, retreiveRootExpand1.remotes.get(1).rootId);
 		Assertions.assertEquals(insertedRemote11.data, retreiveRootExpand1.remotes.get(1).data);
 
-		final TypeOneToManyRootExpand retreiveRootExpand2 = DataAccess.get(TypeOneToManyRootExpand.class,
+		final TypeOneToManyRootExpand retreiveRootExpand2 = this.da.get(TypeOneToManyRootExpand.class,
 				insertedRoot2.id);
 		Assertions.assertEquals(retreiveRootExpand2.otherData, insertedRoot2.otherData);
 		Assertions.assertNotNull(retreiveRootExpand2.remotes);
@@ -138,13 +148,13 @@ public class TestOneToMany {
 
 		final TypeOneToManyUUIDRoot root = new TypeOneToManyUUIDRoot();
 		root.otherData = "plouf";
-		final TypeOneToManyUUIDRoot insertedRoot = DataAccess.insert(root);
+		final TypeOneToManyUUIDRoot insertedRoot = this.da.insert(root);
 		Assertions.assertEquals(insertedRoot.otherData, root.otherData);
 		Assertions.assertNull(insertedRoot.remoteIds);
 
 		final TypeOneToManyUUIDRoot root2 = new TypeOneToManyUUIDRoot();
 		root2.otherData = "plouf 2";
-		final TypeOneToManyUUIDRoot insertedRoot2 = DataAccess.insert(root2);
+		final TypeOneToManyUUIDRoot insertedRoot2 = this.da.insert(root2);
 		Assertions.assertEquals(insertedRoot2.otherData, root2.otherData);
 		Assertions.assertNull(insertedRoot2.remoteIds);
 
@@ -153,34 +163,34 @@ public class TestOneToMany {
 		final TypeOneToManyUUIDRemote remote10 = new TypeOneToManyUUIDRemote();
 		remote10.data = "remote10";
 		remote10.rootUuid = insertedRoot.uuid;
-		final TypeOneToManyUUIDRemote insertedRemote10 = DataAccess.insert(remote10);
+		final TypeOneToManyUUIDRemote insertedRemote10 = this.da.insert(remote10);
 		Assertions.assertEquals(insertedRemote10.data, remote10.data);
 		Assertions.assertEquals(insertedRemote10.rootUuid, remote10.rootUuid);
 
 		final TypeOneToManyUUIDRemote remote11 = new TypeOneToManyUUIDRemote();
 		remote11.data = "remote11";
 		remote11.rootUuid = insertedRoot.uuid;
-		final TypeOneToManyUUIDRemote insertedRemote11 = DataAccess.insert(remote11);
+		final TypeOneToManyUUIDRemote insertedRemote11 = this.da.insert(remote11);
 		Assertions.assertEquals(insertedRemote11.data, remote11.data);
 		Assertions.assertEquals(insertedRemote11.rootUuid, remote11.rootUuid);
 
 		final TypeOneToManyUUIDRemote remote20 = new TypeOneToManyUUIDRemote();
 		remote20.data = "remote20";
 		remote20.rootUuid = insertedRoot2.uuid;
-		final TypeOneToManyUUIDRemote insertedRemote20 = DataAccess.insert(remote20);
+		final TypeOneToManyUUIDRemote insertedRemote20 = this.da.insert(remote20);
 		Assertions.assertEquals(insertedRemote20.data, remote20.data);
 		Assertions.assertEquals(insertedRemote20.rootUuid, remote20.rootUuid);
 
 		// Check remote are inserted
 
-		final TypeOneToManyUUIDRoot retreiveRoot1 = DataAccess.get(TypeOneToManyUUIDRoot.class, insertedRoot.uuid);
+		final TypeOneToManyUUIDRoot retreiveRoot1 = this.da.get(TypeOneToManyUUIDRoot.class, insertedRoot.uuid);
 		Assertions.assertEquals(retreiveRoot1.otherData, insertedRoot.otherData);
 		Assertions.assertNotNull(retreiveRoot1.remoteIds);
 		Assertions.assertEquals(2, retreiveRoot1.remoteIds.size());
 		Assertions.assertEquals(insertedRemote10.uuid, retreiveRoot1.remoteIds.get(0));
 		Assertions.assertEquals(insertedRemote11.uuid, retreiveRoot1.remoteIds.get(1));
 
-		final TypeOneToManyUUIDRoot retreiveRoot2 = DataAccess.get(TypeOneToManyUUIDRoot.class, insertedRoot2.uuid);
+		final TypeOneToManyUUIDRoot retreiveRoot2 = this.da.get(TypeOneToManyUUIDRoot.class, insertedRoot2.uuid);
 		Assertions.assertEquals(retreiveRoot2.otherData, insertedRoot2.otherData);
 		Assertions.assertNotNull(retreiveRoot2.remoteIds);
 		Assertions.assertEquals(1, retreiveRoot2.remoteIds.size());
@@ -188,7 +198,7 @@ public class TestOneToMany {
 
 		// Check remote are inserted and expandable
 
-		final TypeOneToManyUUIDRootExpand retreiveRootExpand1 = DataAccess.get(TypeOneToManyUUIDRootExpand.class,
+		final TypeOneToManyUUIDRootExpand retreiveRootExpand1 = this.da.get(TypeOneToManyUUIDRootExpand.class,
 				insertedRoot.uuid);
 		Assertions.assertEquals(retreiveRootExpand1.otherData, insertedRoot.otherData);
 		Assertions.assertNotNull(retreiveRootExpand1.remotes);
@@ -200,7 +210,7 @@ public class TestOneToMany {
 		Assertions.assertEquals(insertedRemote11.rootUuid, retreiveRootExpand1.remotes.get(1).rootUuid);
 		Assertions.assertEquals(insertedRemote11.data, retreiveRootExpand1.remotes.get(1).data);
 
-		final TypeOneToManyUUIDRootExpand retreiveRootExpand2 = DataAccess.get(TypeOneToManyUUIDRootExpand.class,
+		final TypeOneToManyUUIDRootExpand retreiveRootExpand2 = this.da.get(TypeOneToManyUUIDRootExpand.class,
 				insertedRoot2.uuid);
 		Assertions.assertEquals(retreiveRootExpand2.otherData, insertedRoot2.otherData);
 		Assertions.assertNotNull(retreiveRootExpand2.remotes);

test/src/test/kar/archidata/dataAccess/TestRawQuery.java

@@ -0,0 +1,126 @@
+package test.kar.archidata.dataAccess;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.kar.archidata.dataAccess.DBAccess;
+import org.kar.archidata.dataAccess.DBAccessSQL;
+import org.kar.archidata.dataAccess.DataFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import test.kar.archidata.ConfigureDb;
+import test.kar.archidata.StepwiseExtension;
+import test.kar.archidata.dataAccess.model.TypesTable;
+
+@ExtendWith(StepwiseExtension.class)
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
+public class TestRawQuery {
+	final static private Logger LOGGER = LoggerFactory.getLogger(TestTypes.class);
+
+	private DBAccess da = null;
+
+	@BeforeAll
+	public static void configureWebServer() throws Exception {
+		ConfigureDb.configure();
+	}
+
+	@AfterAll
+	public static void removeDataBase() throws IOException {
+		ConfigureDb.clear();
+	}
+
+	public TestRawQuery() {
+		this.da = DBAccess.createInterface();
+		if (this.da instanceof final DBAccessSQL daSQL) {
+			LOGGER.error("lkjddlkj");
+		}
+	}
+
+	@Order(1)
+	@Test
+	public void testCreateTable() throws Exception {
+		final List<String> sqlCommand = DataFactory.createTable(TypesTable.class);
+		if (this.da instanceof final DBAccessSQL daSQL) {
+			for (final String elem : sqlCommand) {
+				LOGGER.debug("request: '{}'", elem);
+				daSQL.executeSimpleQuery(elem);
+			}
+		}
+	}
+
+	@Order(2)
+	@Test
+	public void testGet() throws Exception {
+		if (this.da instanceof final DBAccessSQL daSQL) {
+
+			final TypesTable test = new TypesTable();
+			test.intData = 95;
+			test.floatData = 1.0F;
+			this.da.insert(test);
+			test.intData = 96;
+			test.floatData = 2.0F;
+			this.da.insert(test);
+			test.intData = 97;
+			test.floatData = 3.0F;
+			this.da.insert(test);
+			test.intData = 98;
+			test.floatData = 4.0F;
+			this.da.insert(test);
+			test.intData = 99;
+			test.floatData = 5.0F;
+			this.da.insert(test);
+			test.intData = 99;
+			test.floatData = 6.0F;
+			this.da.insert(test);
+			test.intData = 99;
+			test.floatData = 7.0F;
+			this.da.insert(test);
+			{
+				final String query = """
+						SELECT *
+						FROM TypesTable
+						WHERE `intData` = ?
+						ORDER BY id DESC
+						""";
+				final List<Object> parameters = List.of(Integer.valueOf(99));
+				// Try to retrieve all the data:
+				final List<TypesTable> retrieve = daSQL.query(TypesTable.class, query, parameters);
+
+				Assertions.assertNotNull(retrieve);
+				Assertions.assertEquals(3, retrieve.size());
+				Assertions.assertEquals(99, retrieve.get(0).intData);
+				Assertions.assertEquals(7.0F, retrieve.get(0).floatData);
+				Assertions.assertEquals(6.0F, retrieve.get(1).floatData);
+				Assertions.assertEquals(5.0F, retrieve.get(2).floatData);
+			}
+			{
+
+				final String query = """
+						SELECT DISTINCT intData
+						FROM TypesTable
+						WHERE `intData` = ?
+						ORDER BY id DESC
+						""";
+				final List<Object> parameters = List.of(Integer.valueOf(99));
+				// Try to retrieve all the data:
+				final List<TypesTable> retrieve = daSQL.query(TypesTable.class, query, parameters);
+
+				Assertions.assertNotNull(retrieve);
+				Assertions.assertEquals(1, retrieve.size());
+				Assertions.assertEquals(99, retrieve.get(0).intData);
+			}
+		} else {
+			LOGGER.warn("Not a SQL DB ...");
+		}
+	}
+
+}

test/src/test/kar/archidata/dataAccess/TestSimpleTable.java

@@ -1,4 +1,4 @@
-package test.kar.archidata;
+package test.kar.archidata.dataAccess;
 
 import java.io.IOException;
 import java.sql.Timestamp;
@@ -14,13 +14,16 @@ import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.kar.archidata.dataAccess.DataAccess;
+import org.kar.archidata.dataAccess.DBAccess;
+import org.kar.archidata.dataAccess.DBAccessSQL;
 import org.kar.archidata.dataAccess.DataFactory;
 import org.kar.archidata.dataAccess.QueryOptions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import test.kar.archidata.model.SimpleTable;
+import test.kar.archidata.ConfigureDb;
+import test.kar.archidata.StepwiseExtension;
+import test.kar.archidata.dataAccess.model.SimpleTable;
 
 @ExtendWith(StepwiseExtension.class)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
@@ -31,6 +34,8 @@ public class TestSimpleTable {
 	private static Long idOfTheObject = null;
 	private static Timestamp startAction = null;
 
+	private DBAccess da = null;
+
 	@BeforeAll
 	public static void configureWebServer() throws Exception {
 		// Clear the static test:
@@ -44,25 +49,31 @@ public class TestSimpleTable {
 		ConfigureDb.clear();
 	}
 
+	public TestSimpleTable() {
+		this.da = DBAccess.createInterface();
+	}
+
 	@Order(1)
 	@Test
 	public void testTableInsertAndRetrieve() throws Exception {
 		TestSimpleTable.startAction = Timestamp.from(Instant.now());
 		final List<String> sqlCommand = DataFactory.createTable(SimpleTable.class);
+		if (this.da instanceof final DBAccessSQL daSQL) {
 			for (final String elem : sqlCommand) {
 				LOGGER.debug("request: '{}'", elem);
-			DataAccess.executeSimpleQuery(elem);
+				daSQL.executeSimpleQuery(elem);
+			}
 		}
 		final SimpleTable test = new SimpleTable();
 		test.data = TestSimpleTable.DATA_INJECTED;
-		final SimpleTable insertedData = DataAccess.insert(test);
+		final SimpleTable insertedData = this.da.insert(test);
 
 		Assertions.assertNotNull(insertedData);
 		Assertions.assertNotNull(insertedData.id);
 		Assertions.assertTrue(insertedData.id >= 0);
 
 		// Try to retrieve all the data:
-		final SimpleTable retrieve = DataAccess.get(SimpleTable.class, insertedData.id);
+		final SimpleTable retrieve = this.da.get(SimpleTable.class, insertedData.id);
 
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.id);
@@ -77,7 +88,7 @@ public class TestSimpleTable {
 	@Test
 	public void testReadAllValuesUnreadable() throws Exception {
 		// check the full values
-		final SimpleTable retrieve = DataAccess.get(SimpleTable.class, TestSimpleTable.idOfTheObject,
+		final SimpleTable retrieve = this.da.get(SimpleTable.class, TestSimpleTable.idOfTheObject,
 				QueryOptions.READ_ALL_COLOMN);
 
 		Assertions.assertNotNull(retrieve);
@@ -100,8 +111,8 @@ public class TestSimpleTable {
 		// Delete the entry:
 		final SimpleTable test = new SimpleTable();
 		test.data = TestSimpleTable.DATA_INJECTED_2;
-		DataAccess.update(test, TestSimpleTable.idOfTheObject, List.of("data"));
+		this.da.update(test, TestSimpleTable.idOfTheObject, List.of("data"));
-		final SimpleTable retrieve = DataAccess.get(SimpleTable.class, TestSimpleTable.idOfTheObject,
+		final SimpleTable retrieve = this.da.get(SimpleTable.class, TestSimpleTable.idOfTheObject,
 				QueryOptions.READ_ALL_COLOMN);
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.id);
@@ -117,8 +128,8 @@ public class TestSimpleTable {
 	@Test
 	public void testDeleteTheObject() throws Exception {
 		// Delete the entry:
-		DataAccess.delete(SimpleTable.class, TestSimpleTable.idOfTheObject);
+		this.da.delete(SimpleTable.class, TestSimpleTable.idOfTheObject);
-		final SimpleTable retrieve = DataAccess.get(SimpleTable.class, TestSimpleTable.idOfTheObject);
+		final SimpleTable retrieve = this.da.get(SimpleTable.class, TestSimpleTable.idOfTheObject);
 		Assertions.assertNull(retrieve);
 	}
 
@@ -127,7 +138,7 @@ public class TestSimpleTable {
 	public void testReadDeletedObject() throws Exception {
 
 		// check if we set get deleted element
-		final SimpleTable retrieve = DataAccess.get(SimpleTable.class, TestSimpleTable.idOfTheObject,
+		final SimpleTable retrieve = this.da.get(SimpleTable.class, TestSimpleTable.idOfTheObject,
 				QueryOptions.ACCESS_DELETED_ITEMS);
 		Assertions.assertNull(retrieve);
 
@@ -137,7 +148,7 @@ public class TestSimpleTable {
 	@Test
 	public void testReadAllValuesUnreadableOfDeletedObject() throws Exception {
 		// check if we set get deleted element with all data
-		final SimpleTable retrieve = DataAccess.get(SimpleTable.class, TestSimpleTable.idOfTheObject,
+		final SimpleTable retrieve = this.da.get(SimpleTable.class, TestSimpleTable.idOfTheObject,
 				QueryOptions.ACCESS_DELETED_ITEMS, QueryOptions.READ_ALL_COLOMN);
 		Assertions.assertNull(retrieve);
 

test/src/test/kar/archidata/dataAccess/TestSimpleTableSoftDelete.java

@@ -1,4 +1,4 @@
-package test.kar.archidata;
+package test.kar.archidata.dataAccess;
 
 import java.io.IOException;
 import java.sql.Timestamp;
@@ -14,14 +14,17 @@ import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.kar.archidata.dataAccess.DataAccess;
+import org.kar.archidata.dataAccess.DBAccess;
+import org.kar.archidata.dataAccess.DBAccessSQL;
 import org.kar.archidata.dataAccess.DataFactory;
 import org.kar.archidata.dataAccess.QueryOptions;
 import org.kar.archidata.tools.ConfigBaseVariable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import test.kar.archidata.model.SimpleTableSoftDelete;
+import test.kar.archidata.ConfigureDb;
+import test.kar.archidata.StepwiseExtension;
+import test.kar.archidata.dataAccess.model.SimpleTableSoftDelete;
 
 @ExtendWith(StepwiseExtension.class)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
@@ -32,6 +35,8 @@ public class TestSimpleTableSoftDelete {
 	private static Long idOfTheObject = null;
 	private static Timestamp startAction = null;
 
+	private DBAccess da = null;
+
 	@BeforeAll
 	public static void configureWebServer() throws Exception {
 		// Clear the static test:
@@ -46,25 +51,31 @@ public class TestSimpleTableSoftDelete {
 		ConfigureDb.clear();
 	}
 
+	public TestSimpleTableSoftDelete() {
+		this.da = DBAccess.createInterface();
+	}
+
 	@Order(1)
 	@Test
 	public void testTableInsertAndRetrieve() throws Exception {
 		TestSimpleTableSoftDelete.startAction = Timestamp.from(Instant.now());
 		final List<String> sqlCommand = DataFactory.createTable(SimpleTableSoftDelete.class);
+		if (this.da instanceof final DBAccessSQL daSQL) {
 			for (final String elem : sqlCommand) {
 				LOGGER.debug("request: '{}'", elem);
-			DataAccess.executeSimpleQuery(elem);
+				daSQL.executeSimpleQuery(elem);
+			}
 		}
 		final SimpleTableSoftDelete test = new SimpleTableSoftDelete();
 		test.data = TestSimpleTableSoftDelete.DATA_INJECTED;
-		final SimpleTableSoftDelete insertedData = DataAccess.insert(test);
+		final SimpleTableSoftDelete insertedData = this.da.insert(test);
 
 		Assertions.assertNotNull(insertedData);
 		Assertions.assertNotNull(insertedData.id);
 		Assertions.assertTrue(insertedData.id >= 0);
 
 		// Try to retrieve all the data:
-		final SimpleTableSoftDelete retrieve = DataAccess.get(SimpleTableSoftDelete.class, insertedData.id);
+		final SimpleTableSoftDelete retrieve = this.da.get(SimpleTableSoftDelete.class, insertedData.id);
 
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.id);
@@ -80,9 +91,8 @@ public class TestSimpleTableSoftDelete {
 	@Test
 	public void testReadAllValuesUnreadable() throws Exception {
 		// check the full values
-		final SimpleTableSoftDelete retrieve = DataAccess.get(SimpleTableSoftDelete.class,
+		final SimpleTableSoftDelete retrieve = this.da.get(SimpleTableSoftDelete.class,
 				TestSimpleTableSoftDelete.idOfTheObject, QueryOptions.READ_ALL_COLOMN);
-
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.id);
 		Assertions.assertEquals(TestSimpleTableSoftDelete.idOfTheObject, retrieve.id);
@@ -107,8 +117,8 @@ public class TestSimpleTableSoftDelete {
 		// Delete the entry:
 		final SimpleTableSoftDelete test = new SimpleTableSoftDelete();
 		test.data = TestSimpleTableSoftDelete.DATA_INJECTED_2;
-		DataAccess.update(test, TestSimpleTableSoftDelete.idOfTheObject, List.of("data"));
+		this.da.update(test, TestSimpleTableSoftDelete.idOfTheObject, List.of("data"));
-		final SimpleTableSoftDelete retrieve = DataAccess.get(SimpleTableSoftDelete.class,
+		final SimpleTableSoftDelete retrieve = this.da.get(SimpleTableSoftDelete.class,
 				TestSimpleTableSoftDelete.idOfTheObject, QueryOptions.ACCESS_DELETED_ITEMS,
 				QueryOptions.READ_ALL_COLOMN);
 		Assertions.assertNotNull(retrieve);
@@ -132,8 +142,8 @@ public class TestSimpleTableSoftDelete {
 			Thread.sleep(Duration.ofMillis(15));
 		}
 		// Delete the entry:
-		DataAccess.delete(SimpleTableSoftDelete.class, TestSimpleTableSoftDelete.idOfTheObject);
+		this.da.delete(SimpleTableSoftDelete.class, TestSimpleTableSoftDelete.idOfTheObject);
-		final SimpleTableSoftDelete retrieve = DataAccess.get(SimpleTableSoftDelete.class,
+		final SimpleTableSoftDelete retrieve = this.da.get(SimpleTableSoftDelete.class,
 				TestSimpleTableSoftDelete.idOfTheObject);
 		Assertions.assertNull(retrieve);
 	}
@@ -143,7 +153,7 @@ public class TestSimpleTableSoftDelete {
 	public void testReadDeletedObject() throws Exception {
 
 		// check if we set get deleted element
-		final SimpleTableSoftDelete retrieve = DataAccess.get(SimpleTableSoftDelete.class,
+		final SimpleTableSoftDelete retrieve = this.da.get(SimpleTableSoftDelete.class,
 				TestSimpleTableSoftDelete.idOfTheObject, QueryOptions.ACCESS_DELETED_ITEMS);
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.id);
@@ -159,7 +169,7 @@ public class TestSimpleTableSoftDelete {
 	@Test
 	public void testReadAllValuesUnreadableOfDeletedObject() throws Exception {
 		// check if we set get deleted element with all data
-		final SimpleTableSoftDelete retrieve = DataAccess.get(SimpleTableSoftDelete.class,
+		final SimpleTableSoftDelete retrieve = this.da.get(SimpleTableSoftDelete.class,
 				TestSimpleTableSoftDelete.idOfTheObject, QueryOptions.ACCESS_DELETED_ITEMS,
 				QueryOptions.READ_ALL_COLOMN);
 		Assertions.assertNotNull(retrieve);

test/src/test/kar/archidata/dataAccess/TestTypeEnum1.java

@@ -1,4 +1,4 @@
-package test.kar.archidata;
+package test.kar.archidata.dataAccess;
 
 import java.io.IOException;
 import java.util.List;
@@ -11,19 +11,24 @@ import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.kar.archidata.dataAccess.DataAccess;
+import org.kar.archidata.dataAccess.DBAccess;
+import org.kar.archidata.dataAccess.DBAccessSQL;
 import org.kar.archidata.dataAccess.DataFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import test.kar.archidata.model.Enum1ForTest;
+import test.kar.archidata.ConfigureDb;
-import test.kar.archidata.model.TypesEnum1;
+import test.kar.archidata.StepwiseExtension;
+import test.kar.archidata.dataAccess.model.Enum1ForTest;
+import test.kar.archidata.dataAccess.model.TypesEnum1;
 
 @ExtendWith(StepwiseExtension.class)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class TestTypeEnum1 {
 	final static private Logger LOGGER = LoggerFactory.getLogger(TestTypeEnum1.class);
 
+	private DBAccess da = null;
+
 	@BeforeAll
 	public static void configureWebServer() throws Exception {
 		ConfigureDb.configure();
@@ -34,13 +39,19 @@ public class TestTypeEnum1 {
 		ConfigureDb.clear();
 	}
 
+	public TestTypeEnum1() {
+		this.da = DBAccess.createInterface();
+	}
+
 	@Order(1)
 	@Test
 	public void testCreateTable() throws Exception {
 		final List<String> sqlCommand = DataFactory.createTable(TypesEnum1.class);
+		if (this.da instanceof final DBAccessSQL daSQL) {
 			for (final String elem : sqlCommand) {
 				LOGGER.debug("request: '{}'", elem);
-			DataAccess.executeSimpleQuery(elem);
+				daSQL.executeSimpleQuery(elem);
+			}
 		}
 	}
 
@@ -50,13 +61,13 @@ public class TestTypeEnum1 {
 
 		final TypesEnum1 test = new TypesEnum1();
 		test.data = Enum1ForTest.ENUM_VALUE_3;
-		final TypesEnum1 insertedData = DataAccess.insert(test);
+		final TypesEnum1 insertedData = this.da.insert(test);
 		Assertions.assertNotNull(insertedData);
 		Assertions.assertNotNull(insertedData.id);
 		Assertions.assertTrue(insertedData.id >= 0);
 
 		// Try to retrieve all the data:
-		final TypesEnum1 retrieve = DataAccess.get(TypesEnum1.class, insertedData.id);
+		final TypesEnum1 retrieve = this.da.get(TypesEnum1.class, insertedData.id);
 
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.id);
@@ -64,6 +75,6 @@ public class TestTypeEnum1 {
 		Assertions.assertNotNull(retrieve.data);
 		Assertions.assertEquals(insertedData.data, retrieve.data);
 
-		DataAccess.delete(TypesEnum1.class, insertedData.id);
+		this.da.delete(TypesEnum1.class, insertedData.id);
 	}
 }

test/src/test/kar/archidata/dataAccess/TestTypeEnum2.java

@@ -1,4 +1,4 @@
-package test.kar.archidata;
+package test.kar.archidata.dataAccess;
 
 import java.io.IOException;
 import java.util.List;
@@ -11,19 +11,24 @@ import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.kar.archidata.dataAccess.DataAccess;
+import org.kar.archidata.dataAccess.DBAccess;
+import org.kar.archidata.dataAccess.DBAccessSQL;
 import org.kar.archidata.dataAccess.DataFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import test.kar.archidata.model.Enum2ForTest;
+import test.kar.archidata.ConfigureDb;
-import test.kar.archidata.model.TypesEnum2;
+import test.kar.archidata.StepwiseExtension;
+import test.kar.archidata.dataAccess.model.Enum2ForTest;
+import test.kar.archidata.dataAccess.model.TypesEnum2;
 
 @ExtendWith(StepwiseExtension.class)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class TestTypeEnum2 {
 	final static private Logger LOGGER = LoggerFactory.getLogger(TestTypeEnum2.class);
 
+	private DBAccess da = null;
+
 	@BeforeAll
 	public static void configureWebServer() throws Exception {
 		ConfigureDb.configure();
@@ -34,13 +39,19 @@ public class TestTypeEnum2 {
 		ConfigureDb.clear();
 	}
 
+	public TestTypeEnum2() {
+		this.da = DBAccess.createInterface();
+	}
+
 	@Order(1)
 	@Test
 	public void testCreateTable() throws Exception {
 		final List<String> sqlCommand = DataFactory.createTable(TypesEnum2.class);
+		if (this.da instanceof final DBAccessSQL daSQL) {
 			for (final String elem : sqlCommand) {
 				LOGGER.debug("request: '{}'", elem);
-			DataAccess.executeSimpleQuery(elem);
+				daSQL.executeSimpleQuery(elem);
+			}
 		}
 	}
 
@@ -50,13 +61,13 @@ public class TestTypeEnum2 {
 
 		final TypesEnum2 test = new TypesEnum2();
 		test.data = Enum2ForTest.ENUM_VALUE_4;
-		final TypesEnum2 insertedData = DataAccess.insert(test);
+		final TypesEnum2 insertedData = this.da.insert(test);
 		Assertions.assertNotNull(insertedData);
 		Assertions.assertNotNull(insertedData.id);
 		Assertions.assertTrue(insertedData.id >= 0);
 
 		// Try to retrieve all the data:
-		TypesEnum2 retrieve = DataAccess.get(TypesEnum2.class, insertedData.id);
+		TypesEnum2 retrieve = this.da.get(TypesEnum2.class, insertedData.id);
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.id);
 		Assertions.assertEquals(insertedData.id, retrieve.id);
@@ -65,22 +76,22 @@ public class TestTypeEnum2 {
 
 		// Update data to null
 		retrieve.data = null;
-		int ret = DataAccess.update(retrieve, retrieve.id);
+		long ret = this.da.update(retrieve, retrieve.id);
-		Assertions.assertEquals(1, ret);
+		Assertions.assertEquals(1L, ret);
 
 		// get new data
-		retrieve = DataAccess.get(TypesEnum2.class, insertedData.id);
+		retrieve = this.da.get(TypesEnum2.class, insertedData.id);
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.id);
 		Assertions.assertEquals(insertedData.id, retrieve.id);
 		Assertions.assertNull(retrieve.data);
 
 		// Remove the data
-		ret = DataAccess.delete(TypesEnum2.class, insertedData.id);
+		ret = this.da.delete(TypesEnum2.class, insertedData.id);
-		Assertions.assertEquals(1, ret);
+		Assertions.assertEquals(1L, ret);
 
 		// Get the removed data:
-		retrieve = DataAccess.get(TypesEnum2.class, insertedData.id);
+		retrieve = this.da.get(TypesEnum2.class, insertedData.id);
 		Assertions.assertNull(retrieve);
 	}
 
@@ -90,19 +101,19 @@ public class TestTypeEnum2 {
 
 		final TypesEnum2 test = new TypesEnum2();
 		test.data = null;
-		final TypesEnum2 insertedData = DataAccess.insert(test);
+		final TypesEnum2 insertedData = this.da.insert(test);
 		Assertions.assertNotNull(insertedData);
 		Assertions.assertNotNull(insertedData.id);
 		Assertions.assertTrue(insertedData.id >= 0);
 
 		// Try to retrieve all the data:
-		final TypesEnum2 retrieve = DataAccess.get(TypesEnum2.class, insertedData.id);
+		final TypesEnum2 retrieve = this.da.get(TypesEnum2.class, insertedData.id);
 
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.id);
 		Assertions.assertEquals(insertedData.id, retrieve.id);
 		Assertions.assertNull(retrieve.data);
 
-		DataAccess.delete(TypesEnum2.class, insertedData.id);
+		this.da.delete(TypesEnum2.class, insertedData.id);
 	}
 }

test/src/test/kar/archidata/dataAccess/TestTypes.java

@@ -1,4 +1,4 @@
-package test.kar.archidata;
+package test.kar.archidata.dataAccess;
 
 import java.io.IOException;
 import java.sql.Timestamp;
@@ -16,18 +16,23 @@ import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.kar.archidata.dataAccess.DataAccess;
+import org.kar.archidata.dataAccess.DBAccess;
+import org.kar.archidata.dataAccess.DBAccessSQL;
 import org.kar.archidata.dataAccess.DataFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import test.kar.archidata.model.TypesTable;
+import test.kar.archidata.ConfigureDb;
+import test.kar.archidata.StepwiseExtension;
+import test.kar.archidata.dataAccess.model.TypesTable;
 
 @ExtendWith(StepwiseExtension.class)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class TestTypes {
 	final static private Logger LOGGER = LoggerFactory.getLogger(TestTypes.class);
 
+	private DBAccess da = null;
+
 	@BeforeAll
 	public static void configureWebServer() throws Exception {
 		ConfigureDb.configure();
@@ -38,13 +43,19 @@ public class TestTypes {
 		ConfigureDb.clear();
 	}
 
+	public TestTypes() {
+		this.da = DBAccess.createInterface();
+	}
+
 	@Order(1)
 	@Test
 	public void testCreateTable() throws Exception {
 		final List<String> sqlCommand = DataFactory.createTable(TypesTable.class);
+		if (this.da instanceof final DBAccessSQL daSQL) {
 			for (final String elem : sqlCommand) {
 				LOGGER.debug("request: '{}'", elem);
-			DataAccess.executeSimpleQuery(elem);
+				daSQL.executeSimpleQuery(elem);
+			}
 		}
 	}
 
@@ -54,13 +65,13 @@ public class TestTypes {
 
 		final TypesTable test = new TypesTable();
 		test.intData = 95;
-		final TypesTable insertedData = DataAccess.insert(test);
+		final TypesTable insertedData = this.da.insert(test);
 		Assertions.assertNotNull(insertedData);
 		Assertions.assertNotNull(insertedData.id);
 		Assertions.assertTrue(insertedData.id >= 0);
 
 		// Try to retrieve all the data:
-		final TypesTable retrieve = DataAccess.get(TypesTable.class, insertedData.id);
+		final TypesTable retrieve = this.da.get(TypesTable.class, insertedData.id);
 
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.id);
@@ -68,7 +79,7 @@ public class TestTypes {
 		Assertions.assertNotNull(retrieve.intData);
 		Assertions.assertEquals(insertedData.intData, retrieve.intData);
 
-		DataAccess.delete(TypesTable.class, insertedData.id);
+		this.da.delete(TypesTable.class, insertedData.id);
 	}
 
 	@Order(3)
@@ -77,13 +88,13 @@ public class TestTypes {
 
 		final TypesTable test = new TypesTable();
 		test.longData = 541684354354L;
-		final TypesTable insertedData = DataAccess.insert(test);
+		final TypesTable insertedData = this.da.insert(test);
 		Assertions.assertNotNull(insertedData);
 		Assertions.assertNotNull(insertedData.id);
 		Assertions.assertTrue(insertedData.id >= 0);
 
 		// Try to retrieve all the data:
-		final TypesTable retrieve = DataAccess.get(TypesTable.class, insertedData.id);
+		final TypesTable retrieve = this.da.get(TypesTable.class, insertedData.id);
 
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.id);
@@ -91,7 +102,7 @@ public class TestTypes {
 		Assertions.assertNotNull(retrieve.longData);
 		Assertions.assertEquals(insertedData.longData, retrieve.longData);
 
-		DataAccess.delete(TypesTable.class, insertedData.id);
+		this.da.delete(TypesTable.class, insertedData.id);
 	}
 
 	@Order(4)
@@ -100,13 +111,13 @@ public class TestTypes {
 
 		final TypesTable test = new TypesTable();
 		test.floatData = 153154.0f;
-		final TypesTable insertedData = DataAccess.insert(test);
+		final TypesTable insertedData = this.da.insert(test);
 		Assertions.assertNotNull(insertedData);
 		Assertions.assertNotNull(insertedData.id);
 		Assertions.assertTrue(insertedData.id >= 0);
 
 		// Try to retrieve all the data:
-		final TypesTable retrieve = DataAccess.get(TypesTable.class, insertedData.id);
+		final TypesTable retrieve = this.da.get(TypesTable.class, insertedData.id);
 
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.id);
@@ -114,7 +125,7 @@ public class TestTypes {
 		Assertions.assertNotNull(retrieve.floatData);
 		Assertions.assertEquals(insertedData.floatData, retrieve.floatData);
 
-		DataAccess.delete(TypesTable.class, insertedData.id);
+		this.da.delete(TypesTable.class, insertedData.id);
 	}
 
 	@Order(5)
@@ -123,13 +134,13 @@ public class TestTypes {
 
 		final TypesTable test = new TypesTable();
 		test.doubleData = 153152654654.0;
-		final TypesTable insertedData = DataAccess.insert(test);
+		final TypesTable insertedData = this.da.insert(test);
 		Assertions.assertNotNull(insertedData);
 		Assertions.assertNotNull(insertedData.id);
 		Assertions.assertTrue(insertedData.id >= 0);
 
 		// Try to retrieve all the data:
-		final TypesTable retrieve = DataAccess.get(TypesTable.class, insertedData.id);
+		final TypesTable retrieve = this.da.get(TypesTable.class, insertedData.id);
 
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.id);
@@ -137,7 +148,7 @@ public class TestTypes {
 		Assertions.assertNotNull(retrieve.doubleData);
 		Assertions.assertEquals(insertedData.doubleData, retrieve.doubleData);
 
-		DataAccess.delete(TypesTable.class, insertedData.id);
+		this.da.delete(TypesTable.class, insertedData.id);
 	}
 
 	@Order(6)
@@ -146,13 +157,13 @@ public class TestTypes {
 
 		final TypesTable test = new TypesTable();
 		test.textData = "lkjlkjlkjmlkqjsdùkljqsùmckljvùwxmckvmwlkdnfqmsjdvnmclkwsjdn;vbcm <wkdjncvm<wk:dnxcm<lwkdnc mqs<wdn:cx,<nm wlx!k:cn<;wmlx:!c;,<wmlx!:c;n<wm ldx:;c,<nwmlx:c,;<wmlx!:c;,< w";
-		final TypesTable insertedData = DataAccess.insert(test);
+		final TypesTable insertedData = this.da.insert(test);
 		Assertions.assertNotNull(insertedData);
 		Assertions.assertNotNull(insertedData.id);
 		Assertions.assertTrue(insertedData.id >= 0);
 
 		// Try to retrieve all the data:
-		final TypesTable retrieve = DataAccess.get(TypesTable.class, insertedData.id);
+		final TypesTable retrieve = this.da.get(TypesTable.class, insertedData.id);
 
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.id);
@@ -160,7 +171,7 @@ public class TestTypes {
 		Assertions.assertNotNull(retrieve.textData);
 		Assertions.assertEquals(insertedData.textData, retrieve.textData);
 
-		DataAccess.delete(TypesTable.class, insertedData.id);
+		this.da.delete(TypesTable.class, insertedData.id);
 	}
 
 	@Order(7)
@@ -169,13 +180,13 @@ public class TestTypes {
 
 		final TypesTable test = new TypesTable();
 		test.varcharData = "123456789123456789";
-		final TypesTable insertedData = DataAccess.insert(test);
+		final TypesTable insertedData = this.da.insert(test);
 		Assertions.assertNotNull(insertedData);
 		Assertions.assertNotNull(insertedData.id);
 		Assertions.assertTrue(insertedData.id >= 0);
 
 		// Try to retrieve all the data:
-		final TypesTable retrieve = DataAccess.get(TypesTable.class, insertedData.id);
+		final TypesTable retrieve = this.da.get(TypesTable.class, insertedData.id);
 
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.id);
@@ -183,7 +194,7 @@ public class TestTypes {
 		Assertions.assertNotNull(retrieve.varcharData);
 		Assertions.assertEquals(insertedData.varcharData, retrieve.varcharData);
 
-		DataAccess.delete(TypesTable.class, insertedData.id);
+		this.da.delete(TypesTable.class, insertedData.id);
 	}
 
 	@Order(8)
@@ -192,13 +203,13 @@ public class TestTypes {
 
 		final TypesTable test = new TypesTable();
 		test.booleanData = true;
-		final TypesTable insertedData = DataAccess.insert(test);
+		final TypesTable insertedData = this.da.insert(test);
 		Assertions.assertNotNull(insertedData);
 		Assertions.assertNotNull(insertedData.id);
 		Assertions.assertTrue(insertedData.id >= 0);
 
 		// Try to retrieve all the data:
-		final TypesTable retrieve = DataAccess.get(TypesTable.class, insertedData.id);
+		final TypesTable retrieve = this.da.get(TypesTable.class, insertedData.id);
 
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.id);
@@ -206,7 +217,7 @@ public class TestTypes {
 		Assertions.assertNotNull(retrieve.booleanData);
 		Assertions.assertEquals(insertedData.booleanData, retrieve.booleanData);
 
-		DataAccess.delete(TypesTable.class, insertedData.id);
+		this.da.delete(TypesTable.class, insertedData.id);
 	}
 
 	@Order(9)
@@ -215,13 +226,13 @@ public class TestTypes {
 
 		final TypesTable test = new TypesTable();
 		test.booleanData = false;
-		final TypesTable insertedData = DataAccess.insert(test);
+		final TypesTable insertedData = this.da.insert(test);
 		Assertions.assertNotNull(insertedData);
 		Assertions.assertNotNull(insertedData.id);
 		Assertions.assertTrue(insertedData.id >= 0);
 
 		// Try to retrieve all the data:
-		final TypesTable retrieve = DataAccess.get(TypesTable.class, insertedData.id);
+		final TypesTable retrieve = this.da.get(TypesTable.class, insertedData.id);
 
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.id);
@@ -229,7 +240,7 @@ public class TestTypes {
 		Assertions.assertNotNull(retrieve.booleanData);
 		Assertions.assertEquals(insertedData.booleanData, retrieve.booleanData);
 
-		DataAccess.delete(TypesTable.class, insertedData.id);
+		this.da.delete(TypesTable.class, insertedData.id);
 	}
 
 	@Order(10)
@@ -239,13 +250,13 @@ public class TestTypes {
 		final TypesTable test = new TypesTable();
 		test.timeStampData = Timestamp.from(Instant.now());
 		LOGGER.debug("Timestamp = {}", test.timeStampData);
-		final TypesTable insertedData = DataAccess.insert(test);
+		final TypesTable insertedData = this.da.insert(test);
 		Assertions.assertNotNull(insertedData);
 		Assertions.assertNotNull(insertedData.id);
 		Assertions.assertTrue(insertedData.id >= 0);
 
 		// Try to retrieve all the data:
-		final TypesTable retrieve = DataAccess.get(TypesTable.class, insertedData.id);
+		final TypesTable retrieve = this.da.get(TypesTable.class, insertedData.id);
 
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.id);
@@ -257,7 +268,7 @@ public class TestTypes {
 		Assertions.assertEquals(insertedData.timeStampData.toInstant().toEpochMilli(),
 				retrieve.timeStampData.toInstant().toEpochMilli());
 
-		DataAccess.delete(TypesTable.class, insertedData.id);
+		this.da.delete(TypesTable.class, insertedData.id);
 	}
 
 	@Order(11)
@@ -267,13 +278,13 @@ public class TestTypes {
 		final TypesTable test = new TypesTable();
 		test.dateFullData = Date.from(Instant.now());
 		LOGGER.debug("Date = {}", test.dateFullData);
-		final TypesTable insertedData = DataAccess.insert(test);
+		final TypesTable insertedData = this.da.insert(test);
 		Assertions.assertNotNull(insertedData);
 		Assertions.assertNotNull(insertedData.id);
 		Assertions.assertTrue(insertedData.id >= 0);
 
 		// Try to retrieve all the data:
-		final TypesTable retrieve = DataAccess.get(TypesTable.class, insertedData.id);
+		final TypesTable retrieve = this.da.get(TypesTable.class, insertedData.id);
 
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.id);
@@ -282,7 +293,7 @@ public class TestTypes {
 		Assertions.assertNotNull(retrieve.dateFullData);
 		Assertions.assertEquals(insertedData.dateFullData, retrieve.dateFullData);
 
-		DataAccess.delete(TypesTable.class, insertedData.id);
+		this.da.delete(TypesTable.class, insertedData.id);
 	}
 
 	@Order(12)
@@ -292,13 +303,13 @@ public class TestTypes {
 		final TypesTable test = new TypesTable();
 		test.dateData = LocalDate.now();
 		LOGGER.debug("LocalDate = {}", test.dateData);
-		final TypesTable insertedData = DataAccess.insert(test);
+		final TypesTable insertedData = this.da.insert(test);
 		Assertions.assertNotNull(insertedData);
 		Assertions.assertNotNull(insertedData.id);
 		Assertions.assertTrue(insertedData.id >= 0);
 
 		// Try to retrieve all the data:
-		final TypesTable retrieve = DataAccess.get(TypesTable.class, insertedData.id);
+		final TypesTable retrieve = this.da.get(TypesTable.class, insertedData.id);
 
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.id);
@@ -307,7 +318,7 @@ public class TestTypes {
 		Assertions.assertNotNull(retrieve.dateData);
 		Assertions.assertEquals(insertedData.dateData, retrieve.dateData);
 
-		DataAccess.delete(TypesTable.class, insertedData.id);
+		this.da.delete(TypesTable.class, insertedData.id);
 	}
 
 	@Order(13)
@@ -317,13 +328,13 @@ public class TestTypes {
 		final TypesTable test = new TypesTable();
 		test.timeData = LocalTime.now();
 		LOGGER.debug("LocalTime = {}", test.timeData);
-		final TypesTable insertedData = DataAccess.insert(test);
+		final TypesTable insertedData = this.da.insert(test);
 		Assertions.assertNotNull(insertedData);
 		Assertions.assertNotNull(insertedData.id);
 		Assertions.assertTrue(insertedData.id >= 0);
 
 		// Try to retrieve all the data:
-		final TypesTable retrieve = DataAccess.get(TypesTable.class, insertedData.id);
+		final TypesTable retrieve = this.da.get(TypesTable.class, insertedData.id);
 
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.id);
@@ -334,7 +345,7 @@ public class TestTypes {
 		Assertions.assertEquals(insertedData.timeData.getMinute(), retrieve.timeData.getMinute());
 		Assertions.assertEquals(insertedData.timeData.getSecond(), retrieve.timeData.getSecond());
 
-		DataAccess.delete(TypesTable.class, insertedData.id);
+		this.da.delete(TypesTable.class, insertedData.id);
 	}
 
 	@Order(14)
@@ -345,13 +356,13 @@ public class TestTypes {
 		test.textData = "test 1";
 		test.booleanData = null;
 		test.varcharData = "plop";
-		final TypesTable insertedData = DataAccess.insert(test);
+		final TypesTable insertedData = this.da.insert(test);
 		Assertions.assertNotNull(insertedData);
 		Assertions.assertNotNull(insertedData.id);
 		Assertions.assertTrue(insertedData.id >= 0);
 
 		// Try to retrieve all the data:
-		final TypesTable retrieve = DataAccess.get(TypesTable.class, insertedData.id);
+		final TypesTable retrieve = this.da.get(TypesTable.class, insertedData.id);
 
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.id);
@@ -366,11 +377,11 @@ public class TestTypes {
 		retrieve.textData = "test 2";
 		retrieve.booleanData = true;
 		retrieve.varcharData = null;
-		final int nbUpdate = DataAccess.update(retrieve, insertedData.id);
+		final long nbUpdate = this.da.update(retrieve, insertedData.id);
-		Assertions.assertEquals(1, nbUpdate);
+		Assertions.assertEquals(1L, nbUpdate);
 
 		// Get new data
-		final TypesTable retrieve2 = DataAccess.get(TypesTable.class, insertedData.id);
+		final TypesTable retrieve2 = this.da.get(TypesTable.class, insertedData.id);
 
 		Assertions.assertNotNull(retrieve2);
 		Assertions.assertNotNull(retrieve2.id);
@@ -385,11 +396,11 @@ public class TestTypes {
 		retrieve.textData = "test 3";
 		retrieve.booleanData = false;
 		retrieve.varcharData = "test3";
-		final int nbUpdate2 = DataAccess.update(retrieve, insertedData.id, List.of("textData"));
+		final long nbUpdate2 = this.da.update(retrieve, insertedData.id, List.of("textData"));
-		Assertions.assertEquals(1, nbUpdate2);
+		Assertions.assertEquals(1L, nbUpdate2);
 
 		// Get new data
-		final TypesTable retrieve3 = DataAccess.get(TypesTable.class, insertedData.id);
+		final TypesTable retrieve3 = this.da.get(TypesTable.class, insertedData.id);
 
 		Assertions.assertNotNull(retrieve3);
 		Assertions.assertNotNull(retrieve3.id);
@@ -401,7 +412,7 @@ public class TestTypes {
 		Assertions.assertEquals(retrieve2.booleanData, retrieve3.booleanData);
 		Assertions.assertNull(retrieve3.varcharData);
 
-		DataAccess.delete(TypesTable.class, insertedData.id);
+		this.da.delete(TypesTable.class, insertedData.id);
 	}
 
 	@Order(15)
@@ -412,13 +423,13 @@ public class TestTypes {
 		test.textData = "test 1";
 		test.booleanData = null;
 		test.varcharData = "plop";
-		final TypesTable insertedData = DataAccess.insert(test);
+		final TypesTable insertedData = this.da.insert(test);
 		Assertions.assertNotNull(insertedData);
 		Assertions.assertNotNull(insertedData.id);
 		Assertions.assertTrue(insertedData.id >= 0);
 
 		// Try to retrieve all the data:
-		final TypesTable retrieve = DataAccess.get(TypesTable.class, insertedData.id);
+		final TypesTable retrieve = this.da.get(TypesTable.class, insertedData.id);
 
 		Assertions.assertNotNull(retrieve);
 		Assertions.assertNotNull(retrieve.id);
@@ -437,11 +448,11 @@ public class TestTypes {
 					"varcharData": null
 				}
 				""";
-		final int nbUpdate = DataAccess.updateWithJson(TypesTable.class, insertedData.id, jsonData);
+		final long nbUpdate = this.da.updateWithJson(TypesTable.class, insertedData.id, jsonData);
-		Assertions.assertEquals(1, nbUpdate);
+		Assertions.assertEquals(1L, nbUpdate);
 
 		// Get new data
-		final TypesTable retrieve2 = DataAccess.get(TypesTable.class, insertedData.id);
+		final TypesTable retrieve2 = this.da.get(TypesTable.class, insertedData.id);
 
 		Assertions.assertNotNull(retrieve2);
 		Assertions.assertNotNull(retrieve2.id);
@@ -452,7 +463,7 @@ public class TestTypes {
 		Assertions.assertEquals(true, retrieve2.booleanData);
 		Assertions.assertNull(retrieve2.varcharData);
 
-		DataAccess.delete(TypesTable.class, insertedData.id);
+		this.da.delete(TypesTable.class, insertedData.id);
 	}
 
 }

test/src/test/kar/archidata/dataAccess/model/Enum1ForTest.java

@@ -1,4 +1,4 @@
-package test.kar.archidata.model;
+package test.kar.archidata.dataAccess.model;
 
 public enum Enum1ForTest {
 	ENUM_VALUE_1, ENUM_VALUE_2, ENUM_VALUE_3, ENUM_VALUE_4, ENUM_VALUE_5,

test/src/test/kar/archidata/dataAccess/model/Enum2ForTest.java

@@ -1,4 +1,4 @@
-package test.kar.archidata.model;
+package test.kar.archidata.dataAccess.model;
 
 public enum Enum2ForTest {
 	ENUM_VALUE_1(5), ENUM_VALUE_2(6), ENUM_VALUE_3(55), ENUM_VALUE_4(84241), ENUM_VALUE_5(54546);

test/src/test/kar/archidata/dataAccess/model/SerializeAsJson.java

@@ -1,8 +1,11 @@
-package test.kar.archidata.model;
+package test.kar.archidata.dataAccess.model;
 
 import org.kar.archidata.annotation.DataJson;
 import org.kar.archidata.model.GenericData;
 
+import dev.morphia.annotations.Entity;
+
+@Entity
 public class SerializeAsJson extends GenericData {
 
 	@DataJson

test/src/test/kar/archidata/dataAccess/model/SerializeListAsJson.java

@@ -1,10 +1,13 @@
-package test.kar.archidata.model;
+package test.kar.archidata.dataAccess.model;
 
 import java.util.List;
 
 import org.kar.archidata.annotation.DataJson;
 import org.kar.archidata.model.GenericData;
 
+import dev.morphia.annotations.Entity;
+
+@Entity
 public class SerializeListAsJson extends GenericData {
 
 	@DataJson

test/src/test/kar/archidata/dataAccess/model/SimpleTable.java

@@ -1,7 +1,10 @@
-package test.kar.archidata.model;
+package test.kar.archidata.dataAccess.model;
 
 import org.kar.archidata.model.GenericData;
 
+import dev.morphia.annotations.Entity;
+
+@Entity
 public class SimpleTable extends GenericData {
 	public String data;
 

test/src/test/kar/archidata/dataAccess/model/SimpleTableSoftDelete.java

@@ -1,7 +1,10 @@
-package test.kar.archidata.model;
+package test.kar.archidata.dataAccess.model;
 
 import org.kar.archidata.model.GenericDataSoftDelete;
 
+import dev.morphia.annotations.Entity;
+
+@Entity
 public class SimpleTableSoftDelete extends GenericDataSoftDelete {
 	public String data;
 }

test/src/test/kar/archidata/dataAccess/model/TypeManyToManyRemote.java

@@ -1,12 +1,14 @@
-package test.kar.archidata.model;
+package test.kar.archidata.dataAccess.model;
 
 import java.util.List;
 
 import org.kar.archidata.model.GenericData;
 
+import dev.morphia.annotations.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.ManyToMany;
 
+@Entity
 public class TypeManyToManyRemote extends GenericData {
 	@ManyToMany(fetch = FetchType.LAZY, targetEntity = TypeManyToManyRoot.class, mappedBy = "remote")
 	public List<Long> remoteToParent;

test/src/test/kar/archidata/dataAccess/model/TypeManyToManyRoot.java

@@ -1,12 +1,14 @@
-package test.kar.archidata.model;
+package test.kar.archidata.dataAccess.model;
 
 import java.util.List;
 
 import org.kar.archidata.model.GenericData;
 
+import dev.morphia.annotations.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.ManyToMany;
 
+@Entity
 public class TypeManyToManyRoot extends GenericData {
 
 	public String otherData;

test/src/test/kar/archidata/dataAccess/model/TypeManyToManyRootExpand.java

@@ -1,14 +1,17 @@
-package test.kar.archidata.model;
+package test.kar.archidata.dataAccess.model;
 
 import java.util.List;
 
 import org.kar.archidata.model.GenericData;
 
+import dev.morphia.annotations.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.ManyToMany;
 import jakarta.persistence.Table;
 
 @Table(name = "TypeManyToManyRoot")
+// for Mongo
+@Entity(value = "TypeManyToManyRoot")
 public class TypeManyToManyRootExpand extends GenericData {
 
 	public String otherData;

test/src/test/kar/archidata/dataAccess/model/TypeManyToOneRemote.java

@@ -1,7 +1,10 @@
-package test.kar.archidata.model;
+package test.kar.archidata.dataAccess.model;
 
 import org.kar.archidata.model.GenericData;
 
+import dev.morphia.annotations.Entity;
+
+@Entity
 public class TypeManyToOneRemote extends GenericData {
 
 	public String data;

test/src/test/kar/archidata/dataAccess/model/TypeManyToOneRoot.java

@@ -1,10 +1,12 @@
-package test.kar.archidata.model;
+package test.kar.archidata.dataAccess.model;
 
 import org.kar.archidata.model.GenericData;
 
+import dev.morphia.annotations.Entity;
 import jakarta.persistence.Column;
 import jakarta.persistence.ManyToOne;
 
+@Entity
 public class TypeManyToOneRoot extends GenericData {
 
 	public String otherData;

test/src/test/kar/archidata/dataAccess/model/TypeManyToOneRootExpand.java

@@ -1,13 +1,16 @@
-package test.kar.archidata.model;
+package test.kar.archidata.dataAccess.model;
 
 import org.kar.archidata.model.GenericData;
 
+import dev.morphia.annotations.Entity;
 import jakarta.persistence.Column;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 
 @Table(name = "TypeManyToOneRoot")
+//for Mongo
+@Entity(value = "TypeManyToOneRoot")
 public class TypeManyToOneRootExpand extends GenericData {
 
 	public String otherData;

test/src/test/kar/archidata/dataAccess/model/TypeManyToOneUUIDRemote.java

@@ -1,7 +1,10 @@
-package test.kar.archidata.model;
+package test.kar.archidata.dataAccess.model;
 
 import org.kar.archidata.model.UUIDGenericData;
 
+import dev.morphia.annotations.Entity;
+
+@Entity
 public class TypeManyToOneUUIDRemote extends UUIDGenericData {
 
 	public String data;

test/src/test/kar/archidata/dataAccess/model/TypeManyToOneUUIDRoot.java

@@ -1,12 +1,14 @@
-package test.kar.archidata.model;
+package test.kar.archidata.dataAccess.model;
 
 import java.util.UUID;
 
 import org.kar.archidata.model.UUIDGenericData;
 
+import dev.morphia.annotations.Entity;
 import jakarta.persistence.Column;
 import jakarta.persistence.ManyToOne;
 
+@Entity
 public class TypeManyToOneUUIDRoot extends UUIDGenericData {
 
 	public String otherData;