kangaroo-and-rabbit/archidata
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[FIX] normalize comment when check size

Browse Source
This commit is contained in:
Edouard DUPIN 2025-01-29 22:43:22 +01:00
parent 69880df4aa
commit 3e81673d38
1 changed files with 51 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
src/org/kar/archidata/checker/CheckJPA.java
View File

@ -134,6 +134,8 @@ public class CheckJPA<T> implements CheckFunctionInterface {
if (maxValueDecimal != null) { if (maxValueDecimal != null) {
final long maxValue = Long.parseLong(maxValueDecimal.value()); final long maxValue = Long.parseLong(maxValueDecimal.value());
final boolean inclusive = maxValueDecimal.inclusive(); final boolean inclusive = maxValueDecimal.inclusive();
final String exceptionComment = "Value too height max=" + maxValue
+ (inclusive ? " (inclusive)" : " (exclusive)");
add(fieldName, add(fieldName,
( (
final DBAccess ioDb, final DBAccess ioDb,
@ -148,12 +150,10 @@ public class CheckJPA<T> implements CheckFunctionInterface {
final Long elemTyped = (Long) elem; final Long elemTyped = (Long) elem;
if (inclusive) { if (inclusive) {
if (elemTyped > maxValue) { if (elemTyped > maxValue) {
throw new InputException(baseName + fieldName, throw new InputException(baseName + fieldName, exceptionComment);
"Value too height max: " + maxValue);
} }
} else if (elemTyped >= maxValue) { } else if (elemTyped >= maxValue) {
throw new InputException(baseName + fieldName, throw new InputException(baseName + fieldName, exceptionComment);
"Value too height max: " + maxValue);
} }
}); });
} }
@ -161,6 +161,8 @@ public class CheckJPA<T> implements CheckFunctionInterface {
if (minValueDecimal != null) { if (minValueDecimal != null) {
final long minValue = Long.parseLong(minValueDecimal.value()); final long minValue = Long.parseLong(minValueDecimal.value());
final boolean inclusive = minValueDecimal.inclusive(); final boolean inclusive = minValueDecimal.inclusive();
final String exceptionComment = "Value too low min=" + minValue
+ (inclusive ? " (inclusive)" : " (exclusive)");
add(fieldName, add(fieldName,
( (
final DBAccess ioDb, final DBAccess ioDb,
@ -175,18 +177,17 @@ public class CheckJPA<T> implements CheckFunctionInterface {
final Long elemTyped = (Long) elem; final Long elemTyped = (Long) elem;
if (inclusive) { if (inclusive) {
if (elemTyped < minValue) { if (elemTyped < minValue) {
throw new InputException(baseName + fieldName, throw new InputException(baseName + fieldName, exceptionComment);
"Value too Low min: " + minValue);
} }
} else if (elemTyped <= minValue) { } else if (elemTyped <= minValue) {
throw new InputException(baseName + fieldName, throw new InputException(baseName + fieldName, exceptionComment);
"Value too Low min: " + minValue);
} }
}); });
} }
final Max maxValue = AnnotationTools.getConstraintsMax(field); final Max maxValue = AnnotationTools.getConstraintsMax(field);
if (maxValue != null) { if (maxValue != null) {
final Long maxValueTmp = maxValue.value(); final Long maxValueTmp = maxValue.value();
final String exceptionComment = "Value too height max=" + maxValueTmp + " (inclusive)";
add(fieldName, add(fieldName,
( (
final DBAccess ioDb, final DBAccess ioDb,
@ -200,14 +201,14 @@ public class CheckJPA<T> implements CheckFunctionInterface {
} }
final Long elemTyped = (Long) elem; final Long elemTyped = (Long) elem;
if (elemTyped > maxValueTmp) { if (elemTyped > maxValueTmp) {
throw new InputException(baseName + fieldName, throw new InputException(baseName + fieldName, exceptionComment);
"Value too height max: " + maxValueTmp);
} }
}); });
} }
final Min minValue = AnnotationTools.getConstraintsMin(field); final Min minValue = AnnotationTools.getConstraintsMin(field);
if (minValue != null) { if (minValue != null) {
final Long minValueTmp = minValue.value(); final Long minValueTmp = minValue.value();
final String exceptionComment = "Value too low min=" + minValueTmp + " (inclusive)";
add(fieldName, add(fieldName,
( (
final DBAccess ioDb, final DBAccess ioDb,
@ -221,8 +222,7 @@ public class CheckJPA<T> implements CheckFunctionInterface {
} }
final Long elemTyped = (Long) elem; final Long elemTyped = (Long) elem;
if (elemTyped < minValueTmp) { if (elemTyped < minValueTmp) {
throw new InputException(baseName + fieldName, throw new InputException(baseName + fieldName, exceptionComment);
"Value too Low min: " + minValueTmp);
} }
}); });
} }
@ -231,6 +231,8 @@ public class CheckJPA<T> implements CheckFunctionInterface {
if (maxValueDecimal != null) { if (maxValueDecimal != null) {
final int maxValue = Integer.parseInt(maxValueDecimal.value()); final int maxValue = Integer.parseInt(maxValueDecimal.value());
final boolean inclusive = maxValueDecimal.inclusive(); final boolean inclusive = maxValueDecimal.inclusive();
final String exceptionComment = "Value too height max=" + maxValue
+ (inclusive ? " (inclusive)" : " (exclusive)");
add(fieldName, add(fieldName,
( (
final DBAccess ioDb, final DBAccess ioDb,
@ -245,13 +247,11 @@ public class CheckJPA<T> implements CheckFunctionInterface {
final Integer elemTyped = (Integer) elem; final Integer elemTyped = (Integer) elem;
if (inclusive) { if (inclusive) {
if (elemTyped > maxValue) { if (elemTyped > maxValue) {
throw new InputException(baseName + fieldName, throw new InputException(baseName + fieldName, exceptionComment);
"Value too height max: " + maxValue);
} }
} else if (elemTyped >= maxValue) { } else if (elemTyped >= maxValue) {
throw new InputException(baseName + fieldName, throw new InputException(baseName + fieldName, exceptionComment);
"Value too height max: " + maxValue);
} }
}); });
} }
@ -259,6 +259,8 @@ public class CheckJPA<T> implements CheckFunctionInterface {
if (minValueDecimal != null) { if (minValueDecimal != null) {
final int minValue = Integer.parseInt(minValueDecimal.value()); final int minValue = Integer.parseInt(minValueDecimal.value());
final boolean inclusive = minValueDecimal.inclusive(); final boolean inclusive = minValueDecimal.inclusive();
final String exceptionComment = "Value too low min=" + minValue
+ (inclusive ? " (inclusive)" : " (exclusive)");
add(fieldName, add(fieldName,
( (
final DBAccess ioDb, final DBAccess ioDb,
@ -273,18 +275,17 @@ public class CheckJPA<T> implements CheckFunctionInterface {
final Integer elemTyped = (Integer) elem; final Integer elemTyped = (Integer) elem;
if (inclusive) { if (inclusive) {
if (elemTyped < minValue) { if (elemTyped < minValue) {
throw new InputException(baseName + fieldName, throw new InputException(baseName + fieldName, exceptionComment);
"Value too Low min: " + minValue);
} }
} else if (elemTyped <= minValue) { } else if (elemTyped <= minValue) {
throw new InputException(baseName + fieldName, throw new InputException(baseName + fieldName, exceptionComment);
"Value too Low min: " + minValue);
} }
}); });
} }
final Max maxValueRoot = AnnotationTools.getConstraintsMax(field); final Max maxValueRoot = AnnotationTools.getConstraintsMax(field);
if (maxValueRoot != null) { if (maxValueRoot != null) {
final int maxValue = (int) maxValueRoot.value(); final int maxValue = (int) maxValueRoot.value();
final String exceptionComment = "Value too height max=" + maxValue + " (inclusive)";
add(fieldName, add(fieldName,
( (
final DBAccess ioDb, final DBAccess ioDb,
@ -298,14 +299,14 @@ public class CheckJPA<T> implements CheckFunctionInterface {
} }
final Integer elemTyped = (Integer) elem; final Integer elemTyped = (Integer) elem;
if (elemTyped > maxValue) { if (elemTyped > maxValue) {
throw new InputException(baseName + fieldName, throw new InputException(baseName + fieldName, exceptionComment);
"Value too height max: " + maxValue);
} }
}); });
} }
final Min minValueRoot = AnnotationTools.getConstraintsMin(field); final Min minValueRoot = AnnotationTools.getConstraintsMin(field);
if (minValueRoot != null) { if (minValueRoot != null) {
final int minValue = (int) minValueRoot.value(); final int minValue = (int) minValueRoot.value();
final String exceptionComment = "Value too low min=" + minValue + " (inclusive)";
add(fieldName, add(fieldName,
( (
final DBAccess ioDb, final DBAccess ioDb,
@ -319,8 +320,7 @@ public class CheckJPA<T> implements CheckFunctionInterface {
} }
final Integer elemTyped = (Integer) elem; final Integer elemTyped = (Integer) elem;
if (elemTyped < minValue) { if (elemTyped < minValue) {
throw new InputException(baseName + fieldName, throw new InputException(baseName + fieldName, exceptionComment);
"Value too Low min: " + minValue);
} }
}); });
} }
@ -331,6 +331,8 @@ public class CheckJPA<T> implements CheckFunctionInterface {
if (maxValueDecimal != null) { if (maxValueDecimal != null) {
final float maxValue = Float.parseFloat(maxValueDecimal.value()); final float maxValue = Float.parseFloat(maxValueDecimal.value());
final boolean inclusive = maxValueDecimal.inclusive(); final boolean inclusive = maxValueDecimal.inclusive();
final String exceptionComment = "Value too height max=" + maxValue
+ (inclusive ? " (inclusive)" : " (exclusive)");
add(fieldName, add(fieldName,
( (
final DBAccess ioDb, final DBAccess ioDb,
@ -345,12 +347,10 @@ public class CheckJPA<T> implements CheckFunctionInterface {
final Float elemTyped = (Float) elem; final Float elemTyped = (Float) elem;
if (inclusive) { if (inclusive) {
if (elemTyped > maxValue) { if (elemTyped > maxValue) {
throw new InputException(baseName + fieldName, throw new InputException(baseName + fieldName, exceptionComment);
"Value too height max: " + maxValue);
} }
} else if (elemTyped >= maxValue) { } else if (elemTyped >= maxValue) {
throw new InputException(baseName + fieldName, throw new InputException(baseName + fieldName, exceptionComment);
"Value too height max: " + maxValue);
} }
}); });
} }
@ -358,6 +358,8 @@ public class CheckJPA<T> implements CheckFunctionInterface {
if (minValueDecimal != null) { if (minValueDecimal != null) {
final float minValue = Float.parseFloat(minValueDecimal.value()); final float minValue = Float.parseFloat(minValueDecimal.value());
final boolean inclusive = minValueDecimal.inclusive(); final boolean inclusive = minValueDecimal.inclusive();
final String exceptionComment = "Value too low min=" + minValue
+ (inclusive ? " (inclusive)" : " (exclusive)");
add(fieldName, add(fieldName,
( (
final DBAccess ioDb, final DBAccess ioDb,
@ -372,18 +374,17 @@ public class CheckJPA<T> implements CheckFunctionInterface {
final Float elemTyped = (Float) elem; final Float elemTyped = (Float) elem;
if (inclusive) { if (inclusive) {
if (elemTyped < minValue) { if (elemTyped < minValue) {
throw new InputException(baseName + fieldName, throw new InputException(baseName + fieldName, exceptionComment);
"Value too Low min: " + minValue);
} }
} else if (elemTyped <= minValue) { } else if (elemTyped <= minValue) {
throw new InputException(baseName + fieldName, throw new InputException(baseName + fieldName, exceptionComment);
"Value too Low min: " + minValue);
} }
}); });
} }
final Max maxValueRoot = AnnotationTools.getConstraintsMax(field); final Max maxValueRoot = AnnotationTools.getConstraintsMax(field);
if (maxValueRoot != null) { if (maxValueRoot != null) {
final float maxValue = maxValueRoot.value(); final float maxValue = maxValueRoot.value();
final String exceptionComment = "Value too height max=" + maxValue + " (inclusive)";
add(fieldName, add(fieldName,
( (
final DBAccess ioDb, final DBAccess ioDb,
@ -398,14 +399,14 @@ public class CheckJPA<T> implements CheckFunctionInterface {
final Float elemTyped = (Float) elem; final Float elemTyped = (Float) elem;
if (elemTyped > maxValue) { if (elemTyped > maxValue) {
throw new InputException(baseName + fieldName, throw new InputException(baseName + fieldName, exceptionComment);
"Value too height max: " + maxValue);
} }
}); });
} }
final Min minValueRoot = AnnotationTools.getConstraintsMin(field); final Min minValueRoot = AnnotationTools.getConstraintsMin(field);
if (minValueRoot != null) { if (minValueRoot != null) {
final float minValue = minValueRoot.value(); final float minValue = minValueRoot.value();
final String exceptionComment = "Value too low min=" + minValue + " (inclusive)";
add(fieldName, add(fieldName,
( (
final DBAccess ioDb, final DBAccess ioDb,
@ -419,8 +420,7 @@ public class CheckJPA<T> implements CheckFunctionInterface {
} }
final Float elemTyped = (Float) elem; final Float elemTyped = (Float) elem;
if (elemTyped < minValue) { if (elemTyped < minValue) {
throw new InputException(baseName + fieldName, throw new InputException(baseName + fieldName, exceptionComment);
"Value too Low min: " + minValue);
} }
}); });
} }
@ -429,6 +429,8 @@ public class CheckJPA<T> implements CheckFunctionInterface {
if (maxValueDecimal != null) { if (maxValueDecimal != null) {
final double maxValue = Float.parseFloat(maxValueDecimal.value()); final double maxValue = Float.parseFloat(maxValueDecimal.value());
final boolean inclusive = maxValueDecimal.inclusive(); final boolean inclusive = maxValueDecimal.inclusive();
final String exceptionComment = "Value too height max=" + maxValue
+ (inclusive ? " (inclusive)" : " (exclusive)");
add(fieldName, add(fieldName,
( (
final DBAccess ioDb, final DBAccess ioDb,
@ -443,12 +445,10 @@ public class CheckJPA<T> implements CheckFunctionInterface {
final Double elemTyped = (Double) elem; final Double elemTyped = (Double) elem;
if (inclusive) { if (inclusive) {
if (elemTyped > maxValue) { if (elemTyped > maxValue) {
throw new InputException(baseName + fieldName, throw new InputException(baseName + fieldName, exceptionComment);
"Value too height max: " + maxValue);
} }
} else if (elemTyped >= maxValue) { } else if (elemTyped >= maxValue) {
throw new InputException(baseName + fieldName, throw new InputException(baseName + fieldName, exceptionComment);
"Value too height max: " + maxValue);
} }
}); });
} }
@ -456,6 +456,8 @@ public class CheckJPA<T> implements CheckFunctionInterface {
if (minValueDecimal != null) { if (minValueDecimal != null) {
final double minValue = Float.parseFloat(minValueDecimal.value()); final double minValue = Float.parseFloat(minValueDecimal.value());
final boolean inclusive = minValueDecimal.inclusive(); final boolean inclusive = minValueDecimal.inclusive();
final String exceptionComment = "Value too low min=" + minValue
+ (inclusive ? " (inclusive)" : " (exclusive)");
add(fieldName, add(fieldName,
( (
final DBAccess ioDb, final DBAccess ioDb,
@ -474,14 +476,14 @@ public class CheckJPA<T> implements CheckFunctionInterface {
"Value too Low min: " + minValue); "Value too Low min: " + minValue);
} }
} else if (elemTyped <= minValue) { } else if (elemTyped <= minValue) {
throw new InputException(baseName + fieldName, throw new InputException(baseName + fieldName, exceptionComment);
"Value too Low min: " + minValue);
} }
}); });
} }
final Max maxValueRoot = AnnotationTools.getConstraintsMax(field); final Max maxValueRoot = AnnotationTools.getConstraintsMax(field);
if (maxValueRoot != null) { if (maxValueRoot != null) {
final double maxValue = maxValueRoot.value(); final double maxValue = maxValueRoot.value();
final String exceptionComment = "Value too height max=" + maxValue + " (inclusive)";
add(fieldName, add(fieldName,
( (
final DBAccess ioDb, final DBAccess ioDb,
@ -495,14 +497,14 @@ public class CheckJPA<T> implements CheckFunctionInterface {
} }
final Double elemTyped = (Double) elem; final Double elemTyped = (Double) elem;
if (elemTyped > maxValue) { if (elemTyped > maxValue) {
throw new InputException(baseName + fieldName, throw new InputException(baseName + fieldName, exceptionComment);
"Value too height max: " + maxValue);
} }
}); });
} }
final Min minValueRoot = AnnotationTools.getConstraintsMin(field); final Min minValueRoot = AnnotationTools.getConstraintsMin(field);
if (minValueRoot != null) { if (minValueRoot != null) {
final double minValue = minValueRoot.value(); final double minValue = minValueRoot.value();
final String exceptionComment = "Value too low min=" + minValue + " (inclusive)";
add(fieldName, add(fieldName,
( (
final DBAccess ioDb, final DBAccess ioDb,
@ -516,8 +518,7 @@ public class CheckJPA<T> implements CheckFunctionInterface {
} }
final Double elemTyped = (Double) elem; final Double elemTyped = (Double) elem;
if (elemTyped < minValue) { if (elemTyped < minValue) {
throw new InputException(baseName + fieldName, throw new InputException(baseName + fieldName, exceptionComment);
"Value too Low min: " + minValue);
} }
}); });
} }
@ -721,7 +722,7 @@ public class CheckJPA<T> implements CheckFunctionInterface {
for (int iii = 0; iii < elements.length; iii++) { for (int iii = 0; iii < elements.length; iii++) {
if (elements[iii] == null) { if (elements[iii] == null) {
throw new InputException(baseName + fieldName + '[' + iii + ']', throw new InputException(baseName + fieldName + '[' + iii + ']',
"This collection can not conatain NULL item"); "Collection can not contain NULL item");
} }
} }
}); });
@ -745,7 +746,7 @@ public class CheckJPA<T> implements CheckFunctionInterface {
} }
final Collection<?> tmpCollection = (Collection<?>) tmpData; final Collection<?> tmpCollection = (Collection<?>) tmpData;
if (tmpCollection.isEmpty()) { if (tmpCollection.isEmpty()) {
throw new InputException(baseName + fieldName, "Can not be empty"); throw new InputException(baseName + fieldName, "Collection can not be empty");
} }
}); });
} }
@ -770,7 +771,8 @@ public class CheckJPA<T> implements CheckFunctionInterface {
condCheckers.get(0).toCondition()); condCheckers.get(0).toCondition());
} }
if (other != null) { if (other != null) {
throw new InputException(baseName + fieldName, "Name already exist in the DB"); throw new InputException(baseName + fieldName,
"The field is already exist in the DB");
} }
}); });
} }