[FEAT] add decorator CollectionNotEmpty

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

@@ -85,6 +85,30 @@ public class AnnotationTools {
 		return tmp;
 	}
 
+	public static CollectionItemNotNull getCollectionItemNotNull(final Field element) {
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(CollectionItemNotNull.class);
+		if (annotation.length == 0) {
+			return null;
+		}
+		return (CollectionItemNotNull) annotation[0];
+	}
+
+	public static CollectionItemUnique getCollectionItemUnique(final Field element) {
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(CollectionItemUnique.class);
+		if (annotation.length == 0) {
+			return null;
+		}
+		return (CollectionItemUnique) annotation[0];
+	}
+
+	public static CollectionNotEmpty getCollectionNotEmpty(final Field element) {
+		final Annotation[] annotation = element.getDeclaredAnnotationsByType(CollectionNotEmpty.class);
+		if (annotation.length == 0) {
+			return null;
+		}
+		return (CollectionNotEmpty) annotation[0];
+	}
+
 	public static boolean getSchemaReadOnly(final Field element) {
 		final Annotation[] annotation = element.getDeclaredAnnotationsByType(Schema.class);
 		if (annotation.length == 0) {

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

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

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

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

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

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

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

@@ -8,12 +8,17 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.UUID;
 import java.util.regex.Pattern;
 
 import org.kar.archidata.annotation.AnnotationTools;
+import org.kar.archidata.annotation.CollectionItemNotNull;
+import org.kar.archidata.annotation.CollectionItemUnique;
+import org.kar.archidata.annotation.CollectionNotEmpty;
 import org.kar.archidata.annotation.DataJson;
 import org.kar.archidata.dataAccess.DBAccess;
 import org.kar.archidata.dataAccess.DataAccess;
@@ -476,7 +481,53 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 				if (dataJson != null && dataJson.checker() != null) {
 					final CheckFunctionInterface checkerInstance = dataJson.checker().getDeclaredConstructor()
 							.newInstance();
-					// check if the type is a list, set, ...
+					if (Collection.class.isAssignableFrom(field.getType())) {
+						add(fieldName,
+								(
+										final DBAccess ioDb,
+										final String baseName,
+										final T data,
+										final List<String> modifiedValue,
+										final QueryOptions options) -> {
+									// get the field of the specific element
+									final Object tmpData = field.get(data);
+									// It is not the objective of this element to check if it is authorize to set NULL
+									if (tmpData == null) {
+										return;
+									}
+									final Collection<?> tmpCollection = (Collection<?>) tmpData;
+									final Object[] elements = tmpCollection.toArray();
+									for (int iii = 0; iii < elements.length; iii++) {
+										if (elements[iii] != null) {
+											checkerInstance.check(ioDb, baseName + fieldName + '[' + iii + "].",
+													elements[iii], null, options);
+										}
+									}
+								});
+					} else {
+						add(fieldName,
+								(
+										final DBAccess ioDb,
+										final String baseName,
+										final T data,
+										final List<String> modifiedValue,
+										final QueryOptions options) -> {
+									// get the field of the specific element
+									final Object tmpData = field.get(data);
+									// It is not the objective of this element to check if it is authorize to set NULL
+									if (tmpData == null) {
+										return;
+									}
+									checkerInstance.check(ioDb, baseName + fieldName + '.', tmpData, null, options);
+								});
+					}
+				}
+				final CollectionItemUnique collectionUnique = AnnotationTools.getCollectionItemUnique(field);
+				if (collectionUnique != null) {
+					if (!Collection.class.isAssignableFrom(field.getType())) {
+						throw new DataAccessException(
+								"Request @CollectionItemUnique on a non collection field: '" + fieldName + "'");
+					}
 					add(fieldName,
 							(
 									final DBAccess ioDb,
@@ -484,26 +535,67 @@ public class CheckJPA<T> implements CheckFunctionInterface {
 									final T data,
 									final List<String> modifiedValue,
 									final QueryOptions options) -> {
-								// get the field of the specific element
 								final Object tmpData = field.get(data);
-								// It is not the objective of this element to check if it is authorize to set NULL
 								if (tmpData == null) {
 									return;
 								}
-								if (tmpData instanceof Collection) {
-									final Collection<?> tmpCollection = (Collection<?>) tmpData;
-									final Object[] elements = tmpCollection.toArray();
-									for (int iii = 0; iii < elements.length; iii++) {
-										if (elements[iii] != null) {
-											checkerInstance.check(ioDb, baseName + '.' + fieldName + '[' + iii + ']',
-													elements[iii], null, options);
-										}
-									}
-
-								} else {
-									checkerInstance.check(ioDb, baseName + '.' + fieldName, tmpData, null, options);
+								final Collection<?> tmpCollection = (Collection<?>) tmpData;
+								final Set<Object> uniqueValues = new HashSet<>(tmpCollection);
+								if (uniqueValues.size() != tmpCollection.size()) {
+									throw new InputException(baseName + fieldName,
+											"Cannot insert multiple times the same elements");
+								}
+							});
+				}
+				final CollectionItemNotNull collectionNotNull = AnnotationTools.getCollectionItemNotNull(field);
+				if (collectionNotNull != null) {
+					if (!Collection.class.isAssignableFrom(field.getType())) {
+						throw new DataAccessException(
+								"Request @CollectionItemNotNull on a non collection field: '" + fieldName + "'");
+					}
+					add(fieldName,
+							(
+									final DBAccess ioDb,
+									final String baseName,
+									final T data,
+									final List<String> modifiedValue,
+									final QueryOptions options) -> {
+								final Object tmpData = field.get(data);
+								if (tmpData == null) {
+									return;
 								}
 
+								final Collection<?> tmpCollection = (Collection<?>) tmpData;
+								final Object[] elements = tmpCollection.toArray();
+								for (int iii = 0; iii < elements.length; iii++) {
+									if (elements[iii] == null) {
+										throw new InputException(baseName + fieldName + '[' + iii + ']',
+												"This collection can not conatain NULL item");
+									}
+								}
+							});
+				}
+				final CollectionNotEmpty collectionNotEmpty = AnnotationTools.getCollectionNotEmpty(field);
+				if (collectionNotEmpty != null) {
+					if (!Collection.class.isAssignableFrom(field.getType())) {
+						throw new DataAccessException(
+								"Request @collectionNotEmpty on a non collection field: '" + fieldName + "'");
+					}
+					add(fieldName,
+							(
+									final DBAccess ioDb,
+									final String baseName,
+									final T data,
+									final List<String> modifiedValue,
+									final QueryOptions options) -> {
+								final Object tmpData = field.get(data);
+								if (tmpData == null) {
+									return;
+								}
+								final Collection<?> tmpCollection = (Collection<?>) tmpData;
+								if (tmpCollection.isEmpty()) {
+									throw new InputException(baseName + fieldName, "Can not be empty");
+								}
 							});
 				}
 				// keep this is last ==> take more time...