Skip to content

fix(QTDI-2489): Apply default value before required validation for absent keys #1254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thboileau wants to merge 8 commits into
base: master
Choose a base branch
from
+268 −66
Open

fix(QTDI-2489): Apply default value before required validation for absent keys #1254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
32bc958
fix(QTDI-2489): Apply default value before required validation for ab…
thboileau Jul 15, 2026
14061d6
fix(QTDI-2489): fix Sonar S3599/S2699 in ReflectionServiceTest
thboileau Jul 15, 2026
a21aaab
fix(QTDI-2489): fix Sonar S3776/S5785/S4144/S5778 in ReflectionService
thboileau Jul 15, 2026
0f0258e
fix(QTDI-2489): decrease method complexity - Sonar comment
thboileau Jul 15, 2026
6e5c56d
fix(QTDI-2489): Sonar comment
thboileau Jul 15, 2026
0c290e6
fix(QTDI-2489): add unit tests for all 8 extracted PayloadValidator v…
thboileau Jul 15, 2026
8b4da72
fix(QTDI-2489): replace S5785/S4144 test issues with @ParameterizedTest
thboileau Jul 15, 2026
f32dff1
fix(QTDI-2489): Sonar comment
thboileau Jul 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
160 changes: 94 additions & 66 deletions ...ger/src/main/java/org/talend/sdk/component/runtime/manager/reflect/ReflectionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -913,95 +913,123 @@ public void onParameter(final ParameterMeta meta, final JsonValue value) {
return;
}

if (Boolean.parseBoolean(meta.getMetadata().get("tcomp::validation::required"))
&& value == JsonValue.NULL) {
if (isRequiredAndMissingWithoutDefault(meta, value)) {
errors.add(MESSAGES.required(meta.getPath()));
}
final Map<String, String> metadata = meta.getMetadata();
{
final String min = metadata.get("tcomp::validation::min");
if (min != null) {
final double bound = Double.parseDouble(min);
if (value.getValueType() == JsonValue.ValueType.NUMBER
&& ((JsonNumber) value).doubleValue() < bound) {
errors.add(MESSAGES.min(meta.getPath(), bound, ((JsonNumber) value).doubleValue()));
}
validateRuleMin(meta, value, metadata);

@thboileau thboileau Jul 15, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Following Sonar comment: reduce method complexity. Each block has been extracted as a method

validateRuleMax(meta, value, metadata);
validateRuleMinLength(meta, value, metadata);
validateRuleMaxLength(meta, value, metadata);
validateRuleMinItems(meta, value, metadata);
validateRuleMaxItems(meta, value, metadata);
validateRuleUniqueItems(meta, value, metadata);
validateRulePattern(meta, value, metadata);
}

private void validateRulePattern(final ParameterMeta meta, final JsonValue value,
final Map<String, String> metadata) {
final String pattern = metadata.get("tcomp::validation::pattern");
if (pattern != null && value.getValueType() == JsonValue.ValueType.STRING) {
final String val = ((JsonString) value).getString();
if (!new JavascriptRegex(pattern).test(val)) {
errors.add(MESSAGES.pattern(meta.getPath(), pattern));
}
}
{
final String max = metadata.get("tcomp::validation::max");
if (max != null) {
final double bound = Double.parseDouble(max);
if (value.getValueType() == JsonValue.ValueType.NUMBER
&& ((JsonNumber) value).doubleValue() > bound) {
errors.add(MESSAGES.max(meta.getPath(), bound, ((JsonNumber) value).doubleValue()));
}
}

private void validateRuleUniqueItems(final ParameterMeta meta, final JsonValue value,
final Map<String, String> metadata) {
final String unique = metadata.get("tcomp::validation::uniqueItems");
if (unique != null && value.getValueType() == JsonValue.ValueType.ARRAY) {
final JsonArray array = value.asJsonArray();
if (new HashSet<>(array).size() != array.size()) {
errors.add(MESSAGES.uniqueItems(meta.getPath()));
}
}
{
final String min = metadata.get("tcomp::validation::minLength");
if (min != null) {
final double bound = Double.parseDouble(min);
if (value.getValueType() == JsonValue.ValueType.STRING) {
final String val = ((JsonString) value).getString();
if (val.length() < bound) {
errors.add(MESSAGES.minLength(meta.getPath(), bound, val.length()));
}
}
}

private void validateRuleMaxItems(final ParameterMeta meta, final JsonValue value,
final Map<String, String> metadata) {
final String max = metadata.get("tcomp::validation::maxItems");
if (max != null) {
final double bound = Double.parseDouble(max);
if (value.getValueType() == JsonValue.ValueType.ARRAY && value.asJsonArray().size() > bound) {
errors.add(MESSAGES.maxItems(meta.getPath(), bound, value.asJsonArray().size()));
}
}
{
final String max = metadata.get("tcomp::validation::maxLength");
if (max != null) {
final double bound = Double.parseDouble(max);
if (value.getValueType() == JsonValue.ValueType.STRING) {
final String val = ((JsonString) value).getString();
if (val.length() > bound) {
errors.add(MESSAGES.maxLength(meta.getPath(), bound, val.length()));
}
}
}

private void validateRuleMinItems(final ParameterMeta meta, final JsonValue value,
final Map<String, String> metadata) {
final String min = metadata.get("tcomp::validation::minItems");
if (min != null) {
final double bound = Double.parseDouble(min);
if (value.getValueType() == JsonValue.ValueType.ARRAY && value.asJsonArray().size() < bound) {
errors.add(MESSAGES.minItems(meta.getPath(), bound, value.asJsonArray().size()));
}
}
{
final String min = metadata.get("tcomp::validation::minItems");
if (min != null) {
final double bound = Double.parseDouble(min);
if (value.getValueType() == JsonValue.ValueType.ARRAY && value.asJsonArray().size() < bound) {
errors.add(MESSAGES.minItems(meta.getPath(), bound, value.asJsonArray().size()));
}

private void validateRuleMaxLength(final ParameterMeta meta, final JsonValue value,
final Map<String, String> metadata) {
final String max = metadata.get("tcomp::validation::maxLength");
if (max != null) {
final double bound = Double.parseDouble(max);
if (value.getValueType() == JsonValue.ValueType.STRING) {
final String val = ((JsonString) value).getString();
if (val.length() > bound) {
errors.add(MESSAGES.maxLength(meta.getPath(), bound, val.length()));
}
}
}
{
final String max = metadata.get("tcomp::validation::maxItems");
if (max != null) {
final double bound = Double.parseDouble(max);
if (value.getValueType() == JsonValue.ValueType.ARRAY && value.asJsonArray().size() > bound) {
errors.add(MESSAGES.maxItems(meta.getPath(), bound, value.asJsonArray().size()));
}

private void validateRuleMinLength(final ParameterMeta meta, final JsonValue value,
final Map<String, String> metadata) {
final String min = metadata.get("tcomp::validation::minLength");
if (min != null) {
final double bound = Double.parseDouble(min);
if (value.getValueType() == JsonValue.ValueType.STRING) {
final String val = ((JsonString) value).getString();
if (val.length() < bound) {
errors.add(MESSAGES.minLength(meta.getPath(), bound, val.length()));
}
}
}
{
final String unique = metadata.get("tcomp::validation::uniqueItems");
if (unique != null) {
if (value.getValueType() == JsonValue.ValueType.ARRAY) {
final JsonArray array = value.asJsonArray();
if (new HashSet<>(array).size() != array.size()) {
errors.add(MESSAGES.uniqueItems(meta.getPath()));
}
}
}

private void validateRuleMax(final ParameterMeta meta, final JsonValue value,
final Map<String, String> metadata) {
final String max = metadata.get("tcomp::validation::max");
if (max != null) {
final double bound = Double.parseDouble(max);
if (value.getValueType() == JsonValue.ValueType.NUMBER
&& ((JsonNumber) value).doubleValue() > bound) {
errors.add(MESSAGES.max(meta.getPath(), bound, ((JsonNumber) value).doubleValue()));
}
}
{
final String pattern = metadata.get("tcomp::validation::pattern");
if (pattern != null && value.getValueType() == JsonValue.ValueType.STRING) {
final String val = ((JsonString) value).getString();
if (!new JavascriptRegex(pattern).test((CharSequence) val)) {
errors.add(MESSAGES.pattern(meta.getPath(), pattern));
}
}

private void validateRuleMin(final ParameterMeta meta, final JsonValue value,
final Map<String, String> metadata) {
final String min = metadata.get("tcomp::validation::min");
if (min != null) {
final double bound = Double.parseDouble(min);
if (value.getValueType() == JsonValue.ValueType.NUMBER
&& ((JsonNumber) value).doubleValue() < bound) {
errors.add(MESSAGES.min(meta.getPath(), bound, ((JsonNumber) value).doubleValue()));
}
}
}

private static boolean isRequiredAndMissingWithoutDefault(final ParameterMeta meta,
final JsonValue value) {
return Boolean.parseBoolean(meta.getMetadata().get("tcomp::validation::required"))
&& value == JsonValue.NULL
&& meta.getMetadata().get("tcomp::ui::defaultvalue::value") == null;
}

private void throwIfFailed() {
if (!errors.isEmpty()) {
throw new IllegalArgumentException("- " + String.join("\n- ", errors));
Expand Down
Loading
Loading