[RELEASE] create version v0.8.0

[FIX] correct the typescript gneration
[DEV] better management of UUID as remove elemnt
2024-04-24 15:48:48 +02:00 · 2024-04-22 23:02:52 +02:00 · 2024-04-20 21:58:31 +02:00 · 2024-04-19 08:47:24 +02:00 · 2024-04-17 23:11:04 +02:00 · 2024-04-17 23:08:33 +02:00
27 changed files with 972 additions and 212 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>kangaroo-and-rabbit</groupId>
 	<artifactId>archidata</artifactId>
-	<version>0.7.0</version>
+	<version>0.8.0</version>
 	<properties>
 		<maven.compiler.version>3.1</maven.compiler.version>
 		<maven.compiler.source>21</maven.compiler.source>
--- a/src/org/kar/archidata/annotation/AnnotationTools.java
+++ b/src/org/kar/archidata/annotation/AnnotationTools.java
@@ -257,6 +257,19 @@ public class AnnotationTools {
 		return true;
 	}

+	public static Field getPrimaryKeyField(final Class<?> clazz) throws Exception {
+		for (final Field field : clazz.getFields()) {
+			// static field is only for internal global declaration ==> remove it ..
+			if (java.lang.reflect.Modifier.isStatic(field.getModifiers())) {
+				continue;
+			}
+			if (AnnotationTools.isPrimaryKey(field)) {
+				return field;
+			}
+		}
+		return null;
+	}
+
 	public static boolean isPrimaryKey(final Field element) throws Exception {
 		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Id.class);
 		if (annotation.length == 0) {
--- a/src/org/kar/archidata/annotation/AsyncType.java
+++ b/src/org/kar/archidata/annotation/AsyncType.java
@@ -6,8 +6,12 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;

 /** In case of the update parameter with String input to detect null element. */
-@Target({ElementType.PARAMETER, ElementType.METHOD})
+@Target({ ElementType.PARAMETER, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
 public @interface AsyncType {
-	Class<?> value();
+	// Possible class values.
+	Class<?>[] value();
+
+	// direct copy value in the TypeScript (separate with type by a |
+	String[] tsComplement() default {};
 }
--- a/src/org/kar/archidata/annotation/TypeScriptProgress.java
+++ b/src/org/kar/archidata/annotation/TypeScriptProgress.java
@@ -0,0 +1,11 @@
+package org.kar.archidata.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/** In case of the update parameter with String input to detect null element. */
+@Target({ ElementType.PARAMETER, ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface TypeScriptProgress {}
--- a/src/org/kar/archidata/api/DataResource.java
+++ b/src/org/kar/archidata/api/DataResource.java
@@ -93,6 +93,7 @@ public class DataResource {
 		}
 		return filePath;
 	}
+
 	public static String getFileData(final UUID uuid) {
 		final String stringUUID = uuid.toString();
 		final String part1 = stringUUID.substring(0, 2);
@@ -108,6 +109,7 @@ public class DataResource {
 		filePath += part3;
 		return filePath;
 	}
+
 	public static String getFileMetaData(final UUID uuid) {
 		return getFileData(uuid) + ".json";
 	}
@@ -317,8 +319,8 @@ public class DataResource {
 			return Response.status(404).entity("{\"error\":\"media Does not exist: " + id + "\"}").type("application/json").build();
 		}
 		if (value.mimeType.contentEquals("image/jpeg") || value.mimeType.contentEquals("image/png")
-				// || value.mimeType.contentEquals("image/webp")
-				) {
+		// || value.mimeType.contentEquals("image/webp")
+		) {
 			// reads input image
 			final BufferedImage inputImage = ImageIO.read(inputFile);
 			final int scaledWidth = 250;
@@ -353,13 +355,12 @@ public class DataResource {
 		return buildStream(filePathName, range, value.mimeType);
 	}

-	// @Secured
 	@GET
 	@Path("{id}/{name}")
 	@PermitTokenInURI
 	@RolesAllowed("USER")
 	@Produces(MediaType.APPLICATION_OCTET_STREAM)
-	@Operation(description = "Get back some data from the data environment (with a beautifull name (permit download with basic name)", tags = "SYSTEM")
+	@Operation(description = "Get back some data from the data environment (with a beautiful name (permit download with basic name)", tags = "SYSTEM")
 	public Response retrieveDataFull(@Context final SecurityContext sc, @QueryParam(HttpHeaders.AUTHORIZATION) final String token, @HeaderParam("Range") final String range,
 			@PathParam("id") final UUID id, @PathParam("name") final String name) throws Exception {
 		final GenericContext gc = (GenericContext) sc.getUserPrincipal();
--- a/src/org/kar/archidata/catcher/RestErrorResponse.java
+++ b/src/org/kar/archidata/catcher/RestErrorResponse.java
@@ -3,19 +3,21 @@ package org.kar.archidata.catcher;
 import java.time.Instant;
 import java.util.UUID;

+import org.kar.archidata.tools.UuidUtils;
+
 import jakarta.ws.rs.core.Response;

 public class RestErrorResponse {
-	public UUID uuid = UUID.randomUUID();
+	public UUID uuid = UuidUtils.nextUUID();
+	public String name; // Mandatory for TS generic error
+	public String message; // Mandatory for TS generic error
 	public String time;
-	public String error;
-	public String message;
 	final public int status;
 	final public String statusMessage;

 	public RestErrorResponse(final Response.Status status, final String time, final String error, final String message) {
 		this.time = time;
-		this.error = error;
+		this.name = error;
 		this.message = message;
 		this.status = status.getStatusCode();
 		this.statusMessage = status.getReasonPhrase();
@@ -23,13 +25,15 @@ public class RestErrorResponse {

 	public RestErrorResponse(final Response.Status status, final String error, final String message) {
 		this.time = Instant.now().toString();
-		this.error = error;
+		this.name = error;
 		this.message = message;
 		this.status = status.getStatusCode();
 		this.statusMessage = status.getReasonPhrase();
 	}

 	public RestErrorResponse(final Response.Status status) {
+		this.name = "generic";
+		this.message = "";
 		this.time = Instant.now().toString();
 		this.status = status.getStatusCode();
 		this.statusMessage = status.getReasonPhrase();
--- a/src/org/kar/archidata/dataAccess/DataAccess.java
+++ b/src/org/kar/archidata/dataAccess/DataAccess.java
@@ -174,7 +174,7 @@ public class DataAccess {
 		throw new InternalServerErrorException("Can Not manage the DB-access");
 	}

-	/** extract a list of "-" separated element from a SQL input data.
+	/** Extract a list of Long with "-" 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
@@ -185,7 +185,7 @@ public class DataAccess {
 			return null;
 		}
 		final List<Long> out = new ArrayList<>();
-		final String[] elements = trackString.split("-");
+		final String[] elements = trackString.split(separator);
 		for (final String elem : elements) {
 			final Long tmp = Long.parseLong(elem);
 			out.add(tmp);
@@ -193,6 +193,25 @@ public class DataAccess {
 		return out;
 	}

+	/** Extract a list of UUID with "-" 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. */
+	public static List<UUID> getListOfUUIDs(final ResultSet rs, final int iii, final String separator) throws SQLException {
+		final String trackString = rs.getString(iii);
+		if (rs.wasNull()) {
+			return null;
+		}
+		final List<UUID> out = new ArrayList<>();
+		final String[] elements = trackString.split(separator);
+		for (final String elem : elements) {
+			final UUID tmp = UUID.fromString(elem);
+			out.add(tmp);
+		}
+		return out;
+	}
+
 	protected static <T> void setValuedb(final Class<?> type, final T data, final CountInOut iii, final Field field, final PreparedStatement ps) throws Exception {
 		if (type == UUID.class) {
 			final Object tmp = field.get(data);
@@ -835,7 +854,8 @@ public class DataAccess {
 			UUID uuid = null;
 			if (generateUUID) {
 				firstField = false;
-				uuid = UUID.randomUUID();
+				// uuid = UUID.randomUUID();
+				uuid = UuidUtils.nextUUID();
 				addElement(ps, uuid, iii);
 				iii.inc();
 			}
@@ -889,13 +909,8 @@ public class DataAccess {
 					if (generatedKeys.next()) {
 						if (primaryKeyField.getType() == UUID.class) {
 							// uniqueSQLUUID = generatedKeys.getObject(1, UUID.class);
-							/*
-							final Object obj = generatedKeys.getObject(1);
-							final BigInteger bigint = (BigInteger) generatedKeys.getObject(1);
-							uniqueSQLUUID = UuidUtils.asUuid(bigint);
-							final UUID generatedUUID = (UUID) generatedKeys.getObject(1);
-							System.out.println("UUID généré: " + generatedUUID);
-							 */
+							/* final Object obj = generatedKeys.getObject(1); final BigInteger bigint = (BigInteger) generatedKeys.getObject(1); uniqueSQLUUID = UuidUtils.asUuid(bigint); final UUID
+							 * generatedUUID = (UUID) generatedKeys.getObject(1); System.out.println("UUID généré: " + generatedUUID); */
 							final Object obj = generatedKeys.getObject(1);
 							final byte[] tmpid = generatedKeys.getBytes(1);
 							uniqueSQLUUID = UuidUtils.asUuid(tmpid);
@@ -925,14 +940,20 @@ public class DataAccess {
 			}
 			// ps.execute();
 		} catch (final SQLException ex) {
+			LOGGER.error("Fail SQL request: {}", ex.getMessage());
 			ex.printStackTrace();
+			throw new DataAccessException("Fail to Insert data in DB : " + ex.getMessage());
 		} finally {
 			entry.close();
 		}
 		final List<LazyGetter> asyncActions = new ArrayList<>();
 		for (final Field field : asyncFieldUpdate) {
 			final DataAccessAddOn addOn = findAddOnforField(field);
-			addOn.asyncInsert(tableName, uniqueSQLID, field, field.get(data), asyncActions);
+			if (uniqueSQLID != null) {
+				addOn.asyncInsert(tableName, uniqueSQLID, field, field.get(data), asyncActions);
+			} else if (uniqueSQLUUID != null) {
+				addOn.asyncInsert(tableName, uniqueSQLUUID, field, field.get(data), asyncActions);
+			}
 		}
 		for (final LazyGetter action : asyncActions) {
 			action.doRequest();
--- a/src/org/kar/archidata/dataAccess/DataAccessAddOn.java
+++ b/src/org/kar/archidata/dataAccess/DataAccessAddOn.java
@@ -61,8 +61,17 @@ public interface DataAccessAddOn {
 	 * @param createDrop
 	 * @param fieldId
 	 * @throws Exception */
-	void createTables(String tableName, Field field, StringBuilder mainTableBuilder, List<String> preActionList, List<String> postActionList, boolean createIfNotExist, boolean createDrop, int fieldId)
-			throws Exception;
+	void createTables(//
+			String tableName, //
+			final Field primaryField, //
+			Field field, //
+			StringBuilder mainTableBuilder, //
+			List<String> preActionList, //
+			List<String> postActionList, //
+			boolean createIfNotExist, //
+			boolean createDrop, //
+			int fieldId //
+	) throws Exception;

 	/** Some action must be done asynchronously for update or remove element
 	 * @param field
--- a/src/org/kar/archidata/dataAccess/DataFactory.java
+++ b/src/org/kar/archidata/dataAccess/DataFactory.java
@@ -339,6 +339,7 @@ public class DataFactory {
 		LOGGER.debug("===> TABLE `{}`", tableName);
 		final List<String> primaryKeys = new ArrayList<>();

+		final Field primaryField = AnnotationTools.getPrimaryKeyField(clazz);
 		for (final Field elem : clazz.getFields()) {
 			// DEtect the primary key (support only one primary key right now...
 			if (AnnotationTools.isPrimaryKey(elem)) {
@@ -373,7 +374,7 @@ public class DataFactory {
 					final DataAccessAddOn addOn = DataAccess.findAddOnforField(elem);
 					LOGGER.trace("Create type for: {} ==> {} (ADD-ON)", AnnotationTools.getFieldName(elem), elem.getType());
 					if (addOn != null) {
-						addOn.createTables(tableName, elem, tmpOut, preActionList, postActionList, createIfNotExist, createDrop, fieldId);
+						addOn.createTables(tableName, primaryField, elem, tmpOut, preActionList, postActionList, createIfNotExist, createDrop, fieldId);
 					} else {
 						throw new DataAccessException(
 								"Element matked as add-on but add-on does not loaded: table:" + tableName + " field name=" + AnnotationTools.getFieldName(elem) + " type=" + elem.getType());
--- a/src/org/kar/archidata/dataAccess/DataFactoryTsApi.java
+++ b/src/org/kar/archidata/dataAccess/DataFactoryTsApi.java
@@ -20,6 +20,7 @@ import java.util.Set;

 import org.glassfish.jersey.media.multipart.FormDataParam;
 import org.kar.archidata.annotation.AsyncType;
+import org.kar.archidata.annotation.TypeScriptProgress;
 import org.kar.archidata.catcher.RestErrorResponse;
 import org.kar.archidata.dataAccess.DataFactoryZod.ClassElement;
 import org.kar.archidata.dataAccess.DataFactoryZod.GeneratedTypes;
@@ -56,8 +57,17 @@ public class DataFactoryTsApi {
 				/**
 				 * API of the server (auto-generated code)
 				 */
-				import { HTTPMimeType, HTTPRequestModel, ModelResponseHttp, RESTConfig, RESTRequestJson, RESTRequestJsonArray, RESTRequestVoid } from "./rest-tools"
-				import { """;
+				import {
+				  HTTPMimeType,
+				  HTTPRequestModel,
+				  ModelResponseHttp,
+				  RESTCallbacks,
+				  RESTConfig,
+				  RESTRequestJson,
+				  RESTRequestJsonArray,
+				  RESTRequestVoid
+				} from "./rest-tools"
+				import {""";

 		for (final Class<?> clazz : classs) {
 			final Set<Class<?>> includeModel = new HashSet<>();
@@ -73,8 +83,9 @@ public class DataFactoryTsApi {
 				if (classElement.nativeType) {
 					continue;
 				}
+				generatedData.append("\n  ");
 				generatedData.append(classElement.tsTypeName);
-				generatedData.append(", ");
+				generatedData.append(",");
 			}
 			for (final Class<?> elem : includeCheckerModel) {
 				if (elem == null) {
@@ -84,10 +95,11 @@ public class DataFactoryTsApi {
 				if (classElement.nativeType) {
 					continue;
 				}
+				generatedData.append("\n  ");
 				generatedData.append(classElement.tsCheckType);
-				generatedData.append(", ");
+				generatedData.append(",");
 			}
-			generatedData.append("} from \"./model\"\n");
+			generatedData.append("\n} from \"./model\"\n");
 			generatedData.append(api.data());

 			String fileName = api.className();
@@ -125,6 +137,14 @@ public class DataFactoryTsApi {
 		return Arrays.asList(((Produces) annotation[0]).value());
 	}

+	public static boolean apiAnnotationTypeScriptProgress(final Method element) throws Exception {
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(TypeScriptProgress.class);
+		if (annotation.length == 0) {
+			return false;
+		}
+		return true;
+	}
+
 	public static List<String> apiAnnotationProduces(final Class<?> clazz, final Method method) throws Exception {
 		final List<String> data = apiAnnotationProduces(method);
 		if (data != null) {
@@ -192,14 +212,15 @@ public class DataFactoryTsApi {
 		return ((FormDataParam) annotation[0]).value();
 	}

-	public static Class<?> apiAnnotationGetAsyncType(final Parameter element) throws Exception {
+	public static Class<?>[] apiAnnotationGetAsyncType(final Parameter element) throws Exception {
 		final Annotation[] annotation = element.getDeclaredAnnotationsByType(AsyncType.class);
 		if (annotation.length == 0) {
 			return null;
 		}
 		return ((AsyncType) annotation[0]).value();
 	}
-	public static Class<?> apiAnnotationGetAsyncType(final Method element) throws Exception {
+
+	public static Class<?>[] apiAnnotationGetAsyncType(final Method element) throws Exception {
 		final Annotation[] annotation = element.getDeclaredAnnotationsByType(AsyncType.class);
 		if (annotation.length == 0) {
 			return null;
@@ -235,6 +256,30 @@ public class DataFactoryTsApi {
 		return element.getDeclaredAnnotationsByType(Context.class).length != 0;
 	}

+	public static String convertInTypeScriptType(final List<ClassElement> tmp, final boolean isList) {
+		String out = "";
+		for (final ClassElement elem : tmp) {
+			if (out.length() != 0) {
+				out += " | ";
+			}
+			out += elem.tsTypeName;
+			if (isList) {
+				out += "[]";
+			}
+		}
+		return out;
+	}
+	public static String convertInTypeScriptCheckType(final List<ClassElement> tmp) {
+		String out = "";
+		for (final ClassElement elem : tmp) {
+			if (out.length() != 0) {
+				out += " | ";
+			}
+			out += elem.tsCheckType;
+		}
+		return out;
+	}
+
 	public static APIModel createSingleApi(final Class<?> clazz, final Set<Class<?>> includeModel, final Set<Class<?>> includeCheckerModel, final GeneratedTypes previous) throws Exception {
 		final StringBuilder builder = new StringBuilder();
 		// the basic path has no specific elements...
@@ -260,30 +305,42 @@ public class DataFactoryTsApi {
 			if (methodDescription != null) {
 				LOGGER.trace("         description: {}", methodDescription);
 			}
-			Class<?> returnTypeModel = apiAnnotationGetAsyncType(method);
-			if (returnTypeModel == null) {
-				returnTypeModel = method.getReturnType();
-			}
+			final boolean needGenerateProgress = apiAnnotationTypeScriptProgress(method);
+			Class<?>[] returnTypeModel = apiAnnotationGetAsyncType(method);
 			boolean isUnmanagedReturnType = false;
-			if (returnTypeModel == Response.class ) {
-				isUnmanagedReturnType = true;
-				returnTypeModel = Void.class;
-			}
 			boolean returnModelIsArray = false;
-			ClassElement tmpReturn;
-			if (returnTypeModel == List.class) {
-				final ParameterizedType listType = (ParameterizedType) method.getGenericReturnType();
-				returnTypeModel = (Class<?>) listType.getActualTypeArguments()[0];
-				tmpReturn = DataFactoryZod.createTable(returnTypeModel, previous);
-				returnModelIsArray = true;
-				includeModel.add(tmpReturn.model[0]);
+			List<ClassElement> tmpReturn;
+			if (returnTypeModel == null) {
+				Class<?> returnTypeModelRaw = method.getReturnType();
+				LOGGER.info("Get type: {}", returnTypeModelRaw);
+				if (returnTypeModelRaw == Response.class) {
+					LOGGER.info("Get type: {}", returnTypeModelRaw);
+				}
+				if (returnTypeModelRaw == Response.class) {
+					isUnmanagedReturnType = true;
+					returnTypeModel = new Class<?>[] { Void.class };
+					tmpReturn = new ArrayList<>();
+				} else if (returnTypeModelRaw == List.class) {
+					final ParameterizedType listType = (ParameterizedType) method.getGenericReturnType();
+					returnTypeModelRaw = (Class<?>) listType.getActualTypeArguments()[0];
+					returnModelIsArray = true;
+					returnTypeModel = new Class<?>[] { returnTypeModelRaw };
+					tmpReturn = DataFactoryZod.createTables(returnTypeModel, previous);
+				} else {
+					returnTypeModel = new Class<?>[] { returnTypeModelRaw };
+					tmpReturn = DataFactoryZod.createTables(returnTypeModel, previous);
+				}
 			} else {
-				tmpReturn = DataFactoryZod.createTable(returnTypeModel, previous);
-
+				tmpReturn = DataFactoryZod.createTables(returnTypeModel, previous);
+			}
+			for (final ClassElement elem : tmpReturn) {
+				includeModel.add(elem.model[0]);
+				includeCheckerModel.add(elem.model[0]);
+			}
+			LOGGER.trace("         return: {}", tmpReturn.size());
+			for (final ClassElement elem : tmpReturn) {
+				LOGGER.trace("             - {}", elem.tsTypeName);
 			}
-			includeModel.add(tmpReturn.model[0]);
-			includeCheckerModel.add(tmpReturn.model[0]);
-			LOGGER.trace("         return: {}", tmpReturn.tsTypeName);
 			final Map<String, String> queryParams = new HashMap<>();
 			final Map<String, String> pathParams = new HashMap<>();
 			final Map<String, String> formDataParams = new HashMap<>();
@@ -296,24 +353,28 @@ public class DataFactoryTsApi {
 				}
 				final Class<?> parameterType = parameter.getType();
 				String parameterTypeString;
-				final Class<?> asyncType = apiAnnotationGetAsyncType(parameter);
+				final Class<?>[] asyncType = apiAnnotationGetAsyncType(parameter);
 				if (parameterType == List.class) {
 					if (asyncType == null) {
-						LOGGER.warn("Detext List param ==> not managed type ==> any[] !!!");
+						LOGGER.warn("Detect List param ==> not managed type ==> any[] !!!");
 						parameterTypeString = "any[]";
 					} else {
-						final ClassElement tmp = DataFactoryZod.createTable(asyncType, previous);
-						includeModel.add(tmp.model[0]);
-						parameterTypeString = tmp.tsTypeName + "[]";
+						final List<ClassElement> tmp = DataFactoryZod.createTables(asyncType, previous);
+						for (final ClassElement elem : tmp) {
+							includeModel.add(elem.model[0]);
+						}
+						parameterTypeString = convertInTypeScriptType(tmp, true);
 					}
 				} else if (asyncType == null) {
 					final ClassElement tmp = DataFactoryZod.createTable(parameterType, previous);
 					includeModel.add(tmp.model[0]);
 					parameterTypeString = tmp.tsTypeName;
 				} else {
-					final ClassElement tmp = DataFactoryZod.createTable(asyncType, previous);
-					includeModel.add(tmp.model[0]);
-					parameterTypeString = tmp.tsTypeName;
+					final List<ClassElement> tmp = DataFactoryZod.createTables(asyncType, previous);
+					for (final ClassElement elem : tmp) {
+						includeModel.add(elem.model[0]);
+					}
+					parameterTypeString = convertInTypeScriptType(tmp, true);
 				}
 				final String pathParam = apiAnnotationGetPathParam(parameter);
 				final String queryParam = apiAnnotationGetQueryParam(parameter);
@@ -325,13 +386,21 @@ public class DataFactoryTsApi {
 				} else if (formDataParam != null) {
 					formDataParams.put(formDataParam, parameterTypeString);
 				} else if (asyncType != null) {
-					final ClassElement tmp = DataFactoryZod.createTable(asyncType, previous);
-					includeModel.add(tmp.model[0]);
-					emptyElement.add(tmp.tsTypeName);
+					final List<ClassElement> tmp = DataFactoryZod.createTables(asyncType, previous);
+					parameterTypeString = "";
+					for (final ClassElement elem : tmp) {
+						includeModel.add(elem.model[0]);
+						if (parameterTypeString.length() != 0) {
+							parameterTypeString += " | ";
+						}
+						parameterTypeString += elem.tsTypeName;
+					}
+					emptyElement.add(parameterTypeString);
 				} else if (parameterType == List.class) {
 					parameterTypeString = "any[]";
 					final Class<?> plop = parameterType.arrayType();
 					LOGGER.info("ArrayType = {}", plop);
+					emptyElement.add(parameterTypeString);
 				} else {
 					final ClassElement tmp = DataFactoryZod.createTable(parameterType, previous);
 					includeModel.add(tmp.model[0]);
@@ -371,29 +440,30 @@ public class DataFactoryTsApi {
 			}
 			builder.append("\n\texport function ");
 			builder.append(methodName);
-			builder.append("({ restConfig,");
+			builder.append("({\n\t\t\trestConfig,");
 			if (!queryParams.isEmpty()) {
-				builder.append(" queries,");
+				builder.append("\n\t\t\tqueries,");
 			}
 			if (!pathParams.isEmpty()) {
-				builder.append(" params,");
+				builder.append("\n\t\t\tparams,");
 			}
 			if (produces.size() > 1) {
-				builder.append(" produce,");
+				builder.append("\n\t\t\tproduce,");
 			}
-			if (emptyElement.size() == 1) {
-				builder.append(" data,");
-			} else if (formDataParams.size() != 0) {
-				builder.append(" data,");
+			if (emptyElement.size() == 1 || formDataParams.size() != 0) {
+				builder.append("\n\t\t\tdata,");
 			}
-			builder.append(" }: {");
+			if (needGenerateProgress) {
+				builder.append("\n\t\t\tcallback,");
+			}
+			builder.append("\n\t\t}: {");
 			builder.append("\n\t\trestConfig: RESTConfig,");
 			if (!queryParams.isEmpty()) {
 				builder.append("\n\t\tqueries: {");
 				for (final Entry<String, String> queryEntry : queryParams.entrySet()) {
 					builder.append("\n\t\t\t");
 					builder.append(queryEntry.getKey());
-					builder.append(": ");
+					builder.append("?: ");
 					builder.append(queryEntry.getValue());
 					builder.append(",");
 				}
@@ -453,13 +523,21 @@ public class DataFactoryTsApi {
 				}
 				builder.append(",");
 			}
+			if (needGenerateProgress) {
+				builder.append("\n\t\tcallback?: RESTCallbacks,");
+			}
 			builder.append("\n\t}): Promise<");
-			builder.append(tmpReturn.tsTypeName);
-			if (returnModelIsArray) {
-				builder.append("[]");
+			if (tmpReturn.size() == 0 //
+					|| tmpReturn.get(0).tsTypeName == null //
+					|| tmpReturn.get(0).tsTypeName.equals("void")) {
+				builder.append("void");
+			} else {
+				builder.append(convertInTypeScriptType(tmpReturn, returnModelIsArray));
 			}
 			builder.append("> {");
-			if (tmpReturn.tsTypeName.equals("void")) {
+			if (tmpReturn.size() == 0 //
+					|| tmpReturn.get(0).tsTypeName == null //
+					|| tmpReturn.get(0).tsTypeName.equals("void")) {
 				builder.append("\n\t\treturn RESTRequestVoid({");
 			} else if (returnModelIsArray) {
 				builder.append("\n\t\treturn RESTRequestJsonArray({");
@@ -518,10 +596,14 @@ public class DataFactoryTsApi {
 			} else if (formDataParams.size() != 0) {
 				builder.append("\n\t\t\tdata,");
 			}
+			if (needGenerateProgress) {
+				builder.append("\n\t\t\tcallback,");
+			}
 			builder.append("\n\t\t}");
-			if (tmpReturn.tsCheckType != null) {
+			if (tmpReturn.size() != 0 && tmpReturn.get(0).tsTypeName != null && !tmpReturn.get(0).tsTypeName.equals("void")) {
 				builder.append(", ");
-				builder.append(tmpReturn.tsCheckType);
+				// TODO: correct this it is really bad ...
+				builder.append(convertInTypeScriptCheckType(tmpReturn));
 			}
 			builder.append(");");
 			builder.append("\n\t};");
@@ -551,16 +633,14 @@ public class DataFactoryTsApi {
 		myWriter = new FileWriter(pathPackage + File.separator + "index.ts");
 		myWriter.write(index.toString());
 		myWriter.close();
-		final InputStream ioStream = DataFactoryTsApi.class
-				.getClassLoader()
-				.getResourceAsStream("rest-tools.ts");
+		final InputStream ioStream = DataFactoryTsApi.class.getClassLoader().getResourceAsStream("rest-tools.ts");
 		if (ioStream == null) {
 			throw new IllegalArgumentException("rest-tools.ts is not found");
 		}
 		final BufferedReader buffer = new BufferedReader(new InputStreamReader(ioStream));
 		myWriter = new FileWriter(pathPackage + File.separator + "rest-tools.ts");
 		String line;
-		while( (line = buffer.readLine()) != null) {
+		while ((line = buffer.readLine()) != null) {
 			myWriter.write(line);
 			myWriter.write("\n");
 		}
--- a/src/org/kar/archidata/dataAccess/DataFactoryZod.java
+++ b/src/org/kar/archidata/dataAccess/DataFactoryZod.java
@@ -2,6 +2,7 @@ package org.kar.archidata.dataAccess;

 import java.io.File;
 import java.io.FileWriter;
+import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
@@ -20,6 +21,8 @@ import org.kar.archidata.exception.DataAccessException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+import jakarta.ws.rs.core.Response;
+
 public class DataFactoryZod {
 	static final Logger LOGGER = LoggerFactory.getLogger(DataFactoryZod.class);

@@ -97,7 +100,7 @@ public class DataFactoryZod {
 			out.append("zod.enum([");
 			for (final Object elem : arr) {
 				if (!first) {
-					out.append(", \n\t");
+					out.append(",\n\t");
 				} else {
 					out.append("\n\t");
 					first = false;
@@ -106,14 +109,18 @@ public class DataFactoryZod {
 				out.append(elem.toString());
 				out.append("'");
 			}
-			out.append("\n\t])");
+			if (first) {
+				out.append("]}");
+			} else {
+				out.append("\n\t])");
+			}
 		} else {
 			element.isEnum = true;
 			boolean first = true;
 			out.append("{");
 			for (final Object elem : arr) {
 				if (!first) {
-					out.append(", \n\t");
+					out.append(",\n\t");
 				} else {
 					out.append("\n\t");
 					first = false;
@@ -123,7 +130,11 @@ public class DataFactoryZod {
 				out.append(elem.toString());
 				out.append("'");
 			}
-			out.append("}");
+			if (first) {
+				out.append("}");
+			} else {
+				out.append(",\n\t}");
+			}
 		}
 		element.declaration = out.toString();
 		previous.addOrder(element);
@@ -282,10 +293,24 @@ public class DataFactoryZod {
 		return generatedData.toString();
 	}

+	public static List<ClassElement> createTables(final Class<?>[] classs, final GeneratedTypes previous) throws Exception {
+		final List<ClassElement> out = new ArrayList<>();
+		for (final Class<?> clazz : classs) {
+			if (clazz == Response.class) {
+				throw new IOException("Can not generate a Zod element for an unknow type Response");
+			}
+			out.add(createTable(clazz, previous));
+		}
+		return out;
+	}
+
 	public static ClassElement createTable(final Class<?> clazz, final GeneratedTypes previous) throws Exception {
 		if (clazz == null) {
 			return null;
 		}
+		if (clazz == Response.class) {
+			throw new IOException("Can not generate a Zod element for an unknow type Response");
+		}
 		final ClassElement alreadyExist = previous.find(clazz);
 		if (previous.find(clazz) != null) {
 			return alreadyExist;
--- a/src/org/kar/archidata/dataAccess/addOn/AddOnDataJson.java
+++ b/src/org/kar/archidata/dataAccess/addOn/AddOnDataJson.java
@@ -141,10 +141,20 @@ public class AddOnDataJson implements DataAccessAddOn {
 	}

 	@Override
-	public void createTables(final String tableName, final Field field, final StringBuilder mainTableBuilder, final List<String> preActionList, final List<String> postActionList,
-			final boolean createIfNotExist, final boolean createDrop, final int fieldId) throws Exception {
+	public void createTables(//
+			final String tableName, //
+			final Field primaryField, //
+			final Field field, //
+			final StringBuilder mainTableBuilder, //
+			final List<String> preActionList, //
+			final List<String> postActionList, //
+			final boolean createIfNotExist, //
+			final boolean createDrop, //
+			final int fieldId //
+	) throws Exception {
 		DataFactory.createTablesSpecificType(tableName, 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));
@@ -174,6 +184,7 @@ public class AddOnDataJson implements DataAccessAddOn {
 		data.covers.add(remoteKey);
 		DataAccess.update(data, data.id, List.of("covers"), new OverrideTableName(tableName));
 	}
+
 	public static void addLink(final Class<?> clazz, final UUID id, final String column, final UUID remoteKey) throws Exception {
 		final String tableName = AnnotationTools.getTableName(clazz);
 		final TableCoversUUIDUUID data = DataAccess.get(TableCoversUUIDUUID.class, id, new OverrideTableName(tableName));
@@ -188,6 +199,7 @@ public class AddOnDataJson implements DataAccessAddOn {
 		data.covers.add(remoteKey);
 		DataAccess.update(data, data.id, List.of("covers"), new OverrideTableName(tableName));
 	}
+
 	public static void addLink(final Class<?> clazz, final UUID id, final String column, final Long remoteKey) throws Exception {
 		final String tableName = AnnotationTools.getTableName(clazz);
 		final TableCoversUUIDLong data = DataAccess.get(TableCoversUUIDLong.class, id, new OverrideTableName(tableName));
@@ -202,6 +214,7 @@ public class AddOnDataJson implements DataAccessAddOn {
 		data.covers.add(remoteKey);
 		DataAccess.update(data, data.id, List.of("covers"), new OverrideTableName(tableName));
 	}
+
 	public static void removeLink(final Class<?> clazz, final UUID id, final String column, final Long remoteKey) throws Exception {
 		final String tableName = AnnotationTools.getTableName(clazz);
 		final TableCoversUUIDLong data = DataAccess.get(TableCoversUUIDLong.class, id, new OverrideTableName(tableName));
@@ -218,6 +231,7 @@ public class AddOnDataJson implements DataAccessAddOn {
 		data.covers = newList;
 		DataAccess.update(data, data.id, List.of("covers"), new OverrideTableName(tableName));
 	}
+
 	public static void removeLink(final Class<?> clazz, final UUID id, final String column, final UUID remoteKey) throws Exception {
 		final String tableName = AnnotationTools.getTableName(clazz);
 		final TableCoversUUIDUUID data = DataAccess.get(TableCoversUUIDUUID.class, id, new OverrideTableName(tableName));
@@ -234,6 +248,7 @@ public class AddOnDataJson implements DataAccessAddOn {
 		data.covers = newList;
 		DataAccess.update(data, data.id, List.of("covers"), new OverrideTableName(tableName));
 	}
+
 	public static void removeLink(final Class<?> clazz, final Long id, final String column, final Long remoteKey) throws Exception {
 		final String tableName = AnnotationTools.getTableName(clazz);
 		final TableCoversLongLong data = DataAccess.get(TableCoversLongLong.class, id, new OverrideTableName(tableName));
@@ -250,6 +265,7 @@ public class AddOnDataJson implements DataAccessAddOn {
 		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));
@@ -266,22 +282,9 @@ public class AddOnDataJson implements DataAccessAddOn {
 		data.covers = newList;
 		DataAccess.update(data, data.id, List.of("covers"), new OverrideTableName(tableName));
 	}
-	/*
-	public static <TYPE> void addLink(final Class<TYPE> clazz, final Object localKey, final String column, final Object remoteKey) throws Exception {
-		final String tableName = AnnotationTools.getTableName(clazz);
-		final TYPE data = DataAccess.get(clazz, localKey); // TODO: add filter of the "column"
-
-		// find the field column:
-
-		// add the remoteKey in the list:
-
-
-		// post new data in the DB
-
-		final String linkTableName = generateLinkTableName(this.tableName, this.column);
-		final LinkTable insertElement = new LinkTable(this.localKey, this.remoteKey);
-		DataAccess.insert(insertElement, new OverrideTableName(linkTableName));
-
-	}*/
+	/* public static <TYPE> void addLink(final Class<TYPE> clazz, final Object localKey, final String column, final Object remoteKey) throws Exception { final String tableName =
+	 * AnnotationTools.getTableName(clazz); final TYPE data = DataAccess.get(clazz, localKey); // TODO: add filter of the "column" // find the field column: // add the remoteKey in the list: // post
+	 * new data in the DB final String linkTableName = generateLinkTableName(this.tableName, this.column); final LinkTable insertElement = new LinkTable(this.localKey, this.remoteKey);
+	 * DataAccess.insert(insertElement, new OverrideTableName(linkTableName)); } */

 }
--- a/src/org/kar/archidata/dataAccess/addOn/AddOnManyToMany.java
+++ b/src/org/kar/archidata/dataAccess/addOn/AddOnManyToMany.java
@@ -7,6 +7,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;

 import org.kar.archidata.annotation.AnnotationTools;
 import org.kar.archidata.dataAccess.CountInOut;
@@ -18,7 +19,10 @@ import org.kar.archidata.dataAccess.QueryAnd;
 import org.kar.archidata.dataAccess.QueryCondition;
 import org.kar.archidata.dataAccess.QueryInList;
 import org.kar.archidata.dataAccess.QueryOptions;
-import org.kar.archidata.dataAccess.addOn.model.LinkTable;
+import org.kar.archidata.dataAccess.addOn.model.LinkTableLongLong;
+import org.kar.archidata.dataAccess.addOn.model.LinkTableLongUUID;
+import org.kar.archidata.dataAccess.addOn.model.LinkTableUUIDLong;
+import org.kar.archidata.dataAccess.addOn.model.LinkTableUUIDUUID;
 import org.kar.archidata.dataAccess.options.Condition;
 import org.kar.archidata.dataAccess.options.OverrideTableName;
 import org.kar.archidata.exception.DataAccessException;
@@ -32,7 +36,8 @@ import jakarta.validation.constraints.NotNull;

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

 	@Override
 	public Class<?> getAnnotationClass() {
@@ -62,7 +67,15 @@ public class AddOnManyToMany implements DataAccessAddOn {

 	@Override
 	public boolean canRetrieve(final Field field) {
-		return true;
+		if (field.getType() != List.class) {
+			return false;
+		}
+		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[0];
+		if (objectClass == Long.class || objectClass == UUID.class) {
+			return true;
+		} else {
+			return false;
+		}
 	}

 	public static String generateLinkTableNameField(final String tableName, final Field field) throws Exception {
@@ -78,21 +91,39 @@ public class AddOnManyToMany implements DataAccessAddOn {
 		return tableName + "_link_" + localName;
 	}

-	public void generateConcatQuerry(@NotNull final String tableName, @NotNull final Field field, @NotNull final StringBuilder querrySelect, @NotNull final StringBuilder querry,
-			@NotNull final String name, @NotNull final CountInOut elemCount, final QueryOptions options) {
-
+	public void generateConcatQuerry( //
+			@NotNull final String tableName, //
+			@NotNull final Field field, //
+			@NotNull final StringBuilder querrySelect, //
+			@NotNull final StringBuilder querry, //
+			@NotNull final String name, //
+			@NotNull final CountInOut elemCount, //
+			final QueryOptions options//
+	) {
 		final String linkTableName = generateLinkTableName(tableName, name);
+		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[0];
 		final String tmpVariable = "tmp_" + Integer.toString(elemCount.value);
 		querrySelect.append(" (SELECT GROUP_CONCAT(");
-		querrySelect.append(tmpVariable);
-		querrySelect.append(".object2Id ");
+		if (objectClass == Long.class) {
+			querrySelect.append(tmpVariable);
+			querrySelect.append(".object2Id ");
+		} else {
+			querrySelect.append("BIN_TO_UUID(");
+			querrySelect.append(tmpVariable);
+			querrySelect.append(".object2Id) ");
+		}
 		if ("sqlite".equals(ConfigBaseVariable.getDBType())) {
 			querrySelect.append(", ");
 		} else {
 			querrySelect.append("SEPARATOR ");
 		}
 		querrySelect.append("'");
-		querrySelect.append(SEPARATOR);
+		if (objectClass == Long.class) {
+			querrySelect.append(SEPARATOR_LONG);
+		} else {
+			querrySelect.append(SEPARATOR_UUID);
+
+		}
 		querrySelect.append("') FROM ");
 		querrySelect.append(linkTableName);
 		querrySelect.append(" ");
@@ -118,13 +149,20 @@ public class AddOnManyToMany implements DataAccessAddOn {
 	}

 	@Override
-	public void generateQuerry(@NotNull final String tableName, @NotNull final Field field, @NotNull final StringBuilder querrySelect, @NotNull final StringBuilder querry, @NotNull final String name,
-			@NotNull final CountInOut elemCount, final QueryOptions options) throws Exception {
+	public void generateQuerry( //
+			@NotNull final String tableName, //
+			@NotNull final Field field, //
+			@NotNull final StringBuilder querrySelect, //
+			@NotNull final StringBuilder querry, //
+			@NotNull final String name, //
+			@NotNull final CountInOut elemCount, //
+			final QueryOptions options //
+	) throws Exception {
 		if (field.getType() != List.class) {
 			return;
 		}
 		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[0];
-		if (objectClass == Long.class) {
+		if (objectClass == Long.class || objectClass == UUID.class) {
 			generateConcatQuerry(tableName, field, querrySelect, querry, name, elemCount, options);
 		}
 		final ManyToMany decorators = field.getDeclaredAnnotation(ManyToMany.class);
@@ -141,20 +179,29 @@ public class AddOnManyToMany implements DataAccessAddOn {
 	}

 	@Override
-	public void fillFromQuerry(final ResultSet rs, final Field field, final Object data, final CountInOut count, final QueryOptions options, final List<LazyGetter> lazyCall) throws Exception {
+	public void fillFromQuerry( //
+			final ResultSet rs, //
+			final Field field, //
+			final Object data, //
+			final CountInOut count, //
+			final QueryOptions options, //
+			final List<LazyGetter> lazyCall //
+	) throws Exception {
 		if (field.getType() != List.class) {
 			LOGGER.error("Can not ManyToMany with other than List Model: {}", field.getType().getCanonicalName());
 			return;
 		}
 		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[0];
 		if (objectClass == Long.class) {
-			final List<Long> idList = DataAccess.getListOfIds(rs, count.value, SEPARATOR);
+			final List<Long> idList = DataAccess.getListOfIds(rs, count.value, SEPARATOR_LONG);
+			field.set(data, idList);
+			count.inc();
+			return;
+		} else if (objectClass == UUID.class) {
+			final List<UUID> idList = DataAccess.getListOfUUIDs(rs, count.value, SEPARATOR_UUID);
 			field.set(data, idList);
 			count.inc();
 			return;
-			// } else {
-			// LOGGER.error("Can not ManyToMany with other than List<Long> Model: List<{}>", objectClass.getCanonicalName());
-			// return;
 		}
 		final ManyToMany decorators = field.getDeclaredAnnotation(ManyToMany.class);
 		if (decorators == null) {
@@ -163,8 +210,8 @@ public class AddOnManyToMany implements DataAccessAddOn {
 		if (objectClass == decorators.targetEntity()) {
 			if (decorators.fetch() == FetchType.EAGER) {
 				throw new DataAccessException("EAGER is not supported for list of element...");
-			} else {
-				final List<Long> idList = DataAccess.getListOfIds(rs, count.value, SEPARATOR);
+			} else if (objectClass == Long.class) {
+				final List<Long> idList = DataAccess.getListOfIds(rs, count.value, SEPARATOR_LONG);
 				// field.set(data, idList);
 				count.inc();
 				if (idList != null && idList.size() > 0) {
@@ -182,6 +229,25 @@ public class AddOnManyToMany implements DataAccessAddOn {
 					};
 					lazyCall.add(lambda);
 				}
+			} else if (objectClass == UUID.class) {
+				final List<UUID> idList = DataAccess.getListOfUUIDs(rs, count.value, SEPARATOR_UUID);
+				// field.set(data, idList);
+				count.inc();
+				if (idList != null && idList.size() > 0) {
+					final String idField = AnnotationTools.getFieldName(AnnotationTools.getIdField(objectClass));
+					// In the lazy mode, the request is done in asynchronous mode, they will be done after...
+					final LazyGetter lambda = () -> {
+						final List<UUID> childs = new ArrayList<>(idList);
+						// TODO: update to have get with abstract types ....
+						@SuppressWarnings("unchecked")
+						final Object foreignData = DataAccess.getsWhere(decorators.targetEntity(), new Condition(new QueryInList<>(idField, childs)));
+						if (foreignData == null) {
+							return;
+						}
+						field.set(data, foreignData);
+					};
+					lazyCall.add(lambda);
+				}
 			}
 		}
 	}
@@ -197,12 +263,38 @@ public class AddOnManyToMany implements DataAccessAddOn {
 			LOGGER.error("Can not ManyToMany with other than List Model: {}", field.getType().getCanonicalName());
 			return;
 		}
+		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[0];
+		if (objectClass != Long.class && objectClass != UUID.class) {
+			throw new DataAccessException("Can not ManyToMany with other than List<Long> or List<UUID> Model: List<" + objectClass.getCanonicalName() + ">");
+		}
 		final String columnName = AnnotationTools.getFieldName(field);
 		final String linkTableName = generateLinkTableName(tableName, columnName);
-		actions.add(() -> {
-			DataAccess.deleteWhere(LinkTable.class, new OverrideTableName(linkTableName), new Condition(new QueryCondition("object1Id", "=", localKey)));
-		});
-		asyncInsert(tableName, localKey, field, data, actions);
+
+		if (localKey instanceof final Long localKeyLong) {
+			if (objectClass == Long.class) {
+				actions.add(() -> {
+					DataAccess.deleteWhere(LinkTableLongLong.class, new OverrideTableName(linkTableName), new Condition(new QueryCondition("object1Id", "=", localKeyLong)));
+				});
+				asyncInsert(tableName, localKey, field, data, actions);
+			} else {
+				actions.add(() -> {
+					DataAccess.deleteWhere(LinkTableLongUUID.class, new OverrideTableName(linkTableName), new Condition(new QueryCondition("object1Id", "=", localKeyLong)));
+				});
+				asyncInsert(tableName, localKey, field, data, actions);
+			}
+		} else if (localKey instanceof final UUID localKeyUUID) {
+			if (objectClass == Long.class) {
+				actions.add(() -> {
+					DataAccess.deleteWhere(LinkTableUUIDLong.class, new OverrideTableName(linkTableName), new Condition(new QueryCondition("object1Id", "=", localKeyUUID)));
+				});
+				asyncInsert(tableName, localKey, field, data, actions);
+			} else {
+				actions.add(() -> {
+					DataAccess.deleteWhere(LinkTableUUIDUUID.class, new OverrideTableName(linkTableName), new Condition(new QueryCondition("object1Id", "=", localKeyUUID)));
+				});
+				asyncInsert(tableName, localKey, field, data, actions);
+			}
+		}
 	}

 	@Override
@@ -219,56 +311,142 @@ public class AddOnManyToMany implements DataAccessAddOn {
 			LOGGER.error("Can not ManyToMany with other than List Model: {}", field.getType().getCanonicalName());
 			return;
 		}
+		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[0];
+		if (objectClass != Long.class && objectClass != UUID.class) {
+			throw new DataAccessException("Can not ManyToMany with other than List<Long> or List<UUID> Model: List<" + objectClass.getCanonicalName() + ">");
+		}
 		final String columnName = AnnotationTools.getFieldName(field);
 		final String linkTableName = generateLinkTableName(tableName, columnName);
-		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[0];
-		if (objectClass != Long.class) {
-			LOGGER.error("Can not ManyToMany with other than List<Long> Model: List<{}>", objectClass.getCanonicalName());
-			return;
-		}
-		@SuppressWarnings("unchecked")
-		final List<Long> dataCasted = (List<Long>) data;
-		if (dataCasted.size() == 0) {
-			return;
-		}
-		final List<LinkTable> insertElements = new ArrayList<>();
-		for (final Long remoteKey : dataCasted) {
-			if (remoteKey == null) {
-				throw new DataAccessException("Try to insert remote key with null value");
-			}
-			if (localKey instanceof final Long localKeyLong) {
-				insertElements.add(new LinkTable(localKeyLong, remoteKey));
+		if (localKey instanceof final Long localKeyLong) {
+			if (objectClass == Long.class) {
+				// ========================================================
+				// == Link a "Long" primary Key with List<Long>
+				// ========================================================
+				@SuppressWarnings("unchecked")
+				final List<Long> dataCasted = (List<Long>) data;
+				if (dataCasted.size() == 0) {
+					return;
+				}
+				final List<LinkTableLongLong> insertElements = new ArrayList<>();
+				for (final Long remoteKey : dataCasted) {
+					if (remoteKey == null) {
+						throw new DataAccessException("Try to insert remote key with null value");
+					}
+					insertElements.add(new LinkTableLongLong(localKeyLong, remoteKey));
+				}
+				if (insertElements.size() == 0) {
+					LOGGER.warn("Insert multiple link without any value (may have null in the list): {}", dataCasted);
+					return;
+				}
+				actions.add(() -> {
+					DataAccess.insertMultiple(insertElements, new OverrideTableName(linkTableName));
+				});
 			} else {
-				throw new DataAccessException("Not manage access of remte key like ManyToMany other than Long: " + localKey.getClass().getCanonicalName());
+				// ========================================================
+				// == Link a "Long" primary Key with List<UUID>
+				// ========================================================
+				@SuppressWarnings("unchecked")
+				final List<UUID> dataCasted = (List<UUID>) data;
+				if (dataCasted.size() == 0) {
+					return;
+				}
+				final List<LinkTableLongUUID> insertElements = new ArrayList<>();
+				for (final UUID remoteKey : dataCasted) {
+					if (remoteKey == null) {
+						throw new DataAccessException("Try to insert remote key with null value");
+					}
+					insertElements.add(new LinkTableLongUUID(localKeyLong, remoteKey));
+				}
+				if (insertElements.size() == 0) {
+					LOGGER.warn("Insert multiple link without any value (may have null in the list): {}", dataCasted);
+					return;
+				}
+				actions.add(() -> {
+					DataAccess.insertMultiple(insertElements, new OverrideTableName(linkTableName));
+				});
 			}
+		} else if (localKey instanceof final UUID localKeyUUID) {
+			if (objectClass == Long.class) {
+				// ========================================================
+				// == Link a "UUID" primary Key with List<Long>
+				// ========================================================
+				@SuppressWarnings("unchecked")
+				final List<Long> dataCasted = (List<Long>) data;
+				if (dataCasted.size() == 0) {
+					return;
+				}
+				final List<LinkTableUUIDLong> insertElements = new ArrayList<>();
+				for (final Long remoteKey : dataCasted) {
+					if (remoteKey == null) {
+						throw new DataAccessException("Try to insert remote key with null value");
+					}
+					insertElements.add(new LinkTableUUIDLong(localKeyUUID, remoteKey));
+				}
+				if (insertElements.size() == 0) {
+					LOGGER.warn("Insert multiple link without any value (may have null in the list): {}", dataCasted);
+					return;
+				}
+				actions.add(() -> {
+					DataAccess.insertMultiple(insertElements, new OverrideTableName(linkTableName));
+				});
+			} else {
+				// ========================================================
+				// == Link a "UUID" primary Key with List<UUID>
+				// ========================================================
+				@SuppressWarnings("unchecked")
+				final List<UUID> dataCasted = (List<UUID>) data;
+				if (dataCasted.size() == 0) {
+					return;
+				}
+				final List<LinkTableUUIDUUID> insertElements = new ArrayList<>();
+				for (final UUID remoteKey : dataCasted) {
+					if (remoteKey == null) {
+						throw new DataAccessException("Try to insert remote key with null value");
+					}
+					insertElements.add(new LinkTableUUIDUUID(localKeyUUID, remoteKey));
+				}
+				if (insertElements.size() == 0) {
+					LOGGER.warn("Insert multiple link without any value (may have null in the list): {}", dataCasted);
+					return;
+				}
+				actions.add(() -> {
+					DataAccess.insertMultiple(insertElements, new OverrideTableName(linkTableName));
+				});
+			}
+		} else {
+			throw new DataAccessException("Not manage access of remte key like ManyToMany other than Long or UUID: " + localKey.getClass().getCanonicalName());
 		}
-		if (insertElements.size() == 0) {
-			LOGGER.warn("Insert multiple link without any value (may have null in the list): {}", dataCasted);
-			return;
-		}
-		actions.add(() -> {
-			DataAccess.insertMultiple(insertElements, new OverrideTableName(linkTableName));
-		});
+
 	}

 	@Override
 	public void drop(final String tableName, final Field field) throws Exception {
 		final String columnName = AnnotationTools.getFieldName(field);
 		final String linkTableName = generateLinkTableName(tableName, columnName);
-		DataAccess.drop(LinkTable.class, new OverrideTableName(linkTableName));
+		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[0];
+		if (objectClass != Long.class && objectClass != UUID.class) {
+			throw new DataAccessException("Can not ManyToMany with other than List<Long> or List<UUID> Model: List<" + objectClass.getCanonicalName() + ">");
+		}
+		DataAccess.drop(LinkTableLongLong.class, new OverrideTableName(linkTableName));
 	}

 	@Override
 	public void cleanAll(final String tableName, final Field field) throws Exception {
 		final String columnName = AnnotationTools.getFieldName(field);
 		final String linkTableName = generateLinkTableName(tableName, columnName);
-		DataAccess.cleanAll(LinkTable.class, new OverrideTableName(linkTableName));
+		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[0];
+		if (objectClass != Long.class && objectClass != UUID.class) {
+			throw new DataAccessException("Can not ManyToMany with other than List<Long> or List<UUID> Model: List<" + objectClass.getCanonicalName() + ">");
+		}
+		DataAccess.cleanAll(LinkTableLongLong.class, new OverrideTableName(linkTableName));
 	}

 	public static void addLink(final Class<?> clazz, final long localKey, final String column, final long remoteKey) throws Exception {
 		final String tableName = AnnotationTools.getTableName(clazz);
 		final String linkTableName = generateLinkTableName(tableName, column);
-		final LinkTable insertElement = new LinkTable(localKey, remoteKey);
+		/* final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[0]; if (objectClass != Long.class && objectClass != UUID.class) { throw new
+		 * DataAccessException("Can not ManyToMany with other than List<Long> or List<UUID> Model: List<" + objectClass.getCanonicalName() + ">"); } */
+		final LinkTableLongLong insertElement = new LinkTableLongLong(localKey, remoteKey);
 		DataAccess.insert(insertElement, new OverrideTableName(linkTableName));

 	}
@@ -276,16 +454,48 @@ public class AddOnManyToMany implements DataAccessAddOn {
 	public static int removeLink(final Class<?> clazz, final long localKey, final String column, final long remoteKey) throws Exception {
 		final String tableName = AnnotationTools.getTableName(clazz);
 		final String linkTableName = generateLinkTableName(tableName, column);
-		return DataAccess.deleteWhere(LinkTable.class, new OverrideTableName(linkTableName),
+		return DataAccess.deleteWhere(LinkTableLongLong.class, new OverrideTableName(linkTableName),
 				new Condition(new QueryAnd(new QueryCondition("object1Id", "=", localKey), new QueryCondition("object2Id", "=", remoteKey))));
 	}

 	@Override
-	public void createTables(final String tableName, final Field field, final StringBuilder mainTableBuilder, final List<String> preActionList, final List<String> postActionList,
-			final boolean createIfNotExist, final boolean createDrop, final int fieldId) throws Exception {
+	public void createTables( //
+			final String tableName, //
+			final Field primaryField, //
+			final Field field, //
+			final StringBuilder mainTableBuilder, //
+			final List<String> preActionList, //
+			final List<String> postActionList, //
+			final boolean createIfNotExist, //
+			final boolean createDrop, //
+			final int fieldId//
+	) throws Exception {
 		final String linkTableName = generateLinkTableNameField(tableName, field);
 		final QueryOptions options = new QueryOptions(new OverrideTableName(linkTableName));
-		final List<String> sqlCommand = DataFactory.createTable(LinkTable.class, options);
-		postActionList.addAll(sqlCommand);
+		final Class<?> objectClass = (Class<?>) ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[0];
+		if (objectClass != Long.class && objectClass != UUID.class) {
+			throw new DataAccessException("Can not ManyToMany with other than List<Long> or List<UUID> Model: List<" + objectClass.getCanonicalName() + ">");
+		}
+		final Class<?> primaryType = primaryField.getType();
+		if (primaryType == Long.class) {
+			if (objectClass == Long.class) {
+				final List<String> sqlCommand = DataFactory.createTable(LinkTableLongLong.class, options);
+				postActionList.addAll(sqlCommand);
+			} else {
+				final List<String> sqlCommand = DataFactory.createTable(LinkTableLongUUID.class, options);
+				postActionList.addAll(sqlCommand);
+			}
+		} else if (primaryType == UUID.class) {
+
+			if (objectClass == Long.class) {
+				final List<String> sqlCommand = DataFactory.createTable(LinkTableUUIDLong.class, options);
+				postActionList.addAll(sqlCommand);
+			} else {
+				final List<String> sqlCommand = DataFactory.createTable(LinkTableUUIDUUID.class, options);
+				postActionList.addAll(sqlCommand);
+			}
+		} else {
+			throw new DataAccessException("Can not ManyToMany with other than primary key type Long or UUID Model: " + primaryType.getCanonicalName());
+		}
 	}
 }
--- a/src/org/kar/archidata/dataAccess/addOn/AddOnManyToOne.java
+++ b/src/org/kar/archidata/dataAccess/addOn/AddOnManyToOne.java
@@ -5,6 +5,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.Types;
 import java.util.List;
+import java.util.UUID;

 import org.kar.archidata.annotation.AnnotationTools;
 import org.kar.archidata.dataAccess.CountInOut;
@@ -14,6 +15,7 @@ import org.kar.archidata.dataAccess.DataFactory;
 import org.kar.archidata.dataAccess.LazyGetter;
 import org.kar.archidata.dataAccess.QueryOptions;
 import org.kar.archidata.exception.DataAccessException;
+import org.kar.archidata.tools.UuidUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

@@ -30,12 +32,11 @@ public class AddOnManyToOne implements DataAccessAddOn {
 	}

 	@Override
-	public String getSQLFieldType(final Field elem) throws Exception {
-		final String fieldName = AnnotationTools.getFieldName(elem);
+	public String getSQLFieldType(final Field field) throws Exception {
+		final String fieldName = AnnotationTools.getFieldName(field);
 		try {
-			return DataFactory.convertTypeInSQL(Long.class, fieldName);
+			return DataFactory.convertTypeInSQL(field.getType(), fieldName);
 		} catch (final Exception e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 		return null;
@@ -43,18 +44,41 @@ public class AddOnManyToOne implements DataAccessAddOn {

 	@Override
 	public boolean isCompatibleField(final Field elem) {
-		final ManyToOne decorators = elem.getDeclaredAnnotation(ManyToOne.class);
-		return decorators != null;
+		return elem.getDeclaredAnnotation(ManyToOne.class) != null;
 	}

 	@Override
 	public void insertData(final PreparedStatement ps, final Field field, final Object rootObject, final CountInOut iii) throws Exception {
 		final Object data = field.get(rootObject);
 		if (data == null) {
-			ps.setNull(iii.value, Types.BIGINT);
+			if (field.getType() == Long.class) {
+				ps.setNull(iii.value, Types.BIGINT);
+			} else if (field.getType() == Integer.class) {
+				ps.setNull(iii.value, Types.INTEGER);
+			} else if (field.getType() == Short.class) {
+				ps.setNull(iii.value, Types.INTEGER);
+			} else if (field.getType() == String.class) {
+				ps.setNull(iii.value, Types.VARCHAR);
+			} else if (field.getType() == UUID.class) {
+				ps.setNull(iii.value, Types.BINARY);
+			}
 		} else if (field.getType() == Long.class) {
-			final Long dataLong = (Long) data;
-			ps.setLong(iii.value, dataLong);
+			final Long dataTyped = (Long) data;
+			ps.setLong(iii.value, dataTyped);
+		} else if (field.getType() == Integer.class) {
+			final Integer dataTyped = (Integer) data;
+			ps.setInt(iii.value, dataTyped);
+		} else if (field.getType() == Short.class) {
+			final Short dataTyped = (Short) data;
+			ps.setShort(iii.value, dataTyped);
+		} else if (field.getType() == String.class) {
+			final String dataTyped = (String) data;
+			ps.setString(iii.value, dataTyped);
+		} else if (field.getType() == UUID.class) {
+			final UUID dataTyped = (UUID) data;
+			LOGGER.info("Generate UUTD for DB: {}", dataTyped);
+			final byte[] dataByte = UuidUtils.asBytes(dataTyped);
+			ps.setBytes(iii.value, dataByte);
 		} else {
 			final Field idField = AnnotationTools.getFieldOfId(field.getType());
 			final Object uid = idField.get(data);
@@ -71,7 +95,11 @@ public class AddOnManyToOne implements DataAccessAddOn {

 	@Override
 	public boolean canInsert(final Field field) {
-		if (field.getType() == Long.class) {
+		if (field.getType() == Long.class //
+				|| field.getType() == Integer.class //
+				|| field.getType() == Short.class //
+				|| field.getType() == String.class //
+				|| field.getType() == UUID.class) {
 			return true;
 		}
 		final ManyToOne decorators = field.getDeclaredAnnotation(ManyToOne.class);
@@ -88,7 +116,12 @@ public class AddOnManyToOne implements DataAccessAddOn {

 	@Override
 	public boolean canRetrieve(final Field field) {
-		if (field.getType() == Long.class) {
+		final Class<?> classType = field.getType();
+		if (classType == Long.class //
+				|| classType == Integer.class //
+				|| classType == Short.class //
+				|| classType == String.class //
+				|| classType == UUID.class) {
 			return true;
 		}
 		final ManyToOne decorators = field.getDeclaredAnnotation(ManyToOne.class);
@@ -99,9 +132,20 @@ public class AddOnManyToOne implements DataAccessAddOn {
 	}

 	@Override
-	public void generateQuerry(@NotNull final String tableName, @NotNull final Field field, @NotNull final StringBuilder querrySelect, @NotNull final StringBuilder querry, @NotNull final String name,
-			@NotNull final CountInOut elemCount, final QueryOptions options) throws Exception {
-		if (field.getType() == Long.class) {
+	public void generateQuerry( //
+			@NotNull final String tableName, //
+			@NotNull final Field field, //
+			@NotNull final StringBuilder querrySelect, //
+			@NotNull final StringBuilder querry, //
+			@NotNull final String name, //
+			@NotNull final CountInOut elemCount, //
+			final QueryOptions options//
+	) throws Exception {
+		if (field.getType() == Long.class //
+				|| field.getType() == Integer.class //
+				|| field.getType() == Short.class //
+				|| field.getType() == String.class //
+				|| field.getType() == UUID.class) {
 			querrySelect.append(" ");
 			querrySelect.append(tableName);
 			querrySelect.append(".");
@@ -150,6 +194,39 @@ public class AddOnManyToOne implements DataAccessAddOn {
 			}
 			return;
 		}
+		if (field.getType() == Integer.class) {
+			final Integer foreignKey = rs.getInt(count.value);
+			count.inc();
+			if (!rs.wasNull()) {
+				field.set(data, foreignKey);
+			}
+			return;
+		}
+		if (field.getType() == Short.class) {
+			final Short foreignKey = rs.getShort(count.value);
+			count.inc();
+			if (!rs.wasNull()) {
+				field.set(data, foreignKey);
+			}
+			return;
+		}
+		if (field.getType() == String.class) {
+			final String foreignKey = rs.getString(count.value);
+			count.inc();
+			if (!rs.wasNull()) {
+				field.set(data, foreignKey);
+			}
+			return;
+		}
+		if (field.getType() == UUID.class) {
+			final byte[] tmp = rs.getBytes(count.value);
+			count.inc();
+			if (!rs.wasNull()) {
+				final UUID foreignKey = UuidUtils.asUuid(tmp);
+				field.set(data, foreignKey);
+			}
+			return;
+		}
 		final Class<?> objectClass = field.getType();
 		final ManyToOne decorators = field.getDeclaredAnnotation(ManyToOne.class);
 		if (decorators == null) {
@@ -184,8 +261,27 @@ public class AddOnManyToOne implements DataAccessAddOn {

 	// TODO : refacto this table to manage a generic table with dynamic name to be serialisable with the default system
 	@Override
-	public void createTables(final String tableName, final Field field, final StringBuilder mainTableBuilder, final List<String> preActionList, final List<String> postActionList,
-			final boolean createIfNotExist, final boolean createDrop, final int fieldId) throws Exception {
-		DataFactory.createTablesSpecificType(tableName, field, mainTableBuilder, preActionList, postActionList, createIfNotExist, createDrop, fieldId, Long.class);
+	public void createTables(//
+			final String tableName, //
+			final Field primaryField, //
+			final Field field, //
+			final StringBuilder mainTableBuilder, //
+			final List<String> preActionList, //
+			final List<String> postActionList, //
+			final boolean createIfNotExist, //
+			final boolean createDrop, //
+			final int fieldId //
+	) throws Exception {
+		final Class<?> classType = field.getType();
+		if (classType == Long.class //
+				|| classType == Integer.class //
+				|| classType == Short.class //
+				|| classType == String.class //
+				|| classType == UUID.class) {
+			DataFactory.createTablesSpecificType(tableName, field, mainTableBuilder, preActionList, postActionList, createIfNotExist, createDrop, fieldId, classType);
+		} else {
+			LOGGER.error("Support only the Long remote field of ecternal primary keys...");
+			DataFactory.createTablesSpecificType(tableName, field, mainTableBuilder, preActionList, postActionList, createIfNotExist, createDrop, fieldId, Long.class);
+		}
 	}
 }
--- a/src/org/kar/archidata/dataAccess/addOn/AddOnOneToMany.java
+++ b/src/org/kar/archidata/dataAccess/addOn/AddOnOneToMany.java
@@ -125,8 +125,17 @@ public class AddOnOneToMany implements DataAccessAddOn {

 	// TODO : refacto this table to manage a generic table with dynamic name to be serializable with the default system
 	@Override
-	public void createTables(final String tableName, final Field field, final StringBuilder mainTableBuilder, final List<String> preActionList, final List<String> postActionList,
-			final boolean createIfNotExist, final boolean createDrop, final int fieldId) throws Exception {
+	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, field, mainTableBuilder, preActionList, postActionList, createIfNotExist, createDrop, fieldId, Long.class);
 	}
 }
--- a/src/org/kar/archidata/dataAccess/addOn/AddOnSQLTableExternalForeinKeyAsList.java
+++ b/src/org/kar/archidata/dataAccess/addOn/AddOnSQLTableExternalForeinKeyAsList.java
@@ -105,8 +105,17 @@ public class AddOnSQLTableExternalForeinKeyAsList implements DataAccessAddOn {
 	}

 	@Override
-	public void createTables(final String tableName, final Field field, final StringBuilder mainTableBuilder, final List<String> preActionList, final List<String> postActionList,
-			final boolean createIfNotExist, final boolean createDrop, final int fieldId) throws Exception {
+	public void createTables(//
+			final String tableName, //
+			final Field primaryField, //
+			final Field field, //
+			final StringBuilder mainTableBuilder, //
+			final List<String> preActionList, //
+			final List<String> postActionList, //
+			final boolean createIfNotExist, //
+			final boolean createDrop, //
+			final int fieldId //
+	) throws Exception {
 		// TODO Auto-generated method stub

 		DataFactory.createTablesSpecificType(tableName, field, mainTableBuilder, preActionList, postActionList, createIfNotExist, createDrop, fieldId, String.class);
--- a/src/org/kar/archidata/dataAccess/addOn/model/LinkTableLongLong.java
+++ b/src/org/kar/archidata/dataAccess/addOn/model/LinkTableLongLong.java
@@ -5,12 +5,12 @@ import org.kar.archidata.model.GenericData;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.Column;

-public class LinkTable extends GenericData {
-	public LinkTable() {
+public class LinkTableLongLong extends GenericData {
+	public LinkTableLongLong() {
 		// nothing to do...
 	}

-	public LinkTable(final long object1Id, final long object2Id) {
+	public LinkTableLongLong(final long object1Id, final long object2Id) {
 		this.object1Id = object1Id;
 		this.object2Id = object2Id;
 	}
--- a/src/org/kar/archidata/dataAccess/addOn/model/LinkTableLongUUID.java
+++ b/src/org/kar/archidata/dataAccess/addOn/model/LinkTableLongUUID.java
@@ -0,0 +1,27 @@
+package org.kar.archidata.dataAccess.addOn.model;
+
+import java.util.UUID;
+
+import org.kar.archidata.model.GenericData;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.Column;
+
+public class LinkTableLongUUID extends GenericData {
+	public LinkTableLongUUID() {
+		// nothing to do...
+	}
+
+	public LinkTableLongUUID(final long object1Id, final UUID object2Id) {
+		this.object1Id = object1Id;
+		this.object2Id = object2Id;
+	}
+
+	@Schema(description = "Object reference 1")
+	@Column(nullable = false)
+	public Long object1Id;
+	@Schema(description = "Object reference 2")
+	@Column(nullable = false)
+	public UUID object2Id;
+
+}
--- a/src/org/kar/archidata/dataAccess/addOn/model/LinkTableUUIDLong.java
+++ b/src/org/kar/archidata/dataAccess/addOn/model/LinkTableUUIDLong.java
@@ -0,0 +1,27 @@
+package org.kar.archidata.dataAccess.addOn.model;
+
+import java.util.UUID;
+
+import org.kar.archidata.model.GenericData;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.Column;
+
+public class LinkTableUUIDLong extends GenericData {
+	public LinkTableUUIDLong() {
+		// nothing to do...
+	}
+
+	public LinkTableUUIDLong(final UUID object1Id, final long object2Id) {
+		this.object1Id = object1Id;
+		this.object2Id = object2Id;
+	}
+
+	@Schema(description = "Object reference 1")
+	@Column(nullable = false)
+	public UUID object1Id;
+	@Schema(description = "Object reference 2")
+	@Column(nullable = false)
+	public Long object2Id;
+
+}
--- a/src/org/kar/archidata/dataAccess/addOn/model/LinkTableUUIDUUID.java
+++ b/src/org/kar/archidata/dataAccess/addOn/model/LinkTableUUIDUUID.java
@@ -0,0 +1,27 @@
+package org.kar.archidata.dataAccess.addOn.model;
+
+import java.util.UUID;
+
+import org.kar.archidata.model.GenericData;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.Column;
+
+public class LinkTableUUIDUUID extends GenericData {
+	public LinkTableUUIDUUID() {
+		// nothing to do...
+	}
+
+	public LinkTableUUIDUUID(final UUID object1Id, final UUID object2Id) {
+		this.object1Id = object1Id;
+		this.object2Id = object2Id;
+	}
+
+	@Schema(description = "Object reference 1")
+	@Column(nullable = false)
+	public UUID object1Id;
+	@Schema(description = "Object reference 2")
+	@Column(nullable = false)
+	public UUID object2Id;
+
+}
--- a/src/org/kar/archidata/dataAccess/options/CheckJPA.java
+++ b/src/org/kar/archidata/dataAccess/options/CheckJPA.java
@@ -9,6 +9,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import java.util.regex.Pattern;

 import org.kar.archidata.annotation.AnnotationTools;
@@ -125,7 +126,6 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 					}

 				} else if (type == Integer.class || type == int.class) {
-
 					final Long maxValueRoot = AnnotationTools.getConstraintsMax(field);
 					if (maxValueRoot != null) {
 						final int maxValue = maxValueRoot.intValue();
@@ -167,6 +167,20 @@ 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 Object elem = field.get(data);
+							if (elem == null) {
+								return;
+							}
+							final long count = DataAccess.count(annotationManyToOne.targetEntity(), elem);
+							if (count == 0) {
+								throw new InputException(baseName + fieldName, "Foreign element does not exist in the DB:" + elem);
+							}
+						});
+					}
 				} else if (type == Boolean.class || type == boolean.class) {

 				} else if (type == Float.class || type == float.class) {
--- a/src/org/kar/archidata/exception/RESTErrorResponseExeption.java
+++ b/src/org/kar/archidata/exception/RESTErrorResponseExeption.java
@@ -5,7 +5,7 @@ import java.util.UUID;
 public class RESTErrorResponseExeption extends Exception {
 	public UUID uuid;
 	public String time;
-	public String error;
+	public String name;
 	public String message;
 	public int status;
 	public String statusMessage;
@@ -13,16 +13,16 @@ public class RESTErrorResponseExeption extends Exception {
 	public RESTErrorResponseExeption() {
 		this.uuid = null;
 		this.time = null;
-		this.error = null;
+		this.name = null;
 		this.message = null;
 		this.status = 0;
 		this.statusMessage = null;
 	}

-	public RESTErrorResponseExeption(final UUID uuid, final String time, final String error, final String message, final int status, final String statusMessage) {
+	public RESTErrorResponseExeption(final UUID uuid, final String time, final String name, final String message, final int status, final String statusMessage) {
 		this.uuid = uuid;
 		this.time = time;
-		this.error = error;
+		this.name = name;
 		this.message = message;
 		this.status = status;
 		this.statusMessage = statusMessage;
@@ -30,7 +30,7 @@ public class RESTErrorResponseExeption extends Exception {

 	@Override
 	public String toString() {
-		return "RESTErrorResponseExeption [uuid=" + this.uuid + ", time=" + this.time + ", error=" + this.error + ", message=" + this.message + ", status=" + this.status + ", statusMessage="
+		return "RESTErrorResponseExeption [uuid=" + this.uuid + ", time=" + this.time + ", name=" + this.name + ", message=" + this.message + ", status=" + this.status + ", statusMessage="
 				+ this.statusMessage + "]";
 	}

--- a/src/org/kar/archidata/tools/DataTools.java
+++ b/src/org/kar/archidata/tools/DataTools.java
@@ -211,7 +211,8 @@ public class DataTools {
 		return data;
 	}

-	public static <CLASS_TYPE, ID_TYPE> Response uploadCover(final Class<CLASS_TYPE> clazz, final ID_TYPE id, String fileName, final InputStream fileInputStream, final FormDataContentDisposition fileMetaData) {
+	public static <CLASS_TYPE, ID_TYPE> Response uploadCover(final Class<CLASS_TYPE> clazz, final ID_TYPE id, String fileName, final InputStream fileInputStream,
+			final FormDataContentDisposition fileMetaData) {
 		try {
 			// correct input string stream :
 			fileName = multipartCorrection(fileName);
--- a/src/org/kar/archidata/tools/RESTApi.java
+++ b/src/org/kar/archidata/tools/RESTApi.java
@@ -47,7 +47,7 @@ public class RESTApi {
 		if (httpResponse.statusCode() < 200 || httpResponse.statusCode() >= 300) {
 			try {
 				final RESTErrorResponseExeption out = this.mapper.readValue(httpResponse.body(), RESTErrorResponseExeption.class);
-				throw new RESTErrorResponseExeption(out.uuid, out.time, out.error, out.message, out.status, out.statusMessage);
+				throw out;
 			} catch (final MismatchedInputException ex) {
 				throw new IOException("Fail to get the data [" + httpResponse.statusCode() + "] " + httpResponse.body());
 			}
@@ -123,7 +123,7 @@ public class RESTApi {
 		if (httpResponse.statusCode() < 200 || httpResponse.statusCode() >= 300) {
 			try {
 				final RESTErrorResponseExeption out = this.mapper.readValue(httpResponse.body(), RESTErrorResponseExeption.class);
-				throw new RESTErrorResponseExeption(out.uuid, out.time, out.error, out.message, out.status, out.statusMessage);
+				throw out;
 			} catch (final MismatchedInputException ex) {
 				throw new IOException("Fail to get the data [" + httpResponse.statusCode() + "] " + httpResponse.body());
 			} catch (final JsonParseException ex) {
@@ -156,7 +156,7 @@ public class RESTApi {
 		if (httpResponse.statusCode() < 200 || httpResponse.statusCode() >= 300) {
 			try {
 				final RESTErrorResponseExeption out = this.mapper.readValue(httpResponse.body(), RESTErrorResponseExeption.class);
-				throw new RESTErrorResponseExeption(out.uuid, out.time, out.error, out.message, out.status, out.statusMessage);
+				throw out;
 			} catch (final MismatchedInputException ex) {
 				throw new IOException("Fail to get the data [" + httpResponse.statusCode() + "] " + httpResponse.body());
 			}
@@ -178,7 +178,7 @@ public class RESTApi {
 		if (httpResponse.statusCode() < 200 || httpResponse.statusCode() >= 300) {
 			try {
 				final RESTErrorResponseExeption out = this.mapper.readValue(httpResponse.body(), RESTErrorResponseExeption.class);
-				throw new RESTErrorResponseExeption(out.uuid, out.time, out.error, out.message, out.status, out.statusMessage);
+				throw out;
 			} catch (final MismatchedInputException ex) {
 				throw new IOException("Fail to get the data [" + httpResponse.statusCode() + "] " + httpResponse.body());
 			}
--- a/src/org/kar/archidata/tools/UuidUtils.java
+++ b/src/org/kar/archidata/tools/UuidUtils.java
@@ -2,6 +2,10 @@ package org.kar.archidata.tools;

 import java.math.BigInteger;
 import java.nio.ByteBuffer;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.ZoneOffset;
+import java.time.temporal.ChronoUnit;
 import java.util.UUID;

 public class UuidUtils {
@@ -25,4 +29,41 @@ public class UuidUtils {
 		bb.putLong(uuid.getLeastSignificantBits());
 		return bb.array();
 	}
+
+	private static class Generator {
+		private long base;
+		private final long offset;
+		private long previous;
+
+		public Generator() {
+			this.offset = System.currentTimeMillis();
+			// The local method never generate new UUID in the past, then we use the creation function time to prevent 2038 error
+			final Instant startingUUID = LocalDate.of(2024, 03, 19).atStartOfDay(ZoneOffset.UTC).toInstant();
+			this.base = startingUUID.until(Instant.now(), ChronoUnit.SECONDS);
+			final String serveurBaseUUID = System.getenv("UUID_SERVER_ID");
+			if (serveurBaseUUID != null) {
+				long serverId = Long.valueOf(serveurBaseUUID);
+				serverId %= 0xFFFF;
+				this.base += (serverId << (64 - 16));
+			} else {
+				this.base += (1L << (64 - 16));
+			}
+		}
+
+		public synchronized UUID next() {
+			long tmp = System.currentTimeMillis();
+			if (this.previous >= tmp) {
+				tmp = this.previous + 1;
+			}
+			this.previous = tmp;
+			tmp -= this.offset;
+			return new UUID(Long.reverseBytes(tmp), this.base);
+		}
+	}
+
+	private static Generator generator = new Generator();
+
+	public static UUID nextUUID() {
+		return generator.next();
+	}
 }
--- a/src/resources/rest-tools.ts
+++ b/src/resources/rest-tools.ts
@@ -41,7 +41,7 @@ export interface RESTModel {
    accept?: HTTPMimeType;
    // Content of the local data.
    contentType?: HTTPMimeType;
-    // Mode of the TOKEN in urk or Header
+    // Mode of the TOKEN in URL or Header (?token:${tokenInUrl})
    tokenInUrl?: boolean;
 }

@@ -67,22 +67,48 @@ export function isArrayOf<TYPE>(
    return true;
 }

-export type RESTRequestType = {
+function isNullOrUndefined(data: any): data is undefined | null {
+    return data === undefined || data === null;
+}
+
+// generic progression callback
+export type ProgressCallback = (count: number, total: number) => void;
+
+export interface RESTAbort {
+    abort?: () => boolean
+}
+
+
+// Rest generic callback have a basic model to upload and download advancement.
+export interface RESTCallbacks {
+    progressUpload?: ProgressCallback,
+    progressDownload?: ProgressCallback,
+    abortHandle?: RESTAbort,
+};
+
+export interface RESTRequestType {
    restModel: RESTModel,
    restConfig: RESTConfig,
    data?: any,
    params?: object,
    queries?: object,
+    callback?: RESTCallbacks,
 };

 function removeTrailingSlashes(input: string): string {
+    if (isNullOrUndefined(input)) {
+        return "undefined";
+    }
    return input.replace(/\/+$/, '');
 }
 function removeLeadingSlashes(input: string): string {
+    if (isNullOrUndefined(input)) {
+        return "";
+    }
    return input.replace(/^\/+/, '');
 }

-export function RESTUrl({ restModel, restConfig, data, params, queries }: RESTRequestType): string {
+export function RESTUrl({ restModel, restConfig, params, queries }: RESTRequestType): string {
    // Create the URL PATH:
    let generateUrl = `${removeTrailingSlashes(restConfig.server)}/${removeLeadingSlashes(restModel.endPoint)}`;
    if (params !== undefined) {
@@ -91,7 +117,7 @@ export function RESTUrl({ restModel, restConfig, data, params, queries }: RESTRe
        }
    }
    if (queries === undefined && (restConfig.token === undefined || restModel.tokenInUrl !== true)) {
-    	return generateUrl;
+        return generateUrl;
    }
    const searchParams = new URLSearchParams();
    if (queries !== undefined) {
@@ -112,7 +138,92 @@ export function RESTUrl({ restModel, restConfig, data, params, queries }: RESTRe
    return generateUrl + "?" + searchParams.toString();
 }

-export function RESTRequest({ restModel, restConfig, data, params, queries }: RESTRequestType): Promise<ModelResponseHttp> {
+
+export function fetchProgress(generateUrl: string, { method, headers, body }: {
+    method: HTTPRequestModel,
+    headers: any,
+    body: any,
+}, { progressUpload, progressDownload, abortHandle }: RESTCallbacks): Promise<Response> {
+    const xhr = {
+        io: new XMLHttpRequest()
+    }
+    return new Promise((resolve, reject) => {
+        // Stream the upload progress
+        if (progressUpload) {
+            xhr.io.upload.addEventListener("progress", (dataEvent) => {
+                if (dataEvent.lengthComputable) {
+                    //console.log(`    ==> has a progress event: ${dataEvent.loaded} / ${dataEvent.total}`);
+                    progressUpload(dataEvent.loaded, dataEvent.total);
+                }
+            });
+        }
+        // Stream the download progress
+        if (progressDownload) {
+            xhr.io.addEventListener("progress", (dataEvent) => {
+                if (dataEvent.lengthComputable) {
+                    //console.log(`    ==> download progress:: ${dataEvent.loaded} / ${dataEvent.total}`);
+                    progressUpload(dataEvent.loaded, dataEvent.total);
+                }
+            });
+        }
+        if (abortHandle) {
+            abortHandle.abort = () => {
+                if (xhr.io) {
+                    console.log(`Request abort on the XMLHttpRequest: ${generateUrl}`);
+                    xhr.io.abort();
+                    return true;
+                }
+                console.log(`Request abort (FAIL) on the XMLHttpRequest: ${generateUrl}`);
+                return false;
+            }
+        }
+        // Check if we have an internal Fail:
+        xhr.io.addEventListener('error', () => {
+            xhr.io = undefined;
+            reject(new TypeError('Failed to fetch'))
+        });
+
+        // Capture the end of the stream
+        xhr.io.addEventListener("loadend", () => {
+            if (xhr.io.readyState !== XMLHttpRequest.DONE) {
+                //console.log(`    ==> READY state`);
+                return;
+            }
+            if (xhr.io.status === 0) {
+                //the stream has been aborted
+                reject(new TypeError('Fetch has been aborted'));
+                return;
+            }
+            // Stream is ended, transform in a generic response:
+            const response = new Response(xhr.io.response, {
+                status: xhr.io.status,
+                statusText: xhr.io.statusText
+            });
+            const headersArray = xhr.io.getAllResponseHeaders().trim().replaceAll("\r\n", "\n").split('\n');
+            headersArray.forEach(function (header) {
+                const firstColonIndex = header.indexOf(':');
+                if (firstColonIndex !== -1) {
+                    var key = header.substring(0, firstColonIndex).trim();
+                    var value = header.substring(firstColonIndex + 1).trim();
+                    response.headers.set(key, value);
+                } else {
+                    response.headers.set(header, "");
+                }
+            });
+            xhr.io = undefined;
+            resolve(response);
+        });
+        xhr.io.open(method, generateUrl, true);
+        if (!isNullOrUndefined(headers)) {
+            for (const [key, value] of Object.entries(headers)) {
+                xhr.io.setRequestHeader(key, value as string);
+            }
+        }
+        xhr.io.send(body);
+    });
+}
+
+export function RESTRequest({ restModel, restConfig, data, params, queries, callback }: RESTRequestType): Promise<ModelResponseHttp> {
    // Create the URL PATH:
    let generateUrl = RESTUrl({ restModel, restConfig, data, params, queries });
    let headers: any = {};
@@ -139,13 +250,27 @@ export function RESTRequest({ restModel, restConfig, data, params, queries }: RE
        }
        body = formData
    }
-    console.log(`Call ${generateUrl}`)
    return new Promise((resolve, reject) => {
-        fetch(generateUrl, {
-            method: restModel.requestType,
-            headers,
-            body,
-        }).then((response: Response) => {
+        let action: undefined | Promise<Response> = undefined;
+        if (isNullOrUndefined(callback)
+            || (isNullOrUndefined(callback.progressDownload)
+                && isNullOrUndefined(callback.progressUpload)
+                && isNullOrUndefined(callback.abortHandle))) {
+            // No information needed: call the generic fetch interface
+            action = fetch(generateUrl, {
+                method: restModel.requestType,
+                headers,
+                body,
+            });
+        } else {
+            // need progression information: call old fetch model (XMLHttpRequest) that permit to keep % upload and % download for HTTP1.x
+            action = fetchProgress(generateUrl, {
+                method: restModel.requestType ?? HTTPRequestModel.GET,
+                headers,
+                body,
+            }, callback);
+        }
+        action.then((response: Response) => {
            if (response.status >= 200 && response.status <= 299) {
                const contentType = response.headers.get('Content-Type');
                if (restModel.accept !== contentType) {
@@ -190,12 +315,14 @@ export function RESTRequest({ restModel, restConfig, data, params, queries }: RE
                status: 999,
                error: error,
                statusMessage: "Fetch catch error",
-                message: "http-wrapper.ts detect an error in the fetch request"
+                message: "rest-tools.ts detect an error in the fetch request"
            });
        });
    });
 }

+
+
 export function RESTRequestJson<TYPE>(request: RESTRequestType, checker: (data: any) => data is TYPE): Promise<TYPE> {
    return new Promise((resolve, reject) => {
        RESTRequest(request).then((value: ModelResponseHttp) => {
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.7.0
+0.8.0
Author	SHA1	Message	Date
Edouard DUPIN	cb0ee69820	[RELEASE] create version v0.8.0	2024-04-24 15:48:48 +02:00
Edouard DUPIN	cfc7ec2ff1	[FIX] correct the typescript gneration	2024-04-22 23:02:52 +02:00
Edouard DUPIN	0605ef0824	[DEV] better management of UUID as remove elemnt	2024-04-20 21:58:31 +02:00
Edouard DUPIN	3309abe053	[DEV] update some zond generation file	2024-04-19 08:47:24 +02:00
Edouard DUPIN	f069ce7cc3	[DEV] format code	2024-04-17 23:11:04 +02:00
Edouard DUPIN	a82c3e725d	[RELEASE] create a new version	2024-04-17 23:08:33 +02:00
Edouard DUPIN	08124f212a	[DEV] update REST tool for TS	2024-04-17 23:08:06 +02:00
Edouard DUPIN	631999e135	[FIX] correct the many to One insertion for type other than Long	2024-04-17 12:13:26 +02:00
Edouard DUPIN	7674d9a299	[DEV] well support of the callback for stream	2024-04-17 12:12:50 +02:00
Edouard DUPIN	9cd71ab601	[DEV] add progress callback ==> does not work	2024-04-15 00:56:00 +02:00
Edouard DUPIN	4cb8c84312	[VERSION] create version 0.7.2	2024-03-29 22:37:54 +01:00
Edouard DUPIN	5acdbfb0c7	[DEV] update models	2024-03-29 22:37:54 +01:00
Edouard DUPIN	d35c83fcbf	[DEV] generate a definable UUID	2024-03-19 23:14:11 +01:00
Edouard DUPIN	0fe769a203	[FORMAT] error while formating	2024-03-19 08:48:24 +01:00
Edouard DUPIN	dbe1b469f6	[DEV] update dev tag version	2024-03-19 08:43:14 +01:00
@@ -1 +1 @@
 .7.0
 .8.0