[RELEASE] create version v0.10.3

.island/release.bash

@@ -1,4 +1,14 @@
 #!/bin/bash
+version_file="version.txt"
 
-mvn versions:set -DnewVersion=$(cat version.txt)
-
+# update the Maven version number
+mvn versions:set -DnewVersion=$(sed 's/dev/SNAPSHOT/g' $version_file)
+if grep -q "DEV" "$version_file"; then
+    # update all versions release of dependency
+    mvn versions:use-latest-releases
+    # update our manage dependency as snapshoot
+    mvn versions:use-latest-versions -Dincludes=kangaroo-and-rabbit
+else
+    # update our manage dependency as release (must be done before)
+    mvn versions:use-latest-releases -Dincludes=kangaroo-and-rabbit
+fi

pom.xml

@@ -3,8 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>kangaroo-and-rabbit</groupId>
 	<artifactId>archidata</artifactId>
-	<version>0.8.9</version>
+	<version>0.10.3</version>
 	<properties>
+     	<java.version>21</java.version>
 		<maven.compiler.version>3.1</maven.compiler.version>
 		<maven.compiler.source>21</maven.compiler.source>
 		<maven.compiler.target>21</maven.compiler.target>
@@ -135,24 +136,24 @@
 		<dependency>
 			<groupId>org.xerial</groupId>
 			<artifactId>sqlite-jdbc</artifactId>
-			<version>3.40.0.0</version>
+			<version>3.45.3.0</version>
 		</dependency>
 		<!-- Interface for JWT token -->
 		<dependency>
 			<groupId>com.nimbusds</groupId>
 			<artifactId>nimbus-jose-jwt</artifactId>
-			<version>9.39</version>
+			<version>9.39.1</version>
 		</dependency>
 		<dependency>
 			<groupId>jakarta.persistence</groupId>
 			<artifactId>jakarta.persistence-api</artifactId>
-			<version>3.2.0-M2</version>
+			<version>3.2.0</version>
 		</dependency>
 		<!-- Swagger dependencies -->
 		<dependency>
 			<groupId>io.swagger.core.v3</groupId>
 			<artifactId>swagger-jaxrs2-jakarta</artifactId>
-			<version>2.2.21</version>
+			<version>2.2.22</version>
 		</dependency>
 		<!--
 		************************************************************ 
@@ -162,13 +163,13 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
-			<version>5.11.0-M1</version>
+			<version>5.11.0-M2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>
-			<version>5.11.0-M1</version>
+			<version>5.11.0-M2</version>
 	        <scope>test</scope>
 	    </dependency>
 	    <dependency>

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

@@ -11,6 +11,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.annotation.Nullable;
 import jakarta.persistence.Column;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
@@ -258,6 +259,14 @@ public class AnnotationTools {
 		return !((Column) annotation[0]).nullable();
 	}
 
+	public static boolean getNullable(final Field element) throws Exception {
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Nullable.class);
+		if (annotation.length == 0) {
+			return false;
+		}
+		return true;
+	}
+
 	public static boolean getConstraintsNotNull(final Field element) throws Exception {
 		final Annotation[] annotation = element.getDeclaredAnnotationsByType(NotNull.class);
 		if (annotation.length == 0) {

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

@@ -5,14 +5,25 @@ import java.util.UUID;
 
 import org.kar.archidata.tools.UuidUtils;
 
+import jakarta.persistence.Column;
+import jakarta.validation.constraints.NotNull;
 import jakarta.ws.rs.core.Response;
 
 public class RestErrorResponse {
 	public UUID uuid = UuidUtils.nextUUID();
+	@NotNull
+	@Column(length = 0)
 	public String name; // Mandatory for TS generic error
+	@NotNull
+	@Column(length = 0)
 	public String message; // Mandatory for TS generic error
+	@NotNull
+	@Column(length = 0)
 	public String time;
+	@NotNull
 	final public int status;
+	@NotNull
+	@Column(length = 0)
 	final public String statusMessage;
 
 	public RestErrorResponse(final Response.Status status, final String time, final String error,

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

@@ -796,7 +796,7 @@ public class DataAccess {
 		// External checker of data:
 		final List<CheckFunction> checks = options.get(CheckFunction.class);
 		for (final CheckFunction check : checks) {
-			check.getChecker().check("", data, AnnotationTools.getFieldsNames(clazz));
+			check.getChecker().check("", data, AnnotationTools.getFieldsNames(clazz), options);
 		}
 
 		final DBEntry entry = DBInterfaceOption.getAutoEntry(options);
@@ -1119,7 +1119,7 @@ public class DataAccess {
 		if (options != null) {
 			final List<CheckFunction> checks = options.get(CheckFunction.class);
 			for (final CheckFunction check : checks) {
-				check.getChecker().check("", data, filter.getValues());
+				check.getChecker().check("", data, filter.getValues(), options);
 			}
 		}
 		final List<LazyGetter> asyncActions = new ArrayList<>();
@@ -1293,8 +1293,7 @@ public class DataAccess {
 		return stmt.execute(query);
 	}
 
-	public static <T> T getWhere(final Class<T> clazz, final QueryOption... option) throws Exception {
-		final QueryOptions options = new QueryOptions(option);
+	public static <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) {
@@ -1303,6 +1302,11 @@ public class DataAccess {
 		return values.get(0);
 	}
 
+	public static <T> T getWhere(final Class<T> clazz, final QueryOption... option) throws Exception {
+		final QueryOptions options = new QueryOptions(option);
+		return getWhere(clazz, options);
+	}
+
 	public static void generateSelectField(//
 			final StringBuilder querySelect, //
 			final StringBuilder query, //
@@ -1484,12 +1488,19 @@ public class DataAccess {
 		return data;
 	}
 
-	public static <ID_TYPE> long count(final Class<?> clazz, final ID_TYPE id) throws Exception {
-		return DataAccess.countWhere(clazz, new Condition(getTableIdCondition(clazz, id)));
+	public static <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 DataAccess.countWhere(clazz, options);
 	}
 
 	public static long countWhere(final Class<?> clazz, final QueryOption... option) throws Exception {
 		final QueryOptions options = new QueryOptions(option);
+		return countWhere(clazz, options);
+	}
+
+	public static long countWhere(final Class<?> clazz, final QueryOptions options) throws Exception {
 		final Condition condition = conditionFusionOrEmpty(options, false);
 		final String deletedFieldName = AnnotationTools.getDeletedFieldName(clazz);
 		DBEntry entry = DBInterfaceOption.getAutoEntry(options);

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

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

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

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

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

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

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

@@ -3,12 +3,12 @@ package org.kar.archidata.dataAccess.addOn.model;
 import java.util.List;
 
 import org.kar.archidata.annotation.DataJson;
-import org.kar.archidata.model.GenericData;
+import org.kar.archidata.model.GenericDataSoftDelete;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Id;
 
-public class TableCoversLongLong extends GenericData {
+public class TableCoversLongLong extends GenericDataSoftDelete {
 	public TableCoversLongLong() {
 		// nothing to do...
 	}

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

@@ -4,12 +4,12 @@ import java.util.List;
 import java.util.UUID;
 
 import org.kar.archidata.annotation.DataJson;
-import org.kar.archidata.model.GenericData;
+import org.kar.archidata.model.GenericDataSoftDelete;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Id;
 
-public class TableCoversLongUUID extends GenericData {
+public class TableCoversLongUUID extends GenericDataSoftDelete {
 	public TableCoversLongUUID() {
 		// nothing to do...
 	}

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

@@ -4,12 +4,12 @@ import java.util.List;
 import java.util.UUID;
 
 import org.kar.archidata.annotation.DataJson;
-import org.kar.archidata.model.GenericData;
+import org.kar.archidata.model.GenericDataSoftDelete;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Id;
 
-public class TableCoversUUIDLong extends GenericData {
+public class TableCoversUUIDLong extends GenericDataSoftDelete {
 	public TableCoversUUIDLong() {
 		// nothing to do...
 	}

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

@@ -4,12 +4,12 @@ import java.util.List;
 import java.util.UUID;
 
 import org.kar.archidata.annotation.DataJson;
-import org.kar.archidata.model.GenericData;
+import org.kar.archidata.model.GenericDataSoftDelete;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Id;
 
-public class TableCoversUUIDUUID extends GenericData {
+public class TableCoversUUIDUUID extends GenericDataSoftDelete {
 	public TableCoversUUIDUUID() {
 		// nothing to do...
 	}

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.QueryOptions;
 
 /** By default some element are not read like createAt and UpdatedAt. This option permit to read it. */
 public interface CheckFunctionInterface {
@@ -11,10 +12,11 @@ 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) throws Exception;
+	void check(final String baseName, Object data, List<String> filterValue, final QueryOptions options)
+			throws Exception;
 
-	default void checkAll(final String baseName, final Object data) throws Exception {
-		check(baseName, data, AnnotationTools.getAllFieldsNames(data.getClass()));
+	default void checkAll(final String baseName, final Object data, final QueryOptions options) throws Exception {
+		check(baseName, data, AnnotationTools.getAllFieldsNames(data.getClass()), options);
 	}
 
 }

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

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

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

@@ -16,6 +16,7 @@ import org.kar.archidata.annotation.AnnotationTools;
 import org.kar.archidata.annotation.DataJson;
 import org.kar.archidata.dataAccess.DataAccess;
 import org.kar.archidata.dataAccess.QueryCondition;
+import org.kar.archidata.dataAccess.QueryOptions;
 import org.kar.archidata.exception.DataAccessException;
 import org.kar.archidata.exception.InputException;
 import org.slf4j.Logger;
@@ -37,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) throws Exception;
+		void check(final String baseName, final K data, final QueryOptions options) throws Exception;
 	}
 
 	protected Map<String, List<CheckInterface<T>>> checking = null;
@@ -66,20 +67,20 @@ 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) -> {
+					add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
 						throw new InputException(baseName + fieldName,
 								"This is a '@Id' (primaryKey) ==> can not be change");
 					});
 				}
 				if (AnnotationTools.getConstraintsNotNull(field)) {
-					add(fieldName, (final String baseName, final T data) -> {
+					add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
 						if (field.get(data) == null) {
 							throw new InputException(baseName + fieldName, "Can not be null");
 						}
 					});
 				}
 				if (AnnotationTools.isCreatedAtField(field) || AnnotationTools.isUpdateAtField(field)) {
-					add(fieldName, (final String baseName, final T data) -> {
+					add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
 						throw new InputException(baseName + fieldName, "It is forbidden to change this field");
 					});
 				}
@@ -88,7 +89,7 @@ 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) -> {
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
 							final Object elem = field.get(data);
 							if (elem == null) {
 								return;
@@ -101,7 +102,7 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 					}
 					final Long minValue = AnnotationTools.getConstraintsMin(field);
 					if (minValue != null) {
-						add(fieldName, (final String baseName, final T data) -> {
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
 							final Object elem = field.get(data);
 							if (elem == null) {
 								return;
@@ -114,12 +115,16 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 					}
 					final ManyToOne annotationManyToOne = AnnotationTools.getManyToOne(field);
 					if (annotationManyToOne != null && annotationManyToOne.targetEntity() != null) {
-						add(fieldName, (final String baseName, final T data) -> {
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
 							final Object elem = field.get(data);
 							if (elem == null) {
 								return;
 							}
-							final long count = DataAccess.count(annotationManyToOne.targetEntity(), elem);
+							final List<ConditionChecker> condCheckers = options.get(ConditionChecker.class);
+							final Condition conditionCheck = condCheckers.isEmpty() ? null
+									: condCheckers.get(0).toCondition();
+							final long count = DataAccess.count(annotationManyToOne.targetEntity(), elem,
+									conditionCheck);
 							if (count == 0) {
 								throw new InputException(baseName + fieldName,
 										"Foreign element does not exist in the DB:" + elem);
@@ -131,7 +136,7 @@ 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) -> {
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
 							final Object elem = field.get(data);
 							if (elem == null) {
 								return;
@@ -145,7 +150,7 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 					final Long minValueRoot = AnnotationTools.getConstraintsMin(field);
 					if (minValueRoot != null) {
 						final int minValue = minValueRoot.intValue();
-						add(fieldName, (final String baseName, final T data) -> {
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
 							final Object elem = field.get(data);
 							if (elem == null) {
 								return;
@@ -158,7 +163,7 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 					}
 					final ManyToOne annotationManyToOne = AnnotationTools.getManyToOne(field);
 					if (annotationManyToOne != null && annotationManyToOne.targetEntity() != null) {
-						add(fieldName, (final String baseName, final T data) -> {
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
 							final Object elem = field.get(data);
 							if (elem == null) {
 								return;
@@ -173,7 +178,7 @@ 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) -> {
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
 							final Object elem = field.get(data);
 							if (elem == null) {
 								return;
@@ -191,7 +196,7 @@ 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) -> {
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
 							final Object elem = field.get(data);
 							if (elem == null) {
 								return;
@@ -205,7 +210,7 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 					final Long minValueRoot = AnnotationTools.getConstraintsMin(field);
 					if (minValueRoot != null) {
 						final float minValue = minValueRoot.floatValue();
-						add(fieldName, (final String baseName, final T data) -> {
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
 							final Object elem = field.get(data);
 							if (elem == null) {
 								return;
@@ -220,7 +225,7 @@ 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) -> {
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
 							final Object elem = field.get(data);
 							if (elem == null) {
 								return;
@@ -234,7 +239,7 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 					final Long minValueRoot = AnnotationTools.getConstraintsMin(field);
 					if (minValueRoot != null) {
 						final double minValue = minValueRoot.doubleValue();
-						add(fieldName, (final String baseName, final T data) -> {
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
 							final Object elem = field.get(data);
 							if (elem == null) {
 								return;
@@ -254,7 +259,7 @@ 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) -> {
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
 							final Object elem = field.get(data);
 							if (elem == null) {
 								return;
@@ -268,7 +273,7 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 					}
 					final Size limitSize = AnnotationTools.getConstraintsSize(field);
 					if (limitSize != null) {
-						add(fieldName, (final String baseName, final T data) -> {
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
 							final Object elem = field.get(data);
 							if (elem == null) {
 								return;
@@ -280,14 +285,14 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 							}
 							if (elemTyped.length() < limitSize.min()) {
 								throw new InputException(baseName + fieldName,
-										"Too small size (constraints) must be >= " + limitSize.max());
+										"Too small size (constraints) must be >= " + limitSize.min());
 							}
 						});
 					}
 					final String patternString = AnnotationTools.getConstraintsPattern(field);
 					if (patternString != null) {
 						final Pattern pattern = Pattern.compile(patternString);
-						add(fieldName, (final String baseName, final T data) -> {
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
 							final Object elem = field.get(data);
 							if (elem == null) {
 								return;
@@ -306,8 +311,8 @@ 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) -> {
-							instance.checkAll(baseName + fieldName + ".", field.get(data));
+						add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
+							instance.checkAll(baseName + fieldName + ".", field.get(data), options);
 						});
 					}
 				} else if (type.isEnum()) {
@@ -316,9 +321,17 @@ 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 Object other = DataAccess.getWhere(this.clazz,
+					add(fieldName, (final String baseName, final T data, final QueryOptions options) -> {
+						final List<ConditionChecker> condCheckers = options.get(ConditionChecker.class);
+						Object other = null;
+						if (condCheckers.isEmpty()) {
+							other = DataAccess.getWhere(this.clazz,
 									new Condition(new QueryCondition(fieldName, "==", field.get(data))));
+						} else {
+							other = DataAccess.getWhere(this.clazz,
+									new Condition(new QueryCondition(fieldName, "==", field.get(data))),
+									condCheckers.get(0).toCondition());
+						}
 						if (other != null) {
 							throw new InputException(baseName + fieldName, "Name already exist in the DB");
 						}
@@ -333,7 +346,11 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 	}
 
 	@Override
-	public void check(final String baseName, final Object data, final List<String> filterValue) throws Exception {
+	public void check(
+			final String baseName,
+			final Object data,
+			final List<String> filterValue,
+			final QueryOptions options) throws Exception {
 		if (this.checking == null) {
 			initialize();
 		}
@@ -348,13 +365,13 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 				continue;
 			}
 			for (final CheckInterface<T> action : actions) {
-				action.check(baseName, dataCasted);
+				action.check(baseName, dataCasted, options);
 			}
 		}
-		checkTyped(dataCasted, filterValue);
+		checkTyped(dataCasted, filterValue, options);
 	}
 
-	public void checkTyped(final T data, final List<String> filterValue) throws Exception {
+	public void checkTyped(final T data, final List<String> filterValue, final QueryOptions options) throws Exception {
 		// nothing to do ...
 	}
 }

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

@@ -0,0 +1,25 @@
+package org.kar.archidata.dataAccess.options;
+
+import org.kar.archidata.dataAccess.QueryItem;
+
+/** Condition model apply to the check models. */
+public class ConditionChecker extends QueryOption {
+	public final QueryItem condition;
+
+	public ConditionChecker(final QueryItem items) {
+		this.condition = items;
+	}
+
+	public ConditionChecker(final Condition cond) {
+		this.condition = cond.condition;
+	}
+
+	public ConditionChecker() {
+		this.condition = null;
+	}
+
+	public Condition toCondition() {
+		return new Condition(this.condition);
+	}
+
+}

src/org/kar/archidata/externalRestApi/AnalyzeApi.java

@@ -0,0 +1,74 @@
+package org.kar.archidata.externalRestApi;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.kar.archidata.externalRestApi.model.ApiGroupModel;
+import org.kar.archidata.externalRestApi.model.ClassModel;
+import org.kar.archidata.externalRestApi.model.ModelGroup;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class AnalyzeApi {
+	static final Logger LOGGER = LoggerFactory.getLogger(AnalyzeApi.class);
+	protected final List<ApiGroupModel> apiModels = new ArrayList<>();
+	protected final ModelGroup modelGroup = new ModelGroup();
+
+	public void addAllModel(final List<Class<?>> classes) throws Exception {
+		this.modelGroup.addAll(classes);
+		analyzeModels();
+	}
+
+	public void addModel(final Class<?> clazz) throws Exception {
+		this.modelGroup.add(clazz);
+		analyzeModels();
+	}
+
+	public void addApi(final Class<?> clazz) throws Exception {
+		this.apiModels.add(new ApiGroupModel(clazz, this.modelGroup));
+		analyzeModels();
+	}
+
+	public void addAllApi(final List<Class<?>> classes) throws Exception {
+		for (final Class<?> clazz : classes) {
+			this.apiModels.add(new ApiGroupModel(clazz, this.modelGroup));
+		}
+		analyzeModels();
+	}
+
+	public List<ApiGroupModel> getAllApi() {
+		return this.apiModels;
+	}
+
+	public List<ClassModel> getAllModel() {
+		return this.modelGroup.getModels();
+	}
+
+	private void analyzeModels() throws Exception {
+		final List<ClassModel> dones = new ArrayList<>();
+		while (dones.size() < getAllModel().size()) {
+			final List<ClassModel> copyList = new ArrayList<>(this.modelGroup.getModels());
+			for (final ClassModel model : copyList) {
+				if (dones.contains(model)) {
+					continue;
+				}
+				LOGGER.info("Analyze: {}", model);
+				model.analyze(this.modelGroup);
+				dones.add(model);
+			}
+		}
+	}
+
+	public List<ClassModel> getCompatibleModels(final List<Class<?>> search) {
+		final List<ClassModel> out = new ArrayList<>();
+		for (final ClassModel model : getAllModel()) {
+			if (search.contains(model.getOriginClasses())) {
+				out.add(model);
+			}
+		}
+		if (out.isEmpty()) {
+			return null;
+		}
+		return out;
+	}
+}

src/org/kar/archidata/externalRestApi/PythonGenerateApi.java

@@ -0,0 +1,8 @@
+package org.kar.archidata.externalRestApi;
+
+public class PythonGenerateApi {
+
+	public static void generateApi(final AnalyzeApi api) {
+
+	}
+}

src/org/kar/archidata/externalRestApi/TsApiGeneration.java

@@ -0,0 +1,439 @@
+package org.kar.archidata.externalRestApi;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.kar.archidata.dataAccess.DataExport;
+import org.kar.archidata.externalRestApi.TsClassElement.DefinedPosition;
+import org.kar.archidata.externalRestApi.model.ApiGroupModel;
+import org.kar.archidata.externalRestApi.model.ApiModel;
+import org.kar.archidata.externalRestApi.model.ClassEnumModel;
+import org.kar.archidata.externalRestApi.model.ClassListModel;
+import org.kar.archidata.externalRestApi.model.ClassMapModel;
+import org.kar.archidata.externalRestApi.model.ClassModel;
+import org.kar.archidata.externalRestApi.model.ClassObjectModel;
+import org.kar.archidata.externalRestApi.model.RestTypeRequest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jakarta.ws.rs.core.MediaType;
+
+public class TsApiGeneration {
+	static final Logger LOGGER = LoggerFactory.getLogger(TsApiGeneration.class);
+
+	public static String getBaseHeader() {
+		return """
+				/**
+				 * Interface of the server (auto-generated code)
+				 */
+				""";
+	}
+
+	public static String generateClassEnumModelTypescript(
+			final ClassEnumModel model,
+			final TsClassElementGroup tsGroup,
+			final Set<ClassModel> imports,
+			final boolean writeMode) throws IOException {
+		imports.add(model);
+		final TsClassElement tsModel = tsGroup.find(model);
+		return tsModel.tsTypeName;
+	}
+
+	public static String generateClassObjectModelTypescript(
+			final ClassObjectModel model,
+			final TsClassElementGroup tsGroup,
+			final Set<ClassModel> imports,
+			final boolean writeMode) throws IOException {
+		final TsClassElement tsModel = tsGroup.find(model);
+		if (tsModel.nativeType != DefinedPosition.NATIVE) {
+			imports.add(model);
+		}
+		if (tsModel.nativeType != DefinedPosition.NORMAL) {
+			return tsModel.tsTypeName;
+		}
+		if (writeMode) {
+			return tsModel.tsTypeName + "Write";
+		}
+		return tsModel.tsTypeName;
+	}
+
+	public static String generateClassMapModelTypescript(
+			final ClassMapModel model,
+			final TsClassElementGroup tsGroup,
+			final Set<ClassModel> imports,
+			final boolean writeMode) throws IOException {
+		final StringBuilder out = new StringBuilder();
+		out.append("{[key: ");
+		out.append(generateClassModelTypescript(model.keyModel, tsGroup, imports, writeMode));
+		out.append("]: ");
+		out.append(generateClassModelTypescript(model.valueModel, tsGroup, imports, writeMode));
+		out.append(";}");
+		return out.toString();
+	}
+
+	public static String generateClassListModelTypescript(
+			final ClassListModel model,
+			final TsClassElementGroup tsGroup,
+			final Set<ClassModel> imports,
+			final boolean writeMode) throws IOException {
+		final StringBuilder out = new StringBuilder();
+		out.append(generateClassModelTypescript(model.valueModel, tsGroup, imports, writeMode));
+		out.append("[]");
+		return out.toString();
+	}
+
+	public static String generateClassModelTypescript(
+			final ClassModel model,
+			final TsClassElementGroup tsGroup,
+			final Set<ClassModel> imports,
+			final boolean writeMode) throws IOException {
+		if (model instanceof final ClassObjectModel objectModel) {
+			return generateClassObjectModelTypescript(objectModel, tsGroup, imports, writeMode);
+		}
+		if (model instanceof final ClassListModel listModel) {
+			return generateClassListModelTypescript(listModel, tsGroup, imports, writeMode);
+		}
+		if (model instanceof final ClassMapModel mapModel) {
+			return generateClassMapModelTypescript(mapModel, tsGroup, imports, writeMode);
+		}
+		if (model instanceof final ClassEnumModel enumModel) {
+			return generateClassEnumModelTypescript(enumModel, tsGroup, imports, writeMode);
+		}
+		throw new IOException("Impossible model:" + model);
+	}
+
+	public static String generateClassModelsTypescript(
+			final List<ClassModel> models,
+			final TsClassElementGroup tsGroup,
+			final Set<ClassModel> imports,
+			final boolean writeMode) throws IOException {
+		if (models.size() == 0) {
+			return "void";
+		}
+		final StringBuilder out = new StringBuilder();
+		boolean isFirst = true;
+		for (final ClassModel model : models) {
+			if (isFirst) {
+				isFirst = false;
+			} else {
+				out.append(" | ");
+			}
+			final String data = generateClassModelTypescript(model, tsGroup, imports, writeMode);
+			out.append(data);
+		}
+		return out.toString();
+	}
+
+	public static String capitalizeFirstLetter(final String str) {
+		if (str == null || str.isEmpty()) {
+			return str;
+		}
+		return str.substring(0, 1).toUpperCase() + str.substring(1);
+	}
+
+	public static void generateApiFile(
+			final ApiGroupModel element,
+			final String pathPackage,
+			final TsClassElementGroup tsGroup) throws IOException {
+		final StringBuilder data = new StringBuilder();
+
+		data.append("export namespace ");
+		data.append(element.name);
+		data.append(" {\n");
+		final Set<ClassModel> imports = new HashSet<>();
+		final Set<ClassModel> zodImports = new HashSet<>();
+		final Set<ClassModel> isImports = new HashSet<>();
+		final Set<ClassModel> writeImports = new HashSet<>();
+		final Set<String> toolImports = new HashSet<>();
+		for (final ApiModel interfaceElement : element.interfaces) {
+			final List<String> consumes = interfaceElement.consumes;
+			final List<String> produces = interfaceElement.produces;
+			final boolean needGenerateProgress = interfaceElement.needGenerateProgress;
+			final String returnModelNameIfComplex = capitalizeFirstLetter(interfaceElement.name) + "TypeReturn";
+			final String returnComplexModel = TsClassElement.generateLocalModel(returnModelNameIfComplex,
+					interfaceElement.returnTypes, tsGroup);
+			if (returnComplexModel != null) {
+				data.append("\n\n");
+				data.append(returnComplexModel.replaceAll("(?m)^", "\t"));
+				for (final ClassModel elem : interfaceElement.returnTypes) {
+					zodImports.addAll(elem.getDependencyGroupModels());
+				}
+			}
+			if (interfaceElement.description != null) {
+				data.append("\n\t/**\n\t * ");
+				data.append(interfaceElement.description);
+				data.append("\n\t */");
+			}
+			data.append("\n\texport function ");
+			data.append(interfaceElement.name);
+			data.append("({\n\t\t\trestConfig,");
+			if (!interfaceElement.queries.isEmpty()) {
+				data.append("\n\t\t\tqueries,");
+			}
+			if (!interfaceElement.parameters.isEmpty()) {
+				data.append("\n\t\t\tparams,");
+			}
+			if (produces != null && produces.size() > 1) {
+				data.append("\n\t\t\tproduce,");
+			}
+			if (interfaceElement.unnamedElement.size() == 1 || interfaceElement.multiPartParameters.size() != 0) {
+				data.append("\n\t\t\tdata,");
+			}
+			if (needGenerateProgress) {
+				data.append("\n\t\t\tcallback,");
+			}
+			data.append("\n\t\t}: {");
+			data.append("\n\t\trestConfig: RESTConfig,");
+			toolImports.add("RESTConfig");
+			if (!interfaceElement.queries.isEmpty()) {
+				data.append("\n\t\tqueries: {");
+				for (final Entry<String, List<ClassModel>> queryEntry : interfaceElement.queries.entrySet()) {
+					data.append("\n\t\t\t");
+					data.append(queryEntry.getKey());
+					data.append("?: ");
+					data.append(generateClassModelsTypescript(queryEntry.getValue(), tsGroup, imports, false));
+					data.append(",");
+				}
+				data.append("\n\t\t},");
+			}
+			if (!interfaceElement.parameters.isEmpty()) {
+				data.append("\n\t\tparams: {");
+				for (final Entry<String, List<ClassModel>> paramEntry : interfaceElement.parameters.entrySet()) {
+					data.append("\n\t\t\t");
+					data.append(paramEntry.getKey());
+					data.append(": ");
+					data.append(generateClassModelsTypescript(paramEntry.getValue(), tsGroup, imports, false));
+					data.append(",");
+				}
+				data.append("\n\t\t},");
+			}
+			if (interfaceElement.unnamedElement.size() == 1) {
+				data.append("\n\t\tdata: ");
+				data.append(generateClassModelTypescript(interfaceElement.unnamedElement.get(0), tsGroup, writeImports,
+						true));
+				data.append(",");
+			} else if (interfaceElement.multiPartParameters.size() != 0) {
+				data.append("\n\t\tdata: {");
+				for (final Entry<String, List<ClassModel>> pathEntry : interfaceElement.multiPartParameters
+						.entrySet()) {
+					data.append("\n\t\t\t");
+					data.append(pathEntry.getKey());
+					data.append(": ");
+					data.append(generateClassModelsTypescript(pathEntry.getValue(), tsGroup, writeImports, true));
+					data.append(",");
+				}
+				data.append("\n\t\t},");
+			}
+			if (produces != null && produces.size() > 1) {
+				data.append("\n\t\tproduce: ");
+				String isFist = null;
+				for (final String elem : produces) {
+					String lastElement = null;
+
+					if (MediaType.APPLICATION_JSON.equals(elem)) {
+						lastElement = "HTTPMimeType.JSON";
+						toolImports.add("HTTPMimeType");
+					}
+					if (MediaType.MULTIPART_FORM_DATA.equals(elem)) {
+						lastElement = "HTTPMimeType.MULTIPART";
+						toolImports.add("HTTPMimeType");
+					}
+					if (DataExport.CSV_TYPE.equals(elem)) {
+						lastElement = "HTTPMimeType.CSV";
+						toolImports.add("HTTPMimeType");
+					}
+					if (lastElement != null) {
+						if (isFist == null) {
+							isFist = lastElement;
+						} else {
+							data.append(" | ");
+						}
+						data.append(lastElement);
+					} else {
+						LOGGER.error("Unmanaged model type: {}", elem);
+					}
+				}
+				data.append(",");
+			}
+			if (needGenerateProgress) {
+				data.append("\n\t\tcallback?: RESTCallbacks,");
+				toolImports.add("RESTCallbacks");
+			}
+			data.append("\n\t}): Promise<");
+			if (returnComplexModel != null) {
+				data.append(returnModelNameIfComplex);
+				data.append("> {");
+				data.append("\n\t\treturn RESTRequestJson({");
+				toolImports.add("RESTRequestJson");
+			} else {
+				final String returnType = generateClassModelsTypescript(interfaceElement.returnTypes, tsGroup, imports,
+						false);
+				data.append(returnType);
+				data.append("> {");
+				if ("void".equals(returnType)) {
+					data.append("\n\t\treturn RESTRequestVoid({");
+					toolImports.add("RESTRequestVoid");
+				} else {
+					isImports.addAll(interfaceElement.returnTypes);
+					data.append("\n\t\treturn RESTRequestJson({");
+					toolImports.add("RESTRequestJson");
+				}
+			}
+			data.append("\n\t\t\trestModel: {");
+			data.append("\n\t\t\t\tendPoint: \"");
+			data.append(interfaceElement.restEndPoint);
+			data.append("\",");
+			data.append("\n\t\t\t\trequestType: HTTPRequestModel.");
+			toolImports.add("HTTPRequestModel");
+			data.append(interfaceElement.restTypeRequest);
+			data.append(",");
+			if (consumes != null) {
+				for (final String elem : consumes) {
+					if (MediaType.APPLICATION_JSON.equals(elem)) {
+						data.append("\n\t\t\t\tcontentType: HTTPMimeType.JSON,");
+						toolImports.add("HTTPMimeType");
+						break;
+					} else if (MediaType.MULTIPART_FORM_DATA.equals(elem)) {
+						data.append("\n\t\t\t\tcontentType: HTTPMimeType.MULTIPART,");
+						toolImports.add("HTTPMimeType");
+						break;
+					} else if (MediaType.TEXT_PLAIN.equals(elem)) {
+						data.append("\n\t\t\t\tcontentType: HTTPMimeType.TEXT_PLAIN,");
+						toolImports.add("HTTPMimeType");
+						break;
+					}
+				}
+			} else if (RestTypeRequest.DELETE.equals(interfaceElement.restTypeRequest)) {
+				data.append("\n\t\t\t\tcontentType: HTTPMimeType.TEXT_PLAIN,");
+				toolImports.add("HTTPMimeType");
+			}
+			if (produces != null) {
+				if (produces.size() > 1) {
+					data.append("\n\t\t\t\taccept: produce,");
+				} else {
+					final String returnType = generateClassModelsTypescript(interfaceElement.returnTypes, tsGroup,
+							imports, false);
+					if (!"void".equals(returnType)) {
+						for (final String elem : produces) {
+							if (MediaType.APPLICATION_JSON.equals(elem)) {
+								data.append("\n\t\t\t\taccept: HTTPMimeType.JSON,");
+								toolImports.add("HTTPMimeType");
+								break;
+							}
+						}
+					}
+				}
+			}
+			data.append("\n\t\t\t},");
+			data.append("\n\t\t\trestConfig,");
+			if (!interfaceElement.parameters.isEmpty()) {
+				data.append("\n\t\t\tparams,");
+			}
+			if (!interfaceElement.queries.isEmpty()) {
+				data.append("\n\t\t\tqueries,");
+			}
+			if (interfaceElement.unnamedElement.size() == 1) {
+				data.append("\n\t\t\tdata,");
+			} else if (interfaceElement.multiPartParameters.size() != 0) {
+				data.append("\n\t\t\tdata,");
+			}
+			if (needGenerateProgress) {
+				data.append("\n\t\t\tcallback,");
+			}
+			data.append("\n\t\t}");
+			if (returnComplexModel != null) {
+				data.append(", is");
+				data.append(returnModelNameIfComplex);
+			} else {
+				final TsClassElement retType = tsGroup.find(interfaceElement.returnTypes.get(0));
+				if (retType.tsCheckType != null) {
+					data.append(", ");
+					data.append(retType.tsCheckType);
+					imports.add(interfaceElement.returnTypes.get(0));
+				}
+			}
+			data.append(");");
+			data.append("\n\t};");
+		}
+		data.append("\n}\n");
+
+		final StringBuilder out = new StringBuilder();
+		out.append(getBaseHeader());
+
+		final List<String> toolImportsList = new ArrayList<>(toolImports);
+		Collections.sort(toolImportsList);
+		if (toolImportsList.size() != 0) {
+			out.append("import {");
+			for (final String elem : toolImportsList) {
+				out.append("\n\t");
+				out.append(elem);
+				out.append(",");
+			}
+			out.append("\n} from \"../rest-tools\";\n\n");
+		}
+
+		if (zodImports.size() != 0) {
+			out.append("import { z as zod } from \"zod\"\n");
+		}
+
+		final Set<String> finalImportSet = new TreeSet<>();
+
+		for (final ClassModel model : imports) {
+			final TsClassElement tsModel = tsGroup.find(model);
+			if (tsModel.nativeType == DefinedPosition.NATIVE) {
+				continue;
+			}
+			finalImportSet.add(tsModel.tsTypeName);
+		}
+		for (final ClassModel model : isImports) {
+			final TsClassElement tsModel = tsGroup.find(model);
+			if (tsModel.nativeType == DefinedPosition.NATIVE) {
+				continue;
+			}
+			if (tsModel.tsCheckType != null) {
+				finalImportSet.add(tsModel.tsCheckType);
+			}
+		}
+		for (final ClassModel model : zodImports) {
+			final TsClassElement tsModel = tsGroup.find(model);
+			if (tsModel.nativeType == DefinedPosition.NATIVE) {
+				continue;
+			}
+			finalImportSet.add("Zod" + tsModel.tsTypeName);
+		}
+		for (final ClassModel model : writeImports) {
+			final TsClassElement tsModel = tsGroup.find(model);
+			if (tsModel.nativeType == DefinedPosition.NATIVE) {
+				continue;
+			}
+			finalImportSet.add(tsModel.tsTypeName + "Write");
+		}
+
+		if (finalImportSet.size() != 0) {
+			out.append("import {");
+			for (final String elem : finalImportSet) {
+				out.append("\n\t");
+				out.append(elem);
+				out.append(",");
+			}
+			out.append("\n} from \"../model\";\n\n");
+		}
+
+		out.append(data.toString());
+
+		final String fileName = TsClassElement.determineFileName(element.name);
+		final FileWriter myWriter = new FileWriter(
+				pathPackage + File.separator + "api" + File.separator + fileName + ".ts");
+		myWriter.write(out.toString());
+		myWriter.close();
+	}
+
+}

src/org/kar/archidata/externalRestApi/TsClassElement.java

@@ -0,0 +1,487 @@
+package org.kar.archidata.externalRestApi;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Map.Entry;
+
+import org.kar.archidata.externalRestApi.model.ClassEnumModel;
+import org.kar.archidata.externalRestApi.model.ClassListModel;
+import org.kar.archidata.externalRestApi.model.ClassMapModel;
+import org.kar.archidata.externalRestApi.model.ClassModel;
+import org.kar.archidata.externalRestApi.model.ClassObjectModel;
+import org.kar.archidata.externalRestApi.model.ClassObjectModel.FieldProperty;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TsClassElement {
+	static final Logger LOGGER = LoggerFactory.getLogger(TsClassElement.class);
+
+	public enum DefinedPosition {
+		NATIVE, // Native element of  TS language.
+		BASIC, // basic wrapping for JAVA type.
+		NORMAL // Normal Object to interpret.
+	}
+
+	public List<ClassModel> models;
+	public String zodName;
+	public String tsTypeName;
+	public String tsCheckType;
+	public String declaration;
+	public String fileName = null;
+	public String comment = null;
+	public DefinedPosition nativeType = DefinedPosition.NORMAL;
+
+	public static String determineFileName(final String className) {
+		return className.replaceAll("([a-z])([A-Z])", "$1-$2").replaceAll("([A-Z])([A-Z][a-z])", "$1-$2").toLowerCase();
+	}
+
+	public TsClassElement(final List<ClassModel> model, final String zodName, final String tsTypeName,
+			final String tsCheckType, final String declaration, final DefinedPosition nativeType) {
+		this.models = model;
+		this.zodName = zodName;
+		this.tsTypeName = tsTypeName;
+		this.tsCheckType = tsCheckType;
+		this.declaration = declaration;
+		this.nativeType = nativeType;
+		this.fileName = determineFileName(tsTypeName);
+	}
+
+	public TsClassElement(final ClassModel model) {
+		this.models = List.of(model);
+		this.zodName = "Zod" + model.getOriginClasses().getSimpleName();
+		this.tsTypeName = model.getOriginClasses().getSimpleName();
+		this.tsCheckType = "is" + model.getOriginClasses().getSimpleName();
+		this.declaration = null;
+		this.fileName = determineFileName(this.tsTypeName);
+	}
+
+	public boolean isCompatible(final ClassModel model) {
+		return this.models.contains(model);
+	}
+
+	public String getBaseHeader() {
+		return """
+				/**
+				 * Interface of the server (auto-generated code)
+				 */
+				import { z as zod } from "zod";
+
+				""";
+	}
+
+	public String generateEnum(final ClassEnumModel model, final TsClassElementGroup tsGroup) throws IOException {
+		final StringBuilder out = new StringBuilder();
+		out.append(getBaseHeader());
+		out.append("\n");
+		//out.append(generateComment(model));
+
+		if (System.getenv("ARCHIDATA_GENERATE_ZOD_ENUM") != null) {
+			boolean first = true;
+			out.append("export const ");
+			out.append(this.tsTypeName);
+			out.append(" = ");
+			out.append("zod.enum([");
+			for (final Entry<String, Object> elem : model.getListOfValues().entrySet()) {
+				if (!first) {
+					out.append(",\n\t");
+				} else {
+					out.append("\n\t");
+					first = false;
+				}
+				out.append("'");
+				out.append(elem.getKey());
+				out.append("'");
+			}
+			if (first) {
+				out.append("]}");
+			} else {
+				out.append("\n\t])");
+			}
+			out.append(";\n");
+			out.append(generateZodInfer(this.tsTypeName, this.zodName));
+		} else {
+			boolean first = true;
+			out.append("export enum ");
+			out.append(this.tsTypeName);
+			out.append("  {");
+			for (final Entry<String, Object> elem : model.getListOfValues().entrySet()) {
+				if (!first) {
+					out.append(",\n\t");
+				} else {
+					out.append("\n\t");
+					first = false;
+				}
+				out.append(elem.getKey());
+				out.append(" = ");
+				if (elem.getValue() instanceof final Integer value) {
+					out.append(value);
+				} else {
+					out.append("'");
+					out.append(elem.getValue());
+					out.append("'");
+				}
+			}
+			if (first) {
+				out.append("}");
+			} else {
+				out.append(",\n\t}");
+			}
+			out.append(";\n");
+			out.append("\nexport const ");
+			out.append(this.zodName);
+			out.append(" = zod.nativeEnum(");
+			out.append(this.tsTypeName);
+			out.append(");\n");
+		}
+		out.append(generateExportCheckFunctionWrite(""));
+		return out.toString();
+	}
+
+	private static String generateExportCheckFunction(
+			final String tsCheckType,
+			final String tsTypeName,
+			final String zodName) {
+		final StringBuilder out = new StringBuilder();
+		out.append("\nexport function ");
+		out.append(tsCheckType);
+		out.append("(data: any): data is ");
+		out.append(tsTypeName);
+		out.append(" {\n\ttry {\n\t\t");
+		out.append(zodName);
+		out.append("""
+				.parse(data);
+						return true;
+					} catch (e: any) {
+						console.log(`Fail to parse data type='""");
+		out.append(zodName);
+		out.append("""
+				' error=${e}`);
+						return false;
+					}
+				}
+				""");
+		return out.toString();
+	}
+
+	private String generateExportCheckFunctionWrite(final String writeString) {
+		return generateExportCheckFunction(this.tsCheckType + writeString, this.tsTypeName + writeString,
+				this.zodName + writeString);
+	}
+
+	public String generateImports(final List<ClassModel> depModels, final TsClassElementGroup tsGroup)
+			throws IOException {
+		final StringBuilder out = new StringBuilder();
+		for (final ClassModel depModel : depModels) {
+			final TsClassElement tsModel = tsGroup.find(depModel);
+			if (tsModel.nativeType != DefinedPosition.NATIVE) {
+				out.append("import {");
+				out.append(tsModel.zodName);
+				out.append("} from \"./");
+				out.append(tsModel.fileName);
+				out.append("\";\n");
+			}
+		}
+		return out.toString();
+	}
+
+	private Object generateComment(final ClassObjectModel model) {
+		final StringBuilder out = new StringBuilder();
+		if (model.getDescription() != null || model.getExample() != null) {
+			out.append("/**\n");
+			if (model.getDescription() != null) {
+				for (final String elem : model.getDescription().split("\n")) {
+					out.append(" * ");
+					out.append(elem);
+					out.append("\n");
+				}
+			}
+			if (model.getExample() != null) {
+				out.append(" * Example:\n");
+				out.append(" * ```\n");
+				for (final String elem : model.getExample().split("\n")) {
+					out.append(" * ");
+					out.append(elem);
+					out.append("\n");
+				}
+				out.append(" * ```\n");
+			}
+			out.append(" */\n");
+		}
+		return out.toString();
+	}
+
+	public String optionalTypeZod(final FieldProperty field) {
+		// Common checking element (apply to List, Map, ...)
+		if (field.nullable()) {
+			return ".optional()";
+		}
+		if (field.notNull()) {
+			return "";
+		}
+		// Other object:
+		if (field.model().getOriginClasses() == null || field.model().getOriginClasses().isPrimitive()) {
+			return "";
+		}
+		if (field.columnNotNull()) {
+			return "";
+		}
+		return ".optional()";
+	}
+
+	public String maxSizeZod(final FieldProperty field) {
+		final StringBuilder builder = new StringBuilder();
+		final Class<?> clazz = field.model().getOriginClasses();
+		if (field.limitSize() > 0 && clazz == String.class) {
+			builder.append(".max(");
+			builder.append(field.limitSize());
+			builder.append(")");
+		}
+		return builder.toString();
+	}
+
+	public String readOnlyZod(final FieldProperty field) {
+		if (field.readOnly()) {
+			return ".readonly()";
+		}
+		return "";
+	}
+
+	public String generateBaseObject() {
+		final StringBuilder out = new StringBuilder();
+		out.append(getBaseHeader());
+		out.append("\n");
+
+		out.append("export const ");
+		out.append(this.zodName);
+		out.append(" = ");
+		out.append(this.declaration);
+		out.append(";");
+		out.append(generateZodInfer(this.tsTypeName, this.zodName));
+		return out.toString();
+	}
+
+	public String generateObject(final ClassObjectModel model, final TsClassElementGroup tsGroup) throws IOException {
+		final StringBuilder out = new StringBuilder();
+		out.append(getBaseHeader());
+		out.append(generateImports(model.getDependencyModels(), tsGroup));
+		out.append("\n");
+
+		out.append(generateComment(model));
+		out.append("export const ");
+		out.append(this.zodName);
+		out.append(" = ");
+
+		if (model.getExtendsClass() != null) {
+			final ClassModel parentClass = model.getExtendsClass();
+			final TsClassElement tsParentModel = tsGroup.find(parentClass);
+			out.append(tsParentModel.zodName);
+			out.append(".extend({");
+		} else {
+			out.append("zod.object({");
+		}
+		out.append("\n");
+		for (final FieldProperty field : model.getFields()) {
+			final ClassModel fieldModel = field.model();
+			if (field.comment() != null) {
+				out.append("\t/**\n");
+				out.append("\t * ");
+				out.append(field.comment());
+				out.append("\n\t */\n");
+			}
+			out.append("\t");
+			out.append(field.name());
+			out.append(": ");
+			if (fieldModel instanceof ClassEnumModel || fieldModel instanceof ClassObjectModel) {
+				final TsClassElement tsFieldModel = tsGroup.find(fieldModel);
+				out.append(tsFieldModel.zodName);
+			} else if (fieldModel instanceof final ClassListModel fieldListModel) {
+				final String data = generateTsList(fieldListModel, tsGroup);
+				out.append(data);
+			} else if (fieldModel instanceof final ClassMapModel fieldMapModel) {
+				final String data = generateTsMap(fieldMapModel, tsGroup);
+				out.append(data);
+			}
+			out.append(maxSizeZod(field));
+			out.append(readOnlyZod(field));
+			out.append(optionalTypeZod(field));
+			out.append(",\n");
+		}
+		final List<String> omitField = model.getReadOnlyField();
+		out.append("\n});\n");
+		out.append(generateZodInfer(this.tsTypeName, this.zodName));
+		out.append(generateExportCheckFunctionWrite(""));
+
+		// Generate the Write Type associated.
+		out.append("\nexport const ");
+		out.append(this.zodName);
+		out.append("Write = ");
+		out.append(this.zodName);
+		if (omitField.size() != 0) {
+			out.append(".omit({\n");
+			for (final String elem : omitField) {
+				out.append("\t");
+				out.append(elem);
+				out.append(": true,\n");
+			}
+			out.append("\n})");
+		}
+		out.append(".partial();\n");
+		out.append(generateZodInfer(this.tsTypeName + "Write", this.zodName + "Write"));
+
+		// Check only the input value ==> no need of the output
+		out.append(generateExportCheckFunctionWrite("Write"));
+
+		return out.toString();
+	}
+
+	private static String generateZodInfer(final String tsName, final String zodName) {
+		final StringBuilder out = new StringBuilder();
+		out.append("\nexport type ");
+		out.append(tsName);
+		out.append(" = zod.infer<typeof ");
+		out.append(zodName);
+		out.append(">;\n");
+		return out.toString();
+	}
+
+	private static String generateTsMap(final ClassMapModel model, final TsClassElementGroup tsGroup) {
+		final StringBuilder out = new StringBuilder();
+		out.append("zod.record(");
+		if (model.keyModel instanceof final ClassListModel fieldListModel) {
+			final String tmp = generateTsList(fieldListModel, tsGroup);
+			out.append(tmp);
+		} else if (model.keyModel instanceof final ClassMapModel fieldMapModel) {
+			final String tmp = generateTsMap(fieldMapModel, tsGroup);
+			out.append(tmp);
+		} else if (model.keyModel instanceof final ClassObjectModel fieldObjectModel) {
+			final String tmp = generateTsObject(fieldObjectModel, tsGroup);
+			out.append(tmp);
+		} else if (model.keyModel instanceof final ClassEnumModel fieldEnumModel) {
+			final String tmp = generateTsEnum(fieldEnumModel, tsGroup);
+			out.append(tmp);
+		}
+		out.append(", ");
+		if (model.valueModel instanceof final ClassListModel fieldListModel) {
+			final String tmp = generateTsList(fieldListModel, tsGroup);
+			out.append(tmp);
+		} else if (model.valueModel instanceof final ClassMapModel fieldMapModel) {
+			final String tmp = generateTsMap(fieldMapModel, tsGroup);
+			out.append(tmp);
+		} else if (model.valueModel instanceof final ClassObjectModel fieldObjectModel) {
+			final String tmp = generateTsObject(fieldObjectModel, tsGroup);
+			out.append(tmp);
+		} else if (model.valueModel instanceof final ClassEnumModel fieldEnumModel) {
+			final String tmp = generateTsEnum(fieldEnumModel, tsGroup);
+			out.append(tmp);
+		}
+		out.append(")");
+		return out.toString();
+	}
+
+	private static String generateTsEnum(final ClassEnumModel model, final TsClassElementGroup tsGroup) {
+		final TsClassElement tsParentModel = tsGroup.find(model);
+		return tsParentModel.zodName;
+	}
+
+	private static String generateTsObject(final ClassObjectModel model, final TsClassElementGroup tsGroup) {
+		final TsClassElement tsParentModel = tsGroup.find(model);
+		return tsParentModel.zodName;
+	}
+
+	private static String generateTsList(final ClassListModel model, final TsClassElementGroup tsGroup) {
+		final StringBuilder out = new StringBuilder();
+		out.append("zod.array(");
+		if (model.valueModel instanceof final ClassListModel fieldListModel) {
+			final String tmp = generateTsList(fieldListModel, tsGroup);
+			out.append(tmp);
+		} else if (model.valueModel instanceof final ClassMapModel fieldMapModel) {
+			final String tmp = generateTsMap(fieldMapModel, tsGroup);
+			out.append(tmp);
+		} else if (model.valueModel instanceof final ClassObjectModel fieldObjectModel) {
+			final String tmp = generateTsObject(fieldObjectModel, tsGroup);
+			out.append(tmp);
+		}
+		out.append(")");
+		return out.toString();
+	}
+
+	public void generateFile(final String pathPackage, final TsClassElementGroup tsGroup) throws IOException {
+		if (this.nativeType == DefinedPosition.NATIVE) {
+			return;
+		}
+		final ClassModel model = this.models.get(0);
+		String data = "";
+		if (this.nativeType == DefinedPosition.BASIC && model instanceof ClassObjectModel) {
+			data = generateBaseObject();
+		} else if (model instanceof final ClassEnumModel modelEnum) {
+			data = generateEnum(modelEnum, tsGroup);
+		} else if (model instanceof final ClassObjectModel modelObject) {
+			data = generateObject(modelObject, tsGroup);
+		}
+		final Path path = Paths.get(pathPackage + File.separator + "model");
+		if (Files.notExists(path)) {
+			Files.createDirectories(path);
+		}
+		final FileWriter myWriter = new FileWriter(
+				pathPackage + File.separator + "model" + File.separator + this.fileName + ".ts");
+		myWriter.write(data);
+		myWriter.close();
+	}
+
+	private static String generateLocalModelBase(final ClassModel model, final TsClassElementGroup tsGroup)
+			throws IOException {
+		if (model instanceof final ClassObjectModel objectModel) {
+			return generateTsObject(objectModel, tsGroup);
+		}
+		if (model instanceof final ClassEnumModel enumModel) {
+			return generateTsEnum(enumModel, tsGroup);
+		}
+		if (model instanceof final ClassListModel listModel) {
+			return generateTsList(listModel, tsGroup);
+		}
+		if (model instanceof final ClassMapModel mapModel) {
+			return generateTsMap(mapModel, tsGroup);
+		}
+		return "";
+	}
+
+	public static String generateLocalModel(
+			final String ModelName,
+			final List<ClassModel> models,
+			final TsClassElementGroup tsGroup) throws IOException {
+		if (models.size() == 1) {
+			if (models.get(0) instanceof ClassObjectModel) {
+				return null;
+			}
+			if (models.get(0) instanceof ClassEnumModel) {
+				return null;
+			}
+		}
+		final StringBuilder out = new StringBuilder();
+		out.append("export const Zod");
+		out.append(ModelName);
+		out.append(" = ");
+		if (models.size() == 1) {
+			out.append(generateLocalModelBase(models.get(0), tsGroup));
+			out.append(";");
+		} else {
+			out.append("z.union([\n");
+			for (final ClassModel model : models) {
+				out.append("\t");
+				out.append(generateLocalModelBase(models.get(0), tsGroup));
+				out.append(",\n");
+			}
+			out.append("]);");
+		}
+		//model.getDependencyModels()
+		out.append(generateZodInfer(ModelName, "Zod" + ModelName));
+		out.append(generateExportCheckFunction("is" + ModelName, ModelName, "Zod" + ModelName));
+		return out.toString();
+	}
+
+}

src/org/kar/archidata/externalRestApi/TsClassElementGroup.java

@@ -0,0 +1,27 @@
+package org.kar.archidata.externalRestApi;
+
+import java.util.List;
+
+import org.kar.archidata.externalRestApi.model.ClassModel;
+
+public class TsClassElementGroup {
+	private final List<TsClassElement> tsElements;
+
+	public List<TsClassElement> getTsElements() {
+		return this.tsElements;
+	}
+
+	public TsClassElementGroup(final List<TsClassElement> tsElements) {
+		this.tsElements = tsElements;
+	}
+
+	public TsClassElement find(final ClassModel model) {
+		for (final TsClassElement elem : this.tsElements) {
+			if (elem.isCompatible(model)) {
+				return elem;
+			}
+		}
+		return null;
+	}
+
+}

src/org/kar/archidata/externalRestApi/TsGenerateApi.java

@@ -0,0 +1,233 @@
+package org.kar.archidata.externalRestApi;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.sql.Timestamp;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import org.glassfish.jersey.media.multipart.ContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.kar.archidata.catcher.RestErrorResponse;
+import org.kar.archidata.externalRestApi.TsClassElement.DefinedPosition;
+import org.kar.archidata.externalRestApi.model.ApiGroupModel;
+import org.kar.archidata.externalRestApi.model.ClassModel;
+
+public class TsGenerateApi {
+
+	public static void generateApi(final AnalyzeApi api, final String pathPackage) throws Exception {
+		final List<TsClassElement> localModel = generateApiModel(api);
+		final TsClassElementGroup tsGroup = new TsClassElementGroup(localModel);
+		// Generates all MODEL files
+		for (final TsClassElement element : localModel) {
+			element.generateFile(pathPackage, tsGroup);
+		}
+		// Generate index of model files
+		createModelIndex(pathPackage, tsGroup);
+
+		for (final ApiGroupModel element : api.apiModels) {
+			TsApiGeneration.generateApiFile(element, pathPackage, tsGroup);
+		}
+		// Generate index of model files
+		createResourceIndex(pathPackage, api.apiModels);
+		createIndex(pathPackage);
+		copyResourceFile("rest-tools.ts", pathPackage + File.separator + "rest-tools.ts");
+	}
+
+	private static void createIndex(final String pathPackage) throws IOException {
+		final String out = """
+				/**
+				 * Interface of the server (auto-generated code)
+				 */
+				export * from \"./model\";
+				export * from \"./api\";
+				export * from \"./rest-tools\";
+
+				""";
+		final FileWriter myWriter = new FileWriter(pathPackage + File.separator + "index.ts");
+		myWriter.write(out);
+		myWriter.close();
+	}
+
+	private static void createResourceIndex(final String pathPackage, final List<ApiGroupModel> apiModels)
+			throws IOException {
+		final StringBuilder out = new StringBuilder("""
+				/**
+				 * Interface of the server (auto-generated code)
+				 */
+				""");
+		final List<String> files = new ArrayList<>();
+		for (final ApiGroupModel elem : apiModels) {
+			files.add(TsClassElement.determineFileName(elem.name));
+		}
+		Collections.sort(files);
+		for (final String elem : files) {
+			out.append("export * from \"./");
+			out.append(elem);
+			out.append("\"\n");
+		}
+		final FileWriter myWriter = new FileWriter(pathPackage + File.separator + "api" + File.separator + "index.ts");
+		myWriter.write(out.toString());
+		myWriter.close();
+	}
+
+	private static void createModelIndex(final String pathPackage, final TsClassElementGroup tsGroup)
+			throws IOException {
+		final StringBuilder out = new StringBuilder("""
+				/**
+				 * Interface of the server (auto-generated code)
+				 */
+				""");
+		final List<String> files = new ArrayList<>();
+		for (final TsClassElement elem : tsGroup.getTsElements()) {
+			if (elem.nativeType == DefinedPosition.NATIVE) {
+				continue;
+			}
+			files.add(elem.fileName);
+		}
+		Collections.sort(files);
+		for (final String elem : files) {
+			out.append("export * from \"./");
+			out.append(elem);
+			out.append("\"\n");
+		}
+		final FileWriter myWriter = new FileWriter(
+				pathPackage + File.separator + "model" + File.separator + "index.ts");
+		myWriter.write(out.toString());
+		myWriter.close();
+	}
+
+	private static List<TsClassElement> generateApiModel(final AnalyzeApi api) throws Exception {
+		// First step is to add all specific basic elements the wrap correctly the model
+		final List<TsClassElement> tsModels = new ArrayList<>();
+		List<ClassModel> models = api.getCompatibleModels(List.of(Void.class, void.class));
+		if (models != null) {
+			tsModels.add(new TsClassElement(models, "void", "void", null, null, DefinedPosition.NATIVE));
+		}
+		models = api.getCompatibleModels(List.of(Object.class));
+		if (models != null) {
+			tsModels.add(
+					new TsClassElement(models, "zod.any()", "object", null, "zod.object()", DefinedPosition.NATIVE));
+		}
+		// Map is binded to any ==> can not determine this complex model for now
+		models = api.getCompatibleModels(List.of(Map.class));
+		if (models != null) {
+			tsModels.add(new TsClassElement(models, "zod.any()", "any", null, null, DefinedPosition.NATIVE));
+		}
+		models = api.getCompatibleModels(List.of(String.class));
+		if (models != null) {
+			tsModels.add(
+					new TsClassElement(models, "zod.string()", "string", null, "zod.string()", DefinedPosition.NATIVE));
+		}
+		models = api.getCompatibleModels(
+				List.of(InputStream.class, FormDataContentDisposition.class, ContentDisposition.class));
+		if (models != null) {
+			tsModels.add(new TsClassElement(models, "z.instanceof(File)", "File", null, "z.instanceof(File)",
+					DefinedPosition.NATIVE));
+		}
+		models = api.getCompatibleModels(List.of(Boolean.class, boolean.class));
+		if (models != null) {
+			tsModels.add(new TsClassElement(models, "zod.boolean()", "boolean", null, "zod.boolean()",
+					DefinedPosition.NATIVE));
+		}
+		models = api.getCompatibleModels(List.of(UUID.class));
+		if (models != null) {
+			tsModels.add(new TsClassElement(models, "ZodUUID", "UUID", "isUUID", "zod.string().uuid()",
+					DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(Long.class, long.class));
+		if (models != null) {
+			tsModels.add(
+					new TsClassElement(models, "ZodLong", "Long", "isLong", "zod.number()", DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(Short.class, short.class));
+		if (models != null) {
+			tsModels.add(new TsClassElement(models, "ZodShort", "Short", "isShort", "zod.number().safe()",
+					DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(Integer.class, int.class));
+		if (models != null) {
+			tsModels.add(new TsClassElement(models, "ZodInteger", "Integer", "isInteger", "zod.number().safe()",
+					DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(Double.class, double.class));
+		if (models != null) {
+			tsModels.add(new TsClassElement(models, "ZodDouble", "Double", "isDouble", "zod.number()",
+					DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(Float.class, float.class));
+		if (models != null) {
+			tsModels.add(
+					new TsClassElement(models, "ZodFloat", "Float", "isFloat", "zod.number()", DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(Instant.class));
+		if (models != null) {
+			tsModels.add(new TsClassElement(models, "ZodInstant", "Instant", "isInstant", "zod.string()",
+					DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(Date.class));
+		if (models != null) {
+			tsModels.add(new TsClassElement(models, "ZodIsoDate", "IsoDate", "isIsoDate",
+					"zod.string().datetime({ precision: 3 })", DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(Timestamp.class));
+		if (models != null) {
+			tsModels.add(new TsClassElement(models, "ZodTimestamp", "Timestamp", "isTimestamp",
+					"zod.string().datetime({ precision: 3 })", DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(LocalDate.class));
+		if (models != null) {
+			tsModels.add(new TsClassElement(models, "ZodLocalDate", "LocalDate", "isLocalDate", "zod.string().date()",
+					DefinedPosition.BASIC));
+		}
+		models = api.getCompatibleModels(List.of(LocalTime.class));
+		if (models != null) {
+			tsModels.add(new TsClassElement(models, "ZodLocalTime", "LocalTime", "isLocalTime", "zod.string().time()",
+					DefinedPosition.BASIC));
+		}
+		// needed for Rest interface
+		api.addModel(RestErrorResponse.class);
+		for (final ClassModel model : api.getAllModel()) {
+			boolean alreadyExist = false;
+			for (final TsClassElement elem : tsModels) {
+				if (elem.isCompatible(model)) {
+					alreadyExist = true;
+					break;
+				}
+			}
+			if (alreadyExist) {
+				continue;
+			}
+			tsModels.add(new TsClassElement(model));
+		}
+		return tsModels;
+
+	}
+
+	public static void copyResourceFile(final String name, final String destinationPath) throws IOException {
+		final InputStream ioStream = TsGenerateApi.class.getClassLoader().getResourceAsStream(name);
+		if (ioStream == null) {
+			throw new IllegalArgumentException("rest-tools.ts is not found");
+		}
+		final BufferedReader buffer = new BufferedReader(new InputStreamReader(ioStream));
+		final FileWriter myWriter = new FileWriter(destinationPath);
+		String line;
+		while ((line = buffer.readLine()) != null) {
+			myWriter.write(line);
+			myWriter.write("\n");
+		}
+		ioStream.close();
+		myWriter.close();
+	}
+}

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

@@ -0,0 +1,72 @@
+package org.kar.archidata.externalRestApi.model;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+// Temporary class that permit to order the list of API.
+record OrderedElement(
+		String methodName,
+		Method method) {}
+
+public class ApiGroupModel {
+	static final Logger LOGGER = LoggerFactory.getLogger(ApiGroupModel.class);
+
+	// Name of the REST end-point name
+	public String restEndPoint;
+	// Name of the Class
+	public String name;
+	// Origin class reference
+	public Class<?> originClass;
+	// List of all API
+	public List<ApiModel> interfaces = new ArrayList<>();
+
+	public ApiModel getInterfaceNamed(final String name) {
+		for (final ApiModel model : this.interfaces) {
+			if (name.equals(model.name)) {
+				return model;
+			}
+		}
+		return null;
+	}
+
+	public ApiGroupModel(final Class<?> clazz, final ModelGroup previousModel) throws Exception {
+		this.originClass = clazz;
+		// the basic path has no specific elements...
+		this.restEndPoint = ApiTool.apiAnnotationGetPath(clazz);
+		if (this.restEndPoint == null) {
+			this.restEndPoint = "";
+		}
+		this.name = clazz.getSimpleName();
+
+		final List<String> consumes = ApiTool.apiAnnotationGetConsumes(clazz);
+		final List<String> produces = ApiTool.apiAnnotationProduces(clazz);
+
+		// Get all method to order it. This permit to stabilize the generation.
+		// JAVA has dynamic allocation of member order, then we need to order it?.
+		final List<OrderedElement> orderedElements = new ArrayList<>();
+		for (final Method method : clazz.getDeclaredMethods()) {
+			final String methodName = method.getName();
+			orderedElements.add(new OrderedElement(methodName, method));
+		}
+		final Comparator<OrderedElement> comparator = Comparator.comparing(OrderedElement::methodName);
+		Collections.sort(orderedElements, comparator);
+
+		for (final OrderedElement orderedElement : orderedElements) {
+			// Check if the path is available
+			final RestTypeRequest methodType = ApiTool.apiAnnotationGetTypeRequest2(orderedElement.method());
+			if (methodType == null) {
+				LOGGER.info("    [{}] {} ==> No methode type @PATH, @GET ...", methodType, orderedElement.methodName());
+				continue;
+			}
+			final ApiModel model = new ApiModel(clazz, orderedElement.method(), this.restEndPoint, consumes, produces,
+					previousModel);
+			this.interfaces.add(model);
+		}
+	}
+}

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

@@ -0,0 +1,176 @@
+package org.kar.archidata.externalRestApi.model;
+
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ApiModel {
+	static final Logger LOGGER = LoggerFactory.getLogger(ApiModel.class);
+
+	Class<?> originClass;
+	Method orignMethod;
+
+	// Name of the REST end-point name
+	public String restEndPoint;
+	// Type of the request:
+	public RestTypeRequest restTypeRequest;
+	// Description of the API
+	public String description;
+	// need to generate the progression of stream (if possible)
+	public boolean needGenerateProgress;
+
+	// List of types returned by the API
+	public List<ClassModel> returnTypes = new ArrayList<>();;
+	// Name of the API (function name)
+	public String name;
+	// list of all parameters (/{key}/...
+	public final Map<String, List<ClassModel>> parameters = new HashMap<>();
+	// list of all query (?key...)
+	public final Map<String, List<ClassModel>> queries = new HashMap<>();
+	// when request multi-part, need to separate it.
+	public final Map<String, List<ClassModel>> multiPartParameters = new HashMap<>();
+	// model of data available
+	public final List<ClassModel> unnamedElement = new ArrayList<>();
+
+	// Possible input type of the REST API
+	public List<String> consumes = new ArrayList<>();
+	// Possible output type of the REST API
+	public List<String> produces = new ArrayList<>();
+
+	private void updateReturnTypes(final Method method, final ModelGroup previousModel) throws Exception {
+		// get return type from the user specification:
+		final Class<?>[] returnTypeModel = ApiTool.apiAnnotationGetAsyncType(method);
+		LOGGER.info("Get return Type async = {}", returnTypeModel);
+		if (returnTypeModel != null) {
+			if (returnTypeModel.length == 0) {
+				throw new IOException("Create a @AsyncType with empty elements ...");
+			}
+			for (final Class<?> clazz : returnTypeModel) {
+				if (clazz == Void.class || clazz == void.class) {
+					this.returnTypes.add(previousModel.add(Void.class));
+				} else if (clazz == List.class) {
+					throw new IOException("Unmanaged List.class in @AsyncType.");
+				} else if (clazz == Map.class) {
+					throw new IOException("Unmanaged Map.class in @AsyncType.");
+				} else {
+					this.returnTypes.add(previousModel.add(clazz));
+				}
+			}
+			if (this.returnTypes.size() == 0) {
+				this.produces.clear();
+			}
+			return;
+		}
+
+		final Class<?> returnTypeModelRaw = method.getReturnType();
+		LOGGER.info("Get return Type RAW = {}", returnTypeModelRaw.getCanonicalName());
+		if (returnTypeModelRaw == Map.class) {
+			LOGGER.warn("Model Map");
+			final Type listType = method.getGenericReturnType();
+			final ClassModel modelGenerated = ClassModel.getModel(listType, previousModel);
+			this.returnTypes.add(modelGenerated);
+			LOGGER.warn("Model Map ==> {}", modelGenerated);
+			return;
+		} else if (returnTypeModelRaw == List.class) {
+			LOGGER.warn("Model List");
+			final Type listType = method.getGenericReturnType();
+			final ClassModel modelGenerated = ClassModel.getModel(listType, previousModel);
+			this.returnTypes.add(modelGenerated);
+			LOGGER.warn("Model List ==> {}", modelGenerated);
+			return;
+		} else {
+			LOGGER.warn("Model Object");
+			this.returnTypes.add(previousModel.add(returnTypeModelRaw));
+		}
+		LOGGER.warn("List of returns elements:");
+		for (final ClassModel elem : this.returnTypes) {
+			LOGGER.warn("    - {}", elem);
+		}
+		if (this.returnTypes.size() == 0) {
+			this.produces.clear();
+		}
+	}
+
+	public ApiModel(final Class<?> clazz, final Method method, final String baseRestEndPoint,
+			final List<String> consume, final List<String> produce, final ModelGroup previousModel) throws Exception {
+		this.originClass = clazz;
+		this.orignMethod = method;
+
+		String tmpPath = ApiTool.apiAnnotationGetPath(method);
+		if (tmpPath == null) {
+			tmpPath = "";
+		}
+		this.restEndPoint = baseRestEndPoint + "/" + tmpPath;
+		this.restTypeRequest = ApiTool.apiAnnotationGetTypeRequest2(method);
+		this.name = method.getName();
+
+		this.description = ApiTool.apiAnnotationGetOperationDescription(method);
+		this.consumes = ApiTool.apiAnnotationGetConsumes2(consume, method);
+		this.produces = ApiTool.apiAnnotationProduces2(produce, method);
+		LOGGER.trace("    [{}] {} => {}/{}", baseRestEndPoint, this.name, this.restEndPoint);
+		this.needGenerateProgress = ApiTool.apiAnnotationTypeScriptProgress(method);
+
+		updateReturnTypes(method, previousModel);
+		LOGGER.trace("         return: {}", this.returnTypes.size());
+		for (final ClassModel elem : this.returnTypes) {
+			LOGGER.trace("             - {}", elem);
+		}
+
+		// LOGGER.info(" Parameters:");
+		for (final Parameter parameter : method.getParameters()) {
+			// Security context are internal parameter (not available from API)
+			if (ApiTool.apiAnnotationIsContext(parameter)) {
+				continue;
+			}
+			final Class<?> parameterType = parameter.getType();
+			final List<ClassModel> parameterModel = new ArrayList<>();
+			final Class<?>[] asyncType = ApiTool.apiAnnotationGetAsyncType(parameter);
+			if (asyncType != null) {
+				for (final Class<?> elem : asyncType) {
+					final ClassModel modelGenerated = ClassModel.getModel(elem, previousModel);
+					parameterModel.add(modelGenerated);
+				}
+			} else if (parameterType == List.class) {
+				final Type parameterrizedType = parameter.getParameterizedType();
+				final ClassModel modelGenerated = ClassModel.getModel(parameterrizedType, previousModel);
+				parameterModel.add(modelGenerated);
+			} else if (parameterType == Map.class) {
+				final Type parameterrizedType = parameter.getParameterizedType();
+				final ClassModel modelGenerated = ClassModel.getModel(parameterrizedType, previousModel);
+				parameterModel.add(modelGenerated);
+			} else {
+				parameterModel.add(previousModel.add(parameterType));
+			}
+
+			final String pathParam = ApiTool.apiAnnotationGetPathParam(parameter);
+			final String queryParam = ApiTool.apiAnnotationGetQueryParam(parameter);
+			final String formDataParam = ApiTool.apiAnnotationGetFormDataParam(parameter);
+			if (queryParam != null) {
+				if (!this.queries.containsKey(queryParam)) {
+					this.queries.put(queryParam, parameterModel);
+				}
+			} else if (pathParam != null) {
+				if (!this.parameters.containsKey(pathParam)) {
+					this.parameters.put(pathParam, parameterModel);
+				}
+			} else if (formDataParam != null) {
+				if (!this.multiPartParameters.containsKey(formDataParam)) {
+					this.multiPartParameters.put(formDataParam, parameterModel);
+				}
+			} else {
+				this.unnamedElement.addAll(parameterModel);
+			}
+		}
+		if (this.unnamedElement.size() > 1) {
+			throw new IOException("Can not parse the API, enmpty element is more than 1 in " + this.name);
+		}
+	}
+}

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

@@ -0,0 +1,208 @@
+package org.kar.archidata.externalRestApi.model;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
+import java.util.Arrays;
+import java.util.List;
+
+import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.kar.archidata.annotation.AsyncType;
+import org.kar.archidata.annotation.TypeScriptProgress;
+
+import io.swagger.v3.oas.annotations.Operation;
+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.QueryParam;
+import jakarta.ws.rs.core.Context;
+
+public class ApiTool {
+
+	public static String apiAnnotationGetPath(final Class<?> element) throws Exception {
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Path.class);
+		if (annotation.length == 0) {
+			return null;
+		}
+		return ((Path) annotation[0]).value();
+	}
+
+	public static List<String> apiAnnotationProduces(final Class<?> element) throws Exception {
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Produces.class);
+		if (annotation.length == 0) {
+			return null;
+		}
+		return Arrays.asList(((Produces) annotation[0]).value());
+	}
+
+	public static List<String> apiAnnotationProduces(final Method element) throws Exception {
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Produces.class);
+		if (annotation.length == 0) {
+			return null;
+		}
+		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) {
+			return data;
+		}
+		return apiAnnotationProduces(clazz);
+	}
+
+	public static List<String> apiAnnotationProduces2(final List<String> parentProduce, final Method method)
+			throws Exception {
+		final List<String> data = apiAnnotationProduces(method);
+		if (data != null) {
+			return data;
+		}
+		return parentProduce;
+	}
+
+	public static String apiAnnotationGetOperationDescription(final Method element) throws Exception {
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Operation.class);
+		if (annotation.length == 0) {
+			return null;
+		}
+		return ((Operation) annotation[0]).description();
+	}
+
+	public static String apiAnnotationGetPath(final Method element) throws Exception {
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Path.class);
+		if (annotation.length == 0) {
+			return null;
+		}
+		return ((Path) annotation[0]).value();
+	}
+
+	public static String apiAnnotationGetTypeRequest(final Method element) throws Exception {
+		if (element.getDeclaredAnnotationsByType(GET.class).length == 1) {
+			return "GET";
+		}
+		if (element.getDeclaredAnnotationsByType(POST.class).length == 1) {
+			return "POST";
+		}
+		if (element.getDeclaredAnnotationsByType(PUT.class).length == 1) {
+			return "PUT";
+		}
+		if (element.getDeclaredAnnotationsByType(PATCH.class).length == 1) {
+			return "PATCH";
+		}
+		if (element.getDeclaredAnnotationsByType(DELETE.class).length == 1) {
+			return "DELETE";
+		}
+		return null;
+	}
+
+	public static RestTypeRequest apiAnnotationGetTypeRequest2(final Method element) throws Exception {
+		if (element.getDeclaredAnnotationsByType(GET.class).length == 1) {
+			return RestTypeRequest.GET;
+		}
+		if (element.getDeclaredAnnotationsByType(POST.class).length == 1) {
+			return RestTypeRequest.POST;
+		}
+		if (element.getDeclaredAnnotationsByType(PUT.class).length == 1) {
+			return RestTypeRequest.PUT;
+		}
+		if (element.getDeclaredAnnotationsByType(PATCH.class).length == 1) {
+			return RestTypeRequest.PATCH;
+		}
+		if (element.getDeclaredAnnotationsByType(DELETE.class).length == 1) {
+			return RestTypeRequest.DELETE;
+		}
+		return null;
+	}
+
+	public static String apiAnnotationGetPathParam(final Parameter element) throws Exception {
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(PathParam.class);
+		if (annotation.length == 0) {
+			return null;
+		}
+		return ((PathParam) annotation[0]).value();
+	}
+
+	public static String apiAnnotationGetQueryParam(final Parameter element) throws Exception {
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(QueryParam.class);
+		if (annotation.length == 0) {
+			return null;
+		}
+		return ((QueryParam) annotation[0]).value();
+	}
+
+	public static String apiAnnotationGetFormDataParam(final Parameter element) throws Exception {
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(FormDataParam.class);
+		if (annotation.length == 0) {
+			return null;
+		}
+		return ((FormDataParam) annotation[0]).value();
+	}
+
+	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 {
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(AsyncType.class);
+		if (annotation.length == 0) {
+			return null;
+		}
+		return ((AsyncType) annotation[0]).value();
+	}
+
+	public static List<String> apiAnnotationGetConsumes(final Method element) throws Exception {
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Consumes.class);
+		if (annotation.length == 0) {
+			return null;
+		}
+		return Arrays.asList(((Consumes) annotation[0]).value());
+	}
+
+	public static List<String> apiAnnotationGetConsumes(final Class<?> element) throws Exception {
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Consumes.class);
+		if (annotation.length == 0) {
+			return null;
+		}
+		return Arrays.asList(((Consumes) annotation[0]).value());
+	}
+
+	public static List<String> apiAnnotationGetConsumes(final Class<?> clazz, final Method method) throws Exception {
+		final List<String> data = apiAnnotationGetConsumes(method);
+		if (data != null) {
+			return data;
+		}
+		return apiAnnotationGetConsumes(clazz);
+	}
+
+	public static List<String> apiAnnotationGetConsumes2(final List<String> parentConsume, final Method method)
+			throws Exception {
+		final List<String> data = apiAnnotationGetConsumes(method);
+		if (data != null) {
+			return data;
+		}
+		return parentConsume;
+	}
+
+	public static boolean apiAnnotationIsContext(final Parameter element) throws Exception {
+		return element.getDeclaredAnnotationsByType(Context.class).length != 0;
+	}
+
+}

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

@@ -0,0 +1,66 @@
+package org.kar.archidata.externalRestApi.model;
+
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+public class ClassEnumModel extends ClassModel {
+
+	protected ClassEnumModel(final Class<?> clazz) {
+		this.originClasses = clazz;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder out = new StringBuilder();
+		out.append("ClassEnumModel [");
+		out.append(this.originClasses.getCanonicalName());
+		out.append("]");
+		return out.toString();
+	}
+
+	final Map<String, Object> listOfValues = new HashMap<>();
+
+	@Override
+	public void analyze(final ModelGroup group) throws IOException {
+		if (this.analyzeDone) {
+			return;
+		}
+		this.analyzeDone = true;
+		final Class<?> clazz = this.originClasses;
+		final Object[] constants = clazz.getEnumConstants();
+
+		// Try to get a get Value element to serialize:
+		try {
+			final Method getValueMethod = clazz.getMethod("getValue");
+			for (final Object constant : constants) {
+				final String name = constant.toString();
+				final Object value = getValueMethod.invoke(constant);
+				this.listOfValues.put(name, value);
+			}
+			return;
+		} catch (final Exception e) {
+			//e.printStackTrace();
+		}
+
+		for (final Object elem : constants) {
+			this.listOfValues.put(elem.toString(), elem.toString());
+		}
+	}
+
+	public Map<String, Object> getListOfValues() {
+		return this.listOfValues;
+	}
+
+	@Override
+	public Set<ClassModel> getAlls() {
+		return Set.of(this);
+	}
+
+	@Override
+	public Set<ClassModel> getDependencyGroupModels() {
+		return Set.of(this);
+	}
+}

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

@@ -0,0 +1,47 @@
+package org.kar.archidata.externalRestApi.model;
+
+import java.io.IOException;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.Set;
+
+public class ClassListModel extends ClassModel {
+	public ClassModel valueModel;
+
+	public ClassListModel(final ClassModel valueModel) {
+		this.valueModel = valueModel;
+	}
+
+	public ClassListModel(final Class<?> clazz, final ModelGroup previousModel) throws IOException {
+		this.valueModel = getModel(clazz, previousModel);
+	}
+
+	public ClassListModel(final Type model, final ModelGroup previousModel) throws IOException {
+		this.valueModel = getModel(model, previousModel);
+	}
+
+	public ClassListModel(final ParameterizedType listType, final ModelGroup previousModel) throws IOException {
+		final Type model = listType.getActualTypeArguments()[0];
+		this.valueModel = getModel(model, previousModel);
+	}
+
+	@Override
+	public String toString() {
+		return "ClassListModel [valueModel=" + this.valueModel + "]";
+	}
+
+	@Override
+	public void analyze(final ModelGroup group) throws IOException {
+		throw new IOException("Analyze can not be done at this phase for List...");
+	}
+
+	@Override
+	public Set<ClassModel> getAlls() {
+		return this.valueModel.getAlls();
+	}
+
+	@Override
+	public Set<ClassModel> getDependencyGroupModels() {
+		return this.valueModel.getDependencyGroupModels();
+	}
+}

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

@@ -0,0 +1,52 @@
+package org.kar.archidata.externalRestApi.model;
+
+import java.io.IOException;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.HashSet;
+import java.util.Set;
+
+public class ClassMapModel extends ClassModel {
+	public ClassModel keyModel;
+	public ClassModel valueModel;
+
+	public ClassMapModel(final ClassModel keyModel, final ClassModel valueModel) {
+		this.keyModel = keyModel;
+		this.valueModel = valueModel;
+	}
+
+	public ClassMapModel(final Type listTypeKey, final Type listTypeValue, final ModelGroup previousModel)
+			throws IOException {
+		this.keyModel = getModel(listTypeKey, previousModel);
+		this.valueModel = getModel(listTypeValue, previousModel);
+	}
+
+	public ClassMapModel(final ParameterizedType listType, final ModelGroup previousModel) throws IOException {
+		this.keyModel = getModel(listType.getActualTypeArguments()[0], previousModel);
+		this.valueModel = getModel(listType.getActualTypeArguments()[1], previousModel);
+	}
+
+	@Override
+	public String toString() {
+		return "ClassMapModel [keyModel=" + this.keyModel + ", valueModel=" + this.valueModel + "]";
+	}
+
+	@Override
+	public void analyze(final ModelGroup group) throws IOException {
+		throw new IOException("Analyze can not be done at this phase for Map...");
+	}
+
+	@Override
+	public Set<ClassModel> getAlls() {
+		final Set<ClassModel> out = new HashSet<>(this.keyModel.getAlls());
+		out.addAll(this.valueModel.getAlls());
+		return out;
+	}
+
+	@Override
+	public Set<ClassModel> getDependencyGroupModels() {
+		final Set<ClassModel> out = new HashSet<>(this.valueModel.getDependencyGroupModels());
+		out.addAll(this.keyModel.getDependencyGroupModels());
+		return out;
+	}
+}

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

@@ -0,0 +1,78 @@
+package org.kar.archidata.externalRestApi.model;
+
+import java.io.IOException;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public abstract class ClassModel {
+	protected boolean analyzeDone = false;
+	protected Class<?> originClasses = null;
+	protected List<ClassModel> dependencyModels = new ArrayList<>();
+
+	public Class<?> getOriginClasses() {
+		return this.originClasses;
+	}
+
+	protected boolean isCompatible(final Class<?> clazz) {
+		return this.originClasses == clazz;
+	}
+
+	public List<ClassModel> getDependencyModels() {
+		return this.dependencyModels;
+	}
+
+	public abstract Set<ClassModel> getDependencyGroupModels();
+
+	public static ClassModel getModel(final Type type, final ModelGroup previousModel) throws IOException {
+		if (type instanceof final ParameterizedType paramType) {
+			final Type[] typeArguments = paramType.getActualTypeArguments();
+			if (paramType.getRawType() == List.class) {
+				return new ClassListModel(typeArguments[0], previousModel);
+			}
+			if (paramType.getRawType() == Map.class) {
+				return new ClassMapModel(typeArguments[0], typeArguments[1], previousModel);
+			}
+			throw new IOException("Fail to manage parametrized type...");
+		}
+		return previousModel.add((Class<?>) type);
+	}
+
+	public static ClassModel getModelBase(
+			final Class<?> clazz,
+			final Type parameterizedType,
+			final ModelGroup previousModel) throws IOException {
+		/*
+		if (clazz == List.class) {
+			return new ClassListModel((ParameterizedType) parameterizedType, previousModel);
+		}
+		if (clazz == Map.class) {
+			return new ClassMapModel((ParameterizedType) parameterizedType, previousModel);
+		}
+		return previousModel.add(clazz);
+		*/
+		return getModel(parameterizedType, previousModel);
+	}
+
+	public static ClassModel getModel(final Class<?> type, final ModelGroup previousModel) throws IOException {
+		if (type == List.class) {
+			throw new IOException("Fail to manage parametrized type...");
+		}
+		if (type == Map.class) {
+			throw new IOException("Fail to manage parametrized type...");
+		}
+		return previousModel.add(type);
+	}
+
+	public abstract void analyze(final ModelGroup group) throws Exception;
+
+	public abstract Set<ClassModel> getAlls();
+
+	public List<String> getReadOnlyField() {
+		return List.of();
+	}
+
+}

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

@@ -0,0 +1,205 @@
+package org.kar.archidata.externalRestApi.model;
+
+import java.lang.reflect.Field;
+import java.sql.Timestamp;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+import org.kar.archidata.annotation.AnnotationTools;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ClassObjectModel extends ClassModel {
+	static final Logger LOGGER = LoggerFactory.getLogger(ClassObjectModel.class);
+
+	public ClassObjectModel(final Class<?> clazz) {
+		this.originClasses = clazz;
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder out = new StringBuilder();
+		out.append("ClassObjectModel [");
+		out.append(this.originClasses.getCanonicalName());
+		out.append("]");
+		return out.toString();
+	}
+
+	private static boolean isFieldFromSuperClass(final Class<?> model, final String filedName) {
+		final Class<?> superClass = model.getSuperclass();
+		if (superClass == null) {
+			return false;
+		}
+		for (final Field field : superClass.getFields()) {
+			String name;
+			try {
+				name = AnnotationTools.getFieldName(field);
+				if (filedName.equals(name)) {
+					return true;
+				}
+			} catch (final Exception e) {
+				// TODO Auto-generated catch block
+				LOGGER.trace("Catch error field name in parent create data table: {}", e.getMessage());
+			}
+		}
+		return false;
+	}
+
+	public record FieldProperty(
+			String name,
+			ClassModel model,
+			String comment,
+			int limitSize,
+			Boolean readOnly,
+			Boolean notNull,
+			Boolean columnNotNull,
+			Boolean nullable) {
+
+		public FieldProperty(final String name, final ClassModel model, final String comment, final int limitSize,
+				final Boolean readOnly, final Boolean notNull, final Boolean columnNotNull, final Boolean nullable) {
+			this.name = name;
+			this.model = model;
+			this.comment = comment;
+			this.limitSize = limitSize;
+			this.readOnly = readOnly;
+			this.notNull = notNull;
+			this.columnNotNull = columnNotNull;
+			this.nullable = nullable;
+
+		}
+
+		public FieldProperty(final Field field, final ModelGroup previous) throws Exception {
+			this(field.getName(), //
+					ClassModel.getModel(field.getGenericType(), previous), //
+					AnnotationTools.getComment(field), //
+					AnnotationTools.getLimitSize(field), //
+					AnnotationTools.getSchemaReadOnly(field), //
+					AnnotationTools.getConstraintsNotNull(field), //
+					AnnotationTools.getColumnNotNull(field), //
+					AnnotationTools.getNullable(field));
+		}
+
+	}
+
+	String name = "";
+	boolean isPrimitive = false;
+	String description = null;
+	String example = null;
+	ClassModel extendsClass = null;
+	List<FieldProperty> fields = new ArrayList<>();
+
+	public String getName() {
+		return this.name;
+	}
+
+	public boolean isPrimitive() {
+		return this.isPrimitive;
+	}
+
+	public String getDescription() {
+		return this.description;
+	}
+
+	public String getExample() {
+		return this.example;
+	}
+
+	public ClassModel getExtendsClass() {
+		return this.extendsClass;
+	}
+
+	public List<FieldProperty> getFields() {
+		return this.fields;
+	}
+
+	@Override
+	public void analyze(final ModelGroup previous) throws Exception {
+		if (this.analyzeDone) {
+			return;
+		}
+		this.analyzeDone = true;
+		final Class<?> clazz = this.originClasses;
+		this.isPrimitive = clazz.isPrimitive();
+		if (this.isPrimitive) {
+			return;
+		}
+		final List<Class<?>> basicClass = List.of(Void.class, void.class, Character.class, char.class, Short.class,
+				short.class, Integer.class, int.class, Long.class, long.class, Float.class, float.class, Double.class,
+				double.class, Date.class, Timestamp.class, LocalDate.class, LocalTime.class);
+		if (basicClass.contains(clazz)) {
+			return;
+		}
+
+		// Local generation of class:
+		LOGGER.trace("parse class: '{}'", clazz.getCanonicalName());
+		final List<String> alreadyAdded = new ArrayList<>();
+		for (final Field elem : clazz.getFields()) {
+			if (java.lang.reflect.Modifier.isStatic(elem.getModifiers())) {
+				continue;
+			}
+			final String dataName = elem.getName();
+			if (isFieldFromSuperClass(clazz, dataName)) {
+				LOGGER.trace("        SKIP:  '{}'", elem.getName());
+				continue;
+			}
+			if (alreadyAdded.contains(dataName)) {
+				LOGGER.trace("        SKIP2: '{}'", elem.getName());
+				continue;
+			}
+			alreadyAdded.add(dataName);
+			LOGGER.trace("        + '{}'", elem.getName());
+			LOGGER.trace("Create type for: {} ==> {}", AnnotationTools.getFieldName(elem), elem.getType());
+			final FieldProperty porperty = new FieldProperty(elem, previous);
+			for (final ClassModel depModel : porperty.model().getAlls()) {
+				if (!this.dependencyModels.contains(depModel)) {
+					this.dependencyModels.add(depModel);
+				}
+			}
+			this.fields.add(new FieldProperty(elem, previous));
+		}
+		this.name = clazz.getName();
+
+		final String[] elems = this.name.split("\\$");
+		if (elems.length == 2) {
+			LOGGER.warn("Can have conflict in generation: {} (Remove class path) ==> {}", this.name, elems[1]);
+			this.name = elems[1];
+		}
+		this.description = AnnotationTools.getSchemaDescription(clazz);
+		this.example = AnnotationTools.getSchemaExample(clazz);
+		final Class<?> parentClass = clazz.getSuperclass();
+		// manage heritage
+		if (parentClass != null && parentClass != Object.class && parentClass != Record.class) {
+			this.extendsClass = previous.add(parentClass);
+			this.dependencyModels.add(this.extendsClass);
+		}
+	}
+
+	@Override
+	public Set<ClassModel> getDependencyGroupModels() {
+		return Set.of(this);
+	}
+
+	@Override
+	public Set<ClassModel> getAlls() {
+		return Set.of(this);
+	}
+
+	@Override
+	public List<String> getReadOnlyField() {
+		final List<String> out = new ArrayList<>();
+		for (final FieldProperty field : this.fields) {
+			if (field.readOnly()) {
+				out.add(field.name);
+			}
+		}
+		if (this.extendsClass != null) {
+			out.addAll(this.extendsClass.getReadOnlyField());
+		}
+		return out;
+	}
+
+}

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

@@ -0,0 +1,53 @@
+package org.kar.archidata.externalRestApi.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jakarta.ws.rs.core.Response;
+
+public class ModelGroup {
+	static final Logger LOGGER = LoggerFactory.getLogger(ModelGroup.class);
+	public List<ClassModel> models = new ArrayList<>();
+
+	public ModelGroup() {}
+
+	public void addAll(final List<Class<?>> classes) {
+		for (final Class<?> clazz : classes) {
+			add(clazz);
+		}
+	}
+
+	public ClassModel add(Class<?> clazz) {
+		if (clazz == Response.class) {
+			clazz = Object.class;
+		}
+		if (clazz == Number.class) {
+			return null;
+		}
+		//LOGGER.trace("Search element {}", clazz.getCanonicalName());
+		for (final ClassModel value : this.models) {
+			if (value.isCompatible(clazz)) {
+				//LOGGER.trace("  ==> return {}", value);
+				return value;
+			}
+		}
+		if (clazz.isEnum()) {
+			final ClassModel elem = new ClassEnumModel(clazz);
+			this.models.add(elem);
+			//LOGGER.trace("  ==> return enum {}", elem);
+			return elem;
+		}
+		// create new model:
+		final ClassModel elem = new ClassObjectModel(clazz);
+		this.models.add(elem);
+		//LOGGER.trace("  ==> return object {}", elem);
+		return elem;
+	}
+
+	public List<ClassModel> getModels() {
+		return this.models;
+	}
+}

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

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

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

@@ -4,8 +4,8 @@ import org.kar.archidata.annotation.DataDeleted;
 import org.kar.archidata.annotation.DataNotRead;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.annotation.Nullable;
 import jakarta.persistence.Column;
-import jakarta.validation.constraints.NotNull;
 import jakarta.ws.rs.DefaultValue;
 
 public class GenericDataSoftDelete extends GenericData {
@@ -13,7 +13,7 @@ public class GenericDataSoftDelete extends GenericData {
 	@Column(nullable = false)
 	@DefaultValue("'0'")
 	@DataDeleted
-	@NotNull
 	@Schema(description = "Deleted state", hidden = true, required = false, readOnly = true)
+	@Nullable
 	public Boolean deleted = null;
 }

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

@@ -9,23 +9,23 @@ import org.kar.archidata.annotation.UpdateTimestamp;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.annotation.Nullable;
 import jakarta.persistence.Column;
-import jakarta.validation.constraints.NotNull;
 
 public class GenericTiming {
 	@DataNotRead
 	@CreationTimestamp
 	@Column(nullable = false)
-	@NotNull
 	@Schema(description = "Create time of the object", required = false, example = "2000-01-23T01:23:45.678+01:00", readOnly = true)
 	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+	@Nullable
 	public Date createdAt = null;
 	@DataNotRead
 	@UpdateTimestamp
 	@Column(nullable = false)
-	@NotNull
 	@Schema(description = "When update the object", required = false, example = "2000-01-23T00:23:45.678Z", readOnly = true)
 	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
 	// public Instant updatedAt = null;
+	@Nullable
 	public Date updatedAt = null;
 }

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

@@ -5,6 +5,7 @@ import java.util.UUID;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.Column;
 import jakarta.persistence.Id;
+import jakarta.validation.constraints.NotNull;
 import jakarta.ws.rs.DefaultValue;
 
 public class UUIDGenericData extends GenericTiming {
@@ -12,5 +13,6 @@ public class UUIDGenericData extends GenericTiming {
 	@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")
+	@NotNull
 	public UUID uuid = null;
 }

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

@@ -4,8 +4,8 @@ import org.kar.archidata.annotation.DataDeleted;
 import org.kar.archidata.annotation.DataNotRead;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.annotation.Nullable;
 import jakarta.persistence.Column;
-import jakarta.validation.constraints.NotNull;
 import jakarta.ws.rs.DefaultValue;
 
 public class UUIDGenericDataSoftDelete extends UUIDGenericData {
@@ -13,7 +13,7 @@ public class UUIDGenericDataSoftDelete extends UUIDGenericData {
 	@Column(nullable = false)
 	@DefaultValue("'0'")
 	@DataDeleted
-	@NotNull
 	@Schema(description = "Deleted state", hidden = true, required = false, readOnly = true)
+	@Nullable
 	public Boolean deleted = null;
 }

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

@@ -16,6 +16,7 @@ CREATE TABLE `user` (
 
 import java.sql.Timestamp;
 import java.util.List;
+import java.util.UUID;
 
 import org.kar.archidata.annotation.DataIfNotExists;
 import org.kar.archidata.annotation.DataJson;
@@ -24,6 +25,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.annotation.Nullable;
 import jakarta.persistence.Column;
 import jakarta.persistence.Table;
 import jakarta.ws.rs.DefaultValue;
@@ -49,7 +51,8 @@ public class User extends GenericDataSoftDelete {
 
 	@Schema(description = "List of Id of the specific covers")
 	@DataJson(targetEntity = Data.class)
-	public List<Long> covers;
+	@Nullable
+	public List<UUID> covers;
 
 	@Override
 	public String toString() {

src/resources/rest-tools.ts

@@ -4,25 +4,25 @@
  * @license MPL-2
  */
 
-import { RestErrorResponse } from "./model"
+import { RestErrorResponse } from "./model";
 
 export enum HTTPRequestModel {
-    DELETE = 'DELETE',
-    GET = 'GET',
-    PATCH = 'PATCH',
-    POST = 'POST',
-    PUT = 'PUT',
+    DELETE = "DELETE",
+    GET = "GET",
+    PATCH = "PATCH",
+    POST = "POST",
+    PUT = "PUT",
 }
 export enum HTTPMimeType {
-    ALL = '*/*',
-    CSV = 'text/csv',
-    IMAGE = 'image/*',
-    IMAGE_JPEG = 'image/jpeg',
-    IMAGE_PNG = 'image/png',
-    JSON = 'application/json',
-    MULTIPART = 'multipart/form-data',
-    OCTET_STREAM = 'application/octet-stream',
-    TEXT_PLAIN = 'text/plain',
+    ALL = "*/*",
+    CSV = "text/csv",
+    IMAGE = "image/*",
+    IMAGE_JPEG = "image/jpeg",
+    IMAGE_PNG = "image/png",
+    JSON = "application/json",
+    MULTIPART = "multipart/form-data",
+    OCTET_STREAM = "application/octet-stream",
+    TEXT_PLAIN = "text/plain",
 }
 
 export interface RESTConfig {
@@ -50,23 +50,6 @@ export interface ModelResponseHttp {
     data: any;
 }
 
-export function isArrayOf<TYPE>(
-    data: any,
-    typeChecker: (subData: any) => subData is TYPE,
-    length?: number
-): data is TYPE[] {
-    if (!Array.isArray(data)) {
-        return false;
-    }
-    if (!data.every(typeChecker)) {
-        return false;
-    }
-    if (length !== undefined && data.length != length) {
-        return false;
-    }
-    return true;
-}
-
 function isNullOrUndefined(data: any): data is undefined | null {
     return data === undefined || data === null;
 }
@@ -75,25 +58,24 @@ function isNullOrUndefined(data: any): data is undefined | null {
 export type ProgressCallback = (count: number, total: number) => void;
 
 export interface RESTAbort {
-    abort?: () => boolean
+    abort?: () => boolean;
 }
 
-
 // Rest generic callback have a basic model to upload and download advancement.
 export interface RESTCallbacks {
-    progressUpload?: ProgressCallback,
-    progressDownload?: ProgressCallback,
-    abortHandle?: RESTAbort,
-};
+    progressUpload?: ProgressCallback;
+    progressDownload?: ProgressCallback;
+    abortHandle?: RESTAbort;
+}
 
 export interface RESTRequestType {
-    restModel: RESTModel,
-    restConfig: RESTConfig,
-    data?: any,
-    params?: object,
-    queries?: object,
-    callback?: RESTCallbacks,
-};
+    restModel: RESTModel;
+    restConfig: RESTConfig;
+    data?: any;
+    params?: object;
+    queries?: object;
+    callback?: RESTCallbacks;
+}
 
 function replaceAll(input, searchValue, replaceValue) {
     return input.split(searchValue).join(replaceValue);
@@ -103,24 +85,34 @@ function removeTrailingSlashes(input: string): string {
     if (isNullOrUndefined(input)) {
         return "undefined";
     }
-    return input.replace(/\/+$/, '');
+    return input.replace(/\/+$/, "");
 }
 function removeLeadingSlashes(input: string): string {
     if (isNullOrUndefined(input)) {
         return "";
     }
-    return input.replace(/^\/+/, '');
+    return input.replace(/^\/+/, "");
 }
 
-export function RESTUrl({ restModel, restConfig, 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)}`;
+    let generateUrl = `${removeTrailingSlashes(
+        restConfig.server
+    )}/${removeLeadingSlashes(restModel.endPoint)}`;
     if (params !== undefined) {
         for (let key of Object.keys(params)) {
             generateUrl = replaceAll(generateUrl, `{${key}}`, `${params[key]}`);
         }
     }
-    if (queries === undefined && (restConfig.token === undefined || restModel.tokenInUrl !== true)) {
+    if (
+        queries === undefined &&
+        (restConfig.token === undefined || restModel.tokenInUrl !== true)
+    ) {
         return generateUrl;
     }
     const searchParams = new URLSearchParams();
@@ -128,8 +120,8 @@ export function RESTUrl({ restModel, restConfig, params, queries }: RESTRequestT
         for (let key of Object.keys(queries)) {
             const value = queries[key];
             if (Array.isArray(value)) {
-                for (let iii = 0; iii < value.length; iii++) {
-                    searchParams.append(`${key}`, `${value[iii]}`);
+                for (const element of value) {
+                    searchParams.append(`${key}`, `${element}`);
                 }
             } else {
                 searchParams.append(`${key}`, `${value}`);
@@ -137,36 +129,43 @@ export function RESTUrl({ restModel, restConfig, params, queries }: RESTRequestT
         }
     }
     if (restConfig.token !== undefined && restModel.tokenInUrl === true) {
-        searchParams.append('Authorization', `Bearer ${restConfig.token}`);
+        searchParams.append("Authorization", `Bearer ${restConfig.token}`);
     }
     return generateUrl + "?" + searchParams.toString();
 }
 
-
-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()
-    }
+export function fetchProgress(
+    generateUrl: string,
+    {
+        method,
+        headers,
+        body,
+    }: {
+        method: HTTPRequestModel;
+        headers: any;
+        body: any;
+    },
+    { progressUpload, progressDownload, abortHandle }: RESTCallbacks
+): Promise<Response> {
+    const xhr: {
+        io?: XMLHttpRequest;
+    } = {
+        io: new XMLHttpRequest(),
+    };
     return new Promise((resolve, reject) => {
         // Stream the upload progress
         if (progressUpload) {
-            xhr.io.upload.addEventListener("progress", (dataEvent) => {
+            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) => {
+            xhr.io?.addEventListener("progress", (dataEvent) => {
                 if (dataEvent.lengthComputable) {
-                    //console.log(`    ==> download progress:: ${dataEvent.loaded} / ${dataEvent.total}`);
-                    progressUpload(dataEvent.loaded, dataEvent.total);
+                    progressDownload(dataEvent.loaded, dataEvent.total);
                 }
             });
         }
@@ -177,38 +176,43 @@ export function fetchProgress(generateUrl: string, { method, headers, body }: {
                     xhr.io.abort();
                     return true;
                 }
-                console.log(`Request abort (FAIL) on the XMLHttpRequest: ${generateUrl}`);
+                console.log(
+                    `Request abort (FAIL) on the XMLHttpRequest: ${generateUrl}`
+                );
                 return false;
-            }
+            };
         }
         // Check if we have an internal Fail:
-        xhr.io.addEventListener('error', () => {
+        xhr.io?.addEventListener("error", () => {
             xhr.io = undefined;
-            reject(new TypeError('Failed to fetch'))
+            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`);
+        xhr.io?.addEventListener("loadend", () => {
+            if (xhr.io?.readyState !== XMLHttpRequest.DONE) {
                 return;
             }
-            if (xhr.io.status === 0) {
+            if (xhr.io?.status === 0) {
                 //the stream has been aborted
-                reject(new TypeError('Fetch 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
+                statusText: xhr.io.statusText,
             });
-            const headersArray = replaceAll(xhr.io.getAllResponseHeaders().trim(), "\r\n", "\n").split('\n');
+            const headersArray = replaceAll(
+                xhr.io.getAllResponseHeaders().trim(),
+                "\r\n",
+                "\n"
+            ).split("\n");
             headersArray.forEach(function (header) {
-                const firstColonIndex = header.indexOf(':');
+                const firstColonIndex = header.indexOf(":");
                 if (firstColonIndex !== -1) {
-                    var key = header.substring(0, firstColonIndex).trim();
-                    var value = header.substring(firstColonIndex + 1).trim();
+                    const key = header.substring(0, firstColonIndex).trim();
+                    const value = header.substring(firstColonIndex + 1).trim();
                     response.headers.set(key, value);
                 } else {
                     response.headers.set(header, "");
@@ -217,31 +221,38 @@ export function fetchProgress(generateUrl: string, { method, headers, body }: {
             xhr.io = undefined;
             resolve(response);
         });
-        xhr.io.open(method, generateUrl, true);
+        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?.setRequestHeader(key, value as string);
             }
         }
-        xhr.io.send(body);
+        xhr.io?.send(body);
     });
 }
 
-export function RESTRequest({ restModel, restConfig, data, params, queries, callback }: RESTRequestType): Promise<ModelResponseHttp> {
+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 = {};
     if (restConfig.token !== undefined && restModel.tokenInUrl !== true) {
-        headers['Authorization'] = `Bearer ${restConfig.token}`;
+        headers["Authorization"] = `Bearer ${restConfig.token}`;
     }
     if (restModel.accept !== undefined) {
-        headers['Accept'] = restModel.accept;
+        headers["Accept"] = restModel.accept;
     }
     if (restModel.requestType !== HTTPRequestModel.GET) {
         // if Get we have not a content type, the body is empty
         if (restModel.contentType !== HTTPMimeType.MULTIPART) {
             // special case of multi-part ==> no content type otherwise the browser does not set the ";bundary=--****"
-            headers['Content-Type'] = restModel.contentType;
+            headers["Content-Type"] = restModel.contentType;
         }
     }
     let body = data;
@@ -252,14 +263,16 @@ export function RESTRequest({ restModel, restConfig, data, params, queries, call
         for (const name in data) {
             formData.append(name, data[name]);
         }
-        body = formData
+        body = formData;
     }
     return new Promise((resolve, reject) => {
         let action: undefined | Promise<Response> = undefined;
-        if (isNullOrUndefined(callback)
-            || (isNullOrUndefined(callback.progressDownload)
-                && isNullOrUndefined(callback.progressUpload)
-                && isNullOrUndefined(callback.abortHandle))) {
+        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,
@@ -268,37 +281,46 @@ export function RESTRequest({ restModel, restConfig, data, params, queries, call
             });
         } else {
             // need progression information: call old fetch model (XMLHttpRequest) that permit to keep % upload and % download for HTTP1.x
-            action = fetchProgress(generateUrl, {
+            action = fetchProgress(
+                generateUrl,
+                {
                     method: restModel.requestType ?? HTTPRequestModel.GET,
                     headers,
                     body,
-            }, callback);
+                },
+                callback
+            );
         }
-        action.then((response: Response) => {
+        action
+            .then((response: Response) => {
                 if (response.status >= 200 && response.status <= 299) {
-                const contentType = response.headers.get('Content-Type');
-				if (!isNullOrUndefined(restModel.accept) && restModel.accept !== contentType) {
+                    const contentType = response.headers.get("Content-Type");
+                    if (
+                        !isNullOrUndefined(restModel.accept) &&
+                        restModel.accept !== contentType
+                    ) {
                         reject({
+                            name: "Model accept type incompatible",
                             time: Date().toString(),
                             status: 901,
                             error: `REST check wrong type: ${restModel.accept} != ${contentType}`,
                             statusMessage: "Fetch error",
-                        message: "rest-tools.ts Wrong type in the message return type"
+                            message: "rest-tools.ts Wrong type in the message return type",
                         } as RestErrorResponse);
                     } else if (contentType === HTTPMimeType.JSON) {
                         response
                             .json()
                             .then((value: any) => {
-                            //console.log(`RECEIVE ==> ${response.status}=${ JSON.stringify(value, null, 2)}`);
                                 resolve({ status: response.status, data: value });
                             })
                             .catch((reason: any) => {
                                 reject({
+                                    name: "API serialization error",
                                     time: Date().toString(),
                                     status: 902,
                                     error: `REST parse json fail: ${reason}`,
                                     statusMessage: "Fetch parse error",
-                                message: "rest-tools.ts Wrong message model to parse"
+                                    message: "rest-tools.ts Wrong message model to parse",
                                 } as RestErrorResponse);
                             });
                     } else {
@@ -306,64 +328,52 @@ export function RESTRequest({ restModel, restConfig, data, params, queries, call
                     }
                 } else {
                     reject({
+                        name: "REST return no OK status",
                         time: Date().toString(),
                         status: response.status,
                         error: `${response.body}`,
                         statusMessage: "Fetch code error",
-                    message: "rest-tools.ts Wrong return code"
+                        message: "rest-tools.ts Wrong return code",
                     } as RestErrorResponse);
                 }
-        }).catch((error: any) => {
+            })
+            .catch((error: any) => {
                 reject({
+                    name: "Request fail",
                     time: Date(),
                     status: 999,
                     error: error,
                     statusMessage: "Fetch catch error",
-                message: "rest-tools.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> {
+export function RESTRequestJson<TYPE>(
+    request: RESTRequestType,
+    checker?: (data: any) => data is TYPE
+): Promise<TYPE> {
     return new Promise((resolve, reject) => {
-        RESTRequest(request).then((value: ModelResponseHttp) => {
+        RESTRequest(request)
+            .then((value: ModelResponseHttp) => {
                 if (isNullOrUndefined(checker)) {
                     console.log(`Have no check of MODEL in API: ${RESTUrl(request)}`);
                     resolve(value.data);
-            } else if (checker(value.data)) {
+                } else if (checker === undefined || checker(value.data)) {
                     resolve(value.data);
                 } else {
                     reject({
+                        name: "Model check fail",
                         time: Date().toString(),
                         status: 950,
                         error: "REST Fail to verify the data",
                         statusMessage: "API cast ERROR",
-                    message: "api.ts Check type as fail"
+                        message: "api.ts Check type as fail",
                     } as RestErrorResponse);
                 }
-        }).catch((reason: RestErrorResponse) => {
-            reject(reason);
-        });
-    });
-}
-export function RESTRequestJsonArray<TYPE>(request: RESTRequestType, checker: (data: any) => data is TYPE): Promise<TYPE[]> {
-    return new Promise((resolve, reject) => {
-        RESTRequest(request).then((value: ModelResponseHttp) => {
-            if (isArrayOf(value.data, checker)) {
-                resolve(value.data);
-            } else {
-                reject({
-                    time: Date().toString(),
-                    status: 950,
-                    error: "REST Fail to verify the data",
-                    statusMessage: "API cast ERROR",
-                    message: "api.ts Check type as fail"
-                } as RestErrorResponse);
-            }
-        }).catch((reason: RestErrorResponse) => {
+            })
+            .catch((reason: RestErrorResponse) => {
                 reject(reason);
             });
     });
@@ -371,9 +381,11 @@ export function RESTRequestJsonArray<TYPE>(request: RESTRequestType, checker: (d
 
 export function RESTRequestVoid(request: RESTRequestType): Promise<void> {
     return new Promise((resolve, reject) => {
-        RESTRequest(request).then((value: ModelResponseHttp) => {
+        RESTRequest(request)
+            .then((value: ModelResponseHttp) => {
                 resolve();
-        }).catch((reason: RestErrorResponse) => {
+            })
+            .catch((reason: RestErrorResponse) => {
                 reject(reason);
             });
     });

test/src/test/kar/archidata/externalRestApi/TestAnalyzeApiName.java

@@ -0,0 +1,47 @@
+package test.kar.archidata.externalRestApi;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.kar.archidata.externalRestApi.AnalyzeApi;
+import org.kar.archidata.externalRestApi.model.ApiModel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jakarta.ws.rs.GET;
+
+public class TestAnalyzeApiName {
+	final static private Logger LOGGER = LoggerFactory.getLogger(TestAnalyzeApiName.class);
+
+	public class ApiName {
+		@GET
+		public void firstName() {
+
+		}
+
+		@GET
+		public void SecondName() {
+
+		}
+	}
+
+	@Test
+	public void testNames() throws Exception {
+		final AnalyzeApi api = new AnalyzeApi();
+		api.addAllApi(List.of(ApiName.class));
+
+		Assertions.assertEquals(1, api.getAllApi().size());
+		Assertions.assertEquals("ApiName", api.getAllApi().get(0).name);
+		Assertions.assertEquals(2, api.getAllApi().get(0).interfaces.size());
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("firstName");
+			Assertions.assertNotNull(model);
+		}
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("SecondName");
+			Assertions.assertNotNull(model);
+		}
+	}
+
+}

test/src/test/kar/archidata/externalRestApi/TestAnalyzeApiParameterType.java

@@ -0,0 +1,143 @@
+package test.kar.archidata.externalRestApi;
+
+import java.util.List;
+import java.util.Map;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.kar.archidata.externalRestApi.AnalyzeApi;
+import org.kar.archidata.externalRestApi.model.ApiModel;
+import org.kar.archidata.externalRestApi.model.ClassEnumModel;
+import org.kar.archidata.externalRestApi.model.ClassListModel;
+import org.kar.archidata.externalRestApi.model.ClassMapModel;
+import org.kar.archidata.externalRestApi.model.ClassObjectModel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jakarta.ws.rs.GET;
+
+public class TestAnalyzeApiParameterType {
+	final static private Logger LOGGER = LoggerFactory.getLogger(TestAnalyzeApiParameterType.class);
+
+	public enum TestEnum {
+		PLOP, PLIP
+	}
+
+	public class TestObject {
+		public int value;
+	}
+
+	public class BasicParameter {
+		@GET
+		public void setInteger1(final int parameter) {}
+
+		@GET
+		public void setInteger2(final Integer parameter) {}
+
+		@GET
+		public void setString(final String parameter) {}
+
+		@GET
+		public void setObject(final TestObject parameter) {}
+
+		@GET
+		public void setEnum(final TestEnum parameter) {}
+	}
+
+	@Test
+	public void testBasicParameter() throws Exception {
+		final AnalyzeApi api = new AnalyzeApi();
+		api.addAllApi(List.of(BasicParameter.class));
+
+		Assertions.assertEquals(1, api.getAllApi().size());
+		Assertions.assertEquals(5, api.getAllApi().get(0).interfaces.size());
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("setInteger1");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals(1, model.unnamedElement.size());
+			final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
+					model.unnamedElement.get(0));
+			Assertions.assertEquals(int.class, classModel.getOriginClasses());
+		}
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("setInteger2");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals(1, model.unnamedElement.size());
+			final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
+					model.unnamedElement.get(0));
+			Assertions.assertEquals(Integer.class, classModel.getOriginClasses());
+		}
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("setString");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals(1, model.unnamedElement.size());
+			final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
+					model.unnamedElement.get(0));
+			Assertions.assertEquals(String.class, classModel.getOriginClasses());
+		}
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("setObject");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals(1, model.unnamedElement.size());
+			final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
+					model.unnamedElement.get(0));
+			Assertions.assertEquals(TestObject.class, classModel.getOriginClasses());
+		}
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("setEnum");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals(1, model.unnamedElement.size());
+			final ClassEnumModel classModel = Assertions.assertInstanceOf(ClassEnumModel.class,
+					model.unnamedElement.get(0));
+			Assertions.assertEquals(TestEnum.class, classModel.getOriginClasses());
+		}
+
+	}
+
+	public class ListParameter {
+		@GET
+		public void setList(final List<Integer> parameter) {}
+	}
+
+	@Test
+	public void testListParameter() throws Exception {
+		final AnalyzeApi api = new AnalyzeApi();
+		api.addAllApi(List.of(ListParameter.class));
+
+		Assertions.assertEquals(1, api.getAllApi().size());
+		Assertions.assertEquals(1, api.getAllApi().get(0).interfaces.size());
+		final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("setList");
+		Assertions.assertNotNull(model);
+		Assertions.assertEquals(1, model.unnamedElement.size());
+		final ClassListModel classModel = Assertions.assertInstanceOf(ClassListModel.class,
+				model.unnamedElement.get(0));
+		final ClassObjectModel classModelValue = Assertions.assertInstanceOf(ClassObjectModel.class,
+				classModel.valueModel);
+		Assertions.assertEquals(Integer.class, classModelValue.getOriginClasses());
+
+	}
+
+	public class MapParameter {
+		@GET
+		public void setMap(final Map<String, Integer> parameter) {}
+	}
+
+	@Test
+	public void testMapParameter() throws Exception {
+		final AnalyzeApi api = new AnalyzeApi();
+		api.addAllApi(List.of(MapParameter.class));
+
+		Assertions.assertEquals(1, api.getAllApi().size());
+		Assertions.assertEquals(1, api.getAllApi().get(0).interfaces.size());
+		final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("setMap");
+		Assertions.assertNotNull(model);
+		Assertions.assertEquals(1, model.unnamedElement.size());
+		final ClassMapModel classModel = Assertions.assertInstanceOf(ClassMapModel.class, model.unnamedElement.get(0));
+		final ClassObjectModel classModelKey = Assertions.assertInstanceOf(ClassObjectModel.class, classModel.keyModel);
+		Assertions.assertEquals(String.class, classModelKey.getOriginClasses());
+		final ClassObjectModel classModelValue = Assertions.assertInstanceOf(ClassObjectModel.class,
+				classModel.valueModel);
+		Assertions.assertEquals(Integer.class, classModelValue.getOriginClasses());
+
+	}
+}

test/src/test/kar/archidata/externalRestApi/TestAnalyzeApiPath.java

@@ -0,0 +1,107 @@
+package test.kar.archidata.externalRestApi;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.kar.archidata.externalRestApi.AnalyzeApi;
+import org.kar.archidata.externalRestApi.model.ApiModel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+
+public class TestAnalyzeApiPath {
+	final static private Logger LOGGER = LoggerFactory.getLogger(TestAnalyzeApiPath.class);
+
+	public class NoPath {
+		@GET
+		public void noPath() {
+
+		}
+
+		@GET
+		@Path("plop")
+		public void withPath() {
+
+		}
+
+		@GET
+		@Path("/plop")
+		public void withPath2() {
+
+		}
+	}
+
+	@Test
+	public void testNoPath() throws Exception {
+		final AnalyzeApi api = new AnalyzeApi();
+		api.addAllApi(List.of(NoPath.class));
+
+		Assertions.assertEquals(1, api.getAllApi().size());
+		Assertions.assertEquals("", api.getAllApi().get(0).restEndPoint);
+		Assertions.assertEquals(3, api.getAllApi().get(0).interfaces.size());
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("noPath");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals("/", model.restEndPoint);
+		}
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("withPath");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals("/plop", model.restEndPoint);
+		}
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("withPath2");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals("//plop", model.restEndPoint);
+		}
+	}
+
+	@Path("/kaboom")
+	public class WithPath {
+		@GET
+		public void noPath() {
+
+		}
+
+		@GET
+		@Path("plop")
+		public void withPath() {
+
+		}
+
+		@GET
+		@Path("/plop")
+		public void withPath2() {
+
+		}
+	}
+
+	@Test
+	public void testWithPath() throws Exception {
+		final AnalyzeApi api = new AnalyzeApi();
+		api.addAllApi(List.of(WithPath.class));
+
+		Assertions.assertEquals(1, api.getAllApi().size());
+		Assertions.assertEquals("/kaboom", api.getAllApi().get(0).restEndPoint);
+		Assertions.assertEquals(3, api.getAllApi().get(0).interfaces.size());
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("noPath");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals("/kaboom/", model.restEndPoint);
+		}
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("withPath");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals("/kaboom/plop", model.restEndPoint);
+		}
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("withPath2");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals("/kaboom//plop", model.restEndPoint);
+		}
+	}
+
+}

test/src/test/kar/archidata/externalRestApi/TestAnalyzeApiReturn.java

@@ -0,0 +1,605 @@
+package test.kar.archidata.externalRestApi;
+
+import java.util.List;
+import java.util.Map;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.kar.archidata.externalRestApi.AnalyzeApi;
+import org.kar.archidata.externalRestApi.model.ApiModel;
+import org.kar.archidata.externalRestApi.model.ClassEnumModel;
+import org.kar.archidata.externalRestApi.model.ClassListModel;
+import org.kar.archidata.externalRestApi.model.ClassMapModel;
+import org.kar.archidata.externalRestApi.model.ClassObjectModel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.core.Response;
+
+public class TestAnalyzeApiReturn {
+	final static private Logger LOGGER = LoggerFactory.getLogger(TestAnalyzeApiReturn.class);
+
+	public enum TestEnum {
+		PLOP, PLIP
+	}
+
+	public class TestObject {
+		public int value;
+	}
+
+	public class ReturnValueVoid {
+		@GET
+		public void getVoid1() {}
+
+		@GET
+		public Void getVoid2() {
+			return null;
+		}
+	}
+
+	@Test
+	public void testReturnVoid() throws Exception {
+		final AnalyzeApi api = new AnalyzeApi();
+		api.addAllApi(List.of(ReturnValueVoid.class));
+
+		Assertions.assertEquals(1, api.getAllApi().size());
+		Assertions.assertEquals(2, api.getAllApi().get(0).interfaces.size());
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getVoid1");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals(1, model.returnTypes.size());
+			final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
+					model.returnTypes.get(0));
+			Assertions.assertEquals(void.class, classModel.getOriginClasses());
+		}
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getVoid2");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals(1, model.returnTypes.size());
+			final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
+					model.returnTypes.get(0));
+			Assertions.assertEquals(Void.class, classModel.getOriginClasses());
+		}
+
+	}
+
+	public class ReturnValueInteger {
+		@GET
+		public int getInteger1() {
+			return 0;
+		}
+
+		@GET
+		public Integer getInteger2() {
+			return 0;
+		}
+
+	}
+
+	@Test
+	public void testReturnInteger() throws Exception {
+		final AnalyzeApi api = new AnalyzeApi();
+		api.addAllApi(List.of(ReturnValueInteger.class));
+
+		Assertions.assertEquals(1, api.getAllApi().size());
+		Assertions.assertEquals(2, api.getAllApi().get(0).interfaces.size());
+		// Check int
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getInteger1");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals(1, model.returnTypes.size());
+			final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
+					model.returnTypes.get(0));
+			Assertions.assertEquals(int.class, classModel.getOriginClasses());
+		}
+		// Check Integer
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getInteger2");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals(1, model.returnTypes.size());
+			final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
+					model.returnTypes.get(0));
+			Assertions.assertEquals(Integer.class, classModel.getOriginClasses());
+		}
+
+	}
+
+	public class ReturnValueShort {
+		@GET
+		public short getShort1() {
+			return 0;
+		}
+
+		@GET
+		public Short getShort2() {
+			return 0;
+		}
+
+	}
+
+	@Test
+	public void testReturnShort() throws Exception {
+		final AnalyzeApi api = new AnalyzeApi();
+		api.addAllApi(List.of(ReturnValueShort.class));
+
+		Assertions.assertEquals(1, api.getAllApi().size());
+		Assertions.assertEquals(2, api.getAllApi().get(0).interfaces.size());
+		// Check short
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getShort1");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals(1, model.returnTypes.size());
+			final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
+					model.returnTypes.get(0));
+			Assertions.assertEquals(short.class, classModel.getOriginClasses());
+		}
+		// Check Short
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getShort2");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals(1, model.returnTypes.size());
+			final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
+					model.returnTypes.get(0));
+			Assertions.assertEquals(Short.class, classModel.getOriginClasses());
+		}
+
+	}
+
+	public class ReturnValueLong {
+		@GET
+		public long getLong1() {
+			return 0;
+		}
+
+		@GET
+		public Long getLong2() {
+			return 0L;
+		}
+
+	}
+
+	@Test
+	public void testReturnLong() throws Exception {
+		final AnalyzeApi api = new AnalyzeApi();
+		api.addAllApi(List.of(ReturnValueLong.class));
+
+		Assertions.assertEquals(1, api.getAllApi().size());
+		Assertions.assertEquals(2, api.getAllApi().get(0).interfaces.size());
+		// Check long
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getLong1");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals(1, model.returnTypes.size());
+			final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
+					model.returnTypes.get(0));
+			Assertions.assertEquals(long.class, classModel.getOriginClasses());
+		}
+		// Check Long
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getLong2");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals(1, model.returnTypes.size());
+			Assertions.assertInstanceOf(ClassObjectModel.class, model.returnTypes.get(0));
+			final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
+					model.returnTypes.get(0));
+			Assertions.assertEquals(Long.class, classModel.getOriginClasses());
+		}
+
+	}
+
+	public class ReturnValueFloat {
+		@GET
+		public float getFloat1() {
+			return 0;
+		}
+
+		@GET
+		public Float getFloat2() {
+			return 0.0f;
+		}
+
+	}
+
+	@Test
+	public void testReturnFloat() throws Exception {
+		final AnalyzeApi api = new AnalyzeApi();
+		api.addAllApi(List.of(ReturnValueFloat.class));
+
+		Assertions.assertEquals(1, api.getAllApi().size());
+		Assertions.assertEquals(2, api.getAllApi().get(0).interfaces.size());
+		// Check float
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getFloat1");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals(1, model.returnTypes.size());
+			final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
+					model.returnTypes.get(0));
+			Assertions.assertEquals(float.class, classModel.getOriginClasses());
+		}
+		// Check Float
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getFloat2");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals(1, model.returnTypes.size());
+			final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
+					model.returnTypes.get(0));
+			Assertions.assertEquals(Float.class, classModel.getOriginClasses());
+		}
+
+	}
+
+	public class ReturnValueDouble {
+		@GET
+		public double getDouble1() {
+			return 0;
+		}
+
+		@GET
+		public Double getDouble2() {
+			return 0.0;
+		}
+
+	}
+
+	@Test
+	public void testReturnDouble() throws Exception {
+		final AnalyzeApi api = new AnalyzeApi();
+		api.addAllApi(List.of(ReturnValueDouble.class));
+
+		Assertions.assertEquals(1, api.getAllApi().size());
+		Assertions.assertEquals(2, api.getAllApi().get(0).interfaces.size());
+		// Check double
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getDouble1");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals(1, model.returnTypes.size());
+			final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
+					model.returnTypes.get(0));
+			Assertions.assertEquals(double.class, classModel.getOriginClasses());
+		}
+		// Check Double
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getDouble2");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals(1, model.returnTypes.size());
+			final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
+					model.returnTypes.get(0));
+			Assertions.assertEquals(Double.class, classModel.getOriginClasses());
+		}
+
+	}
+
+	public class ReturnValueString {
+		@GET
+		public String getString() {
+			return "0";
+		}
+
+	}
+
+	@Test
+	public void testReturnString() throws Exception {
+		final AnalyzeApi api = new AnalyzeApi();
+		api.addAllApi(List.of(ReturnValueString.class));
+
+		Assertions.assertEquals(1, api.getAllApi().size());
+		Assertions.assertEquals(1, api.getAllApi().get(0).interfaces.size());
+		// Check String
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getString");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals(1, model.returnTypes.size());
+			final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
+					model.returnTypes.get(0));
+			Assertions.assertEquals(String.class, classModel.getOriginClasses());
+		}
+
+	}
+
+	public class ReturnValueAny {
+		@GET
+		public Response getResponse() {
+			return null;
+		}
+
+		@GET
+		public Object getObject() {
+			return null;
+		}
+	}
+
+	@Test
+	public void testReturnAny() throws Exception {
+		final AnalyzeApi api = new AnalyzeApi();
+		api.addAllApi(List.of(ReturnValueAny.class));
+
+		Assertions.assertEquals(1, api.getAllApi().size());
+		Assertions.assertEquals(2, api.getAllApi().get(0).interfaces.size());
+		// Check Response ==> represent a Any value then it wrapped as Object
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getResponse");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals(1, model.returnTypes.size());
+			final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
+					model.returnTypes.get(0));
+			Assertions.assertEquals(Object.class, classModel.getOriginClasses());
+		}
+		// Check Object
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getObject");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals(1, model.returnTypes.size());
+			final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class,
+					model.returnTypes.get(0));
+			Assertions.assertEquals(Object.class, classModel.getOriginClasses());
+		}
+
+	}
+
+	public class ReturnValueEnum {
+		@GET
+		public TestEnum getEnum() {
+			return TestEnum.PLIP;
+		}
+
+	}
+
+	@Test
+	public void testReturnEnum() throws Exception {
+		final AnalyzeApi api = new AnalyzeApi();
+		api.addAllApi(List.of(ReturnValueEnum.class));
+
+		Assertions.assertEquals(1, api.getAllApi().size());
+		Assertions.assertEquals(1, api.getAllApi().get(0).interfaces.size());
+		// Check Enum
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getEnum");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals(1, model.returnTypes.size());
+			final ClassEnumModel classModel = Assertions.assertInstanceOf(ClassEnumModel.class,
+					model.returnTypes.get(0));
+			Assertions.assertEquals(TestEnum.class, classModel.getOriginClasses());
+		}
+	}
+
+	public class ReturnValueList {
+		@GET
+		public List<Integer> getListInteger() {
+			return null;
+		}
+
+		@GET
+		public List<TestEnum> getListEnum() {
+			return null;
+		}
+
+		@GET
+		public List<TestObject> getListObject() {
+			return null;
+		}
+
+		@GET
+		public List<List<Integer>> getListListInteger() {
+			return null;
+		}
+
+		@GET
+		public List<Map<String, Integer>> getListMapInteger() {
+			return null;
+		}
+
+	}
+
+	@Test
+	public void testReturnList() throws Exception {
+		final AnalyzeApi api = new AnalyzeApi();
+		api.addAllApi(List.of(ReturnValueList.class));
+
+		Assertions.assertEquals(1, api.getAllApi().size());
+		Assertions.assertEquals(5, api.getAllApi().get(0).interfaces.size());
+		// Check List<Integer>
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getListInteger");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals(1, model.returnTypes.size());
+			// Level 0
+			final ClassListModel classListModel = Assertions.assertInstanceOf(ClassListModel.class,
+					model.returnTypes.get(0));
+			// Level 1
+			final ClassObjectModel classModelOfValue = Assertions.assertInstanceOf(ClassObjectModel.class,
+					classListModel.valueModel);
+			Assertions.assertEquals(Integer.class, classModelOfValue.getOriginClasses());
+		}
+		// Check List<TestEnum>
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getListEnum");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals(1, model.returnTypes.size());
+			// Level 0
+			final ClassListModel classListModel = Assertions.assertInstanceOf(ClassListModel.class,
+					model.returnTypes.get(0));
+			// Level 1
+			final ClassEnumModel classModelOfValue = Assertions.assertInstanceOf(ClassEnumModel.class,
+					classListModel.valueModel);
+			Assertions.assertEquals(TestEnum.class, classModelOfValue.getOriginClasses());
+		}
+		// Check List<TestObject>
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getListObject");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals(1, model.returnTypes.size());
+			// Level 0
+			final ClassListModel classListModel = Assertions.assertInstanceOf(ClassListModel.class,
+					model.returnTypes.get(0));
+			// Level 1
+			final ClassObjectModel classModelOfValue = Assertions.assertInstanceOf(ClassObjectModel.class,
+					classListModel.valueModel);
+			Assertions.assertEquals(TestObject.class, classModelOfValue.getOriginClasses());
+		}
+		// Check List<List<Integer>>
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getListListInteger");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals(1, model.returnTypes.size());
+			// Level 0
+			final ClassListModel classListModel = Assertions.assertInstanceOf(ClassListModel.class,
+					model.returnTypes.get(0));
+			// Level 1
+			final ClassListModel classList2Model = Assertions.assertInstanceOf(ClassListModel.class,
+					classListModel.valueModel);
+			// Level 2
+			final ClassObjectModel classModelOfValue = Assertions.assertInstanceOf(ClassObjectModel.class,
+					classList2Model.valueModel);
+			Assertions.assertEquals(Integer.class, classModelOfValue.getOriginClasses());
+		}
+		// Check List<Map<String, Integer>>
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getListMapInteger");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals(1, model.returnTypes.size());
+			// Level 0
+			final ClassListModel classListModel = Assertions.assertInstanceOf(ClassListModel.class,
+					model.returnTypes.get(0));
+			// Level 1
+			final ClassMapModel classMapModel = Assertions.assertInstanceOf(ClassMapModel.class,
+					classListModel.valueModel);
+			// Level 2
+			final ClassObjectModel classModelOfKey = Assertions.assertInstanceOf(ClassObjectModel.class,
+					classMapModel.keyModel);
+			Assertions.assertEquals(String.class, classModelOfKey.getOriginClasses());
+			final ClassObjectModel classModelOfValue = Assertions.assertInstanceOf(ClassObjectModel.class,
+					classMapModel.valueModel);
+			Assertions.assertEquals(Integer.class, classModelOfValue.getOriginClasses());
+		}
+
+	}
+
+	// does not test other than key string, but in theory it works.
+	public class ReturnValueMap {
+		@GET
+		public Map<String, Integer> getMapInteger() {
+			return null;
+		}
+
+		@GET
+		public Map<String, TestEnum> getMapEnum() {
+			return null;
+		}
+
+		@GET
+		public Map<String, TestObject> getMapObject() {
+			return null;
+		}
+
+		@GET
+		public Map<String, Map<String, Integer>> getMapMap() {
+			return null;
+		}
+
+		@GET
+		public Map<String, List<Integer>> getMapList() {
+			return null;
+		}
+
+	}
+
+	@Test
+	public void testReturnMap() throws Exception {
+		final AnalyzeApi api = new AnalyzeApi();
+		api.addAllApi(List.of(ReturnValueMap.class));
+
+		Assertions.assertEquals(1, api.getAllApi().size());
+		Assertions.assertEquals(5, api.getAllApi().get(0).interfaces.size());
+		// Check Map<String, Integer>
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getMapInteger");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals(1, model.returnTypes.size());
+			// Level 0
+			final ClassMapModel classMapModel = Assertions.assertInstanceOf(ClassMapModel.class,
+					model.returnTypes.get(0));
+			final ClassObjectModel classModelOfKey = Assertions.assertInstanceOf(ClassObjectModel.class,
+					classMapModel.keyModel);
+			Assertions.assertEquals(String.class, classModelOfKey.getOriginClasses());
+			// Level 1
+			final ClassObjectModel classModelOfValue = Assertions.assertInstanceOf(ClassObjectModel.class,
+					classMapModel.valueModel);
+			Assertions.assertEquals(Integer.class, classModelOfValue.getOriginClasses());
+		}
+		// Check Map<String, TestEnum>
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getMapEnum");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals(1, model.returnTypes.size());
+			// Level 0
+			final ClassMapModel classMapModel = Assertions.assertInstanceOf(ClassMapModel.class,
+					model.returnTypes.get(0));
+			final ClassObjectModel classModelOfKey = Assertions.assertInstanceOf(ClassObjectModel.class,
+					classMapModel.keyModel);
+			Assertions.assertEquals(String.class, classModelOfKey.getOriginClasses());
+			// Level 1
+			final ClassEnumModel classModelOfValue = Assertions.assertInstanceOf(ClassEnumModel.class,
+					classMapModel.valueModel);
+			Assertions.assertEquals(TestEnum.class, classModelOfValue.getOriginClasses());
+		}
+		// Check Map<String, TestObject>
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getMapObject");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals(1, model.returnTypes.size());
+			// Level 0
+			final ClassMapModel classMapModel = Assertions.assertInstanceOf(ClassMapModel.class,
+					model.returnTypes.get(0));
+			final ClassObjectModel classModelOfKey = Assertions.assertInstanceOf(ClassObjectModel.class,
+					classMapModel.keyModel);
+			Assertions.assertEquals(String.class, classModelOfKey.getOriginClasses());
+			// Level 1
+			final ClassObjectModel classModelOfValue = Assertions.assertInstanceOf(ClassObjectModel.class,
+					classMapModel.valueModel);
+			Assertions.assertEquals(TestObject.class, classModelOfValue.getOriginClasses());
+		}
+		// Check Map<String, Map<String, Integer>>
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getMapMap");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals(1, model.returnTypes.size());
+			// Level 0
+			final ClassMapModel classMapModel = Assertions.assertInstanceOf(ClassMapModel.class,
+					model.returnTypes.get(0));
+			final ClassObjectModel classModelOfKey = Assertions.assertInstanceOf(ClassObjectModel.class,
+					classMapModel.keyModel);
+			Assertions.assertEquals(String.class, classModelOfKey.getOriginClasses());
+			// Level 1
+			final ClassMapModel classModelOfValue = Assertions.assertInstanceOf(ClassMapModel.class,
+					classMapModel.valueModel);
+			final ClassObjectModel classModelOfValueOfKey = Assertions.assertInstanceOf(ClassObjectModel.class,
+					classModelOfValue.keyModel);
+			Assertions.assertEquals(String.class, classModelOfValueOfKey.getOriginClasses());
+
+			final ClassObjectModel classSubModel = Assertions.assertInstanceOf(ClassObjectModel.class,
+					classModelOfValue.valueModel);
+			Assertions.assertEquals(Integer.class, classSubModel.getOriginClasses());
+		}
+		// Check Map<String, List<Integer>>
+		{
+			final ApiModel model = api.getAllApi().get(0).getInterfaceNamed("getMapList");
+			Assertions.assertNotNull(model);
+			Assertions.assertEquals(1, model.returnTypes.size());
+			// Level 0
+			final ClassMapModel classMapModel = Assertions.assertInstanceOf(ClassMapModel.class,
+					model.returnTypes.get(0));
+			final ClassObjectModel classModelOfKey = Assertions.assertInstanceOf(ClassObjectModel.class,
+					classMapModel.keyModel);
+			Assertions.assertEquals(String.class, classModelOfKey.getOriginClasses());
+			// Level 1
+			final ClassListModel classModelOfValue = Assertions.assertInstanceOf(ClassListModel.class,
+					classMapModel.valueModel);
+			final ClassObjectModel classSubModel = Assertions.assertInstanceOf(ClassObjectModel.class,
+					classModelOfValue.valueModel);
+			Assertions.assertEquals(Integer.class, classSubModel.getOriginClasses());
+		}
+
+	}
+
+}

test/src/test/kar/archidata/externalRestApi/TestAnalyzeModel.java

@@ -0,0 +1,40 @@
+package test.kar.archidata.externalRestApi;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.kar.archidata.externalRestApi.AnalyzeApi;
+import org.kar.archidata.externalRestApi.model.ClassObjectModel;
+import org.kar.archidata.externalRestApi.model.ClassObjectModel.FieldProperty;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TestAnalyzeModel {
+	final static private Logger LOGGER = LoggerFactory.getLogger(TestAnalyzeModel.class);
+
+	public class TestObject {
+		public Integer value;
+	}
+
+	@Test
+	public void testNames() throws Exception {
+		final AnalyzeApi apiInterface = new AnalyzeApi();
+		apiInterface.addModel(TestObject.class);
+		Assertions.assertEquals(2, apiInterface.getAllModel().size());
+		final ClassObjectModel model = Assertions.assertInstanceOf(ClassObjectModel.class,
+				apiInterface.getAllModel().get(0));
+
+		Assertions.assertEquals("TestObject", model.getName());
+		Assertions.assertEquals(false, model.isPrimitive());
+		Assertions.assertNull(model.getDescription());
+		Assertions.assertNull(model.getExample());
+		Assertions.assertNull(model.getExtendsClass());
+		Assertions.assertEquals(1, model.getFields().size());
+		final FieldProperty fieldProperty = model.getFields().get(0);
+		Assertions.assertEquals("value", fieldProperty.name());
+
+		final ClassObjectModel classModel = Assertions.assertInstanceOf(ClassObjectModel.class, fieldProperty.model());
+		Assertions.assertEquals(Integer.class, classModel.getOriginClasses());
+
+	}
+
+}

version.txt

@@ -1 +1 @@
-0.8.9
+0.10.3